1 |
commit: 5031361f5d72d15120456a3a4bd853afe65ac5c2 |
2 |
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org> |
3 |
AuthorDate: Sun Sep 25 02:02:27 2022 +0000 |
4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 27 14:00:45 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5031361f |
7 |
|
8 |
sci-astronomy/stellarium: drop 0.21.3, 0.22.1, 0.22.1-r1 |
9 |
|
10 |
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org> |
11 |
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> |
12 |
|
13 |
sci-astronomy/stellarium/Manifest | 6 - |
14 |
.../stellarium-0.21.2-unbundle-qtcompress.patch | 207 -------------------- |
15 |
.../files/stellarium-0.22.1-fix-conv.patch | 23 --- |
16 |
...ellarium-0.22.1-fix-star-manager-segfault.patch | 30 --- |
17 |
.../files/stellarium-0.22.1-fix-test-x86.patch | 93 --------- |
18 |
.../stellarium-0.22.1-unbundle-qtcompress.patch | 208 --------------------- |
19 |
sci-astronomy/stellarium/stellarium-0.21.3.ebuild | 144 -------------- |
20 |
.../stellarium/stellarium-0.22.1-r1.ebuild | 149 --------------- |
21 |
sci-astronomy/stellarium/stellarium-0.22.1.ebuild | 146 --------------- |
22 |
9 files changed, 1006 deletions(-) |
23 |
|
24 |
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest |
25 |
index c582a4819100..beecdeb0e8ee 100644 |
26 |
--- a/sci-astronomy/stellarium/Manifest |
27 |
+++ b/sci-astronomy/stellarium/Manifest |
28 |
@@ -3,12 +3,6 @@ DIST stars_5_2v0_1.cat 42580300 BLAKE2B eb6528c0577b3f2001a8b03cc5a4e08fa4e75723 |
29 |
DIST stars_6_2v0_1.cat 148352404 BLAKE2B c605b284b3d768cb1619ada3f58d406fa7737f09949e8926d6c14b82a85927d124d7fcb50c6d6c357d21b003938cc0b28937f2adb28ae268bb5c85d575f5e0ff SHA512 794279407595f44bbc1e492086063d98068bf332202a5448cd83dd7afbdcf7c6c3ff2878f3016369ebb5a98552874eb4eddb38e2c40e9a163c6231b640e02977 |
30 |
DIST stars_7_2v0_1.cat 305710678 BLAKE2B 1cc9b4a6bc35a9339e495f7e0da4f7e90a0e92b05b5de8599be1bbdd2a8053cbcec44b0e58bc9248364666db9cdf23449edf236e3f21fdc0e8f1a4a706afc919 SHA512 43b866eb793e8812c9d5502101a6c985d2055fb88bdbda274726bcd51e1527ecf342b22acd673318c9c8e88cac68eace18de8f27d29ffe64933fd32a5b84c5e3 |
31 |
DIST stars_8_2v0_1.cat 559068934 BLAKE2B c040a369cdf6885759998e1315b554d21a5e2b9b149a67967a8af45606aebf57bec407fab5ce1904978af0dc529aa6bddd267331ca45f58617bbf56d5ca99dee SHA512 06d4fa298b9dff8452f550377df99fcaa5e7107cfc7b75c9a4769b3cb6d97a822a54213c706102c1d7ef2dabc16df32a85f46b2f6d6c6f76a4e919353b739de4 |
32 |
-DIST stellarium-0.21.3.tar.gz 390176992 BLAKE2B 9a6ba3ab6e1b0a61916c844d271bb2181f7b6482dfaaf24e9160dd00cec297e80fc2af167f77aaf248c4dcb358ff64c5cdc138626f37030529146f1e822813e8 SHA512 6553f0229f837742e8b9db2715ecb96d69fe46aa7f057d86fb2547540d86f2cb767ca4a6bb5ff18037642113b42fec3f2850e037275fc732aae63da8031bbd0e |
33 |
-DIST stellarium-0.22.1.tar.gz 407700439 BLAKE2B 7a01bf63892ab800988896748f44961832756cb993884ab1d45e454035db72d6494a536936ccc338f1c0322e20ec5b282a2c3764b77f1c16cf2ee47f1a57a979 SHA512 31d0294c78c3254261dd2a5e46022342f9f3046f920efd8e4f1353eecf79116f50a968479768c12a8419ed3f9182fd3694a78b5ea2ab27ad67e6ef6d17aaa137 |
34 |
DIST stellarium-0.22.2.tar.gz 409151525 BLAKE2B c49abfb17a8bf7b120d8a0dffbe58b83e18f86b7ef2764cddc946e0cbaad9bf01adaf8d008557108f6354ed11d79e56d94c92c2a07befbd955aed8d201b68292 SHA512 ed905f58e1ff8b257b1e054ca76c83470915b00a04f7925b63784aa62b74e972f332e0b7dc605ffc17bb6516ef4f045943cb564d9637238726b9d7ceb2d44dda |
35 |
-DIST stellarium-dso-catalog-3.13.dat 28683353 BLAKE2B 6d7587f98ccb06a83e6befb1d569c9639170c8a430901c1c6098a86a33fe8934cd4454a87b51752636a15ab1a96fd3ebd77cbd5d9e4260436ec2e4e4795f98b0 SHA512 3880ec776798599640fb083b0c9ebbccadef44f640fb2214052161ddbeb06bf5b0babc0c31d9ac02aa40e52e290d4f5613c11a6dadd83fd61114dbfb49ebe855 |
36 |
-DIST stellarium-dso-catalog-3.15.dat 28683372 BLAKE2B c2ba23a6b169815ed20d97113887f663a9b730774cc2e8402e4149ff25b8d0107166c806814d3fb46ccc1f1859a901508f652234b8ddff3ea7d4710b21b65c93 SHA512 2f43696b093bcc35288b51fdacf89380ee878296fa596c10404c89004efbd08104e7d04e193499eed711ad7d13dd7fe8af805167e3b10d6b2c2b02fca42ad041 |
37 |
DIST stellarium-dso-catalog-3.16.dat 28678822 BLAKE2B 130513b5dcb0d06dd605ed62d6bdf12bfd636a5e5f5c33f02c7adb77a6712245a98ce3d56332fce6fea0f18c9b7915af4bb3d9812b1fd09bfc036d4135cef4f5 SHA512 9320d2a3c9af93d19cc4414f371991993793b78315448cafcd83b82de6dc16715b0cab2ddeafca667af31a9086420cbe758708333e5b95215de8a46305324c41 |
38 |
-DIST stellarium_user_guide-0.21.3-1.pdf 31253904 BLAKE2B 3e8a0395a29c2fac164379ea315cd21d102b2b400d9eeacdb37cf85f00816f0678edabb9b779db135f4c43ee4cfcc6307ee59f4a149aa33e878c11fe26551266 SHA512 83137fe09bdc279bec23b78694d5e1efe9238733f8adf2cb8ed7e37f0eee60b0475c4c93b5bc85a04b92a175284c24354c36b6a93014216387211c9b031cdf7c |
39 |
-DIST stellarium_user_guide-0.22.1-1.pdf 36226017 BLAKE2B 628c57f1efa6238e5c12588ed4b0532816e8708f16d40fad0d87f72550af5efa500ae0edbc20e243488c59dfc94b47efe588d47419e7d29b1fd6ff9e4cec5438 SHA512 07d965f5b45ac964bec401f14ee81322a17939e292390ebd040339c265ede4b652b37e9220696f13c093ea22e8a706b27b7d23d7357dffbe808c2538f8cee93d |
40 |
DIST stellarium_user_guide-0.22.2-1.pdf 35082446 BLAKE2B c9bb7f344a9377fe86b714904aa713c7e6cda59d31f8e547b571da0a057d141fa1b998b4adb3dbdcee0bb7a152b6f6e18b58a4a08c345dc0e77efca6ffb5a801 SHA512 45adfe53fa9c7432952152d95ab96a446a6459348fa6724fff83aababb0c967d9467cc0ca3bd24b834fd189fb69c782e521d94528a60a704062aa445e749a4a5 |
41 |
|
42 |
diff --git a/sci-astronomy/stellarium/files/stellarium-0.21.2-unbundle-qtcompress.patch b/sci-astronomy/stellarium/files/stellarium-0.21.2-unbundle-qtcompress.patch |
43 |
deleted file mode 100644 |
44 |
index f5d757b1bb16..000000000000 |
45 |
--- a/sci-astronomy/stellarium/files/stellarium-0.21.2-unbundle-qtcompress.patch |
46 |
+++ /dev/null |
47 |
@@ -1,207 +0,0 @@ |
48 |
---- a/CMakeLists.txt |
49 |
-+++ b/CMakeLists.txt |
50 |
-@@ -594,6 +594,7 @@ ELSE(ENABLE_GPS) |
51 |
- MESSAGE(STATUS "GPS: disabled.") |
52 |
- ENDIF(ENABLE_GPS) |
53 |
- |
54 |
-+find_package(Qt5Compress REQUIRED) |
55 |
- |
56 |
- IF(USE_QTOPENGL) |
57 |
- # QtOpenGL module is deprecated. After merging the QOpenGLWidget branch, we don't use this module directly anymore, |
58 |
---- a/plugins/Satellites/src/CMakeLists.txt |
59 |
-+++ b/plugins/Satellites/src/CMakeLists.txt |
60 |
-@@ -55,7 +55,7 @@ IF(ENABLE_TESTING) |
61 |
- ENDIF(ENABLE_TESTING) |
62 |
- |
63 |
- ADD_LIBRARY(Satellites-static STATIC ${Satellites_SRCS} ${Satellites_RES_CXX} ${SatellitesDialog_UIS_H}) |
64 |
--TARGET_LINK_LIBRARIES(Satellites-static Qt5::Core Qt5::Network Qt5::Widgets) |
65 |
-+TARGET_LINK_LIBRARIES(Satellites-static Qt5::Core Qt5::Network Qt5::Widgets Qt5::Compress) |
66 |
- # The library target "Satellites-static" has a default OUTPUT_NAME of "Satellites-static", so change it. |
67 |
- SET_TARGET_PROPERTIES(Satellites-static PROPERTIES OUTPUT_NAME "Satellites") |
68 |
- IF(MSVC) |
69 |
---- a/plugins/Satellites/src/Satellites.cpp |
70 |
-+++ b/plugins/Satellites/src/Satellites.cpp |
71 |
-@@ -43,7 +43,7 @@ |
72 |
- #include "StelUtils.hpp" |
73 |
- #include "StelActionMgr.hpp" |
74 |
- |
75 |
--#include "external/qtcompress/qzipreader.h" |
76 |
-+#include "qzipreader.h" |
77 |
- |
78 |
- #include <QNetworkAccessManager> |
79 |
- #include <QNetworkReply> |
80 |
-@@ -1549,12 +1549,12 @@ void Satellites::saveDownloadedUpdate(QNetworkReply* reply) |
81 |
- QString archive = zip.fileName(); |
82 |
- QByteArray data; |
83 |
- |
84 |
-- Stel::QZipReader reader(archive); |
85 |
-- if (reader.status() != Stel::QZipReader::NoError) |
86 |
-+ QZipReader reader(archive); |
87 |
-+ if (reader.status() != QZipReader::NoError) |
88 |
- qWarning() << "[Satellites] Unable to open as a ZIP archive"; |
89 |
- else |
90 |
- { |
91 |
-- QList<Stel::QZipReader::FileInfo> infoList = reader.fileInfoList(); |
92 |
-+ QList<QZipReader::FileInfo> infoList = reader.fileInfoList(); |
93 |
- for (const auto& info : qAsConst(infoList)) |
94 |
- { |
95 |
- // qWarning() << "[Satellites] Processing:" << info.filePath; |
96 |
---- a/src/CMakeLists.txt |
97 |
-+++ b/src/CMakeLists.txt |
98 |
-@@ -464,7 +464,7 @@ IF(ENABLE_SPOUT AND SPOUT_LIBRARY_DLL) |
99 |
- CONFIGURE_FILE(${SPOUT_LIBRARY_DLL} ${CMAKE_CURRENT_BINARY_DIR} COPYONLY) |
100 |
- ENDIF() |
101 |
- |
102 |
--SET(STELMAIN_DEPS ${ZLIB_LIBRARIES} qtcompress_stel glues_stel qcustomplot_stel qxlsx_stel ${STELLARIUM_STATIC_PLUGINS_LIBRARIES} ${STELLARIUM_QT_LIBRARIES} ${SPOUT_LIBRARY}) |
103 |
-+SET(STELMAIN_DEPS ${ZLIB_LIBRARIES} Qt5::Compress glues_stel qcustomplot_stel qxlsx_stel ${STELLARIUM_STATIC_PLUGINS_LIBRARIES} ${STELLARIUM_QT_LIBRARIES} ${SPOUT_LIBRARY}) |
104 |
- IF(ENABLE_LIBGPS) |
105 |
- SET(STELMAIN_DEPS ${STELMAIN_DEPS} ${GPS_LIBRARY}) |
106 |
- ENDIF() |
107 |
---- a/src/core/modules/LandscapeMgr.cpp |
108 |
-+++ b/src/core/modules/LandscapeMgr.cpp |
109 |
-@@ -1322,8 +1322,8 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const |
110 |
- } |
111 |
- QDir destinationDir (parentDestinationDir.absoluteFilePath("landscapes")); |
112 |
- |
113 |
-- Stel::QZipReader reader(sourceFilePath); |
114 |
-- if (reader.status() != Stel::QZipReader::NoError) |
115 |
-+ QZipReader reader(sourceFilePath); |
116 |
-+ if (reader.status() != QZipReader::NoError) |
117 |
- { |
118 |
- qWarning() << "LandscapeMgr: Unable to open as a ZIP archive:" << QDir::toNativeSeparators(sourceFilePath); |
119 |
- emit errorNotArchive(); |
120 |
-@@ -1332,7 +1332,7 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const |
121 |
- |
122 |
- //Detect top directory |
123 |
- QString topDir, iniPath; |
124 |
-- QList<Stel::QZipReader::FileInfo> infoList = reader.fileInfoList(); |
125 |
-+ QList<QZipReader::FileInfo> infoList = reader.fileInfoList(); |
126 |
- for (const auto& info : infoList) |
127 |
- { |
128 |
- QFileInfo fileInfo(info.filePath); |
129 |
---- a/src/external/CMakeLists.txt |
130 |
-+++ b/src/external/CMakeLists.txt |
131 |
-@@ -70,6 +70,7 @@ target_include_directories(zlib_stel PUBLIC zlib) |
132 |
- set_target_properties(zlib_stel PROPERTIES AUTOMOC 0) |
133 |
- SET_TARGET_PROPERTIES(zlib_stel PROPERTIES FOLDER "src/external") |
134 |
- |
135 |
-+if(0) |
136 |
- set(qtcompress_SRCS |
137 |
- qtcompress/qzip.cpp |
138 |
- qtcompress/qzipreader.h |
139 |
-@@ -82,6 +83,7 @@ target_link_libraries(qtcompress_stel ${ZLIB_LIBRARIES} Qt5::Core) |
140 |
- #turn off automoc, not needed here |
141 |
- set_target_properties(qtcompress_stel PROPERTIES AUTOMOC 0) |
142 |
- SET_TARGET_PROPERTIES(qtcompress_stel PROPERTIES FOLDER "src/external") |
143 |
-+endif() |
144 |
- |
145 |
- # QCustomPlot should not be unbundled, because upstream uses GPL 3, and |
146 |
- # Stellarium uses GPL 2. Author of QCustomPlot has agreed for GPL 2+ for this. |
147 |
-@@ -180,7 +182,7 @@ SET(qxlsx_SRCS |
148 |
- qxlsx/xlsxcelllocation.h |
149 |
- ) |
150 |
- add_library(qxlsx_stel STATIC EXCLUDE_FROM_ALL ${qxlsx_SRCS}) |
151 |
--target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui qtcompress_stel) |
152 |
-+target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui Qt5::Compress) |
153 |
- set_target_properties(qxlsx_stel PROPERTIES FOLDER "src/external") |
154 |
- |
155 |
- ################################# INDI ################################ |
156 |
---- a/src/external/qxlsx/xlsxzipreader.cpp |
157 |
-+++ b/src/external/qxlsx/xlsxzipreader.cpp |
158 |
-@@ -5,13 +5,13 @@ |
159 |
- QT_BEGIN_NAMESPACE_XLSX |
160 |
- |
161 |
- ZipReader::ZipReader(const QString &filePath) : |
162 |
-- m_reader(new Stel::QZipReader(filePath)) |
163 |
-+ m_reader(new QZipReader(filePath)) |
164 |
- { |
165 |
- init(); |
166 |
- } |
167 |
- |
168 |
- ZipReader::ZipReader(QIODevice *device) : |
169 |
-- m_reader(new Stel::QZipReader(device)) |
170 |
-+ m_reader(new QZipReader(device)) |
171 |
- { |
172 |
- init(); |
173 |
- } |
174 |
-@@ -23,8 +23,8 @@ ZipReader::~ZipReader() |
175 |
- |
176 |
- void ZipReader::init() |
177 |
- { |
178 |
-- QList<Stel::QZipReader::FileInfo> allFiles = m_reader->fileInfoList(); |
179 |
-- for (const Stel::QZipReader::FileInfo &fi : allFiles) { |
180 |
-+ QList<QZipReader::FileInfo> allFiles = m_reader->fileInfoList(); |
181 |
-+ for (const QZipReader::FileInfo &fi : allFiles) { |
182 |
- if (fi.isFile || (!fi.isDir && !fi.isFile && !fi.isSymLink)) |
183 |
- m_filePaths.append(fi.filePath); |
184 |
- } |
185 |
---- a/src/external/qxlsx/xlsxzipreader_p.h |
186 |
-+++ b/src/external/qxlsx/xlsxzipreader_p.h |
187 |
-@@ -8,7 +8,7 @@ |
188 |
- #include <QIODevice> |
189 |
- |
190 |
- #include "xlsxglobal.h" |
191 |
--#include "external/qtcompress/qzipreader.h" |
192 |
-+#include "qzipreader.h" |
193 |
- |
194 |
- #if QT_VERSION >= 0x050600 |
195 |
- #include <QVector> |
196 |
-@@ -31,7 +31,7 @@ public: |
197 |
- private: |
198 |
- Q_DISABLE_COPY(ZipReader) |
199 |
- void init(); |
200 |
-- QScopedPointer<Stel::QZipReader> m_reader; |
201 |
-+ QScopedPointer<QZipReader> m_reader; |
202 |
- QStringList m_filePaths; |
203 |
- }; |
204 |
- |
205 |
---- a/src/external/qxlsx/xlsxzipwriter.cpp |
206 |
-+++ b/src/external/qxlsx/xlsxzipwriter.cpp |
207 |
-@@ -10,14 +10,14 @@ QT_BEGIN_NAMESPACE_XLSX |
208 |
- |
209 |
- ZipWriter::ZipWriter(const QString &filePath) |
210 |
- { |
211 |
-- m_writer = new Stel::QZipWriter(filePath, QIODevice::WriteOnly); |
212 |
-- m_writer->setCompressionPolicy(Stel::QZipWriter::AutoCompress); |
213 |
-+ m_writer = new QZipWriter(filePath, QIODevice::WriteOnly); |
214 |
-+ m_writer->setCompressionPolicy(QZipWriter::AutoCompress); |
215 |
- } |
216 |
- |
217 |
- ZipWriter::ZipWriter(QIODevice *device) |
218 |
- { |
219 |
-- m_writer = new Stel::QZipWriter(device); |
220 |
-- m_writer->setCompressionPolicy(Stel::QZipWriter::AutoCompress); |
221 |
-+ m_writer = new QZipWriter(device); |
222 |
-+ m_writer->setCompressionPolicy(QZipWriter::AutoCompress); |
223 |
- } |
224 |
- |
225 |
- ZipWriter::~ZipWriter() |
226 |
-@@ -27,7 +27,7 @@ ZipWriter::~ZipWriter() |
227 |
- |
228 |
- bool ZipWriter::error() const |
229 |
- { |
230 |
-- return m_writer->status() != Stel::QZipWriter::NoError; |
231 |
-+ return m_writer->status() != QZipWriter::NoError; |
232 |
- } |
233 |
- |
234 |
- void ZipWriter::addFile(const QString &filePath, QIODevice *device) |
235 |
---- a/src/external/qxlsx/xlsxzipwriter_p.h |
236 |
-+++ b/src/external/qxlsx/xlsxzipwriter_p.h |
237 |
-@@ -8,7 +8,7 @@ |
238 |
- #include <QIODevice> |
239 |
- |
240 |
- #include "xlsxglobal.h" |
241 |
--#include "external/qtcompress/qzipwriter.h" |
242 |
-+#include "qzipwriter.h" |
243 |
- |
244 |
- class QZipWriter; |
245 |
- |
246 |
-@@ -27,7 +27,7 @@ public: |
247 |
- void close(); |
248 |
- |
249 |
- private: |
250 |
-- Stel::QZipWriter *m_writer; |
251 |
-+ QZipWriter *m_writer; |
252 |
- }; |
253 |
- |
254 |
- QT_END_NAMESPACE_XLSX |
255 |
|
256 |
diff --git a/sci-astronomy/stellarium/files/stellarium-0.22.1-fix-conv.patch b/sci-astronomy/stellarium/files/stellarium-0.22.1-fix-conv.patch |
257 |
deleted file mode 100644 |
258 |
index 5187837fbb61..000000000000 |
259 |
--- a/sci-astronomy/stellarium/files/stellarium-0.22.1-fix-conv.patch |
260 |
+++ /dev/null |
261 |
@@ -1,23 +0,0 @@ |
262 |
-From dd65fdf5a332d62834ac1cfe9639e220ea635c55 Mon Sep 17 00:00:00 2001 |
263 |
-From: "Alexander V. Wolf" <alex.v.wolf@×××××.com> |
264 |
-Date: Wed, 25 May 2022 20:55:15 +0700 |
265 |
-Subject: [PATCH] Fixed conversion tool radToHms(): avoiding possible negative |
266 |
- zero for value of seconds (see #2460) |
267 |
- |
268 |
---- |
269 |
- src/core/StelUtils.cpp | 2 +- |
270 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
271 |
- |
272 |
-diff --git a/src/core/StelUtils.cpp b/src/core/StelUtils.cpp |
273 |
-index 93a55ebb957..b03f55a68ec 100644 |
274 |
---- a/src/core/StelUtils.cpp |
275 |
-+++ b/src/core/StelUtils.cpp |
276 |
-@@ -140,7 +140,7 @@ void radToHms(double angle, unsigned int& h, unsigned int& m, double& s) |
277 |
- |
278 |
- h = static_cast<unsigned int>(angle); |
279 |
- m = static_cast<unsigned int>((angle-h)*60); |
280 |
-- s = (angle-h)*3600.-60.*m; |
281 |
-+ s = qAbs((angle-h)*3600.-60.*m); |
282 |
- } |
283 |
- |
284 |
- /************************************************************************* |
285 |
|
286 |
diff --git a/sci-astronomy/stellarium/files/stellarium-0.22.1-fix-star-manager-segfault.patch b/sci-astronomy/stellarium/files/stellarium-0.22.1-fix-star-manager-segfault.patch |
287 |
deleted file mode 100644 |
288 |
index 7f8981a006e2..000000000000 |
289 |
--- a/sci-astronomy/stellarium/files/stellarium-0.22.1-fix-star-manager-segfault.patch |
290 |
+++ /dev/null |
291 |
@@ -1,30 +0,0 @@ |
292 |
-This patch is required to fix a segfault on startup in <=0.22.1 if star catalogue files are |
293 |
-added or removed (USE=stars) |
294 |
- |
295 |
-Refer: https://github.com/Stellarium/stellarium/issues/2404 |
296 |
- |
297 |
-This patch may be safely removed for 0.22.2 - it has been patched upstream. |
298 |
- |
299 |
---- a/src/core/modules/StarMgr.cpp |
300 |
-+++ b/src/core/modules/StarMgr.cpp |
301 |
-@@ -592,13 +592,13 @@ void StarMgr::setCheckFlag(const QString& catId, bool b) |
302 |
- return; |
303 |
- m["checked"]=b; |
304 |
- catalogsDescription[idx-1]=m; |
305 |
-- starSettings["catalogs"]=catalogsDescription; |
306 |
-- QFile tmp(starConfigFileFullPath); |
307 |
-- if(tmp.open(QIODevice::WriteOnly)) |
308 |
-- { |
309 |
-- StelJsonParser::write(starSettings, &tmp); |
310 |
-- tmp.close(); |
311 |
-- } |
312 |
-+ } |
313 |
-+ starSettings["catalogs"]=catalogsDescription; |
314 |
-+ QFile tmp(starConfigFileFullPath); |
315 |
-+ if(tmp.open(QIODevice::WriteOnly)) |
316 |
-+ { |
317 |
-+ StelJsonParser::write(starSettings, &tmp); |
318 |
-+ tmp.close(); |
319 |
- } |
320 |
- } |
321 |
- |
322 |
|
323 |
diff --git a/sci-astronomy/stellarium/files/stellarium-0.22.1-fix-test-x86.patch b/sci-astronomy/stellarium/files/stellarium-0.22.1-fix-test-x86.patch |
324 |
deleted file mode 100644 |
325 |
index 784b388b2534..000000000000 |
326 |
--- a/sci-astronomy/stellarium/files/stellarium-0.22.1-fix-test-x86.patch |
327 |
+++ /dev/null |
328 |
@@ -1,93 +0,0 @@ |
329 |
-From 802065e025c8b435dc39b4fdd9262efdc1dcd2a8 Mon Sep 17 00:00:00 2001 |
330 |
-From: "Alexander V. Wolf" <alex.v.wolf@×××××.com> |
331 |
-Date: Tue, 24 May 2022 14:47:50 +0700 |
332 |
-Subject: [PATCH] Fixed something strange in radToHMSStr and radToHMSStrAdapt |
333 |
- convertors |
334 |
- |
335 |
-probably ancient bug (?), maybe related to issue #2460 |
336 |
---- |
337 |
- src/core/StelUtils.cpp | 6 +++--- |
338 |
- src/tests/testConversions.cpp | 16 ++++++---------- |
339 |
- 2 files changed, 9 insertions(+), 13 deletions(-) |
340 |
- |
341 |
-diff --git a/src/core/StelUtils.cpp b/src/core/StelUtils.cpp |
342 |
-index 521d538315e..93a55ebb957 100644 |
343 |
---- a/src/core/StelUtils.cpp |
344 |
-+++ b/src/core/StelUtils.cpp |
345 |
-@@ -225,9 +225,9 @@ QString radToHmsStr(const double angle, const bool decimal) |
346 |
- { |
347 |
- unsigned int h,m; |
348 |
- double s; |
349 |
-- StelUtils::radToHms(angle+0.005*M_PI/12/(60*60), h, m, s); |
350 |
-+ StelUtils::radToHms(angle, h, m, s); |
351 |
- int width, precision; |
352 |
-- QString carry, r; |
353 |
-+ QString carry; |
354 |
- if (decimal) |
355 |
- { |
356 |
- width=5; |
357 |
-@@ -268,7 +268,7 @@ QString radToDmsStrAdapt(const double angle, const bool useD) |
358 |
- bool sign; |
359 |
- unsigned int d,m; |
360 |
- double s; |
361 |
-- StelUtils::radToDms(angle+0.005*M_PI/180/(60*60)*(angle<0?-1.:1.), sign, d, m, s); // NOTE: WTF??? |
362 |
-+ StelUtils::radToDms(angle, sign, d, m, s); |
363 |
- QString str; |
364 |
- QTextStream os(&str); |
365 |
- |
366 |
-diff --git a/src/tests/testConversions.cpp b/src/tests/testConversions.cpp |
367 |
-index a37db14307c..6e8a4c6f04c 100644 |
368 |
---- a/src/tests/testConversions.cpp |
369 |
-+++ b/src/tests/testConversions.cpp |
370 |
-@@ -248,12 +248,12 @@ void TestConversions::testRadToDMSStrAdapt() |
371 |
- data << 61*M_PI/360 << "+30°30'" << false; |
372 |
- data << M_PI/648000 << "+0°0'1\"" << false; |
373 |
- data << 1213*M_PI/2400 << "+90°58'30\"" << false; |
374 |
-- data << 39599*M_PI/648000 << "+10°59'59\"" << false; |
375 |
-+ data << 39599*M_PI/648000 << "+10°59'59.00\"" << false; |
376 |
- data << -M_PI/36 << "-5°" << false; |
377 |
- data << -7*M_PI/8 << "-157°30'" << false; |
378 |
- data << -2*M_PI/5 << "-72°" << false; |
379 |
- data << -M_PI << "-180°" << false; |
380 |
-- data << -10*M_PI/648 << "-2°46'40\"" << false; |
381 |
-+ data << -10*M_PI/648 << "-2°46'40.00\"" << false; |
382 |
- |
383 |
- data << 0. << "+0d" << true; |
384 |
- data << M_PI/6 << "+30d" << true; |
385 |
-@@ -268,12 +268,12 @@ void TestConversions::testRadToDMSStrAdapt() |
386 |
- data << 61*M_PI/360 << "+30d30'" << true; |
387 |
- data << M_PI/648000 << "+0d0'1\"" << true; |
388 |
- data << 1213*M_PI/2400 << "+90d58'30\"" << true; |
389 |
-- data << 39599*M_PI/648000 << "+10d59'59\"" << true; |
390 |
-+ data << 39599*M_PI/648000 << "+10d59'59.00\"" << true; |
391 |
- data << -M_PI/36 << "-5d" << true; |
392 |
- data << -7*M_PI/8 << "-157d30'" << true; |
393 |
- data << -2*M_PI/5 << "-72d" << true; |
394 |
- data << -M_PI << "-180d" << true; |
395 |
-- data << -10*M_PI/648 << "-2d46'40\"" << true; |
396 |
-+ data << -10*M_PI/648 << "-2d46'40.00\"" << true; |
397 |
- |
398 |
- while (data.count()>=3) |
399 |
- { |
400 |
-@@ -282,9 +282,7 @@ void TestConversions::testRadToDMSStrAdapt() |
401 |
- bool flag = data.takeFirst().toBool(); |
402 |
- QString rdms = StelUtils::radToDmsStrAdapt(rad, flag); |
403 |
- QVERIFY2(rdms==edms, qPrintable(QString("%1 radians = %2 (expected %3) [flag: %4]") |
404 |
-- .arg(QString::number(rad, 'f', 5)) |
405 |
-- .arg(rdms) |
406 |
-- .arg(edms) |
407 |
-+ .arg(QString::number(rad, 'f', 5), rdms, edms) |
408 |
- .arg(flag))); |
409 |
- } |
410 |
- } |
411 |
-@@ -381,9 +379,7 @@ void TestConversions::testRadToDMSStr() |
412 |
- bool useDF = data.takeFirst().toBool(); |
413 |
- QString rdms = StelUtils::radToDmsStr(rad, decimalF, useDF); |
414 |
- QVERIFY2(rdms==edms, qPrintable(QString("%1 radians = %2 (expected %3) [flags: %4, %5]") |
415 |
-- .arg(QString::number(rad, 'f', 5)) |
416 |
-- .arg(rdms) |
417 |
-- .arg(edms) |
418 |
-+ .arg(QString::number(rad, 'f', 5), rdms, edms) |
419 |
- .arg(decimalF) |
420 |
- .arg(useDF))); |
421 |
- } |
422 |
|
423 |
diff --git a/sci-astronomy/stellarium/files/stellarium-0.22.1-unbundle-qtcompress.patch b/sci-astronomy/stellarium/files/stellarium-0.22.1-unbundle-qtcompress.patch |
424 |
deleted file mode 100644 |
425 |
index 41721046ed03..000000000000 |
426 |
--- a/sci-astronomy/stellarium/files/stellarium-0.22.1-unbundle-qtcompress.patch |
427 |
+++ /dev/null |
428 |
@@ -1,208 +0,0 @@ |
429 |
---- a/CMakeLists.txt |
430 |
-+++ b/CMakeLists.txt |
431 |
-@@ -614,6 +614,8 @@ ELSE(ENABLE_GPS) |
432 |
- MESSAGE(STATUS "GPS: disabled.") |
433 |
- ENDIF(ENABLE_GPS) |
434 |
- |
435 |
-+find_package(Qt5Compress REQUIRED) |
436 |
-+ |
437 |
- IF(USE_QTOPENGL) |
438 |
- # QtOpenGL module is deprecated. After merging the QOpenGLWidget branch, we don't use this module directly anymore, |
439 |
- # but the QtMultimediaWidgets module requires it internally, so we still have to package it. |
440 |
---- a/plugins/Satellites/src/CMakeLists.txt |
441 |
-+++ b/plugins/Satellites/src/CMakeLists.txt |
442 |
-@@ -55,7 +55,7 @@ IF(ENABLE_TESTING) |
443 |
- ENDIF(ENABLE_TESTING) |
444 |
- |
445 |
- ADD_LIBRARY(Satellites-static STATIC ${Satellites_SRCS} ${Satellites_RES_CXX} ${SatellitesDialog_UIS_H}) |
446 |
--TARGET_LINK_LIBRARIES(Satellites-static Qt5::Core Qt5::Network Qt5::Widgets) |
447 |
-+TARGET_LINK_LIBRARIES(Satellites-static Qt5::Core Qt5::Network Qt5::Widgets Qt5::Compress) |
448 |
- # The library target "Satellites-static" has a default OUTPUT_NAME of "Satellites-static", so change it. |
449 |
- SET_TARGET_PROPERTIES(Satellites-static PROPERTIES OUTPUT_NAME "Satellites") |
450 |
- IF(MSVC) |
451 |
---- a/plugins/Satellites/src/Satellites.cpp |
452 |
-+++ b/plugins/Satellites/src/Satellites.cpp |
453 |
-@@ -43,7 +43,7 @@ |
454 |
- #include "StelUtils.hpp" |
455 |
- #include "StelActionMgr.hpp" |
456 |
- |
457 |
--#include "external/qtcompress/qzipreader.h" |
458 |
-+#include "qzipreader.h" |
459 |
- |
460 |
- #include <QNetworkAccessManager> |
461 |
- #include <QNetworkReply> |
462 |
-@@ -1639,12 +1639,12 @@ void Satellites::saveDownloadedUpdate(QNetworkReply* reply) |
463 |
- QString archive = zip.fileName(); |
464 |
- QByteArray data; |
465 |
- |
466 |
-- Stel::QZipReader reader(archive); |
467 |
-- if (reader.status() != Stel::QZipReader::NoError) |
468 |
-+ QZipReader reader(archive); |
469 |
-+ if (reader.status() != QZipReader::NoError) |
470 |
- qWarning() << "[Satellites] Unable to open as a ZIP archive"; |
471 |
- else |
472 |
- { |
473 |
-- QList<Stel::QZipReader::FileInfo> infoList = reader.fileInfoList(); |
474 |
-+ QList<QZipReader::FileInfo> infoList = reader.fileInfoList(); |
475 |
- for (const auto& info : qAsConst(infoList)) |
476 |
- { |
477 |
- // qWarning() << "[Satellites] Processing:" << info.filePath; |
478 |
---- a/src/CMakeLists.txt |
479 |
-+++ b/src/CMakeLists.txt |
480 |
-@@ -479,7 +479,7 @@ IF(ENABLE_SPOUT AND SPOUT_LIBRARY_DLL) |
481 |
- CONFIGURE_FILE(${SPOUT_LIBRARY_DLL} ${CMAKE_CURRENT_BINARY_DIR} COPYONLY) |
482 |
- ENDIF() |
483 |
- |
484 |
--SET(STELMAIN_DEPS ${ZLIB_LIBRARIES} qtcompress_stel glues_stel qcustomplot_stel qxlsx_stel ${STELLARIUM_STATIC_PLUGINS_LIBRARIES} ${STELLARIUM_QT_LIBRARIES} ${SPOUT_LIBRARY}) |
485 |
-+SET(STELMAIN_DEPS ${ZLIB_LIBRARIES} Qt5::Compress glues_stel qcustomplot_stel qxlsx_stel ${STELLARIUM_STATIC_PLUGINS_LIBRARIES} ${STELLARIUM_QT_LIBRARIES} ${SPOUT_LIBRARY}) |
486 |
- IF(ENABLE_LIBGPS) |
487 |
- SET(STELMAIN_DEPS ${STELMAIN_DEPS} ${GPS_LIBRARY}) |
488 |
- ENDIF() |
489 |
---- a/src/core/modules/LandscapeMgr.cpp |
490 |
-+++ b/src/core/modules/LandscapeMgr.cpp |
491 |
-@@ -1331,8 +1331,8 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const |
492 |
- } |
493 |
- QDir destinationDir (parentDestinationDir.absoluteFilePath("landscapes")); |
494 |
- |
495 |
-- Stel::QZipReader reader(sourceFilePath); |
496 |
-- if (reader.status() != Stel::QZipReader::NoError) |
497 |
-+ QZipReader reader(sourceFilePath); |
498 |
-+ if (reader.status() != QZipReader::NoError) |
499 |
- { |
500 |
- qWarning() << "LandscapeMgr: Unable to open as a ZIP archive:" << QDir::toNativeSeparators(sourceFilePath); |
501 |
- emit errorNotArchive(); |
502 |
-@@ -1341,7 +1341,7 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const |
503 |
- |
504 |
- //Detect top directory |
505 |
- QString topDir, iniPath; |
506 |
-- const QList<Stel::QZipReader::FileInfo> infoList = reader.fileInfoList(); |
507 |
-+ const QList<QZipReader::FileInfo> infoList = reader.fileInfoList(); |
508 |
- for (const auto& info : infoList) |
509 |
- { |
510 |
- QFileInfo fileInfo(info.filePath); |
511 |
---- a/src/external/CMakeLists.txt |
512 |
-+++ b/src/external/CMakeLists.txt |
513 |
-@@ -70,6 +70,7 @@ target_include_directories(zlib_stel PUBLIC zlib) |
514 |
- set_target_properties(zlib_stel PROPERTIES AUTOMOC 0) |
515 |
- SET_TARGET_PROPERTIES(zlib_stel PROPERTIES FOLDER "src/external") |
516 |
- |
517 |
-+if(0) |
518 |
- set(qtcompress_SRCS |
519 |
- qtcompress/qzip.cpp |
520 |
- qtcompress/qzipreader.h |
521 |
-@@ -82,6 +83,7 @@ target_link_libraries(qtcompress_stel ${ZLIB_LIBRARIES} Qt5::Core) |
522 |
- #turn off automoc, not needed here |
523 |
- set_target_properties(qtcompress_stel PROPERTIES AUTOMOC 0) |
524 |
- SET_TARGET_PROPERTIES(qtcompress_stel PROPERTIES FOLDER "src/external") |
525 |
-+endif() |
526 |
- |
527 |
- # QCustomPlot should not be unbundled, because upstream uses GPL 3, and |
528 |
- # Stellarium uses GPL 2. Author of QCustomPlot has agreed for GPL 2+ for this. |
529 |
-@@ -180,7 +182,7 @@ SET(qxlsx_SRCS |
530 |
- qxlsx/xlsxcelllocation.h |
531 |
- ) |
532 |
- add_library(qxlsx_stel STATIC EXCLUDE_FROM_ALL ${qxlsx_SRCS}) |
533 |
--target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui qtcompress_stel) |
534 |
-+target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui Qt5::Compress) |
535 |
- set_target_properties(qxlsx_stel PROPERTIES FOLDER "src/external") |
536 |
- |
537 |
- ################################# INDI ################################ |
538 |
---- a/src/external/qxlsx/xlsxzipreader.cpp |
539 |
-+++ b/src/external/qxlsx/xlsxzipreader.cpp |
540 |
-@@ -5,13 +5,13 @@ |
541 |
- QT_BEGIN_NAMESPACE_XLSX |
542 |
- |
543 |
- ZipReader::ZipReader(const QString &filePath) : |
544 |
-- m_reader(new Stel::QZipReader(filePath)) |
545 |
-+ m_reader(new QZipReader(filePath)) |
546 |
- { |
547 |
- init(); |
548 |
- } |
549 |
- |
550 |
- ZipReader::ZipReader(QIODevice *device) : |
551 |
-- m_reader(new Stel::QZipReader(device)) |
552 |
-+ m_reader(new QZipReader(device)) |
553 |
- { |
554 |
- init(); |
555 |
- } |
556 |
-@@ -23,8 +23,8 @@ ZipReader::~ZipReader() |
557 |
- |
558 |
- void ZipReader::init() |
559 |
- { |
560 |
-- QList<Stel::QZipReader::FileInfo> allFiles = m_reader->fileInfoList(); |
561 |
-- for (const Stel::QZipReader::FileInfo &fi : allFiles) { |
562 |
-+ QList<QZipReader::FileInfo> allFiles = m_reader->fileInfoList(); |
563 |
-+ for (const QZipReader::FileInfo &fi : allFiles) { |
564 |
- if (fi.isFile || (!fi.isDir && !fi.isFile && !fi.isSymLink)) |
565 |
- m_filePaths.append(fi.filePath); |
566 |
- } |
567 |
---- a/src/external/qxlsx/xlsxzipreader_p.h |
568 |
-+++ b/src/external/qxlsx/xlsxzipreader_p.h |
569 |
-@@ -8,7 +8,7 @@ |
570 |
- #include <QIODevice> |
571 |
- |
572 |
- #include "xlsxglobal.h" |
573 |
--#include "external/qtcompress/qzipreader.h" |
574 |
-+#include "qzipreader.h" |
575 |
- |
576 |
- #if QT_VERSION >= 0x050600 |
577 |
- #include <QVector> |
578 |
-@@ -31,7 +31,7 @@ public: |
579 |
- private: |
580 |
- Q_DISABLE_COPY(ZipReader) |
581 |
- void init(); |
582 |
-- QScopedPointer<Stel::QZipReader> m_reader; |
583 |
-+ QScopedPointer<QZipReader> m_reader; |
584 |
- QStringList m_filePaths; |
585 |
- }; |
586 |
- |
587 |
---- a/src/external/qxlsx/xlsxzipwriter.cpp |
588 |
-+++ b/src/external/qxlsx/xlsxzipwriter.cpp |
589 |
-@@ -10,14 +10,14 @@ QT_BEGIN_NAMESPACE_XLSX |
590 |
- |
591 |
- ZipWriter::ZipWriter(const QString &filePath) |
592 |
- { |
593 |
-- m_writer = new Stel::QZipWriter(filePath, QIODevice::WriteOnly); |
594 |
-- m_writer->setCompressionPolicy(Stel::QZipWriter::AutoCompress); |
595 |
-+ m_writer = new QZipWriter(filePath, QIODevice::WriteOnly); |
596 |
-+ m_writer->setCompressionPolicy(QZipWriter::AutoCompress); |
597 |
- } |
598 |
- |
599 |
- ZipWriter::ZipWriter(QIODevice *device) |
600 |
- { |
601 |
-- m_writer = new Stel::QZipWriter(device); |
602 |
-- m_writer->setCompressionPolicy(Stel::QZipWriter::AutoCompress); |
603 |
-+ m_writer = new QZipWriter(device); |
604 |
-+ m_writer->setCompressionPolicy(QZipWriter::AutoCompress); |
605 |
- } |
606 |
- |
607 |
- ZipWriter::~ZipWriter() |
608 |
-@@ -27,7 +27,7 @@ ZipWriter::~ZipWriter() |
609 |
- |
610 |
- bool ZipWriter::error() const |
611 |
- { |
612 |
-- return m_writer->status() != Stel::QZipWriter::NoError; |
613 |
-+ return m_writer->status() != QZipWriter::NoError; |
614 |
- } |
615 |
- |
616 |
- void ZipWriter::addFile(const QString &filePath, QIODevice *device) |
617 |
---- a/src/external/qxlsx/xlsxzipwriter_p.h |
618 |
-+++ b/src/external/qxlsx/xlsxzipwriter_p.h |
619 |
-@@ -8,7 +8,7 @@ |
620 |
- #include <QIODevice> |
621 |
- |
622 |
- #include "xlsxglobal.h" |
623 |
--#include "external/qtcompress/qzipwriter.h" |
624 |
-+#include "qzipwriter.h" |
625 |
- |
626 |
- class QZipWriter; |
627 |
- |
628 |
-@@ -27,7 +27,7 @@ public: |
629 |
- void close(); |
630 |
- |
631 |
- private: |
632 |
-- Stel::QZipWriter *m_writer; |
633 |
-+ QZipWriter *m_writer; |
634 |
- }; |
635 |
- |
636 |
- QT_END_NAMESPACE_XLSX |
637 |
|
638 |
diff --git a/sci-astronomy/stellarium/stellarium-0.21.3.ebuild b/sci-astronomy/stellarium/stellarium-0.21.3.ebuild |
639 |
deleted file mode 100644 |
640 |
index 30d58b14eedc..000000000000 |
641 |
--- a/sci-astronomy/stellarium/stellarium-0.21.3.ebuild |
642 |
+++ /dev/null |
643 |
@@ -1,144 +0,0 @@ |
644 |
-# Copyright 1999-2022 Gentoo Authors |
645 |
-# Distributed under the terms of the GNU General Public License v2 |
646 |
- |
647 |
-EAPI=8 |
648 |
- |
649 |
-PYTHON_COMPAT=( python3_{8..10} ) |
650 |
-inherit cmake desktop flag-o-matic python-any-r1 xdg virtualx |
651 |
- |
652 |
-DESCRIPTION="3D photo-realistic skies in real time" |
653 |
-HOMEPAGE="https://stellarium.org/" |
654 |
-MY_DSO_VERSION="3.13" |
655 |
-SRC_URI=" |
656 |
- https://github.com/Stellarium/stellarium/releases/download/v${PV}/${P}.tar.gz |
657 |
- deep-sky? ( |
658 |
- https://github.com/Stellarium/stellarium-data/releases/download/dso-${MY_DSO_VERSION}/catalog-${MY_DSO_VERSION}.dat -> ${PN}-dso-catalog-${MY_DSO_VERSION}.dat |
659 |
- ) |
660 |
- doc? ( |
661 |
- https://github.com/Stellarium/stellarium/releases/download/v${PV}/stellarium_user_guide-${PV}-1.pdf |
662 |
- ) |
663 |
- stars? ( |
664 |
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat |
665 |
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat |
666 |
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat |
667 |
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat |
668 |
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat |
669 |
- )" |
670 |
- |
671 |
-LICENSE="GPL-2+ SGI-B-2.0" |
672 |
-SLOT="0" |
673 |
-KEYWORDS="amd64 ppc ppc64 ~riscv x86" |
674 |
-IUSE="debug deep-sky doc gps media nls stars telescope test webengine" |
675 |
- |
676 |
-# Python interpreter is used while building RemoteControl plugin |
677 |
-BDEPEND=" |
678 |
- ${PYTHON_DEPS} |
679 |
- doc? ( app-doc/doxygen[dot] ) |
680 |
- nls? ( dev-qt/linguist-tools:5 ) |
681 |
-" |
682 |
-RDEPEND=" |
683 |
- dev-libs/qtcompress:= |
684 |
- dev-qt/qtcore:5 |
685 |
- dev-qt/qtgui:5 |
686 |
- dev-qt/qtnetwork:5 |
687 |
- dev-qt/qtopengl:5 |
688 |
- dev-qt/qtprintsupport:5 |
689 |
- dev-qt/qtscript:5 |
690 |
- dev-qt/qtwidgets:5 |
691 |
- media-fonts/dejavu |
692 |
- sys-libs/zlib |
693 |
- virtual/opengl |
694 |
- gps? ( |
695 |
- dev-qt/qtpositioning:5 |
696 |
- dev-qt/qtserialport:5 |
697 |
- sci-geosciences/gpsd:=[cxx] |
698 |
- ) |
699 |
- media? ( dev-qt/qtmultimedia:5[widgets] ) |
700 |
- telescope? ( |
701 |
- dev-qt/qtserialport:5 |
702 |
- sci-libs/indilib:= |
703 |
- ) |
704 |
- webengine? ( dev-qt/qtwebengine:5[widgets] ) |
705 |
-" |
706 |
-DEPEND="${RDEPEND} |
707 |
- dev-qt/qtconcurrent:5 |
708 |
- test? ( dev-qt/qttest:5 ) |
709 |
-" |
710 |
- |
711 |
-RESTRICT="!test? ( test )" |
712 |
- |
713 |
-PATCHES=( |
714 |
- "${FILESDIR}/stellarium-0.20.3-unbundle-indi.patch" |
715 |
- "${FILESDIR}/stellarium-0.21.2-unbundle-qtcompress.patch" |
716 |
- "${FILESDIR}/stellarium-0.20.3-unbundle-zlib.patch" |
717 |
-) |
718 |
- |
719 |
-src_prepare() { |
720 |
- cmake_src_prepare |
721 |
- use debug || append-cppflags -DQT_NO_DEBUG #415769 |
722 |
- |
723 |
- # Several libraries are bundled, remove them. |
724 |
- rm -r src/external/{libindi,qtcompress,zlib}/ || die |
725 |
- |
726 |
- # qcustomplot can't be easily unbundled because it uses qcustomplot 1 |
727 |
- # while we have qcustomplot 2 in tree which changed API a bit |
728 |
- # Also the license of the external qcustomplot is incompatible with stellarium |
729 |
- |
730 |
- # for glues_stel aka libtess I couldn't find an upstream with the same API |
731 |
- |
732 |
- # unbundling of qxlsx depends on https://github.com/QtExcel/QXlsx/pull/185 |
733 |
- |
734 |
- local remaining="$(cd src/external/ && echo */)" |
735 |
- if [[ "${remaining}" != "glues_stel/ qcustomplot/ qxlsx/" ]]; then |
736 |
- eqawarn "Need to unbundle more deps: ${remaining}" |
737 |
- fi |
738 |
-} |
739 |
- |
740 |
-src_configure() { |
741 |
- local mycmakeargs=( |
742 |
- -DENABLE_GPS="$(usex gps)" |
743 |
- -DENABLE_MEDIA="$(usex media)" |
744 |
- -DENABLE_NLS="$(usex nls)" |
745 |
- -DENABLE_TESTING="$(usex test)" |
746 |
- -DUSE_PLUGIN_TELESCOPECONTROL="$(usex telescope)" |
747 |
- $(cmake_use_find_package webengine Qt5WebEngine) |
748 |
- $(cmake_use_find_package webengine Qt5WebEngineWidgets) |
749 |
- ) |
750 |
- cmake_src_configure |
751 |
-} |
752 |
- |
753 |
-src_test() { |
754 |
- virtx cmake_src_test |
755 |
-} |
756 |
- |
757 |
-src_compile() { |
758 |
- cmake_src_compile |
759 |
- |
760 |
- if use doc ; then |
761 |
- cmake_build apidoc |
762 |
- fi |
763 |
-} |
764 |
- |
765 |
-src_install() { |
766 |
- if use doc ; then |
767 |
- local HTML_DOCS=( "${BUILD_DIR}/doc/html/." ) |
768 |
- dodoc "${DISTDIR}/stellarium_user_guide-${PV}-1.pdf" |
769 |
- fi |
770 |
- cmake_src_install |
771 |
- |
772 |
- # use the more up-to-date system fonts |
773 |
- rm "${ED}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf || die |
774 |
- dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf |
775 |
- dosym ../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf |
776 |
- |
777 |
- if use stars ; then |
778 |
- insinto /usr/share/${PN}/stars/default |
779 |
- doins "${DISTDIR}"/stars_4_1v0_2.cat |
780 |
- doins "${DISTDIR}"/stars_{5,6,7,8}_2v0_1.cat |
781 |
- fi |
782 |
- if use deep-sky ; then |
783 |
- insinto /usr/share/${PN}/nebulae/default |
784 |
- newins "${DISTDIR}/${PN}-dso-catalog-${MY_DSO_VERSION}.dat" catalog.dat |
785 |
- fi |
786 |
- newicon doc/images/stellarium-logo.png ${PN}.png |
787 |
-} |
788 |
|
789 |
diff --git a/sci-astronomy/stellarium/stellarium-0.22.1-r1.ebuild b/sci-astronomy/stellarium/stellarium-0.22.1-r1.ebuild |
790 |
deleted file mode 100644 |
791 |
index 224aff001b9d..000000000000 |
792 |
--- a/sci-astronomy/stellarium/stellarium-0.22.1-r1.ebuild |
793 |
+++ /dev/null |
794 |
@@ -1,149 +0,0 @@ |
795 |
-# Copyright 1999-2022 Gentoo Authors |
796 |
-# Distributed under the terms of the GNU General Public License v2 |
797 |
- |
798 |
-EAPI=8 |
799 |
- |
800 |
-PYTHON_COMPAT=( python3_{8..10} ) |
801 |
-inherit cmake desktop flag-o-matic python-any-r1 xdg virtualx |
802 |
- |
803 |
-DESCRIPTION="3D photo-realistic skies in real time" |
804 |
-HOMEPAGE="https://stellarium.org/" |
805 |
-MY_DSO_VERSION="3.15" |
806 |
-SRC_URI=" |
807 |
- https://github.com/Stellarium/stellarium/releases/download/v${PV}/${P}.tar.gz |
808 |
- deep-sky? ( |
809 |
- https://github.com/Stellarium/stellarium-data/releases/download/dso-${MY_DSO_VERSION}/catalog-${MY_DSO_VERSION}.dat -> ${PN}-dso-catalog-${MY_DSO_VERSION}.dat |
810 |
- ) |
811 |
- doc? ( |
812 |
- https://github.com/Stellarium/stellarium/releases/download/v${PV}/stellarium_user_guide-${PV}-1.pdf |
813 |
- ) |
814 |
- stars? ( |
815 |
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat |
816 |
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat |
817 |
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat |
818 |
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat |
819 |
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat |
820 |
- )" |
821 |
- |
822 |
-LICENSE="GPL-2+ SGI-B-2.0" |
823 |
-SLOT="0" |
824 |
-KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86" |
825 |
-IUSE="debug deep-sky doc gps media nls stars telescope test webengine" |
826 |
- |
827 |
-# Python interpreter is used while building RemoteControl plugin |
828 |
-BDEPEND=" |
829 |
- ${PYTHON_DEPS} |
830 |
- dev-lang/perl |
831 |
- doc? ( app-doc/doxygen[dot] ) |
832 |
- nls? ( dev-qt/linguist-tools:5 ) |
833 |
-" |
834 |
-RDEPEND=" |
835 |
- dev-libs/qtcompress:= |
836 |
- dev-qt/qtcharts:5 |
837 |
- dev-qt/qtcore:5 |
838 |
- dev-qt/qtgui:5 |
839 |
- dev-qt/qtnetwork:5 |
840 |
- dev-qt/qtopengl:5 |
841 |
- dev-qt/qtprintsupport:5 |
842 |
- dev-qt/qtscript:5 |
843 |
- dev-qt/qtwidgets:5 |
844 |
- media-fonts/dejavu |
845 |
- sys-libs/zlib |
846 |
- virtual/opengl |
847 |
- gps? ( |
848 |
- dev-qt/qtpositioning:5 |
849 |
- dev-qt/qtserialport:5 |
850 |
- sci-geosciences/gpsd:=[cxx] |
851 |
- ) |
852 |
- media? ( dev-qt/qtmultimedia:5[widgets] ) |
853 |
- telescope? ( |
854 |
- dev-qt/qtserialport:5 |
855 |
- sci-libs/indilib:= |
856 |
- ) |
857 |
- webengine? ( dev-qt/qtwebengine:5[widgets] ) |
858 |
-" |
859 |
-DEPEND="${RDEPEND} |
860 |
- dev-qt/qtconcurrent:5 |
861 |
- test? ( dev-qt/qttest:5 ) |
862 |
-" |
863 |
- |
864 |
-RESTRICT="!test? ( test )" |
865 |
- |
866 |
-PATCHES=( |
867 |
- "${FILESDIR}/stellarium-0.20.3-unbundle-indi.patch" |
868 |
- "${FILESDIR}/stellarium-0.20.3-unbundle-zlib.patch" |
869 |
- "${FILESDIR}/stellarium-0.22.1-fix-star-manager-segfault.patch" |
870 |
- "${FILESDIR}/stellarium-0.22.1-unbundle-qtcompress.patch" |
871 |
- "${FILESDIR}/stellarium-0.22.1-fix-test-x86.patch" |
872 |
- "${FILESDIR}/stellarium-0.22.1-fix-conv.patch" |
873 |
-) |
874 |
- |
875 |
-src_prepare() { |
876 |
- cmake_src_prepare |
877 |
- use debug || append-cppflags -DQT_NO_DEBUG #415769 |
878 |
- |
879 |
- # Several libraries are bundled, remove them. |
880 |
- rm -r src/external/{libindi,qtcompress,zlib}/ || die |
881 |
- |
882 |
- # qcustomplot can't be easily unbundled because it uses qcustomplot 1 |
883 |
- # while we have qcustomplot 2 in tree which changed API a bit |
884 |
- # Also the license of the external qcustomplot is incompatible with stellarium |
885 |
- |
886 |
- # for glues_stel aka libtess I couldn't find an upstream with the same API |
887 |
- |
888 |
- # unbundling of qxlsx depends on https://github.com/QtExcel/QXlsx/pull/185 |
889 |
- |
890 |
- local remaining="$(cd src/external/ && echo */)" |
891 |
- if [[ "${remaining}" != "glues_stel/ qcustomplot/ qxlsx/" ]]; then |
892 |
- eqawarn "Need to unbundle more deps: ${remaining}" |
893 |
- fi |
894 |
-} |
895 |
- |
896 |
-src_configure() { |
897 |
- local mycmakeargs=( |
898 |
- -DENABLE_GPS="$(usex gps)" |
899 |
- -DENABLE_MEDIA="$(usex media)" |
900 |
- -DENABLE_NLS="$(usex nls)" |
901 |
- -DENABLE_TESTING="$(usex test)" |
902 |
- -DUSE_PLUGIN_TELESCOPECONTROL="$(usex telescope)" |
903 |
- $(cmake_use_find_package webengine Qt5WebEngine) |
904 |
- $(cmake_use_find_package webengine Qt5WebEngineWidgets) |
905 |
- ) |
906 |
- cmake_src_configure |
907 |
-} |
908 |
- |
909 |
-src_test() { |
910 |
- virtx cmake_src_test |
911 |
-} |
912 |
- |
913 |
-src_compile() { |
914 |
- cmake_src_compile |
915 |
- |
916 |
- if use doc ; then |
917 |
- cmake_build apidoc |
918 |
- fi |
919 |
-} |
920 |
- |
921 |
-src_install() { |
922 |
- if use doc ; then |
923 |
- local HTML_DOCS=( "${BUILD_DIR}/doc/html/." ) |
924 |
- dodoc "${DISTDIR}/stellarium_user_guide-${PV}-1.pdf" |
925 |
- fi |
926 |
- cmake_src_install |
927 |
- |
928 |
- # use the more up-to-date system fonts |
929 |
- rm "${ED}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf || die |
930 |
- dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf |
931 |
- dosym ../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf |
932 |
- |
933 |
- if use stars ; then |
934 |
- insinto /usr/share/${PN}/stars/default |
935 |
- doins "${DISTDIR}"/stars_4_1v0_2.cat |
936 |
- doins "${DISTDIR}"/stars_{5,6,7,8}_2v0_1.cat |
937 |
- fi |
938 |
- if use deep-sky ; then |
939 |
- insinto /usr/share/${PN}/nebulae/default |
940 |
- newins "${DISTDIR}/${PN}-dso-catalog-${MY_DSO_VERSION}.dat" catalog.dat |
941 |
- fi |
942 |
- newicon doc/images/stellarium-logo.png ${PN}.png |
943 |
-} |
944 |
|
945 |
diff --git a/sci-astronomy/stellarium/stellarium-0.22.1.ebuild b/sci-astronomy/stellarium/stellarium-0.22.1.ebuild |
946 |
deleted file mode 100644 |
947 |
index b200ab6bbf5c..000000000000 |
948 |
--- a/sci-astronomy/stellarium/stellarium-0.22.1.ebuild |
949 |
+++ /dev/null |
950 |
@@ -1,146 +0,0 @@ |
951 |
-# Copyright 1999-2022 Gentoo Authors |
952 |
-# Distributed under the terms of the GNU General Public License v2 |
953 |
- |
954 |
-EAPI=8 |
955 |
- |
956 |
-PYTHON_COMPAT=( python3_{8..10} ) |
957 |
-inherit cmake desktop flag-o-matic python-any-r1 xdg virtualx |
958 |
- |
959 |
-DESCRIPTION="3D photo-realistic skies in real time" |
960 |
-HOMEPAGE="https://stellarium.org/" |
961 |
-MY_DSO_VERSION="3.15" |
962 |
-SRC_URI=" |
963 |
- https://github.com/Stellarium/stellarium/releases/download/v${PV}/${P}.tar.gz |
964 |
- deep-sky? ( |
965 |
- https://github.com/Stellarium/stellarium-data/releases/download/dso-${MY_DSO_VERSION}/catalog-${MY_DSO_VERSION}.dat -> ${PN}-dso-catalog-${MY_DSO_VERSION}.dat |
966 |
- ) |
967 |
- doc? ( |
968 |
- https://github.com/Stellarium/stellarium/releases/download/v${PV}/stellarium_user_guide-${PV}-1.pdf |
969 |
- ) |
970 |
- stars? ( |
971 |
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat |
972 |
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat |
973 |
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat |
974 |
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat |
975 |
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat |
976 |
- )" |
977 |
- |
978 |
-LICENSE="GPL-2+ SGI-B-2.0" |
979 |
-SLOT="0" |
980 |
-KEYWORDS="amd64 ppc ppc64 ~riscv ~x86" |
981 |
-IUSE="debug deep-sky doc gps media nls stars telescope test webengine" |
982 |
- |
983 |
-# Python interpreter is used while building RemoteControl plugin |
984 |
-BDEPEND=" |
985 |
- ${PYTHON_DEPS} |
986 |
- doc? ( app-doc/doxygen[dot] ) |
987 |
- nls? ( dev-qt/linguist-tools:5 ) |
988 |
-" |
989 |
-RDEPEND=" |
990 |
- dev-libs/qtcompress:= |
991 |
- dev-qt/qtcharts:5 |
992 |
- dev-qt/qtcore:5 |
993 |
- dev-qt/qtgui:5 |
994 |
- dev-qt/qtnetwork:5 |
995 |
- dev-qt/qtopengl:5 |
996 |
- dev-qt/qtprintsupport:5 |
997 |
- dev-qt/qtscript:5 |
998 |
- dev-qt/qtwidgets:5 |
999 |
- media-fonts/dejavu |
1000 |
- sys-libs/zlib |
1001 |
- virtual/opengl |
1002 |
- gps? ( |
1003 |
- dev-qt/qtpositioning:5 |
1004 |
- dev-qt/qtserialport:5 |
1005 |
- sci-geosciences/gpsd:=[cxx] |
1006 |
- ) |
1007 |
- media? ( dev-qt/qtmultimedia:5[widgets] ) |
1008 |
- telescope? ( |
1009 |
- dev-qt/qtserialport:5 |
1010 |
- sci-libs/indilib:= |
1011 |
- ) |
1012 |
- webengine? ( dev-qt/qtwebengine:5[widgets] ) |
1013 |
-" |
1014 |
-DEPEND="${RDEPEND} |
1015 |
- dev-qt/qtconcurrent:5 |
1016 |
- test? ( dev-qt/qttest:5 ) |
1017 |
-" |
1018 |
- |
1019 |
-RESTRICT="!test? ( test )" |
1020 |
- |
1021 |
-PATCHES=( |
1022 |
- "${FILESDIR}/stellarium-0.20.3-unbundle-indi.patch" |
1023 |
- "${FILESDIR}/stellarium-0.20.3-unbundle-zlib.patch" |
1024 |
- "${FILESDIR}/stellarium-0.22.1-fix-star-manager-segfault.patch" |
1025 |
- "${FILESDIR}/stellarium-0.22.1-unbundle-qtcompress.patch" |
1026 |
-) |
1027 |
- |
1028 |
-src_prepare() { |
1029 |
- cmake_src_prepare |
1030 |
- use debug || append-cppflags -DQT_NO_DEBUG #415769 |
1031 |
- |
1032 |
- # Several libraries are bundled, remove them. |
1033 |
- rm -r src/external/{libindi,qtcompress,zlib}/ || die |
1034 |
- |
1035 |
- # qcustomplot can't be easily unbundled because it uses qcustomplot 1 |
1036 |
- # while we have qcustomplot 2 in tree which changed API a bit |
1037 |
- # Also the license of the external qcustomplot is incompatible with stellarium |
1038 |
- |
1039 |
- # for glues_stel aka libtess I couldn't find an upstream with the same API |
1040 |
- |
1041 |
- # unbundling of qxlsx depends on https://github.com/QtExcel/QXlsx/pull/185 |
1042 |
- |
1043 |
- local remaining="$(cd src/external/ && echo */)" |
1044 |
- if [[ "${remaining}" != "glues_stel/ qcustomplot/ qxlsx/" ]]; then |
1045 |
- eqawarn "Need to unbundle more deps: ${remaining}" |
1046 |
- fi |
1047 |
-} |
1048 |
- |
1049 |
-src_configure() { |
1050 |
- local mycmakeargs=( |
1051 |
- -DENABLE_GPS="$(usex gps)" |
1052 |
- -DENABLE_MEDIA="$(usex media)" |
1053 |
- -DENABLE_NLS="$(usex nls)" |
1054 |
- -DENABLE_TESTING="$(usex test)" |
1055 |
- -DUSE_PLUGIN_TELESCOPECONTROL="$(usex telescope)" |
1056 |
- $(cmake_use_find_package webengine Qt5WebEngine) |
1057 |
- $(cmake_use_find_package webengine Qt5WebEngineWidgets) |
1058 |
- ) |
1059 |
- cmake_src_configure |
1060 |
-} |
1061 |
- |
1062 |
-src_test() { |
1063 |
- virtx cmake_src_test |
1064 |
-} |
1065 |
- |
1066 |
-src_compile() { |
1067 |
- cmake_src_compile |
1068 |
- |
1069 |
- if use doc ; then |
1070 |
- cmake_build apidoc |
1071 |
- fi |
1072 |
-} |
1073 |
- |
1074 |
-src_install() { |
1075 |
- if use doc ; then |
1076 |
- local HTML_DOCS=( "${BUILD_DIR}/doc/html/." ) |
1077 |
- dodoc "${DISTDIR}/stellarium_user_guide-${PV}-1.pdf" |
1078 |
- fi |
1079 |
- cmake_src_install |
1080 |
- |
1081 |
- # use the more up-to-date system fonts |
1082 |
- rm "${ED}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf || die |
1083 |
- dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf |
1084 |
- dosym ../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf |
1085 |
- |
1086 |
- if use stars ; then |
1087 |
- insinto /usr/share/${PN}/stars/default |
1088 |
- doins "${DISTDIR}"/stars_4_1v0_2.cat |
1089 |
- doins "${DISTDIR}"/stars_{5,6,7,8}_2v0_1.cat |
1090 |
- fi |
1091 |
- if use deep-sky ; then |
1092 |
- insinto /usr/share/${PN}/nebulae/default |
1093 |
- newins "${DISTDIR}/${PN}-dso-catalog-${MY_DSO_VERSION}.dat" catalog.dat |
1094 |
- fi |
1095 |
- newicon doc/images/stellarium-logo.png ${PN}.png |
1096 |
-} |