Minor Release 2.6 for QT6 support

CMakeLists.txt

@@ -10,9 +10,9 @@ endif(APPLE)
 # Timestamp build
 string(TIMESTAMP StellarSolver_BUILD_TS UTC)
 
-# StellarSolver Version 2.5
+# StellarSolver Version 2.6
 set (StellarSolver_VERSION_MAJOR 2)
-set (StellarSolver_VERSION_MINOR 5)
+set (StellarSolver_VERSION_MINOR 6)
 
 set (StellarSolver_SOVERSION "${StellarSolver_VERSION_MAJOR}")
 set (StellarSolver_VERSION ${StellarSolver_VERSION_MAJOR}.${StellarSolver_VERSION_MINOR})

craft-blueprints/QT5/StellarSolverTester/StellarSolverTester.py

@@ -0,0 +1,41 @@
+import info
+from CraftCore import CraftCore
+from Package.CMakePackageBase import CMakePackageBase
+from Packager.AppxPackager import AppxPackager
+
+
+
+class subinfo(info.infoclass):
+    def setTargets(self):
+        self.description = "StellarSolver Star Extractor (SEP) and Astrometry.net based Library Tester Program"
+        self.svnTargets["master"] = "https://github.com/rlancaste/stellarsolver.git"
+        for ver in ["2.6"]:
+            self.targets[ver] = f"https://github.com/rlancaste/stellarsolver/archive/refs/tags/{ver}.tar.gz"
+            self.archiveNames[ver] = f"stellarsolver-tester-{ver}.tar.gz"
+            self.targetInstSrc[ver] = f"stellarsolver-{ver}"
+        self.defaultTarget = "2.6"
+
+    def setDependencies(self):
+        self.runtimeDependencies["virtual/base"] = None
+        self.runtimeDependencies["libs/qt/qtbase"] = None
+        self.runtimeDependencies["libs/gsl"] = None
+        self.runtimeDependencies["libs/mman"] = None
+        self.runtimeDependencies["libs/cfitsio"] = None
+        self.runtimeDependencies["libs/zlib"] = None
+        self.runtimeDependencies["boost-regex"] = None
+        self.runtimeDependencies["libs/wcslib"] = None
+
+class Package(CMakePackageBase):
+    def __init__(self):
+        super().__init__()
+        self.subinfo.options.configure.args += [
+        	"-DUSE_QT5=ON",
+        	"-DBUILD_TESTER=ON"
+        ]
+
+    def createPackage(self):
+        self.defines["executable"] = "bin\\StellarSolverTester.exe"
+        self.defines["icon"] = self.blueprintDir() / "StellarSolverInstallIcon.ico"
+        if isinstance(self, AppxPackager):
+              self.defines["display_name"] = "StellarSolverTester"
+        return super().createPackage()

craft-blueprints/QT5/stellarbatchsolver/stellarbatchsolver.py

@@ -0,0 +1,39 @@
+import info
+from CraftCore import CraftCore
+from Package.CMakePackageBase import CMakePackageBase
+from Packager.AppxPackager import AppxPackager
+
+class subinfo(info.infoclass):
+    def setTargets(self):
+        self.description = "StellarSolver Star Extractor (SEP) and Astrometry.net based Library Batch Solver Program"
+        self.svnTargets["master"] = "https://github.com/rlancaste/stellarsolver.git"
+        for ver in ["2.6"]:
+            self.targets[ver] = f"https://github.com/rlancaste/stellarsolver/archive/refs/tags/{ver}.tar.gz"
+            self.archiveNames[ver] = f"stellarsolver-tester-{ver}.tar.gz"
+            self.targetInstSrc[ver] = f"stellarsolver-{ver}"
+        self.defaultTarget = "2.6"
+
+    def setDependencies(self):
+        self.runtimeDependencies["virtual/base"] = None
+        self.runtimeDependencies["libs/qt/qtbase"] = None
+        self.runtimeDependencies["libs/gsl"] = None
+        self.runtimeDependencies["libs/mman"] = None
+        self.runtimeDependencies["libs/cfitsio"] = None
+        self.runtimeDependencies["libs/zlib"] = None
+        self.runtimeDependencies["boost-regex"] = None
+        self.runtimeDependencies["libs/wcslib"] = None
+
+class Package(CMakePackageBase):
+    def __init__(self):
+        super().__init__()
+        self.subinfo.options.configure.args += [
+        	"-DUSE_QT5=ON",
+        	"-DBUILD_BATCH_SOLVER=ON"
+        ]
+
+    def createPackage(self):
+        self.defines["executable"] = "bin\\StellarBatchSolver.exe"
+        self.defines["icon"] = self.blueprintDir() / "StellarBatchSolverInstallIcon.ico"
+        if isinstance(self, AppxPackager):
+              self.defines["display_name"] = "StellarBatchSolver"
+        return super().createPackage()

craft-blueprints/QT5/stellarsolver/stellarsolver.py

@@ -0,0 +1,28 @@
+import glob
+import info
+from Package.CMakePackageBase import CMakePackageBase
+
+class subinfo(info.infoclass):
+    def setTargets(self):
+        self.description = "StellarSolver Star Extractor (SEP) and Astrometry.net based Library"
+        self.svnTargets["master"] = "https://github.com/rlancaste/stellarsolver.git"
+        for ver in ["2.6"]:
+            self.targets[ver] = f"https://github.com/rlancaste/stellarsolver/archive/refs/tags/{ver}.tar.gz"
+            self.archiveNames[ver] = f"stellarsolver-tester-{ver}.tar.gz"
+            self.targetInstSrc[ver] = f"stellarsolver-{ver}"
+        self.defaultTarget = "2.6"
+
+    def setDependencies(self):
+        self.runtimeDependencies["virtual/base"] = None
+        self.runtimeDependencies["libs/qt/qtbase"] = None
+        self.runtimeDependencies["libs/gsl"] = None
+        self.runtimeDependencies["libs/mman"] = None
+        self.runtimeDependencies["libs/cfitsio"] = None
+        self.runtimeDependencies["libs/zlib"] = None
+        self.runtimeDependencies["boost-regex"] = None
+        self.runtimeDependencies["libs/wcslib"] = None
+
+class Package(CMakePackageBase):
+    def __init__(self):
+        super().__init__()
+        self.subinfo.options.configure.args += ["-DUSE_QT5=ON"]

craft-blueprints/QT6/StellarSolverTester/StellarSolverTester.py

@@ -0,0 +1,41 @@
+import info
+from CraftCore import CraftCore
+from Package.CMakePackageBase import CMakePackageBase
+from Packager.AppxPackager import AppxPackager
+
+
+
+class subinfo(info.infoclass):
+    def setTargets(self):
+        self.description = "StellarSolver Star Extractor (SEP) and Astrometry.net based Library Tester Program"
+        self.svnTargets["master"] = "https://github.com/rlancaste/stellarsolver.git"
+        for ver in ["2.6"]:
+            self.targets[ver] = f"https://github.com/rlancaste/stellarsolver/archive/refs/tags/{ver}.tar.gz"
+            self.archiveNames[ver] = f"stellarsolver-tester-{ver}.tar.gz"
+            self.targetInstSrc[ver] = f"stellarsolver-{ver}"
+        self.defaultTarget = "2.6"
+
+    def setDependencies(self):
+        self.runtimeDependencies["virtual/base"] = None
+        self.runtimeDependencies["libs/qt/qtbase"] = None
+        self.runtimeDependencies["libs/gsl"] = None
+        self.runtimeDependencies["libs/mman"] = None
+        self.runtimeDependencies["libs/cfitsio"] = None
+        self.runtimeDependencies["libs/zlib"] = None
+        self.runtimeDependencies["boost-regex"] = None
+        self.runtimeDependencies["libs/wcslib"] = None
+
+class Package(CMakePackageBase):
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+        self.subinfo.options.configure.args += [
+        	"-DUSE_QT5=OFF",
+        	"-DBUILD_TESTER=ON"
+        ]
+
+    def createPackage(self):
+        self.defines["executable"] = "bin\\StellarSolverTester.exe"
+        self.defines["icon"] = self.blueprintDir() / "StellarSolverInstallIcon.ico"
+        if isinstance(self, AppxPackager):
+              self.defines["display_name"] = "StellarSolverTester"
+        return super().createPackage()

craft-blueprints/QT6/stellarbatchsolver/stellarbatchsolver.py

@@ -0,0 +1,39 @@
+import info
+from CraftCore import CraftCore
+from Package.CMakePackageBase import CMakePackageBase
+from Packager.AppxPackager import AppxPackager
+
+class subinfo(info.infoclass):
+    def setTargets(self):
+        self.description = "StellarSolver Star Extractor (SEP) and Astrometry.net based Library Batch Solver Program"
+        self.svnTargets["master"] = "https://github.com/rlancaste/stellarsolver.git"
+        for ver in ["2.6"]:
+            self.targets[ver] = f"https://github.com/rlancaste/stellarsolver/archive/refs/tags/{ver}.tar.gz"
+            self.archiveNames[ver] = f"stellarsolver-tester-{ver}.tar.gz"
+            self.targetInstSrc[ver] = f"stellarsolver-{ver}"
+        self.defaultTarget = "2.6"
+
+    def setDependencies(self):
+        self.runtimeDependencies["virtual/base"] = None
+        self.runtimeDependencies["libs/qt/qtbase"] = None
+        self.runtimeDependencies["libs/gsl"] = None
+        self.runtimeDependencies["libs/mman"] = None
+        self.runtimeDependencies["libs/cfitsio"] = None
+        self.runtimeDependencies["libs/zlib"] = None
+        self.runtimeDependencies["boost-regex"] = None
+        self.runtimeDependencies["libs/wcslib"] = None
+
+class Package(CMakePackageBase):
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+        self.subinfo.options.configure.args += [
+        	"-DUSE_QT5=OFF",
+        	"-DBUILD_BATCH_SOLVER=ON"
+        ]
+
+    def createPackage(self):
+        self.defines["executable"] = "bin\\StellarBatchSolver.exe"
+        self.defines["icon"] = self.blueprintDir() / "StellarBatchSolverInstallIcon.ico"
+        if isinstance(self, AppxPackager):
+              self.defines["display_name"] = "StellarBatchSolver"
+        return super().createPackage()

craft-blueprints/QT6/stellarsolver/stellarsolver.py

@@ -0,0 +1,28 @@
+import glob
+import info
+from Package.CMakePackageBase import CMakePackageBase
+
+class subinfo(info.infoclass):
+    def setTargets(self):
+        self.description = "StellarSolver Star Extractor (SEP) and Astrometry.net based Library"
+        self.svnTargets["master"] = "https://github.com/rlancaste/stellarsolver.git"
+        for ver in ["2.6"]:
+            self.targets[ver] = f"https://github.com/rlancaste/stellarsolver/archive/refs/tags/{ver}.tar.gz"
+            self.archiveNames[ver] = f"stellarsolver-tester-{ver}.tar.gz"
+            self.targetInstSrc[ver] = f"stellarsolver-{ver}"
+        self.defaultTarget = "2.6"
+
+    def setDependencies(self):
+        self.runtimeDependencies["virtual/base"] = None
+        self.runtimeDependencies["libs/qt/qtbase"] = None
+        self.runtimeDependencies["libs/gsl"] = None
+        self.runtimeDependencies["libs/mman"] = None
+        self.runtimeDependencies["libs/cfitsio"] = None
+        self.runtimeDependencies["libs/zlib"] = None
+        self.runtimeDependencies["boost-regex"] = None
+        self.runtimeDependencies["libs/wcslib"] = None
+
+class Package(CMakePackageBase):
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+        self.subinfo.options.configure.args += ["-DUSE_QT5=OFF"]

debian/changelog

@@ -1,3 +1,9 @@
+libstellarsolver (2.6) focal; urgency=medium
+
+  * New release.
+
+ -- Robert Lancaster <[email protected]>  Sat, 06 Jul 2024 13:00:00 -0500
+
 libstellarsolver (2.5) focal; urgency=medium
 
   * New release.

spec/stellarsolver.spec

@@ -1,7 +1,7 @@
 %define __cmake_in_source_build %{_vpath_builddir}
 
 Name: stellarsolver
-Version: 2.5.git
+Version: 2.6.git
 Release: %(date -u +%%Y%%m%%d%%H%%M%%S)%{?dist}
 Summary: The Cross Platform Sextractor and Astrometry.net-Based Internal Astrometric Solver
 
@@ -53,6 +53,8 @@ An Astrometric Plate Solver for Mac, Linux, and Windows, built on Astrometry.net
 %license LICENSE
 
 %changelog
+* Thu Jul 06 2024 Rob Lancaster <[email protected]> 2.5.git
+- Updating Spec file to latest version
 * Thu Aug 17 2023 Rob Lancaster <[email protected]> 2.5.git
 - Updating Spec file to latest version
 * Sat May 15 2022 Rob Lancaster <[email protected]> 2.4.git