From: "Joonas Niilola" <juippis@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/stellarium/, sci-astronomy/stellarium/files/
Date: Thu, 23 Feb 2023 07:04:29 +0000 (UTC) [thread overview]
Message-ID: <1677135720.e3048a5a5a887614f309c7cccd9bac7040d2fd97.juippis@gentoo> (raw)
commit: e3048a5a5a887614f309c7cccd9bac7040d2fd97
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Sun Jan 29 23:31:17 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Feb 23 07:02:00 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3048a5a
sci-astronomy/stellarium: drop 0.22.2, 1.1
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-astronomy/stellarium/Manifest | 6 -
.../files/stellarium-0.20.3-unbundle-indi.patch | 82 --------
.../stellarium-0.22.2-unbundle-qtcompress.patch | 208 ---------------------
.../stellarium/files/stellarium-1.1-qxlsx.patch | 11 --
sci-astronomy/stellarium/stellarium-0.22.2.ebuild | 144 --------------
sci-astronomy/stellarium/stellarium-1.1.ebuild | 172 -----------------
6 files changed, 623 deletions(-)
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index 0d6c89fc2489..4a1371b9ec7b 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -3,15 +3,9 @@ DIST stars_5_2v0_1.cat 42580300 BLAKE2B eb6528c0577b3f2001a8b03cc5a4e08fa4e75723
DIST stars_6_2v0_1.cat 148352404 BLAKE2B c605b284b3d768cb1619ada3f58d406fa7737f09949e8926d6c14b82a85927d124d7fcb50c6d6c357d21b003938cc0b28937f2adb28ae268bb5c85d575f5e0ff SHA512 794279407595f44bbc1e492086063d98068bf332202a5448cd83dd7afbdcf7c6c3ff2878f3016369ebb5a98552874eb4eddb38e2c40e9a163c6231b640e02977
DIST stars_7_2v0_1.cat 305710678 BLAKE2B 1cc9b4a6bc35a9339e495f7e0da4f7e90a0e92b05b5de8599be1bbdd2a8053cbcec44b0e58bc9248364666db9cdf23449edf236e3f21fdc0e8f1a4a706afc919 SHA512 43b866eb793e8812c9d5502101a6c985d2055fb88bdbda274726bcd51e1527ecf342b22acd673318c9c8e88cac68eace18de8f27d29ffe64933fd32a5b84c5e3
DIST stars_8_2v0_1.cat 559068934 BLAKE2B c040a369cdf6885759998e1315b554d21a5e2b9b149a67967a8af45606aebf57bec407fab5ce1904978af0dc529aa6bddd267331ca45f58617bbf56d5ca99dee SHA512 06d4fa298b9dff8452f550377df99fcaa5e7107cfc7b75c9a4769b3cb6d97a822a54213c706102c1d7ef2dabc16df32a85f46b2f6d6c6f76a4e919353b739de4
-DIST stellarium-0.22.2.tar.gz 409151525 BLAKE2B c49abfb17a8bf7b120d8a0dffbe58b83e18f86b7ef2764cddc946e0cbaad9bf01adaf8d008557108f6354ed11d79e56d94c92c2a07befbd955aed8d201b68292 SHA512 ed905f58e1ff8b257b1e054ca76c83470915b00a04f7925b63784aa62b74e972f332e0b7dc605ffc17bb6516ef4f045943cb564d9637238726b9d7ceb2d44dda
-DIST stellarium-1.1.1.tar.gz 413806998 BLAKE2B bd5679aa32edfa44807e941d0febcb1c1749eada6c2834cb16de4cc9850735c3033122fd1e4afc8b8550441b8a8f70865f6a7b3eb178bf906c8b64d7829ea3f6 SHA512 4564b8df21afb5d266c21e4d59a5df52a0695f102dc68d59d37ea29e520495132c7fb01235ceac5d68b0812fc05d35b5f8c7a5c337c55007ce562f770e3a3612
DIST stellarium-1.2.tar.xz 344579192 BLAKE2B 56aa497cfd57a3e43ed0f153fbfe0cf348fd1b4e14bc54fbade20063d61211972d2f717c46c872f858b23798521a00390135044ab58625322f88ba9d87513c48 SHA512 d27a038ce51a2a7c5145c40d6ff54938820e98e432adb56f7e986d7cd0c23d87f76c0616641173c1c047652f570069dcb3a5959806262188642e5ac29ffeb003
DIST stellarium-1.2.tar.xz.asc 313 BLAKE2B 147a58a70f98c45bf3446a0fc92ade5ce464a160279192533af00bb0361beeb03e3bc89f3ea59c385010bd211ad33cb203f4e67d354bce3be47ef2e62b8b3cc2 SHA512 b62381bfc49ea8f209224c4afb6515adbc3a8a9e30b0313f63e4db3aa8409a8912795ffbc3fd3de576ef720784674912cafcb88f5f247497e42910f20c067fdd
-DIST stellarium-dso-catalog-3.16.dat 28678822 BLAKE2B 130513b5dcb0d06dd605ed62d6bdf12bfd636a5e5f5c33f02c7adb77a6712245a98ce3d56332fce6fea0f18c9b7915af4bb3d9812b1fd09bfc036d4135cef4f5 SHA512 9320d2a3c9af93d19cc4414f371991993793b78315448cafcd83b82de6dc16715b0cab2ddeafca667af31a9086420cbe758708333e5b95215de8a46305324c41
-DIST stellarium-dso-catalog-3.17.dat 28678790 BLAKE2B 8ec14dd34c749a5bea19cc5567b2d703a7e5d4192eda6636fcec9fb2ef0301fd654aefdf4b33db70210da73eb9e385ace2265a57199f5660ec7034887fdcc80f SHA512 c0c679bd9de9e7ac000be5902d3a1e863853e8f9c382186253dd2d77a658fe93a9e2e206ecd1396f64b7b6cd4e738ecc2e11ea43bc6f71a098a44eb77875978a
DIST stellarium-dso-catalog-3.18.dat 28678602 BLAKE2B 163eecf1bc26728f88f9f322c950fd26570bf52f63f462756e94ce0c6788d58c8d8fd39f34201c8536745e70afe426aec5f1bc079830fdca9723d9a8797a053e SHA512 ff86d47b7b777ae6de76c4bb41870f18de9a309d2b188d01e5c854bd79ae5d022ad1d46a3e80001bed49166df424096e53482398d810eabc792ca1f4829deacd
DIST stellarium-dso-catalog-3.18.dat.asc 313 BLAKE2B 98ef5f9181d5a597328cee2b87963adc81033f2e6539b8db1d155fd2c1ef13fc2d3967e5ad52a892ddfee34d4482dbd174d2d39af9390efdea39b773e0bf7b44 SHA512 71967a83d0720b560895e9369f862b977b5600bad66e095c9b5987dd25a67e49c86bf2abeb0119efb6f1c945b5346153cf5a4c4f279c34e07f3be1c7d044e7f9
-DIST stellarium_user_guide-0.22.2-1.pdf 35082446 BLAKE2B c9bb7f344a9377fe86b714904aa713c7e6cda59d31f8e547b571da0a057d141fa1b998b4adb3dbdcee0bb7a152b6f6e18b58a4a08c345dc0e77efca6ffb5a801 SHA512 45adfe53fa9c7432952152d95ab96a446a6459348fa6724fff83aababb0c967d9467cc0ca3bd24b834fd189fb69c782e521d94528a60a704062aa445e749a4a5
-DIST stellarium_user_guide-1.1-1.pdf 36567672 BLAKE2B d1b7f9c8d8974aeabe92e3127c84a79b92dd9c3a0057b7831a1851c7fc88c13ec456375847e90576448a5dbe655846142637c91067cc10df20ae2b9373190e8e SHA512 2dbcf4100c1f24770fa23b2995103b94f0736eacca76031cecac582364948a4cb0e32aabdb554a30a7a64ed53eaa3538d59d7af2434eb74a04d562f1453bc89d
DIST stellarium_user_guide-1.2-1.pdf 36821463 BLAKE2B f7ddf7bee8f06c323ee3a493a04cfcad0bd78244ba67f1e9fa159e66533a9e5156358d9466e91bebcf3642f252b07535d93a480be0cfdc9991be0a8abb327a6e SHA512 7d1a62bb4dca645789469c2f84daf929494a342168b011cdcc6cc2b0cace0f133eade110e75dcc26d29479550f6a60bbc791b3cf2e9f2a44f4c19ec3333406c0
DIST stellarium_user_guide-1.2-1.pdf.asc 313 BLAKE2B 95a3a5c88a3d4ea37c6fa99ac808caf87fd8e2f24ff57119a16b1d849e1da5280cddb42a5fd300d684bb018a8e6f0f5e80e2de9600e6231a1cddda7cdb40e29a SHA512 8c9e087f38a7e006440a91545d911872adc37dcd865ee75287b493c8ecbaffb6d2d1ca628c332d00910903eb35ac04050d360e6f3b16c7151a3bb84d90b1ec72
diff --git a/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-indi.patch b/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-indi.patch
deleted file mode 100644
index 33d355f842f4..000000000000
--- a/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-indi.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff --git a/plugins/TelescopeControl/src/INDI/CMakeLists.txt b/plugins/TelescopeControl/src/INDI/CMakeLists.txt
-index a250e1bb0f..f14007c392 100644
---- a/plugins/TelescopeControl/src/INDI/CMakeLists.txt
-+++ b/plugins/TelescopeControl/src/INDI/CMakeLists.txt
-@@ -25,7 +25,7 @@ add_library(TelescopeControl_INDI STATIC
- target_link_libraries(TelescopeControl_INDI
- Qt5::Core
- Qt5::Network
-- indiclient
-+ -lindiclient
- TelescopeControl_common
- ${CMAKE_THREAD_LIBS_INIT}
- )
-diff --git a/plugins/TelescopeControl/src/INDI/INDIConnection.cpp b/plugins/TelescopeControl/src/INDI/INDIConnection.cpp
-index f401dc7049..d890d3aa14 100644
---- a/plugins/TelescopeControl/src/INDI/INDIConnection.cpp
-+++ b/plugins/TelescopeControl/src/INDI/INDIConnection.cpp
-@@ -25,9 +25,9 @@
- #include <limits>
- #include <cmath>
-
--#include "indibase/baseclient.h"
--#include "indibase/basedevice.h"
--#include "indibase/inditelescope.h"
-+#include "libindi/baseclient.h"
-+#include "libindi/basedevice.h"
-+#include "libindi/inditelescope.h"
-
- const int INDIConnection::SLEW_STOP = INDI::Telescope::SLEW_GUIDE - 1;
-
-diff --git a/plugins/TelescopeControl/src/INDI/INDIConnection.hpp b/plugins/TelescopeControl/src/INDI/INDIConnection.hpp
-index 111ad2cdba..80ead01137 100644
---- a/plugins/TelescopeControl/src/INDI/INDIConnection.hpp
-+++ b/plugins/TelescopeControl/src/INDI/INDIConnection.hpp
-@@ -20,7 +20,7 @@
- #define INDICONNECTION_HPP
-
- #include <QObject>
--#include "indibase/baseclient.h"
-+#include "libindi/baseclient.h"
-
- #include <mutex>
- #include <QStringList>
-diff --git a/plugins/TelescopeControl/src/INDI/TelescopeClientINDI.cpp b/plugins/TelescopeControl/src/INDI/TelescopeClientINDI.cpp
-index 6bd7754ff5..633d4ae7b2 100644
---- a/plugins/TelescopeControl/src/INDI/TelescopeClientINDI.cpp
-+++ b/plugins/TelescopeControl/src/INDI/TelescopeClientINDI.cpp
-@@ -24,7 +24,7 @@
-
- #include "StelCore.hpp"
- #include "StelUtils.hpp"
--#include "indibase/inditelescope.h"
-+#include "libindi/inditelescope.h"
- #include "INDIControlWidget.hpp"
-
- TelescopeClientINDI::TelescopeClientINDI(const QString &name, const QString ¶ms):
-diff --git a/plugins/TelescopeControl/src/INDI/test/testINDIConnection.cpp b/plugins/TelescopeControl/src/INDI/test/testINDIConnection.cpp
-index 6c1a281ec5..ca7b7e0c40 100644
---- a/plugins/TelescopeControl/src/INDI/test/testINDIConnection.cpp
-+++ b/plugins/TelescopeControl/src/INDI/test/testINDIConnection.cpp
-@@ -22,7 +22,7 @@
- #include <cmath>
-
- #include "INDIConnection.hpp"
--#include "indibase/basedevice.h"
-+#include "libindi/basedevice.h"
-
- void TestINDIConnection::deafultCoordinates()
- {
-diff --git a/src/external/CMakeLists.txt b/src/external/CMakeLists.txt
-index 6fcf7678da..a59d8c121c 100644
---- a/src/external/CMakeLists.txt
-+++ b/src/external/CMakeLists.txt
-@@ -176,7 +176,7 @@ target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui qtcompress_stel)
- set_target_properties(qxlsx_stel PROPERTIES FOLDER "src/external")
-
- ################################# INDI ################################
--IF(USE_PLUGIN_TELESCOPECONTROL)
-+IF(USE_PLUGIN_TELESCOPECONTROL AND 0)
- set(INDI_SOVERSION "1")
- set(CMAKE_INDI_VERSION_MAJOR 1)
- set(CMAKE_INDI_VERSION_MINOR 6)
diff --git a/sci-astronomy/stellarium/files/stellarium-0.22.2-unbundle-qtcompress.patch b/sci-astronomy/stellarium/files/stellarium-0.22.2-unbundle-qtcompress.patch
deleted file mode 100644
index 47643b797992..000000000000
--- a/sci-astronomy/stellarium/files/stellarium-0.22.2-unbundle-qtcompress.patch
+++ /dev/null
@@ -1,208 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -614,6 +614,8 @@ ELSE(ENABLE_GPS)
- MESSAGE(STATUS "GPS: disabled.")
- ENDIF(ENABLE_GPS)
-
-+find_package(Qt5Compress REQUIRED)
-+
- IF(USE_QTOPENGL)
- # QtOpenGL module is deprecated. After merging the QOpenGLWidget branch, we don't use this module directly anymore,
- # but the QtMultimediaWidgets module requires it internally, so we still have to package it.
---- a/plugins/Satellites/src/CMakeLists.txt
-+++ b/plugins/Satellites/src/CMakeLists.txt
-@@ -55,7 +55,7 @@ IF(ENABLE_TESTING)
- ENDIF(ENABLE_TESTING)
-
- ADD_LIBRARY(Satellites-static STATIC ${Satellites_SRCS} ${Satellites_RES_CXX} ${SatellitesDialog_UIS_H})
--TARGET_LINK_LIBRARIES(Satellites-static Qt5::Core Qt5::Network Qt5::Widgets)
-+TARGET_LINK_LIBRARIES(Satellites-static Qt5::Core Qt5::Network Qt5::Widgets Qt5::Compress)
- # The library target "Satellites-static" has a default OUTPUT_NAME of "Satellites-static", so change it.
- SET_TARGET_PROPERTIES(Satellites-static PROPERTIES OUTPUT_NAME "Satellites")
- IF(MSVC)
---- a/plugins/Satellites/src/Satellites.cpp
-+++ b/plugins/Satellites/src/Satellites.cpp
-@@ -43,7 +43,7 @@
- #include "StelUtils.hpp"
- #include "StelActionMgr.hpp"
-
--#include "external/qtcompress/qzipreader.h"
-+#include "qzipreader.h"
-
- #include <QNetworkAccessManager>
- #include <QNetworkReply>
-@@ -1639,12 +1639,12 @@ void Satellites::saveDownloadedUpdate(QNetworkReply* reply)
- QString archive = zip.fileName();
- QByteArray data;
-
-- Stel::QZipReader reader(archive);
-- if (reader.status() != Stel::QZipReader::NoError)
-+ QZipReader reader(archive);
-+ if (reader.status() != QZipReader::NoError)
- qWarning() << "[Satellites] Unable to open as a ZIP archive";
- else
- {
-- QList<Stel::QZipReader::FileInfo> infoList = reader.fileInfoList();
-+ QList<QZipReader::FileInfo> infoList = reader.fileInfoList();
- for (const auto& info : qAsConst(infoList))
- {
- // qWarning() << "[Satellites] Processing:" << info.filePath;
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -479,7 +479,7 @@ IF(ENABLE_SPOUT AND SPOUT_LIBRARY_DLL)
- CONFIGURE_FILE(${SPOUT_LIBRARY_DLL} ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
- ENDIF()
-
--SET(STELMAIN_DEPS ${ZLIB_LIBRARIES} qtcompress_stel glues_stel qxlsx_stel ${STELLARIUM_STATIC_PLUGINS_LIBRARIES} ${STELLARIUM_QT_LIBRARIES} ${SPOUT_LIBRARY})
-+SET(STELMAIN_DEPS ${ZLIB_LIBRARIES} Qt5::Compress glues_stel qxlsx_stel ${STELLARIUM_STATIC_PLUGINS_LIBRARIES} ${STELLARIUM_QT_LIBRARIES} ${SPOUT_LIBRARY})
- IF(ENABLE_LIBGPS)
- SET(STELMAIN_DEPS ${STELMAIN_DEPS} ${GPS_LIBRARY})
- ENDIF()
---- a/src/core/modules/LandscapeMgr.cpp
-+++ b/src/core/modules/LandscapeMgr.cpp
-@@ -1331,8 +1331,8 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const
- }
- QDir destinationDir (parentDestinationDir.absoluteFilePath("landscapes"));
-
-- Stel::QZipReader reader(sourceFilePath);
-- if (reader.status() != Stel::QZipReader::NoError)
-+ QZipReader reader(sourceFilePath);
-+ if (reader.status() != QZipReader::NoError)
- {
- qWarning() << "LandscapeMgr: Unable to open as a ZIP archive:" << QDir::toNativeSeparators(sourceFilePath);
- emit errorNotArchive();
-@@ -1341,7 +1341,7 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const
-
- //Detect top directory
- QString topDir, iniPath;
-- const QList<Stel::QZipReader::FileInfo> infoList = reader.fileInfoList();
-+ const QList<QZipReader::FileInfo> infoList = reader.fileInfoList();
- for (const auto& info : infoList)
- {
- QFileInfo fileInfo(info.filePath);
---- a/src/external/CMakeLists.txt
-+++ b/src/external/CMakeLists.txt
-@@ -70,6 +70,7 @@ target_include_directories(zlib_stel PUBLIC zlib)
- set_target_properties(zlib_stel PROPERTIES AUTOMOC 0)
- SET_TARGET_PROPERTIES(zlib_stel PROPERTIES FOLDER "src/external")
-
-+if(0)
- set(qtcompress_SRCS
- qtcompress/qzip.cpp
- qtcompress/qzipreader.h
-@@ -82,6 +83,7 @@ target_link_libraries(qtcompress_stel ${ZLIB_LIBRARIES} Qt5::Core)
- #turn off automoc, not needed here
- set_target_properties(qtcompress_stel PROPERTIES AUTOMOC 0)
- SET_TARGET_PROPERTIES(qtcompress_stel PROPERTIES FOLDER "src/external")
-+endif()
-
- # QCustomPlot should not be unbundled, because upstream uses GPL 3, and
- # Stellarium uses GPL 2. Author of QCustomPlot has agreed for GPL 2+ for this.
-@@ -180,7 +182,7 @@ SET(qxlsx_SRCS
- qxlsx/xlsxcelllocation.h
- )
- add_library(qxlsx_stel STATIC EXCLUDE_FROM_ALL ${qxlsx_SRCS})
--target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui qtcompress_stel)
-+target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui Qt5::Compress)
- set_target_properties(qxlsx_stel PROPERTIES FOLDER "src/external")
-
- ################################# INDI ################################
---- a/src/external/qxlsx/xlsxzipreader.cpp
-+++ b/src/external/qxlsx/xlsxzipreader.cpp
-@@ -5,13 +5,13 @@
- QT_BEGIN_NAMESPACE_XLSX
-
- ZipReader::ZipReader(const QString &filePath) :
-- m_reader(new Stel::QZipReader(filePath))
-+ m_reader(new QZipReader(filePath))
- {
- init();
- }
-
- ZipReader::ZipReader(QIODevice *device) :
-- m_reader(new Stel::QZipReader(device))
-+ m_reader(new QZipReader(device))
- {
- init();
- }
-@@ -23,8 +23,8 @@ ZipReader::~ZipReader()
-
- void ZipReader::init()
- {
-- QList<Stel::QZipReader::FileInfo> allFiles = m_reader->fileInfoList();
-- for (const Stel::QZipReader::FileInfo &fi : allFiles) {
-+ QList<QZipReader::FileInfo> allFiles = m_reader->fileInfoList();
-+ for (const QZipReader::FileInfo &fi : allFiles) {
- if (fi.isFile || (!fi.isDir && !fi.isFile && !fi.isSymLink))
- m_filePaths.append(fi.filePath);
- }
---- a/src/external/qxlsx/xlsxzipreader_p.h
-+++ b/src/external/qxlsx/xlsxzipreader_p.h
-@@ -8,7 +8,7 @@
- #include <QIODevice>
-
- #include "xlsxglobal.h"
--#include "external/qtcompress/qzipreader.h"
-+#include "qzipreader.h"
-
- #if QT_VERSION >= 0x050600
- #include <QVector>
-@@ -31,7 +31,7 @@ public:
- private:
- Q_DISABLE_COPY(ZipReader)
- void init();
-- QScopedPointer<Stel::QZipReader> m_reader;
-+ QScopedPointer<QZipReader> m_reader;
- QStringList m_filePaths;
- };
-
---- a/src/external/qxlsx/xlsxzipwriter.cpp
-+++ b/src/external/qxlsx/xlsxzipwriter.cpp
-@@ -10,14 +10,14 @@ QT_BEGIN_NAMESPACE_XLSX
-
- ZipWriter::ZipWriter(const QString &filePath)
- {
-- m_writer = new Stel::QZipWriter(filePath, QIODevice::WriteOnly);
-- m_writer->setCompressionPolicy(Stel::QZipWriter::AutoCompress);
-+ m_writer = new QZipWriter(filePath, QIODevice::WriteOnly);
-+ m_writer->setCompressionPolicy(QZipWriter::AutoCompress);
- }
-
- ZipWriter::ZipWriter(QIODevice *device)
- {
-- m_writer = new Stel::QZipWriter(device);
-- m_writer->setCompressionPolicy(Stel::QZipWriter::AutoCompress);
-+ m_writer = new QZipWriter(device);
-+ m_writer->setCompressionPolicy(QZipWriter::AutoCompress);
- }
-
- ZipWriter::~ZipWriter()
-@@ -27,7 +27,7 @@ ZipWriter::~ZipWriter()
-
- bool ZipWriter::error() const
- {
-- return m_writer->status() != Stel::QZipWriter::NoError;
-+ return m_writer->status() != QZipWriter::NoError;
- }
-
- void ZipWriter::addFile(const QString &filePath, QIODevice *device)
---- a/src/external/qxlsx/xlsxzipwriter_p.h
-+++ b/src/external/qxlsx/xlsxzipwriter_p.h
-@@ -8,7 +8,7 @@
- #include <QIODevice>
-
- #include "xlsxglobal.h"
--#include "external/qtcompress/qzipwriter.h"
-+#include "qzipwriter.h"
-
- class QZipWriter;
-
-@@ -27,7 +27,7 @@ public:
- void close();
-
- private:
-- Stel::QZipWriter *m_writer;
-+ QZipWriter *m_writer;
- };
-
- QT_END_NAMESPACE_XLSX
diff --git a/sci-astronomy/stellarium/files/stellarium-1.1-qxlsx.patch b/sci-astronomy/stellarium/files/stellarium-1.1-qxlsx.patch
deleted file mode 100644
index f3e4c9c38ab7..000000000000
--- a/sci-astronomy/stellarium/files/stellarium-1.1-qxlsx.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -815,7 +815,7 @@ IF(ENABLE_XLSX)
- # TODO: switch to something like vcpkg or conan, and plain find_package,
- # without the fallback of cmake downloading the dep itself.
- # But some libraries are not available there yet.
-- CPMFindPackage(NAME QXlsx
-+ CPMFindPackage(NAME QXlsxQt${QT_VERSION_MAJOR}
- URL https://github.com/QtExcel/QXlsx/archive/refs/tags/v1.4.4.zip
- URL_HASH SHA256=3efbd6f63a1ffd521c535dce7b5a5a7e9ebd23db51e6ae8e3e2eb89796e57675
- DOWNLOAD_ONLY yes
diff --git a/sci-astronomy/stellarium/stellarium-0.22.2.ebuild b/sci-astronomy/stellarium/stellarium-0.22.2.ebuild
deleted file mode 100644
index ec1e66781138..000000000000
--- a/sci-astronomy/stellarium/stellarium-0.22.2.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit cmake desktop flag-o-matic python-any-r1 xdg virtualx
-
-DESCRIPTION="3D photo-realistic skies in real time"
-HOMEPAGE="https://stellarium.org/"
-MY_DSO_VERSION="3.16"
-SRC_URI="
- https://github.com/Stellarium/stellarium/releases/download/v${PV}/${P}.tar.gz
- deep-sky? (
- https://github.com/Stellarium/stellarium-data/releases/download/dso-${MY_DSO_VERSION}/catalog-${MY_DSO_VERSION}.dat -> ${PN}-dso-catalog-${MY_DSO_VERSION}.dat
- )
- doc? (
- https://github.com/Stellarium/stellarium/releases/download/v${PV}/stellarium_user_guide-${PV}-1.pdf
- )
- stars? (
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat
- )"
-
-LICENSE="GPL-2+ SGI-B-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~riscv x86"
-IUSE="debug deep-sky doc gps media nls stars telescope test webengine"
-
-# Python interpreter is used while building RemoteControl plugin
-BDEPEND="
- ${PYTHON_DEPS}
- dev-lang/perl
- doc? ( app-doc/doxygen[dot] )
- nls? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="
- dev-libs/qtcompress:=
- dev-qt/qtcharts:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtscript:5
- dev-qt/qtwidgets:5
- media-fonts/dejavu
- sys-libs/zlib
- gps? (
- dev-qt/qtpositioning:5
- dev-qt/qtserialport:5
- sci-geosciences/gpsd:=[cxx]
- )
- media? (
- dev-qt/qtmultimedia:5[widgets]
- dev-qt/qtopengl:5
- virtual/opengl
- )
- telescope? (
- dev-qt/qtserialport:5
- sci-libs/indilib:=
- )
- webengine? ( dev-qt/qtwebengine:5[widgets] )
-"
-DEPEND="${RDEPEND}
- dev-qt/qtconcurrent:5
- test? ( dev-qt/qttest:5 )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- "${FILESDIR}/stellarium-0.20.3-unbundle-indi.patch"
- "${FILESDIR}/stellarium-0.20.3-unbundle-zlib.patch"
- "${FILESDIR}/stellarium-0.22.2-unbundle-qtcompress.patch"
- "${FILESDIR}/stellarium-0.22.2-ccache.patch"
-)
-
-src_prepare() {
- cmake_src_prepare
- use debug || append-cppflags -DQT_NO_DEBUG #415769
-
- # Several libraries are bundled, remove them.
- rm -r src/external/{libindi,qtcompress,zlib}/ || die
-
- # for glues_stel aka libtess I couldn't find an upstream with the same API
-
- # unbundling of qxlsx depends on https://github.com/QtExcel/QXlsx/pull/185
-
- local remaining="$(cd src/external/ && echo */)"
- if [[ "${remaining}" != "glues_stel/ qxlsx/" ]]; then
- eqawarn "Need to unbundle more deps: ${remaining}"
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_GPS="$(usex gps)"
- -DENABLE_MEDIA="$(usex media)"
- -DENABLE_NLS="$(usex nls)"
- -DENABLE_TESTING="$(usex test)"
- -DUSE_PLUGIN_TELESCOPECONTROL="$(usex telescope)"
- $(cmake_use_find_package webengine Qt5WebEngine)
- $(cmake_use_find_package webengine Qt5WebEngineWidgets)
- )
- cmake_src_configure
-}
-
-src_test() {
- virtx cmake_src_test
-}
-
-src_compile() {
- cmake_src_compile
-
- if use doc ; then
- cmake_build apidoc
- fi
-}
-
-src_install() {
- if use doc ; then
- local HTML_DOCS=( "${BUILD_DIR}/doc/html/." )
- dodoc "${DISTDIR}/stellarium_user_guide-${PV}-1.pdf"
- fi
- cmake_src_install
-
- # use the more up-to-date system fonts
- rm "${ED}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf || die
- dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf
- dosym ../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf
-
- if use stars ; then
- insinto /usr/share/${PN}/stars/default
- doins "${DISTDIR}"/stars_4_1v0_2.cat
- doins "${DISTDIR}"/stars_{5,6,7,8}_2v0_1.cat
- fi
- if use deep-sky ; then
- insinto /usr/share/${PN}/nebulae/default
- newins "${DISTDIR}/${PN}-dso-catalog-${MY_DSO_VERSION}.dat" catalog.dat
- fi
- newicon doc/images/stellarium-logo.png ${PN}.png
-}
diff --git a/sci-astronomy/stellarium/stellarium-1.1.ebuild b/sci-astronomy/stellarium/stellarium-1.1.ebuild
deleted file mode 100644
index 8f98ea2eb1d2..000000000000
--- a/sci-astronomy/stellarium/stellarium-1.1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit cmake desktop flag-o-matic python-any-r1 xdg virtualx
-
-DESCRIPTION="3D photo-realistic skies in real time"
-HOMEPAGE="https://stellarium.org/"
-MY_DSO_VERSION="3.17"
-SRC_URI="
- https://github.com/Stellarium/stellarium/releases/download/v${PV}/${P}.1.tar.gz
- deep-sky? (
- https://github.com/Stellarium/stellarium-data/releases/download/dso-${MY_DSO_VERSION}/catalog-${MY_DSO_VERSION}.dat -> ${PN}-dso-catalog-${MY_DSO_VERSION}.dat
- )
- doc? (
- https://github.com/Stellarium/stellarium/releases/download/v${PV}/stellarium_user_guide-${PV}-1.pdf
- )
- stars? (
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat
- )"
-
-LICENSE="GPL-2+ SGI-B-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~riscv"
-IUSE="debug deep-sky doc gps media nls qt6 +scripting +show-my-sky stars telescope test webengine +xlsx"
-# Qt6 QAudioOutput crashes on startup; qt 6.4.0
-# https://bugreports.qt.io/browse/QTBUG-108221
-REQUIRED_USE="|| ( !media !qt6 )"
-
-# Python interpreter is used while building RemoteControl plugin
-BDEPEND="
- ${PYTHON_DEPS}
- dev-lang/perl
- doc? ( app-doc/doxygen[dot] )
- nls? (
- !qt6? ( dev-qt/linguist-tools:5 )
- qt6? ( dev-qt/qttools:6[linguist] )
- )
-"
-RDEPEND="
- media-fonts/dejavu
- sys-libs/zlib
- gps? ( sci-geosciences/gpsd:=[cxx] )
- media? ( virtual/opengl )
- !qt6? (
- dev-qt/qtcharts:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5=
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
- sci-astronomy/calcmysky:=[qt5]
- gps? (
- dev-qt/qtpositioning:5
- dev-qt/qtserialport:5
- )
- media? (
- dev-qt/qtmultimedia:5[widgets]
- dev-qt/qtopengl:5
- )
- scripting? ( dev-qt/qtscript:5 )
- telescope? ( dev-qt/qtserialport:5 )
- webengine? ( dev-qt/qtwebengine:5[widgets] )
- xlsx? ( dev-libs/qxlsx:=[qt5] )
- )
- qt6? (
- dev-qt/qtbase:6=[gui,network,widgets]
- dev-qt/qtcharts:6
- sci-astronomy/calcmysky:=[qt6]
- gps? (
- dev-qt/qtpositioning:6
- dev-qt/qtserialport:6
- )
- media? (
- dev-qt/qtmultimedia:6[gstreamer]
- )
- scripting? ( dev-qt/qtdeclarative:6 )
- telescope? ( dev-qt/qtserialport:6 )
- webengine? ( dev-qt/qtwebengine:6[widgets] )
- xlsx? ( dev-libs/qxlsx:=[qt6] )
- )
- telescope? ( sci-libs/indilib:= )
-"
-DEPEND="${RDEPEND}
- !qt6? (
- dev-qt/qtconcurrent:5
- test? ( dev-qt/qttest:5 )
- )
- qt6? ( dev-qt/qtbase:6=[concurrent] )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- "${FILESDIR}/stellarium-0.20.3-unbundle-zlib.patch"
- "${FILESDIR}/stellarium-0.22.2-ccache.patch"
- "${FILESDIR}/stellarium-1.1-qxlsx.patch"
-)
-
-src_prepare() {
- cmake_src_prepare
- use debug || append-cppflags -DQT_NO_DEBUG #415769
-
- rm -r src/external/zlib/ || die
-
- # for glues_stel aka libtess I couldn't find an upstream with the same API
-
- local remaining="$(cd src/external/ && echo */)"
- if [[ "${remaining}" != "glues_stel/" ]]; then
- eqawarn "Need to unbundle more deps: ${remaining}"
- fi
-}
-
-src_configure() {
- filter-lto # https://bugs.gentoo.org/862249
-
- local mycmakeargs=(
- -DCPM_LOCAL_PACKAGES_ONLY=yes
- -DENABLE_GPS="$(usex gps)"
- -DENABLE_MEDIA="$(usex media)"
- -DENABLE_NLS="$(usex nls)"
- -DENABLE_QT6="$(usex qt6)"
- -DENABLE_QTWEBENGINE="$(usex webengine)"
- -DENABLE_SHOWMYSKY=$(usex show-my-sky)
- -DENABLE_SCRIPTING=$(usex scripting)
- -DENABLE_TESTING="$(usex test)"
- -DENABLE_XLSX="$(usex xlsx)"
- -DUSE_PLUGIN_TELESCOPECONTROL="$(usex telescope)"
- )
- cmake_src_configure
-}
-
-src_test() {
- virtx cmake_src_test
-}
-
-src_compile() {
- cmake_src_compile
-
- if use doc ; then
- cmake_build apidoc
- fi
-}
-
-src_install() {
- if use doc ; then
- local HTML_DOCS=( "${BUILD_DIR}/doc/html/." )
- dodoc "${DISTDIR}/stellarium_user_guide-${PV}-1.pdf"
- fi
- cmake_src_install
-
- # use the more up-to-date system fonts
- rm "${ED}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf || die
- dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf
- dosym ../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf
-
- if use stars ; then
- insinto /usr/share/${PN}/stars/default
- doins "${DISTDIR}"/stars_4_1v0_2.cat
- doins "${DISTDIR}"/stars_{5,6,7,8}_2v0_1.cat
- fi
- if use deep-sky ; then
- insinto /usr/share/${PN}/nebulae/default
- newins "${DISTDIR}/${PN}-dso-catalog-${MY_DSO_VERSION}.dat" catalog.dat
- fi
- newicon doc/images/stellarium-logo.png ${PN}.png
-}
next reply other threads:[~2023-02-23 7:04 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-23 7:04 Joonas Niilola [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-04-30 6:42 [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/stellarium/, sci-astronomy/stellarium/files/ Sam James
2024-01-10 7:11 Joonas Niilola
2023-12-13 8:06 Florian Schmaus
2023-09-27 8:34 Florian Schmaus
2022-09-27 14:01 Andrew Ammerlaan
2022-05-26 12:58 Joonas Niilola
2022-04-18 20:29 Sam James
2022-01-03 19:07 Florian Schmaus
2021-06-11 8:55 David Seifert
2020-08-21 7:15 Joonas Niilola
2019-01-18 11:01 Andreas Sturmlechner
2018-11-12 23:00 Andreas Sturmlechner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1677135720.e3048a5a5a887614f309c7cccd9bac7040d2fd97.juippis@gentoo \
--to=juippis@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox