diff --git a/programming/library/stellarsolver/actions.py b/programming/library/stellarsolver/actions.py index a8087aa1ef..027b5980d7 100644 --- a/programming/library/stellarsolver/actions.py +++ b/programming/library/stellarsolver/actions.py @@ -13,7 +13,7 @@ def setup(): shelltools.makedirs("build") shelltools.cd("build") - cmaketools.configure(sourceDir="..") + cmaketools.configure("-DUSE_QT5=OFF", sourceDir="..") def build(): cmaketools.make("-C build") diff --git a/programming/library/stellarsolver/files/e8d809b183d1f752cd683e1dcad02678cac552f0.patch b/programming/library/stellarsolver/files/e8d809b183d1f752cd683e1dcad02678cac552f0.patch new file mode 100644 index 0000000000..7b3ed69949 --- /dev/null +++ b/programming/library/stellarsolver/files/e8d809b183d1f752cd683e1dcad02678cac552f0.patch @@ -0,0 +1,44 @@ +From e8d809b183d1f752cd683e1dcad02678cac552f0 Mon Sep 17 00:00:00 2001 +From: Robert Lancaster +Date: Fri, 30 May 2025 10:08:45 -0400 +Subject: [PATCH] Update to Fix Fedora and QT6.9 issues + +--- + linux-scripts/installStellarSolverTesterQt6.sh | 2 +- + tester/mainwindow.h | 9 --------- + 2 files changed, 1 insertion(+), 10 deletions(-) + +diff --git a/linux-scripts/installStellarSolverTesterQt6.sh b/linux-scripts/installStellarSolverTesterQt6.sh +index fe58440..16af335 100755 +--- a/linux-scripts/installStellarSolverTesterQt6.sh ++++ b/linux-scripts/installStellarSolverTesterQt6.sh +@@ -5,7 +5,7 @@ DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/../ + + #This installs the dependencies + if [ -f /usr/lib/fedora-release ]; then +- sudo dnf -y install git cmake qt6 cfitsio-devel gsl-devel wcslib-devel ++ sudo dnf -y install git cmake automake gcc gcc-c++ kernel-devel qt6-qtbase-devel cfitsio-devel gsl-devel wcslib-devel + else + sudo apt -y install g++ git cmake qt6-base-dev libgl1-mesa-dev libcfitsio-dev libgsl-dev wcslib-dev + fi +diff --git a/tester/mainwindow.h b/tester/mainwindow.h +index 9f16b43..6367d0d 100644 +--- a/tester/mainwindow.h ++++ b/tester/mainwindow.h +@@ -39,16 +39,7 @@ + + //Astrometry.net includes + extern "C"{ +-#include "ioutils.h" +-#include "bl.h" +-#include "an-bool.h" +-#include "solver.h" +-#include "astrometry/blind.h" +-#include "log.h" + #include "engine.h" +-#include "anqfits.h" +-#include "ioutils.h" +-#include "fitstable.h" + } + + namespace Ui { diff --git a/programming/library/stellarsolver/pspec.xml b/programming/library/stellarsolver/pspec.xml index af672744f6..5d2565ad08 100644 --- a/programming/library/stellarsolver/pspec.xml +++ b/programming/library/stellarsolver/pspec.xml @@ -13,16 +13,16 @@ app:console The Cross Platform Sextractor and Astrometry.net-Based Internal Astrometric Solver The Cross Platform Sextractor and Astrometry.net-Based Internal Astrometric Solver. - https://github.com/rlancaste/stellarsolver/archive/2.4.tar.gz + https://github.com/rlancaste/stellarsolver/archive/2.7.tar.gz cmake gsl-devel wcslib-devel cfitsio-devel - qt5-base-devel + qt6-base-devel - + e8d809b183d1f752cd683e1dcad02678cac552f0.patch @@ -33,13 +33,13 @@ libgcc wcslib cfitsio - qt5-base + qt6-base /usr/share/doc - /usr/lib/libstellarsolver.so* - /usr/lib/libstellarsolver.so.2 - /usr/lib/libstellarsolver.so.2.2 + /usr/lib/libstellarsolver6.so* + /usr/lib/libstellarsolver6.so.2 + /usr/lib/libstellarsolver6.so.2.* @@ -57,6 +57,13 @@ + + 2025-06-05 + 2.7 + Version bump. + Pisi Linux Community + admin@pisilinux.org + 2023-07-28 2.4