Merge pull request #16756 from Rmys/master

stellarsolver

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")

programming/library/stellarsolver/files/e8d809b183d1f752cd683e1dcad02678cac552f0.patch

@@ -0,0 +1,44 @@
+From e8d809b183d1f752cd683e1dcad02678cac552f0 Mon Sep 17 00:00:00 2001
+From: Robert Lancaster <rlancaste@gmail.com>
+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 {

programming/library/stellarsolver/pspec.xml

@@ -13,16 +13,16 @@
         <IsA>app:console</IsA>
         <Summary>The Cross Platform Sextractor and Astrometry.net-Based Internal Astrometric Solver</Summary>
         <Description>The Cross Platform Sextractor and Astrometry.net-Based Internal Astrometric Solver.</Description>
-        <Archive sha1sum="5dbc5128e5d8d89ca3ed0913fb96f556eeb3dde5" type="targz">https://github.com/rlancaste/stellarsolver/archive/2.4.tar.gz</Archive>
+        <Archive sha1sum="0d6e6453255401f005901c36e226223670b498ea" type="targz">https://github.com/rlancaste/stellarsolver/archive/2.7.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>cmake</Dependency>
             <Dependency>gsl-devel</Dependency>
             <Dependency versionFrom="8.1">wcslib-devel</Dependency>
             <Dependency>cfitsio-devel</Dependency>
-            <Dependency>qt5-base-devel</Dependency>
+            <Dependency>qt6-base-devel</Dependency>
         </BuildDependencies>
         <Patches>
-<!--             <Patch>.patch</Patch> -->
+            <Patch level="1">e8d809b183d1f752cd683e1dcad02678cac552f0.patch</Patch>
         </Patches>
     </Source>
 
@@ -33,13 +33,13 @@
             <Dependency>libgcc</Dependency>
             <Dependency>wcslib</Dependency>
             <Dependency>cfitsio</Dependency>
-            <Dependency>qt5-base</Dependency>
+            <Dependency>qt6-base</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="doc">/usr/share/doc</Path>
-            <Path fileType="library">/usr/lib/libstellarsolver.so*</Path>
+            <Path fileType="library">/usr/lib/libstellarsolver6.so*</Path>
-            <Path fileType="library">/usr/lib/libstellarsolver.so.2</Path>
+            <Path fileType="library">/usr/lib/libstellarsolver6.so.2</Path>
-            <Path fileType="library">/usr/lib/libstellarsolver.so.2.2</Path>
+            <Path fileType="library">/usr/lib/libstellarsolver6.so.2.*</Path>
         </Files>
     </Package>
 
@@ -57,6 +57,13 @@
     </Package>
 
     <History>
+        <Update release="5">
+            <Date>2025-06-05</Date>
+            <Version>2.7</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Pisi Linux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
         <Update release="4">
             <Date>2023-07-28</Date>
             <Version>2.4</Version>