1 |
commit: a01383e452525c74df3ab9892d2b423c7d9f0619 |
2 |
Author: Alexey Sokolov <sokolov <AT> google <DOT> com> |
3 |
AuthorDate: Mon Sep 28 10:07:36 2020 +0000 |
4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 10 07:22:32 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a01383e4 |
7 |
|
8 |
sci-astronomy/stellarium: version 0.20.3 |
9 |
|
10 |
Unbundle several libraries, install docs, update metadata.xml |
11 |
|
12 |
Due to new deps, even though they were bundled already, dropped some |
13 |
keywords (ppc, ppc64, and prefix ones). Will bring them back some of |
14 |
them later. |
15 |
|
16 |
Bug: https://bugs.gentoo.org/745234 |
17 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
18 |
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org> |
19 |
Closes: https://github.com/gentoo/gentoo/pull/17639 |
20 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
21 |
|
22 |
sci-astronomy/stellarium/Manifest | 3 + |
23 |
.../files/stellarium-0.20.3-unbundle-indi.patch | 82 ++++++++ |
24 |
.../stellarium-0.20.3-unbundle-qtcompress.patch | 222 +++++++++++++++++++++ |
25 |
.../files/stellarium-0.20.3-unbundle-zlib.patch | 23 +++ |
26 |
sci-astronomy/stellarium/metadata.xml | 53 ++--- |
27 |
sci-astronomy/stellarium/stellarium-0.20.3.ebuild | 135 +++++++++++++ |
28 |
6 files changed, 492 insertions(+), 26 deletions(-) |
29 |
|
30 |
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest |
31 |
index 56fb5754805..cca66613498 100644 |
32 |
--- a/sci-astronomy/stellarium/Manifest |
33 |
+++ b/sci-astronomy/stellarium/Manifest |
34 |
@@ -4,4 +4,7 @@ DIST stars_6_2v0_1.cat 148352404 BLAKE2B c605b284b3d768cb1619ada3f58d406fa7737f0 |
35 |
DIST stars_7_2v0_1.cat 305710678 BLAKE2B 1cc9b4a6bc35a9339e495f7e0da4f7e90a0e92b05b5de8599be1bbdd2a8053cbcec44b0e58bc9248364666db9cdf23449edf236e3f21fdc0e8f1a4a706afc919 SHA512 43b866eb793e8812c9d5502101a6c985d2055fb88bdbda274726bcd51e1527ecf342b22acd673318c9c8e88cac68eace18de8f27d29ffe64933fd32a5b84c5e3 |
36 |
DIST stars_8_2v0_1.cat 559068934 BLAKE2B c040a369cdf6885759998e1315b554d21a5e2b9b149a67967a8af45606aebf57bec407fab5ce1904978af0dc529aa6bddd267331ca45f58617bbf56d5ca99dee SHA512 06d4fa298b9dff8452f550377df99fcaa5e7107cfc7b75c9a4769b3cb6d97a822a54213c706102c1d7ef2dabc16df32a85f46b2f6d6c6f76a4e919353b739de4 |
37 |
DIST stellarium-0.20.2.tar.gz 344319520 BLAKE2B 0a64cfc6d5a43bf811609caa9104458768e234bad8fabd2aa88a38d860c22573d076f677f7523c95e1fc1770e73dc1e73b2e94d544cb099c7cd9a21ac79f6bdb SHA512 34f1ad5891dde84b53324046bdf1514df858335ba8f0954bb72350b057ff6dc4091a2d7bf89083489e0d8d1c750c5fb8ba8e1e241f9287a740121b377f0e510c |
38 |
+DIST stellarium-0.20.3.tar.gz 349073272 BLAKE2B 4380e2f589f8ca7af7a62d7e72e18355328ba37d5d8c4e31f8da011fa46296a3c79b74aca04b9f4014f2b2ebc5a1124d62239d6a9bf947cea687d0a2f6e09c13 SHA512 7f4769955fa55751828b211023f3e88e78c42bd367dade9b29cbe86afcdbfc7078d87dc8f856b0f96a4c75bb3d07462a195095f7afb84bfca0988135a1518a1d |
39 |
DIST stellarium-dso-catalog-3.10.dat 28297970 BLAKE2B 69d8f9756986c872cde0190ae3e5f225de30d8fabd5ba3e007176c8ffc4234e964ccc3beb58f75fc4579c75cee620661728a7c6c1d6960d5cb1be027828ba127 SHA512 22068d9ebca592db214f9831765701c52d07e71616705faaf6f5827d51a65af805947bd1f84553e5768f3e82f9e1a0e81eb36943713afb924d604a4676711b1f |
40 |
+DIST stellarium-dso-catalog-3.11.dat 28297989 BLAKE2B de56efe1930e9ee0e584de9f8167c7b588b886623bbea547ac35b7d3fe32e99e402f8811a2878b82f059e9b946b19ce2456d8a8a4f2127b8dc85c34c6ba1b13b SHA512 21efc43f7ac10b3b14e63731938cbfeaa7b5097ef2a7328e741e00cfd391b80ba4f7e6a367677be2f01879d9c46b8b1bcd5fce8963776ef670455a442c663fc3 |
41 |
+DIST stellarium_user_guide-0.20.3-1.pdf 32404701 BLAKE2B 811c8c58818bf76a6e597a2d24feaff2f7705a0eaffc8ccc1e6cdc037f374dedff01185466dac1635242bcf3ec8309806db03340b251fb39cea1f285a3cf5f26 SHA512 b820c2f76f40df9ef3c2f732cbb5c3622f37bff0cfdab8b56c78c0f4417ba036f6c623f00e7186e4b3c045ed2a4598baabd334fb6cb1037de12af0837a2fe86d |
42 |
|
43 |
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 |
44 |
new file mode 100644 |
45 |
index 00000000000..ac3f84d5bb6 |
46 |
--- /dev/null |
47 |
+++ b/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-indi.patch |
48 |
@@ -0,0 +1,82 @@ |
49 |
+diff --git a/plugins/TelescopeControl/src/INDI/CMakeLists.txt b/plugins/TelescopeControl/src/INDI/CMakeLists.txt |
50 |
+index a250e1bb0f..f14007c392 100644 |
51 |
+--- a/plugins/TelescopeControl/src/INDI/CMakeLists.txt |
52 |
++++ b/plugins/TelescopeControl/src/INDI/CMakeLists.txt |
53 |
+@@ -25,7 +25,7 @@ add_library(TelescopeControl_INDI STATIC |
54 |
+ target_link_libraries(TelescopeControl_INDI |
55 |
+ Qt5::Core |
56 |
+ Qt5::Network |
57 |
+- indiclient |
58 |
++ -lindiclient |
59 |
+ TelescopeControl_common |
60 |
+ ${CMAKE_THREAD_LIBS_INIT} |
61 |
+ ) |
62 |
+diff --git a/plugins/TelescopeControl/src/INDI/INDIConnection.cpp b/plugins/TelescopeControl/src/INDI/INDIConnection.cpp |
63 |
+index f401dc7049..d890d3aa14 100644 |
64 |
+--- a/plugins/TelescopeControl/src/INDI/INDIConnection.cpp |
65 |
++++ b/plugins/TelescopeControl/src/INDI/INDIConnection.cpp |
66 |
+@@ -25,9 +25,9 @@ |
67 |
+ #include <limits> |
68 |
+ #include <cmath> |
69 |
+ |
70 |
+-#include "indibase/baseclient.h" |
71 |
+-#include "indibase/basedevice.h" |
72 |
+-#include "indibase/inditelescope.h" |
73 |
++#include "libindi/baseclient.h" |
74 |
++#include "libindi/basedevice.h" |
75 |
++#include "libindi/inditelescope.h" |
76 |
+ |
77 |
+ const int INDIConnection::SLEW_STOP = INDI::Telescope::SLEW_GUIDE - 1; |
78 |
+ |
79 |
+diff --git a/plugins/TelescopeControl/src/INDI/INDIConnection.hpp b/plugins/TelescopeControl/src/INDI/INDIConnection.hpp |
80 |
+index 111ad2cdba..80ead01137 100644 |
81 |
+--- a/plugins/TelescopeControl/src/INDI/INDIConnection.hpp |
82 |
++++ b/plugins/TelescopeControl/src/INDI/INDIConnection.hpp |
83 |
+@@ -20,7 +20,7 @@ |
84 |
+ #define INDICONNECTION_HPP |
85 |
+ |
86 |
+ #include <QObject> |
87 |
+-#include "indibase/baseclient.h" |
88 |
++#include "libindi/baseclient.h" |
89 |
+ |
90 |
+ #include <mutex> |
91 |
+ #include <QStringList> |
92 |
+diff --git a/plugins/TelescopeControl/src/INDI/TelescopeClientINDI.cpp b/plugins/TelescopeControl/src/INDI/TelescopeClientINDI.cpp |
93 |
+index 6bd7754ff5..633d4ae7b2 100644 |
94 |
+--- a/plugins/TelescopeControl/src/INDI/TelescopeClientINDI.cpp |
95 |
++++ b/plugins/TelescopeControl/src/INDI/TelescopeClientINDI.cpp |
96 |
+@@ -24,7 +24,7 @@ |
97 |
+ |
98 |
+ #include "StelCore.hpp" |
99 |
+ #include "StelUtils.hpp" |
100 |
+-#include "indibase/inditelescope.h" |
101 |
++#include "libindi/inditelescope.h" |
102 |
+ #include "INDIControlWidget.hpp" |
103 |
+ |
104 |
+ TelescopeClientINDI::TelescopeClientINDI(const QString &name, const QString ¶ms): |
105 |
+diff --git a/plugins/TelescopeControl/src/INDI/test/testINDIConnection.cpp b/plugins/TelescopeControl/src/INDI/test/testINDIConnection.cpp |
106 |
+index 6c1a281ec5..ca7b7e0c40 100644 |
107 |
+--- a/plugins/TelescopeControl/src/INDI/test/testINDIConnection.cpp |
108 |
++++ b/plugins/TelescopeControl/src/INDI/test/testINDIConnection.cpp |
109 |
+@@ -22,7 +22,7 @@ |
110 |
+ #include <cmath> |
111 |
+ |
112 |
+ #include "INDIConnection.hpp" |
113 |
+-#include "indibase/basedevice.h" |
114 |
++#include "libindi/basedevice.h" |
115 |
+ |
116 |
+ void TestINDIConnection::deafultCoordinates() |
117 |
+ { |
118 |
+diff --git a/src/external/CMakeLists.txt b/src/external/CMakeLists.txt |
119 |
+index 6fcf7678da..a59d8c121c 100644 |
120 |
+--- a/src/external/CMakeLists.txt |
121 |
++++ b/src/external/CMakeLists.txt |
122 |
+@@ -176,7 +176,7 @@ target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui qtcompress_stel) |
123 |
+ set_target_properties(qxlsx_stel PROPERTIES FOLDER "src/external") |
124 |
+ |
125 |
+ ################################# INDI ################################ |
126 |
+-IF(USE_PLUGIN_TELESCOPECONTROL) |
127 |
++IF(USE_PLUGIN_TELESCOPECONTROL AND 0) |
128 |
+ set(INDI_SOVERSION "1") |
129 |
+ set(CMAKE_INDI_VERSION_MAJOR 1) |
130 |
+ set(CMAKE_INDI_VERSION_MINOR 6) |
131 |
|
132 |
diff --git a/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-qtcompress.patch b/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-qtcompress.patch |
133 |
new file mode 100644 |
134 |
index 00000000000..7a585b71894 |
135 |
--- /dev/null |
136 |
+++ b/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-qtcompress.patch |
137 |
@@ -0,0 +1,222 @@ |
138 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
139 |
+index 1b72c2c8f6..9436bc66da 100644 |
140 |
+--- a/CMakeLists.txt |
141 |
++++ b/CMakeLists.txt |
142 |
+@@ -629,5 +629,6 @@ ELSE() |
143 |
+ ENDIF() |
144 |
+ |
145 |
++find_package(Qt5Compress REQUIRED) |
146 |
+ |
147 |
+ ########### Set some global variables ########### |
148 |
+ IF(UNIX AND NOT WIN32) |
149 |
+diff --git a/plugins/Satellites/src/CMakeLists.txt b/plugins/Satellites/src/CMakeLists.txt |
150 |
+index 8e3138adf2..b59049767d 100644 |
151 |
+--- a/plugins/Satellites/src/CMakeLists.txt |
152 |
++++ b/plugins/Satellites/src/CMakeLists.txt |
153 |
+@@ -55,7 +55,7 @@ IF(ENABLE_TESTING) |
154 |
+ ENDIF(ENABLE_TESTING) |
155 |
+ |
156 |
+ ADD_LIBRARY(Satellites-static STATIC ${Satellites_SRCS} ${Satellites_RES_CXX} ${SatellitesDialog_UIS_H}) |
157 |
+-TARGET_LINK_LIBRARIES(Satellites-static Qt5::Core Qt5::Network Qt5::Widgets) |
158 |
++TARGET_LINK_LIBRARIES(Satellites-static Qt5::Core Qt5::Network Qt5::Widgets Qt5::Compress) |
159 |
+ # The library target "Satellites-static" has a default OUTPUT_NAME of "Satellites-static", so change it. |
160 |
+ SET_TARGET_PROPERTIES(Satellites-static PROPERTIES OUTPUT_NAME "Satellites") |
161 |
+ IF(MSVC) |
162 |
+diff --git a/plugins/Satellites/src/Satellites.cpp b/plugins/Satellites/src/Satellites.cpp |
163 |
+index 7432f4316d..f4f4453661 100644 |
164 |
+--- a/plugins/Satellites/src/Satellites.cpp |
165 |
++++ b/plugins/Satellites/src/Satellites.cpp |
166 |
+@@ -43,7 +43,7 @@ |
167 |
+ #include "StelUtils.hpp" |
168 |
+ #include "StelActionMgr.hpp" |
169 |
+ |
170 |
+-#include "external/qtcompress/qzipreader.h" |
171 |
++#include "qzipreader.h" |
172 |
+ |
173 |
+ #include <QNetworkAccessManager> |
174 |
+ #include <QNetworkReply> |
175 |
+@@ -1533,12 +1533,12 @@ void Satellites::saveDownloadedUpdate(QNetworkReply* reply) |
176 |
+ QString archive = zip.fileName(); |
177 |
+ QByteArray data; |
178 |
+ |
179 |
+- Stel::QZipReader reader(archive); |
180 |
+- if (reader.status() != Stel::QZipReader::NoError) |
181 |
++ QZipReader reader(archive); |
182 |
++ if (reader.status() != QZipReader::NoError) |
183 |
+ qWarning() << "[Satellites] Unable to open as a ZIP archive"; |
184 |
+ else |
185 |
+ { |
186 |
+- QList<Stel::QZipReader::FileInfo> infoList = reader.fileInfoList(); |
187 |
++ QList<QZipReader::FileInfo> infoList = reader.fileInfoList(); |
188 |
+ for (const auto& info : infoList) |
189 |
+ { |
190 |
+ // qWarning() << "[Satellites] Processing:" << info.filePath; |
191 |
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
192 |
+index bdd214729f..81631ce8ec 100644 |
193 |
+--- a/src/CMakeLists.txt |
194 |
++++ b/src/CMakeLists.txt |
195 |
+@@ -465,7 +465,7 @@ IF(ENABLE_SPOUT AND SPOUT_LIBRARY_DLL) |
196 |
+ CONFIGURE_FILE(${SPOUT_LIBRARY_DLL} ${CMAKE_CURRENT_BINARY_DIR} COPYONLY) |
197 |
+ ENDIF() |
198 |
+ |
199 |
+-SET(STELMAIN_DEPS ${ZLIB_LIBRARIES} qtcompress_stel glues_stel qcustomplot_stel qxlsx_stel ${STELLARIUM_STATIC_PLUGINS_LIBRARIES} ${STELLARIUM_QT_LIBRARIES} ${SPOUT_LIBRARY}) |
200 |
++SET(STELMAIN_DEPS ${ZLIB_LIBRARIES} Qt5::Compress glues_stel qcustomplot_stel qxlsx_stel ${STELLARIUM_STATIC_PLUGINS_LIBRARIES} ${STELLARIUM_QT_LIBRARIES} ${SPOUT_LIBRARY}) |
201 |
+ IF(ENABLE_LIBGPS) |
202 |
+ SET(STELMAIN_DEPS ${STELMAIN_DEPS} ${GPS_LIBRARY}) |
203 |
+ ENDIF() |
204 |
+diff --git a/src/core/modules/LandscapeMgr.cpp b/src/core/modules/LandscapeMgr.cpp |
205 |
+index 8da2070b26..9949252cee 100644 |
206 |
+--- a/src/core/modules/LandscapeMgr.cpp |
207 |
++++ b/src/core/modules/LandscapeMgr.cpp |
208 |
+@@ -1183,8 +1183,8 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const |
209 |
+ } |
210 |
+ QDir destinationDir (parentDestinationDir.absoluteFilePath("landscapes")); |
211 |
+ |
212 |
+- Stel::QZipReader reader(sourceFilePath); |
213 |
+- if (reader.status() != Stel::QZipReader::NoError) |
214 |
++ QZipReader reader(sourceFilePath); |
215 |
++ if (reader.status() != QZipReader::NoError) |
216 |
+ { |
217 |
+ qWarning() << "LandscapeMgr: Unable to open as a ZIP archive:" << QDir::toNativeSeparators(sourceFilePath); |
218 |
+ emit errorNotArchive(); |
219 |
+@@ -1193,7 +1193,7 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const |
220 |
+ |
221 |
+ //Detect top directory |
222 |
+ QString topDir, iniPath; |
223 |
+- QList<Stel::QZipReader::FileInfo> infoList = reader.fileInfoList(); |
224 |
++ QList<QZipReader::FileInfo> infoList = reader.fileInfoList(); |
225 |
+ for (const auto& info : infoList) |
226 |
+ { |
227 |
+ QFileInfo fileInfo(info.filePath); |
228 |
+diff --git a/src/external/CMakeLists.txt b/src/external/CMakeLists.txt |
229 |
+index 1e0e7e2b32..834aff89cb 100644 |
230 |
+--- a/src/external/CMakeLists.txt |
231 |
++++ b/src/external/CMakeLists.txt |
232 |
+@@ -70,6 +70,7 @@ target_include_directories(zlib_stel PUBLIC zlib) |
233 |
+ set_target_properties(zlib_stel PROPERTIES AUTOMOC 0) |
234 |
+ SET_TARGET_PROPERTIES(zlib_stel PROPERTIES FOLDER "src/external") |
235 |
+ |
236 |
++if(0) |
237 |
+ set(qtcompress_SRCS |
238 |
+ qtcompress/qzip.cpp |
239 |
+ qtcompress/qzipreader.h |
240 |
+@@ -82,6 +83,7 @@ target_link_libraries(qtcompress_stel ${ZLIB_LIBRARIES} Qt5::Core) |
241 |
+ #turn off automoc, not needed here |
242 |
+ set_target_properties(qtcompress_stel PROPERTIES AUTOMOC 0) |
243 |
+ SET_TARGET_PROPERTIES(qtcompress_stel PROPERTIES FOLDER "src/external") |
244 |
++endif() |
245 |
+ |
246 |
+ set(qcustomplot_SRCS |
247 |
+ qcustomplot/qcustomplot.cpp |
248 |
+@@ -176,7 +176,7 @@ |
249 |
+ qxlsx/xlsxcelllocation.h |
250 |
+ ) |
251 |
+ add_library(qxlsx_stel STATIC EXCLUDE_FROM_ALL ${qxlsx_SRCS}) |
252 |
+-target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui qtcompress_stel) |
253 |
++target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui Qt5::Compress) |
254 |
+ set_target_properties(qxlsx_stel PROPERTIES FOLDER "src/external") |
255 |
+ |
256 |
+ ################################# INDI ################################ |
257 |
+diff -r 11536448457a xlsxzipreader.cpp |
258 |
+--- a/src/external/qxlsx/xlsxzipreader.cpp Thu Oct 08 21:41:22 2020 +0100 |
259 |
++++ b/src/external/qxlsx/xlsxzipreader.cpp Thu Oct 08 21:42:03 2020 +0100 |
260 |
+@@ -28,13 +28,13 @@ |
261 |
+ namespace QXlsx { |
262 |
+ |
263 |
+ ZipReader::ZipReader(const QString &filePath) : |
264 |
+- m_reader(new Stel::QZipReader(filePath)) |
265 |
++ m_reader(new QZipReader(filePath)) |
266 |
+ { |
267 |
+ init(); |
268 |
+ } |
269 |
+ |
270 |
+ ZipReader::ZipReader(QIODevice *device) : |
271 |
+- m_reader(new Stel::QZipReader(device)) |
272 |
++ m_reader(new QZipReader(device)) |
273 |
+ { |
274 |
+ init(); |
275 |
+ } |
276 |
+@@ -45,8 +45,8 @@ |
277 |
+ |
278 |
+ void ZipReader::init() |
279 |
+ { |
280 |
+- QList<Stel::QZipReader::FileInfo> allFiles = m_reader->fileInfoList(); |
281 |
+- foreach (const Stel::QZipReader::FileInfo &fi, allFiles) |
282 |
++ QList<QZipReader::FileInfo> allFiles = m_reader->fileInfoList(); |
283 |
++ foreach (const QZipReader::FileInfo &fi, allFiles) |
284 |
+ { |
285 |
+ if (fi.isFile) |
286 |
+ m_filePaths.append(fi.filePath); |
287 |
+diff -r 2019bb0d2919 xlsxzipreader_p.h |
288 |
+--- a/src/external/qxlsx/xlsxzipreader_p.h Thu Oct 08 21:35:35 2020 +0100 |
289 |
++++ b/src/external/qxlsx/xlsxzipreader_p.h Thu Oct 08 21:36:28 2020 +0100 |
290 |
+@@ -38,7 +38,7 @@ |
291 |
+ // |
292 |
+ |
293 |
+ #include "xlsxglobal.h" |
294 |
+-#include "external/qtcompress/qzipreader.h" |
295 |
++#include "qzipreader.h" |
296 |
+ #include <QScopedPointer> |
297 |
+ #include <QStringList> |
298 |
+ #include <QVector> |
299 |
+@@ -60,7 +60,7 @@ |
300 |
+ private: |
301 |
+ Q_DISABLE_COPY(ZipReader) |
302 |
+ void init(); |
303 |
+- QScopedPointer<Stel::QZipReader> m_reader; |
304 |
++ QScopedPointer<QZipReader> m_reader; |
305 |
+ QStringList m_filePaths; |
306 |
+ }; |
307 |
+ |
308 |
+diff -r 11536448457a xlsxzipwriter.cpp |
309 |
+--- a/src/external/qxlsx/xlsxzipwriter.cpp Thu Oct 08 21:41:22 2020 +0100 |
310 |
++++ b/src/external/qxlsx/xlsxzipwriter.cpp Thu Oct 08 21:42:03 2020 +0100 |
311 |
+@@ -29,14 +29,14 @@ |
312 |
+ |
313 |
+ ZipWriter::ZipWriter(const QString &filePath) |
314 |
+ { |
315 |
+- m_writer = new Stel::QZipWriter(filePath, QIODevice::WriteOnly); |
316 |
+- m_writer->setCompressionPolicy(Stel::QZipWriter::AutoCompress); |
317 |
++ m_writer = new QZipWriter(filePath, QIODevice::WriteOnly); |
318 |
++ m_writer->setCompressionPolicy(QZipWriter::AutoCompress); |
319 |
+ } |
320 |
+ |
321 |
+ ZipWriter::ZipWriter(QIODevice *device) |
322 |
+ { |
323 |
+- m_writer = new Stel::QZipWriter(device); |
324 |
+- m_writer->setCompressionPolicy(Stel::QZipWriter::AutoCompress); |
325 |
++ m_writer = new QZipWriter(device); |
326 |
++ m_writer->setCompressionPolicy(QZipWriter::AutoCompress); |
327 |
+ } |
328 |
+ |
329 |
+ ZipWriter::~ZipWriter() |
330 |
+@@ -46,7 +46,7 @@ |
331 |
+ |
332 |
+ bool ZipWriter::error() const |
333 |
+ { |
334 |
+- return m_writer->status() != Stel::QZipWriter::NoError; |
335 |
++ return m_writer->status() != QZipWriter::NoError; |
336 |
+ } |
337 |
+ |
338 |
+ void ZipWriter::addFile(const QString &filePath, QIODevice *device) |
339 |
+diff -r 2019bb0d2919 xlsxzipwriter_p.h |
340 |
+--- a/src/external/qxlsx/xlsxzipwriter_p.h Thu Oct 08 21:35:35 2020 +0100 |
341 |
++++ b/src/external/qxlsx/xlsxzipwriter_p.h Thu Oct 08 21:36:28 2020 +0100 |
342 |
+@@ -37,7 +37,7 @@ |
343 |
+ // |
344 |
+ |
345 |
+ #include <QString> |
346 |
+-#include "external/qtcompress/qzipwriter.h" |
347 |
++#include "qzipwriter.h" |
348 |
+ |
349 |
+ class QIODevice; |
350 |
+ class QZipWriter; |
351 |
+@@ -57,7 +57,7 @@ |
352 |
+ void close(); |
353 |
+ |
354 |
+ private: |
355 |
+- Stel::QZipWriter *m_writer; |
356 |
++ QZipWriter *m_writer; |
357 |
+ }; |
358 |
+ |
359 |
+ } // namespace QXlsx |
360 |
|
361 |
diff --git a/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-zlib.patch b/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-zlib.patch |
362 |
new file mode 100644 |
363 |
index 00000000000..37acb83e667 |
364 |
--- /dev/null |
365 |
+++ b/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-zlib.patch |
366 |
@@ -0,0 +1,23 @@ |
367 |
+This patch is not really needed, because zlib is already used from system, but |
368 |
+it makes it easier to ensure that nothing else is bundled |
369 |
+ |
370 |
+diff --git a/src/external/CMakeLists.txt b/src/external/CMakeLists.txt |
371 |
+index 834aff89cb..590579e501 100644 |
372 |
+--- a/src/external/CMakeLists.txt |
373 |
++++ b/src/external/CMakeLists.txt |
374 |
+@@ -36,6 +36,7 @@ target_link_libraries(glues_stel Qt5::Gui) |
375 |
+ set_target_properties(glues_stel PROPERTIES AUTOMOC 0) |
376 |
+ SET_TARGET_PROPERTIES(glues_stel PROPERTIES FOLDER "src/external") |
377 |
+ |
378 |
++if(0) |
379 |
+ SET(zlib_SRCS |
380 |
+ zlib/adler32.c |
381 |
+ zlib/compress.c |
382 |
+@@ -69,6 +70,7 @@ target_include_directories(zlib_stel PUBLIC zlib) |
383 |
+ #turn off automoc, not needed here |
384 |
+ set_target_properties(zlib_stel PROPERTIES AUTOMOC 0) |
385 |
+ SET_TARGET_PROPERTIES(zlib_stel PROPERTIES FOLDER "src/external") |
386 |
++endif() |
387 |
+ |
388 |
+ if(0) |
389 |
+ set(qtcompress_SRCS |
390 |
|
391 |
diff --git a/sci-astronomy/stellarium/metadata.xml b/sci-astronomy/stellarium/metadata.xml |
392 |
index 53378dcf228..5edf86197e9 100644 |
393 |
--- a/sci-astronomy/stellarium/metadata.xml |
394 |
+++ b/sci-astronomy/stellarium/metadata.xml |
395 |
@@ -1,30 +1,31 @@ |
396 |
<?xml version="1.0" encoding="UTF-8"?> |
397 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
398 |
<pkgmetadata> |
399 |
- <maintainer type="person"> |
400 |
- <email>alexey+gentoo@××××××××.org</email> |
401 |
- <name>Alexey Sokolov</name> |
402 |
- </maintainer> |
403 |
- <maintainer type="project"> |
404 |
- <email>proxy-maint@g.o</email> |
405 |
- <name>Proxy Maintainers</name> |
406 |
- </maintainer> |
407 |
- <maintainer type="project"> |
408 |
- <email>sci-astronomy@g.o</email> |
409 |
- <name>Gentoo Astronomy Project</name> |
410 |
- </maintainer> |
411 |
- <longdescription lang="en"> |
412 |
- Stellarium is a free open source planetarium for your computer. It |
413 |
- shows a realistic sky in 3D, just like what you see with the naked |
414 |
- eye, binoculars or a telescope. It is being used in planetarium |
415 |
- projectors. |
416 |
-</longdescription> |
417 |
- <use> |
418 |
- <flag name="deep-sky">Install extra deep sky objects catalog (may affect performance)</flag> |
419 |
- <flag name="media">Enable sound and video support</flag> |
420 |
- <flag name="stars">Install extra star catalogs</flag> |
421 |
- </use> |
422 |
- <upstream> |
423 |
- <remote-id type="sourceforge">stellarium</remote-id> |
424 |
- </upstream> |
425 |
+ <maintainer type="person"> |
426 |
+ <email>alexey+gentoo@××××××××.org</email> |
427 |
+ <name>Alexey Sokolov</name> |
428 |
+ </maintainer> |
429 |
+ <maintainer type="project"> |
430 |
+ <email>proxy-maint@g.o</email> |
431 |
+ <name>Proxy Maintainers</name> |
432 |
+ </maintainer> |
433 |
+ <maintainer type="project"> |
434 |
+ <email>sci-astronomy@g.o</email> |
435 |
+ <name>Gentoo Astronomy Project</name> |
436 |
+ </maintainer> |
437 |
+ <longdescription lang="en"> |
438 |
+ Stellarium is a free open source planetarium for your computer. It |
439 |
+ shows a realistic sky in 3D, just like what you see with the naked |
440 |
+ eye, binoculars or a telescope. It is being used in planetarium |
441 |
+ projectors. |
442 |
+ </longdescription> |
443 |
+ <use> |
444 |
+ <flag name="deep-sky">Install extra deep sky objects catalog (may affect performance)</flag> |
445 |
+ <flag name="media">Enable sound and video support</flag> |
446 |
+ <flag name="stars">Install extra star catalogs</flag> |
447 |
+ <flag name="telescope">Enable telescope control via <pkg>sci-libs/indilib</pkg></flag> |
448 |
+ </use> |
449 |
+ <upstream> |
450 |
+ <remote-id type="github">Stellarium/stellarium</remote-id> |
451 |
+ </upstream> |
452 |
</pkgmetadata> |
453 |
|
454 |
diff --git a/sci-astronomy/stellarium/stellarium-0.20.3.ebuild b/sci-astronomy/stellarium/stellarium-0.20.3.ebuild |
455 |
new file mode 100644 |
456 |
index 00000000000..00d5ddb9e3b |
457 |
--- /dev/null |
458 |
+++ b/sci-astronomy/stellarium/stellarium-0.20.3.ebuild |
459 |
@@ -0,0 +1,135 @@ |
460 |
+# Copyright 1999-2020 Gentoo Authors |
461 |
+# Distributed under the terms of the GNU General Public License v2 |
462 |
+ |
463 |
+EAPI=7 |
464 |
+ |
465 |
+PYTHON_COMPAT=( python3_{6,7,8,9} ) |
466 |
+inherit cmake desktop flag-o-matic python-any-r1 xdg virtualx |
467 |
+ |
468 |
+DESCRIPTION="3D photo-realistic skies in real time" |
469 |
+HOMEPAGE="https://stellarium.org/" |
470 |
+MY_DSO_VERSION="3.11" |
471 |
+SRC_URI=" |
472 |
+ https://github.com/Stellarium/stellarium/releases/download/v${PV}/${P}.tar.gz |
473 |
+ deep-sky? ( |
474 |
+ https://github.com/Stellarium/stellarium-data/releases/download/dso-${MY_DSO_VERSION}/catalog.dat -> ${PN}-dso-catalog-${MY_DSO_VERSION}.dat |
475 |
+ ) |
476 |
+ doc? ( |
477 |
+ https://github.com/Stellarium/stellarium/releases/download/v${PV}/stellarium_user_guide-${PV}-1.pdf |
478 |
+ ) |
479 |
+ stars? ( |
480 |
+ https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat |
481 |
+ https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat |
482 |
+ https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat |
483 |
+ https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat |
484 |
+ https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat |
485 |
+ )" |
486 |
+ |
487 |
+LICENSE="GPL-2+ SGI-B-2.0" |
488 |
+SLOT="0" |
489 |
+KEYWORDS="~amd64 ~x86" |
490 |
+IUSE="debug deep-sky doc gps media nls stars telescope test" |
491 |
+ |
492 |
+# Python interpreter is used while building RemoteControl plugin |
493 |
+BDEPEND=" |
494 |
+ ${PYTHON_DEPS} |
495 |
+ doc? ( app-doc/doxygen[dot] ) |
496 |
+ nls? ( dev-qt/linguist-tools:5 ) |
497 |
+" |
498 |
+RDEPEND=" |
499 |
+ dev-libs/qtcompress:= |
500 |
+ dev-qt/qtcore:5 |
501 |
+ dev-qt/qtgui:5 |
502 |
+ dev-qt/qtnetwork:5 |
503 |
+ dev-qt/qtopengl:5 |
504 |
+ dev-qt/qtprintsupport:5 |
505 |
+ dev-qt/qtscript:5 |
506 |
+ dev-qt/qtserialport:5 |
507 |
+ dev-qt/qtwidgets:5 |
508 |
+ media-fonts/dejavu |
509 |
+ sys-libs/zlib |
510 |
+ virtual/opengl |
511 |
+ gps? ( dev-qt/qtpositioning:5 ) |
512 |
+ media? ( dev-qt/qtmultimedia:5[widgets] ) |
513 |
+ telescope? ( sci-libs/indilib:= ) |
514 |
+" |
515 |
+DEPEND="${RDEPEND} |
516 |
+ dev-qt/qtconcurrent:5 |
517 |
+ test? ( dev-qt/qttest:5 ) |
518 |
+" |
519 |
+ |
520 |
+RESTRICT="!test? ( test )" |
521 |
+ |
522 |
+PATCHES=( |
523 |
+ "${FILESDIR}/${P}-unbundle-indi.patch" |
524 |
+ "${FILESDIR}/${P}-unbundle-qtcompress.patch" |
525 |
+ "${FILESDIR}/${P}-unbundle-zlib.patch" |
526 |
+) |
527 |
+ |
528 |
+src_prepare() { |
529 |
+ cmake_src_prepare |
530 |
+ use debug || append-cppflags -DQT_NO_DEBUG #415769 |
531 |
+ |
532 |
+ # Several libraries are bundled, remove them. |
533 |
+ rm -r src/external/{libindi,qtcompress,zlib}/ || die |
534 |
+ |
535 |
+ # qcustomplot can't be easily unbundled because it uses qcustomplot 1 |
536 |
+ # while we have qcustomplot 2 in tree which changed API a bit |
537 |
+ # Also the license of the external qcustomplot is incompatible with stellarium |
538 |
+ |
539 |
+ # for glues_stel aka libtess I couldn't find an upstream with the same API |
540 |
+ |
541 |
+ # unbundling of qxlsx depends on https://github.com/QtExcel/QXlsx/pull/114 |
542 |
+ |
543 |
+ local remaining="$(cd src/external/ && echo */)" |
544 |
+ if [[ "${remaining}" != "glues_stel/ qcustomplot/ qxlsx/" ]]; then |
545 |
+ eqawarn "Need to unbundle more deps: ${remaining}" |
546 |
+ fi |
547 |
+} |
548 |
+ |
549 |
+src_configure() { |
550 |
+ local mycmakeargs=( |
551 |
+ -DENABLE_GPS="$(usex gps)" |
552 |
+ -DENABLE_MEDIA="$(usex media)" |
553 |
+ -DENABLE_NLS="$(usex nls)" |
554 |
+ -DENABLE_TESTING="$(usex test)" |
555 |
+ -DUSE_PLUGIN_TELESCOPECONTROL="$(usex telescope)" |
556 |
+ ) |
557 |
+ cmake_src_configure |
558 |
+} |
559 |
+ |
560 |
+src_test() { |
561 |
+ virtx cmake_src_test |
562 |
+} |
563 |
+ |
564 |
+src_compile() { |
565 |
+ cmake_src_compile |
566 |
+ |
567 |
+ if use doc ; then |
568 |
+ cmake_build apidoc |
569 |
+ fi |
570 |
+} |
571 |
+ |
572 |
+src_install() { |
573 |
+ if use doc ; then |
574 |
+ local HTML_DOCS=( "${BUILD_DIR}/doc/html/." ) |
575 |
+ dodoc "${DISTDIR}/stellarium_user_guide-${PV}-1.pdf" |
576 |
+ fi |
577 |
+ cmake_src_install |
578 |
+ |
579 |
+ # use the more up-to-date system fonts |
580 |
+ rm "${ED}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf || die |
581 |
+ dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf |
582 |
+ dosym ../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf |
583 |
+ |
584 |
+ if use stars ; then |
585 |
+ insinto /usr/share/${PN}/stars/default |
586 |
+ doins "${DISTDIR}"/stars_4_1v0_2.cat |
587 |
+ doins "${DISTDIR}"/stars_{5,6,7,8}_2v0_1.cat |
588 |
+ fi |
589 |
+ if use deep-sky ; then |
590 |
+ insinto /usr/share/${PN}/nebulae/default |
591 |
+ newins "${DISTDIR}/${PN}-dso-catalog-${MY_DSO_VERSION}.dat" catalog.dat |
592 |
+ fi |
593 |
+ newicon doc/images/stellarium-logo.png ${PN}.png |
594 |
+} |