diff --git a/sci-astronomy/stellarium/patches/stellarium-1.0.patchset b/sci-astronomy/stellarium/patches/stellarium-1.0.patchset deleted file mode 100644 index 7bc69e7f6..000000000 --- a/sci-astronomy/stellarium/patches/stellarium-1.0.patchset +++ /dev/null @@ -1,70 +0,0 @@ -From 9efc735bb708cd6f9a6e867f4db265602d548ccb Mon Sep 17 00:00:00 2001 -From: Georg Zotti -Date: Tue, 2 Oct 2022 23:33:49 +1000 -Subject: Use QString instead of QByteArray (Fix #2709) - - -diff --git a/plugins/Satellites/src/Satellite.cpp b/plugins/Satellites/src/Satellite.cpp -index ff97eb2..589fd5f 100644 ---- a/plugins/Satellites/src/Satellite.cpp -+++ b/plugins/Satellites/src/Satellite.cpp -@@ -251,8 +251,8 @@ QVariantMap Satellite::getMap(void) - map["stdMag"] = stdMag; - map["rcs"] = RCS; - map["status"] = status; -- map["tle1"] = tleElements.first.data(); -- map["tle2"] = tleElements.second.data(); -+ map["tle1"] = tleElements.first; -+ map["tle2"] = tleElements.second; - - if (!description.isEmpty()) - map["description"] = description; -@@ -544,8 +544,8 @@ QVariantMap Satellite::getInfoMap(const StelCore *core) const - - map.insert("description", QString(description).replace("\n", " - ")); - map.insert("catalog", id); -- map.insert("tle1", tleElements.first.data()); -- map.insert("tle2", tleElements.second.data()); -+ map.insert("tle1", tleElements.first); -+ map.insert("tle2", tleElements.second); - map.insert("tle-epoch", tleEpoch); - - if (!internationalDesignator.isEmpty()) -@@ -788,8 +788,8 @@ void Satellite::setNewTleElements(const QString& tle1, const QString& tle2) - delete old; - } - -- tleElements.first = tle1.toUtf8(); -- tleElements.second = tle2.toUtf8(); -+ tleElements.first = tle1; -+ tleElements.second = tle2; - - pSatWrapper = new gSatWrapper(id, tle1, tle2); - orbitPoints.clear(); -@@ -802,8 +802,8 @@ void Satellite::setNewTleElements(const QString& tle1, const QString& tle2) - - void Satellite::recomputeSatData() - { -- calculateEpochFromLine1(tleElements.first.data()); -- calculateSatDataFromLine2(tleElements.second.data()); -+ calculateEpochFromLine1(tleElements.first); -+ calculateSatDataFromLine2(tleElements.second); - } - - void Satellite::update(double) -diff --git a/plugins/Satellites/src/Satellite.hpp b/plugins/Satellites/src/Satellite.hpp -index f612099..af7aed6 100644 ---- a/plugins/Satellites/src/Satellite.hpp -+++ b/plugins/Satellites/src/Satellite.hpp -@@ -313,7 +313,7 @@ private: - int status; - //! Contains the J2000 position. - Vec3d XYZ; -- QPair< QByteArray, QByteArray > tleElements; -+ QPair< QString, QString > tleElements; - double height, range, rangeRate; - QList comms; - Vec3f hintColor; --- -2.36.1 - diff --git a/sci-astronomy/stellarium/stellarium-1.0.recipe b/sci-astronomy/stellarium/stellarium-24.1.recipe similarity index 81% rename from sci-astronomy/stellarium/stellarium-1.0.recipe rename to sci-astronomy/stellarium/stellarium-24.1.recipe index df037a0cb..433f2bf83 100644 --- a/sci-astronomy/stellarium/stellarium-1.0.recipe +++ b/sci-astronomy/stellarium/stellarium-24.1.recipe @@ -3,12 +3,11 @@ DESCRIPTION="Stellarium is a free open source planetarium for your computer. \ It shows a realistic sky in 3D, just like what you see with the naked eye, \ binoculars or a telescope." HOMEPAGE="https://stellarium.org" -COPYRIGHT="2001-2022 Fabien Chéreau" +COPYRIGHT="2001-2024 Fabien Chéreau" LICENSE="GNU GPL v2" REVISION="1" -SOURCE_URI="https://github.com/Stellarium/stellarium/archive/refs/tags/v$portVersion.tar.gz" -CHECKSUM_SHA256="841dfbd27fa6ea97c4ce22424b12a9e73ad70d61af892734ce2f67d7681ec76d" -PATCHES="stellarium-$portVersion.patchset" +SOURCE_URI="https://github.com/Stellarium/stellarium/releases/download/v$portVersion/stellarium-$portVersion.tar.gz" +CHECKSUM_SHA256="5a48fb2c5b17c9ebfa23153604f470dc87a5eab5fafb0510f71e115ac76072a8" ADDITIONAL_FILES="stellarium.rdef.in" ARCHITECTURES="all !x86_gcc2" @@ -70,7 +69,9 @@ BUILD() cmake .. \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$prefix \ - -DENABLE_SHOWMYSKY=OFF + -DENABLE_SHOWMYSKY=Off \ + -DENABLE_QTWEBENGINE=Off \ + -DUSE_PLUGIN_LENSDISTORTIONESTIMATOR=Off sed -e '/#include /a #include ' -i _deps/indiclient-src/libs/indibase/baseclient.cpp sed -e '/if (bt == 0 && ioctl(t_fd, TIOCEXCL) == -1)/c if (0)' -i _deps/indiclient-src/libs/indicom.c @@ -101,5 +102,16 @@ INSTALL() $portDir/additional-files/stellarium.rdef.in > stellarium.rdef addResourcesToBinaries stellarium.rdef $appsDir/Stellarium - addAppDeskbarSymlink $appsDir/Stellarium + + # add wrapper + cat > $appsDir/Stellarium.sh <<-EOF + #!/bin/sh + `finddir B_APPS_DIRECTORY`/Stellarium --low-graphics + EOF + + chmod +x $appsDir/Stellarium.sh + rc stellarium.rdef + resattr -o $appsDir/Stellarium.sh stellarium.rsrc + + addAppDeskbarSymlink $appsDir/Stellarium.sh Stellarium }