Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/stellarium/files/, sci-astronomy/stellarium/
Date: Tue, 02 Jul 2019 14:07:32
Message-Id: 1562076433.968f739831bcbb64de7513b279b376f6817b233a.asturm@gentoo
1 commit: 968f739831bcbb64de7513b279b376f6817b233a
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jul 2 14:05:35 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Jul 2 14:07:13 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=968f7398
7
8 sci-astronomy/stellarium: Drop 0.18.2
9
10 Package-Manager: Portage-2.3.68, Repoman-2.3.16
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 sci-astronomy/stellarium/Manifest | 1 -
14 .../files/stellarium-0.18.2-as-needed.patch | 47 ---------
15 .../files/stellarium-0.18.2-fix-test.patch | 113 ---------------------
16 sci-astronomy/stellarium/stellarium-0.18.2.ebuild | 92 -----------------
17 4 files changed, 253 deletions(-)
18
19 diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
20 index be30a0328bd..411c050d03a 100644
21 --- a/sci-astronomy/stellarium/Manifest
22 +++ b/sci-astronomy/stellarium/Manifest
23 @@ -3,5 +3,4 @@ DIST stars_5_2v0_1.cat 42580300 BLAKE2B eb6528c0577b3f2001a8b03cc5a4e08fa4e75723
24 DIST stars_6_2v0_1.cat 148352404 BLAKE2B c605b284b3d768cb1619ada3f58d406fa7737f09949e8926d6c14b82a85927d124d7fcb50c6d6c357d21b003938cc0b28937f2adb28ae268bb5c85d575f5e0ff SHA512 794279407595f44bbc1e492086063d98068bf332202a5448cd83dd7afbdcf7c6c3ff2878f3016369ebb5a98552874eb4eddb38e2c40e9a163c6231b640e02977
25 DIST stars_7_2v0_1.cat 305710678 BLAKE2B 1cc9b4a6bc35a9339e495f7e0da4f7e90a0e92b05b5de8599be1bbdd2a8053cbcec44b0e58bc9248364666db9cdf23449edf236e3f21fdc0e8f1a4a706afc919 SHA512 43b866eb793e8812c9d5502101a6c985d2055fb88bdbda274726bcd51e1527ecf342b22acd673318c9c8e88cac68eace18de8f27d29ffe64933fd32a5b84c5e3
26 DIST stars_8_2v0_1.cat 559068934 BLAKE2B c040a369cdf6885759998e1315b554d21a5e2b9b149a67967a8af45606aebf57bec407fab5ce1904978af0dc529aa6bddd267331ca45f58617bbf56d5ca99dee SHA512 06d4fa298b9dff8452f550377df99fcaa5e7107cfc7b75c9a4769b3cb6d97a822a54213c706102c1d7ef2dabc16df32a85f46b2f6d6c6f76a4e919353b739de4
27 -DIST stellarium-0.18.2.tar.gz 265334731 BLAKE2B d8527f93f2ea856466f98e7ab326a34e4265c4937c4d399755878cc6bbb1202580c825a6253e090986ebc80119fb33881b120a1ed6873278dacef75a1e69c517 SHA512 f658b19524b78739a5125ac7c89f5d2b48284d8696da54e39d2390bbbe5eeb8da70837c4e9055a650a492f3f71ebbc966c4c1341729982ba37d93b26fcb91912
28 DIST stellarium-0.19.0.tar.gz 309151408 BLAKE2B d5726762c402cebca47c7cb218a2edc918aceb11e4bf44f0473bf86a8bfc75b908467112e8ce797c90f9c1307884f853a24f919efe11e86ef04c9eb0ff356a3b SHA512 26cb44fe4280275ce64594d01bdded4ddd2cda5d21887b4329de51188cc392e8390036702ee316446dcdb54182dec5d217a387898c4c7aa82ce14742b4d4694f
29
30 diff --git a/sci-astronomy/stellarium/files/stellarium-0.18.2-as-needed.patch b/sci-astronomy/stellarium/files/stellarium-0.18.2-as-needed.patch
31 deleted file mode 100644
32 index 71fc8ccf2d7..00000000000
33 --- a/sci-astronomy/stellarium/files/stellarium-0.18.2-as-needed.patch
34 +++ /dev/null
35 @@ -1,47 +0,0 @@
36 -From e1bd46e11fead134ee9d8ec4d72f2592c3e18c72 Mon Sep 17 00:00:00 2001
37 -From: Alexey Sokolov <sokolov@××××××.com>
38 -Date: Thu, 8 Nov 2018 23:30:02 +0000
39 -Subject: [PATCH] Fix build with --as-needed
40 -
41 -Fixes the following error:
42 -
43 -/usr/bin/x86_64-pc-linux-gnu-g++ -O2 -pipe -march=bdver2 -ggdb3 -Wall -Wextra -Wno-unused-parameter -Wno-unused-result -Wl,-O1 -Wl,--as-needed -rdynamic CMakeFiles/stellarium.dir/main.cpp.o CMakeFiles/stellarium.dir/stellarium_autogen/mocs_compilation.cpp.o -o stellarium -lz external/libqtcompress_stel.a external/libglues_stel.a external/libqcustomplot_stel.a ../plugins/AngleMeasure/src/libAngleMeasure.a ../plugins/ArchaeoLines/src/libArchaeoLines.a ../plugins/CompassMarks/src/libCompassMarks.a ../plugins/Exoplanets/src/libExoplanets.a ../plugins/EquationOfTime/src/libEquationOfTime.a ../plugins/FOV/src/libFOV.a ../plugins/MeteorShowers/src/libMeteorShowers.a ../plugins/NavStars/src/libNavStars.a ../plugins/Novae/src/libNovae.a ../plugins/Observability/src/libObservability.a ../plugins/Oculars/src/libOculars.a ../plugins/PointerCoordinates/src/libPointerCoordinates.a ../plugins/Pulsars/src/libPulsars.a ../plugins/Quasars/src/libQuasars.a ../plugins/RemoteControl/src/libRemoteCont
44 rol.a ../plugins/RemoteSync/src/libRemoteSync.a ../plugins/Satellites/src/libSatellites.a ../plugins/Scenery3d/src/libScenery3d.a ../plugins/SolarSystemEditor/src/libSolarSystemEditor.a ../plugins/Supernovae/src/libSupernovae.a ../plugins/TextUserInterface/src/libTextUserInterface.a ../plugins/TelescopeControl/src/libTelescopeControl.a libstelMain.a external/libqtcompress_stel.a -lz external/libglues_stel.a ../plugins/AngleMeasure/src/libAngleMeasure.a ../plugins/ArchaeoLines/src/libArchaeoLines.a ../plugins/CompassMarks/src/libCompassMarks.a ../plugins/Exoplanets/src/libExoplanets.a external/libqcustomplot_stel.a /usr/lib64/libQt5PrintSupport.so.5.11.1 ../plugins/EquationOfTime/src/libEquationOfTime.a ../plugins/FOV/src/libFOV.a ../plugins/MeteorShowers/src/libMeteorShowers.a ../plugins/NavStars/src/libNavStars.a ../plugins/Novae/src/libNovae.a ../plugins/Observability/src/libObservability.a ../plugins/Oculars/src/libOculars.a ../plugins/PointerCoordinates/src/libPointerCoordinates
45 .a ../plugins/Pulsars/src/libPulsars.a ../plugins/Quasars/src/libQuasars.a ../plugins/RemoteControl/src/libRemoteControl.a ../plugins/RemoteSync/src/libRemoteSync.a ../plugins/Satellites/src/libSatellites.a ../plugins/Scenery3d/src/libScenery3d.a ../plugins/SolarSystemEditor/src/libSolarSystemEditor.a ../plugins/Supernovae/src/libSupernovae.a ../plugins/TextUserInterface/src/libTextUserInterface.a ../plugins/TelescopeControl/src/libTelescopeControl.a /usr/lib64/libQt5SerialPort.so.5.11.1 ../plugins/TelescopeControl/src/gui/libTelescopeControl_gui.a ../plugins/TelescopeControl/src/Lx200/libTelescopeControl_Lx200.a ../plugins/TelescopeControl/src/INDI/libTelescopeControl_INDI.a external/libindiclient.a external/libzlib_stel.a -lpthread ../plugins/TelescopeControl/src/NexStar/libTelescopeControl_NexStar.a ../plugins/TelescopeControl/src/Rts2/libTelescopeControl_Rts2.a ../plugins/TelescopeControl/src/common/libTelescopeControl_common.a /usr/lib64/libQt5Concurrent.so.5.11.1 /usr/lib64/li
46 bQt5Network.so.5.11.1 /usr/lib64/libQt5Widgets.so.5.11.1 /usr/lib64/libQt5Gui.so.5.11.1 /usr/lib64/libQt5Script.so.5.11.1 /usr/lib64/libQt5Core.so.5.11.1
47 -../plugins/TelescopeControl/src/gui/libTelescopeControl_gui.a(TelescopeConfigurationDialog.cpp.o): In function `QList<QSerialPortInfo>::dealloc(QListData::Data*) [clone .isra.21]':
48 -/usr/include/qt5/QtCore/qlist.h:494: undefined reference to `QSerialPortInfo::~QSerialPortInfo()'
49 -../plugins/TelescopeControl/src/gui/libTelescopeControl_gui.a(TelescopeConfigurationDialog.cpp.o): In function `TelescopeConfigurationDialog::listSerialPorts()':
50 -/mnt/portagetmp/portage/sci-astronomy/stellarium-0.18.2/work/stellarium-0.18.2/plugins/TelescopeControl/src/gui/TelescopeConfigurationDialog.cpp:73: undefined reference to `QSerialPortInfo::availablePorts()'
51 -/mnt/portagetmp/portage/sci-astronomy/stellarium-0.18.2/work/stellarium-0.18.2/plugins/TelescopeControl/src/gui/TelescopeConfigurationDialog.cpp:80: undefined reference to `QSerialPortInfo::portName() const'
52 -/mnt/portagetmp/portage/sci-astronomy/stellarium-0.18.2/work/stellarium-0.18.2/plugins/TelescopeControl/src/gui/TelescopeConfigurationDialog.cpp:81: undefined reference to `QSerialPortInfo::vendorIdentifier() const'
53 -/mnt/portagetmp/portage/sci-astronomy/stellarium-0.18.2/work/stellarium-0.18.2/plugins/TelescopeControl/src/gui/TelescopeConfigurationDialog.cpp:82: undefined reference to `QSerialPortInfo::productIdentifier() const'
54 -/mnt/portagetmp/portage/sci-astronomy/stellarium-0.18.2/work/stellarium-0.18.2/plugins/TelescopeControl/src/gui/TelescopeConfigurationDialog.cpp:78: undefined reference to `QSerialPortInfo::systemLocation() const'
55 -../plugins/TelescopeControl/src/gui/libTelescopeControl_gui.a(TelescopeConfigurationDialog.cpp.o): In function `QList<QSerialPortInfo>::detach_helper(int)':
56 -/usr/include/qt5/QtCore/qlist.h:462: undefined reference to `QSerialPortInfo::QSerialPortInfo(QSerialPortInfo const&)'
57 -/usr/include/qt5/QtCore/qlist.h:468: undefined reference to `QSerialPortInfo::~QSerialPortInfo()'
58 -collect2: error: ld returned 1 exit status
59 ----
60 - plugins/TelescopeControl/src/CMakeLists.txt | 6 +++---
61 - 1 file changed, 3 insertions(+), 3 deletions(-)
62 -
63 -diff --git a/plugins/TelescopeControl/src/CMakeLists.txt b/plugins/TelescopeControl/src/CMakeLists.txt
64 -index e8dc3212fe..34586b7528 100644
65 ---- a/plugins/TelescopeControl/src/CMakeLists.txt
66 -+++ b/plugins/TelescopeControl/src/CMakeLists.txt
67 -@@ -22,15 +22,15 @@ ADD_LIBRARY(TelescopeControl-static STATIC
68 - SET_TARGET_PROPERTIES(TelescopeControl-static PROPERTIES OUTPUT_NAME "TelescopeControl")
69 -
70 - TARGET_LINK_LIBRARIES(TelescopeControl-static
71 -- Qt5::Core
72 -- Qt5::Widgets
73 -- Qt5::SerialPort
74 - TelescopeControl_gui
75 - TelescopeControl_Lx200
76 - TelescopeControl_INDI
77 - TelescopeControl_NexStar
78 - TelescopeControl_Rts2
79 - TelescopeControl_common
80 -+ Qt5::Core
81 -+ Qt5::Widgets
82 -+ Qt5::SerialPort
83 - )
84 -
85 - SET_TARGET_PROPERTIES(TelescopeControl-static PROPERTIES COMPILE_FLAGS "-DQT_STATICPLUGIN")
86
87 diff --git a/sci-astronomy/stellarium/files/stellarium-0.18.2-fix-test.patch b/sci-astronomy/stellarium/files/stellarium-0.18.2-fix-test.patch
88 deleted file mode 100644
89 index 34089363498..00000000000
90 --- a/sci-astronomy/stellarium/files/stellarium-0.18.2-fix-test.patch
91 +++ /dev/null
92 @@ -1,113 +0,0 @@
93 -From d20954d0a9a7890865a2d4b09a01d62f2ed0d8e9 Mon Sep 17 00:00:00 2001
94 -From: Alexey Sokolov <sokolov@××××××.com>
95 -Date: Sun, 6 Jan 2019 13:20:59 +0000
96 -Subject: [PATCH 1/2] Fix test, when building out of source.
97 -
98 -https://bugs.gentoo.org/674472 has details.
99 ----
100 - src/CMakeLists.txt | 2 ++
101 - src/core/StelFileMgr.cpp | 9 +++++----
102 - src/tests/testEphemeris.cpp | 5 -----
103 - 3 files changed, 7 insertions(+), 9 deletions(-)
104 -
105 -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
106 -index 6a46d006b2..10db29593b 100644
107 ---- a/src/CMakeLists.txt
108 -+++ b/src/CMakeLists.txt
109 -@@ -646,5 +646,7 @@ IF(ENABLE_TESTING)
110 - ADD_DEPENDENCIES(buildTests testEphemeris)
111 - ADD_TEST(testEphemeris testEphemeris)
112 - SET_TARGET_PROPERTIES(testEphemeris PROPERTIES FOLDER "src/tests")
113 -+ SET_TESTS_PROPERTIES(testEphemeris PROPERTIES
114 -+ ENVIRONMENT "STELLARIUM_DATA_ROOT=${PROJECT_SOURCE_DIR}")
115 -
116 - ENDIF (ENABLE_TESTING)
117 -diff --git a/src/core/StelFileMgr.cpp b/src/core/StelFileMgr.cpp
118 -index c88fd72b86..95126152f2 100644
119 ---- a/src/core/StelFileMgr.cpp
120 -+++ b/src/core/StelFileMgr.cpp
121 -@@ -26,6 +26,7 @@
122 - #include <QString>
123 - #include <QDebug>
124 - #include <QStandardPaths>
125 -+#include <QProcessEnvironment>
126 -
127 - #include <stdio.h>
128 -
129 -@@ -78,11 +79,11 @@ void StelFileMgr::init()
130 -
131 -
132 - // Determine install data directory location
133 --
134 -- // If we are running from the build tree, we use the files from the current directory
135 -- if (QFileInfo(CHECK_FILE).exists())
136 -+ QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
137 -+ QString envRoot = env.value("STELLARIUM_DATA_ROOT", ".");
138 -+ if (QFileInfo(envRoot + QDir::separator() + QString(CHECK_FILE)).exists())
139 - {
140 -- installDir = ".";
141 -+ installDir = envRoot;
142 - }
143 - else
144 - {
145 -diff --git a/src/tests/testEphemeris.cpp b/src/tests/testEphemeris.cpp
146 -index 26b4d83b98..ba5ac2a315 100644
147 ---- a/src/tests/testEphemeris.cpp
148 -+++ b/src/tests/testEphemeris.cpp
149 -@@ -42,12 +42,7 @@ QTEST_GUILESS_MAIN(TestEphemeris)
150 -
151 - void TestEphemeris::initTestCase()
152 - {
153 -- #ifndef Q_OS_WIN
154 -- // FIXME: StelFileMgr::init(); is disabled on Windows due it will caused problem "could not find install location"
155 -- // on Windows machines without installed Stellarium (e.g. AppVeyor). So, it will be give "false positive
156 -- // test pass" at the moment for DE42x ephemeris.
157 - StelFileMgr::init();
158 -- #endif
159 -
160 - de430FilePath = StelFileMgr::findFile("ephem/" + QString(DE430_FILENAME), StelFileMgr::File);
161 - de431FilePath = StelFileMgr::findFile("ephem/" + QString(DE431_FILENAME), StelFileMgr::File);
162 -
163 -From 2620a64db14e5feb5db8cb085dacef592556ded1 Mon Sep 17 00:00:00 2001
164 -From: Alexey Sokolov <sokolov@××××××.com>
165 -Date: Sun, 6 Jan 2019 15:56:52 +0000
166 -Subject: [PATCH 2/2] Fix testExtinction on i686
167 -
168 -https://bugs.gentoo.org/674472
169 ----
170 - src/tests/testExtinction.cpp | 2 +-
171 - 1 file changed, 1 insertion(+), 1 deletion(-)
172 -
173 -diff --git a/src/tests/testExtinction.cpp b/src/tests/testExtinction.cpp
174 -index bfb6ff8479..6a4c22212c 100644
175 ---- a/src/tests/testExtinction.cpp
176 -+++ b/src/tests/testExtinction.cpp
177 -@@ -41,5 +41,5 @@ void TestExtinction::testBase()
178 - mag=2.0f;
179 - extCls.setExtinctionCoefficient(0.25);
180 - extCls.forward(vert, &mag);
181 -- QVERIFY(mag==2.25);
182 -+ QVERIFY(fabs(mag-2.25)<0.0001);
183 - }
184 -From 3ffebb1ce599e2f0062472ee05060a5de5838101 Mon Sep 17 00:00:00 2001
185 -From: Alexey Sokolov <sokolov@××××××.com>
186 -Date: Sun, 6 Jan 2019 18:00:41 +0000
187 -Subject: [PATCH 2/2] Try fix #587 differently
188 -
189 ----
190 - src/CMakeLists.txt | 2 ++
191 - 1 file changed, 2 insertions(+)
192 -
193 -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
194 -index 10db29593b..18cae6be4d 100644
195 ---- a/src/CMakeLists.txt
196 -+++ b/src/CMakeLists.txt
197 -@@ -546,6 +546,8 @@ IF(ENABLE_TESTING)
198 - ADD_DEPENDENCIES(buildTests testStelFileMgr)
199 - ADD_TEST(testStelFileMgr testStelFileMgr)
200 - SET_TARGET_PROPERTIES(testStelFileMgr PROPERTIES FOLDER "src/tests")
201 -+ SET_TESTS_PROPERTIES(testStelFileMgr PROPERTIES
202 -+ ENVIRONMENT "STELLARIUM_DATA_ROOT=.")
203 -
204 - SET(tests_testStelSphereGeometry_SRCS
205 - tests/testStelSphereGeometry.hpp
206
207 diff --git a/sci-astronomy/stellarium/stellarium-0.18.2.ebuild b/sci-astronomy/stellarium/stellarium-0.18.2.ebuild
208 deleted file mode 100644
209 index 60181904114..00000000000
210 --- a/sci-astronomy/stellarium/stellarium-0.18.2.ebuild
211 +++ /dev/null
212 @@ -1,92 +0,0 @@
213 -# Copyright 1999-2019 Gentoo Authors
214 -# Distributed under the terms of the GNU General Public License v2
215 -
216 -EAPI=6
217 -
218 -inherit cmake-utils desktop flag-o-matic gnome2-utils virtualx
219 -
220 -DESCRIPTION="3D photo-realistic skies in real time"
221 -HOMEPAGE="https://www.stellarium.org/"
222 -SRC_URI="
223 - https://github.com/Stellarium/stellarium/releases/download/v${PV}/${P}.tar.gz
224 - stars? (
225 - https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat
226 - https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat
227 - https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat
228 - https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat
229 - https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat
230 - )"
231 -
232 -LICENSE="GPL-2+"
233 -SLOT="0"
234 -KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
235 -IUSE="debug gps media nls stars test"
236 -
237 -RDEPEND="
238 - dev-qt/qtcore:5
239 - dev-qt/qtgui:5
240 - dev-qt/qtnetwork:5
241 - dev-qt/qtopengl:5
242 - dev-qt/qtprintsupport:5
243 - dev-qt/qtscript:5
244 - dev-qt/qtserialport:5
245 - dev-qt/qtwidgets:5
246 - media-fonts/dejavu
247 - sys-libs/zlib
248 - virtual/opengl
249 - gps? ( dev-qt/qtpositioning:5 )
250 - media? ( dev-qt/qtmultimedia:5[widgets] )
251 -"
252 -DEPEND="${RDEPEND}
253 - dev-qt/qtconcurrent:5
254 - nls? ( dev-qt/linguist-tools:5 )
255 - test? ( dev-qt/qttest:5 )
256 -"
257 -
258 -PATCHES=(
259 - "${FILESDIR}"/${P}-as-needed.patch
260 - "${FILESDIR}"/${P}-fix-test.patch
261 -)
262 -
263 -src_prepare() {
264 - cmake-utils_src_prepare
265 - use debug || append-cppflags -DQT_NO_DEBUG #415769
266 -}
267 -
268 -src_configure() {
269 - local mycmakeargs=(
270 - -DENABLE_GPS="$(usex gps)"
271 - -DENABLE_MEDIA="$(usex media)"
272 - -DENABLE_NLS="$(usex nls)"
273 - -DENABLE_TESTING="$(usex test)"
274 - )
275 - cmake-utils_src_configure
276 -}
277 -
278 -src_test() {
279 - virtx cmake-utils_src_test
280 -}
281 -
282 -src_install() {
283 - cmake-utils_src_install
284 -
285 - # use the more up-to-date system fonts
286 - rm "${ED%/}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf || die
287 - dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf
288 - dosym ../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf
289 -
290 - if use stars ; then
291 - insinto /usr/share/${PN}/stars/default
292 - doins "${DISTDIR}"/stars_4_1v0_2.cat
293 - doins "${DISTDIR}"/stars_{5,6,7,8}_2v0_1.cat
294 - fi
295 - newicon doc/images/stellarium-logo.png ${PN}.png
296 -}
297 -
298 -pkg_postinst() {
299 - gnome2_icon_cache_update
300 -}
301 -
302 -pkg_postrm() {
303 - gnome2_icon_cache_update
304 -}