summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2019-07-02 16:05:35 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2019-07-02 16:07:13 +0200
commit968f739831bcbb64de7513b279b376f6817b233a (patch)
tree28dc461562397054fae726715161a3279c5d3fd7 /sci-astronomy/stellarium
parentdev-libs/quazip: Drop 0.7.6 (diff)
downloadgentoo-968f739831bcbb64de7513b279b376f6817b233a.tar.gz
gentoo-968f739831bcbb64de7513b279b376f6817b233a.tar.bz2
gentoo-968f739831bcbb64de7513b279b376f6817b233a.zip
sci-astronomy/stellarium: Drop 0.18.2
Package-Manager: Portage-2.3.68, Repoman-2.3.16 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'sci-astronomy/stellarium')
-rw-r--r--sci-astronomy/stellarium/Manifest1
-rw-r--r--sci-astronomy/stellarium/files/stellarium-0.18.2-as-needed.patch47
-rw-r--r--sci-astronomy/stellarium/files/stellarium-0.18.2-fix-test.patch113
-rw-r--r--sci-astronomy/stellarium/stellarium-0.18.2.ebuild92
4 files changed, 0 insertions, 253 deletions
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index be30a0328bd1..411c050d03ab 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -3,5 +3,4 @@ DIST stars_5_2v0_1.cat 42580300 BLAKE2B eb6528c0577b3f2001a8b03cc5a4e08fa4e75723
DIST stars_6_2v0_1.cat 148352404 BLAKE2B c605b284b3d768cb1619ada3f58d406fa7737f09949e8926d6c14b82a85927d124d7fcb50c6d6c357d21b003938cc0b28937f2adb28ae268bb5c85d575f5e0ff SHA512 794279407595f44bbc1e492086063d98068bf332202a5448cd83dd7afbdcf7c6c3ff2878f3016369ebb5a98552874eb4eddb38e2c40e9a163c6231b640e02977
DIST stars_7_2v0_1.cat 305710678 BLAKE2B 1cc9b4a6bc35a9339e495f7e0da4f7e90a0e92b05b5de8599be1bbdd2a8053cbcec44b0e58bc9248364666db9cdf23449edf236e3f21fdc0e8f1a4a706afc919 SHA512 43b866eb793e8812c9d5502101a6c985d2055fb88bdbda274726bcd51e1527ecf342b22acd673318c9c8e88cac68eace18de8f27d29ffe64933fd32a5b84c5e3
DIST stars_8_2v0_1.cat 559068934 BLAKE2B c040a369cdf6885759998e1315b554d21a5e2b9b149a67967a8af45606aebf57bec407fab5ce1904978af0dc529aa6bddd267331ca45f58617bbf56d5ca99dee SHA512 06d4fa298b9dff8452f550377df99fcaa5e7107cfc7b75c9a4769b3cb6d97a822a54213c706102c1d7ef2dabc16df32a85f46b2f6d6c6f76a4e919353b739de4
-DIST stellarium-0.18.2.tar.gz 265334731 BLAKE2B d8527f93f2ea856466f98e7ab326a34e4265c4937c4d399755878cc6bbb1202580c825a6253e090986ebc80119fb33881b120a1ed6873278dacef75a1e69c517 SHA512 f658b19524b78739a5125ac7c89f5d2b48284d8696da54e39d2390bbbe5eeb8da70837c4e9055a650a492f3f71ebbc966c4c1341729982ba37d93b26fcb91912
DIST stellarium-0.19.0.tar.gz 309151408 BLAKE2B d5726762c402cebca47c7cb218a2edc918aceb11e4bf44f0473bf86a8bfc75b908467112e8ce797c90f9c1307884f853a24f919efe11e86ef04c9eb0ff356a3b SHA512 26cb44fe4280275ce64594d01bdded4ddd2cda5d21887b4329de51188cc392e8390036702ee316446dcdb54182dec5d217a387898c4c7aa82ce14742b4d4694f
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
deleted file mode 100644
index 71fc8ccf2d70..000000000000
--- a/sci-astronomy/stellarium/files/stellarium-0.18.2-as-needed.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From e1bd46e11fead134ee9d8ec4d72f2592c3e18c72 Mon Sep 17 00:00:00 2001
-From: Alexey Sokolov <sokolov@google.com>
-Date: Thu, 8 Nov 2018 23:30:02 +0000
-Subject: [PATCH] Fix build with --as-needed
-
-Fixes the following error:
-
-/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/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 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.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/libQt5Network.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
-../plugins/TelescopeControl/src/gui/libTelescopeControl_gui.a(TelescopeConfigurationDialog.cpp.o): In function `QList<QSerialPortInfo>::dealloc(QListData::Data*) [clone .isra.21]':
-/usr/include/qt5/QtCore/qlist.h:494: undefined reference to `QSerialPortInfo::~QSerialPortInfo()'
-../plugins/TelescopeControl/src/gui/libTelescopeControl_gui.a(TelescopeConfigurationDialog.cpp.o): In function `TelescopeConfigurationDialog::listSerialPorts()':
-/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()'
-/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'
-/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'
-/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'
-/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'
-../plugins/TelescopeControl/src/gui/libTelescopeControl_gui.a(TelescopeConfigurationDialog.cpp.o): In function `QList<QSerialPortInfo>::detach_helper(int)':
-/usr/include/qt5/QtCore/qlist.h:462: undefined reference to `QSerialPortInfo::QSerialPortInfo(QSerialPortInfo const&)'
-/usr/include/qt5/QtCore/qlist.h:468: undefined reference to `QSerialPortInfo::~QSerialPortInfo()'
-collect2: error: ld returned 1 exit status
----
- plugins/TelescopeControl/src/CMakeLists.txt | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/plugins/TelescopeControl/src/CMakeLists.txt b/plugins/TelescopeControl/src/CMakeLists.txt
-index e8dc3212fe..34586b7528 100644
---- a/plugins/TelescopeControl/src/CMakeLists.txt
-+++ b/plugins/TelescopeControl/src/CMakeLists.txt
-@@ -22,15 +22,15 @@ ADD_LIBRARY(TelescopeControl-static STATIC
- SET_TARGET_PROPERTIES(TelescopeControl-static PROPERTIES OUTPUT_NAME "TelescopeControl")
-
- TARGET_LINK_LIBRARIES(TelescopeControl-static
-- Qt5::Core
-- Qt5::Widgets
-- Qt5::SerialPort
- TelescopeControl_gui
- TelescopeControl_Lx200
- TelescopeControl_INDI
- TelescopeControl_NexStar
- TelescopeControl_Rts2
- TelescopeControl_common
-+ Qt5::Core
-+ Qt5::Widgets
-+ Qt5::SerialPort
- )
-
- SET_TARGET_PROPERTIES(TelescopeControl-static PROPERTIES COMPILE_FLAGS "-DQT_STATICPLUGIN")
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
deleted file mode 100644
index 340893634982..000000000000
--- a/sci-astronomy/stellarium/files/stellarium-0.18.2-fix-test.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From d20954d0a9a7890865a2d4b09a01d62f2ed0d8e9 Mon Sep 17 00:00:00 2001
-From: Alexey Sokolov <sokolov@google.com>
-Date: Sun, 6 Jan 2019 13:20:59 +0000
-Subject: [PATCH 1/2] Fix test, when building out of source.
-
-https://bugs.gentoo.org/674472 has details.
----
- src/CMakeLists.txt | 2 ++
- src/core/StelFileMgr.cpp | 9 +++++----
- src/tests/testEphemeris.cpp | 5 -----
- 3 files changed, 7 insertions(+), 9 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 6a46d006b2..10db29593b 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -646,5 +646,7 @@ IF(ENABLE_TESTING)
- ADD_DEPENDENCIES(buildTests testEphemeris)
- ADD_TEST(testEphemeris testEphemeris)
- SET_TARGET_PROPERTIES(testEphemeris PROPERTIES FOLDER "src/tests")
-+ SET_TESTS_PROPERTIES(testEphemeris PROPERTIES
-+ ENVIRONMENT "STELLARIUM_DATA_ROOT=${PROJECT_SOURCE_DIR}")
-
- ENDIF (ENABLE_TESTING)
-diff --git a/src/core/StelFileMgr.cpp b/src/core/StelFileMgr.cpp
-index c88fd72b86..95126152f2 100644
---- a/src/core/StelFileMgr.cpp
-+++ b/src/core/StelFileMgr.cpp
-@@ -26,6 +26,7 @@
- #include <QString>
- #include <QDebug>
- #include <QStandardPaths>
-+#include <QProcessEnvironment>
-
- #include <stdio.h>
-
-@@ -78,11 +79,11 @@ void StelFileMgr::init()
-
-
- // Determine install data directory location
--
-- // If we are running from the build tree, we use the files from the current directory
-- if (QFileInfo(CHECK_FILE).exists())
-+ QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
-+ QString envRoot = env.value("STELLARIUM_DATA_ROOT", ".");
-+ if (QFileInfo(envRoot + QDir::separator() + QString(CHECK_FILE)).exists())
- {
-- installDir = ".";
-+ installDir = envRoot;
- }
- else
- {
-diff --git a/src/tests/testEphemeris.cpp b/src/tests/testEphemeris.cpp
-index 26b4d83b98..ba5ac2a315 100644
---- a/src/tests/testEphemeris.cpp
-+++ b/src/tests/testEphemeris.cpp
-@@ -42,12 +42,7 @@ QTEST_GUILESS_MAIN(TestEphemeris)
-
- void TestEphemeris::initTestCase()
- {
-- #ifndef Q_OS_WIN
-- // FIXME: StelFileMgr::init(); is disabled on Windows due it will caused problem "could not find install location"
-- // on Windows machines without installed Stellarium (e.g. AppVeyor). So, it will be give "false positive
-- // test pass" at the moment for DE42x ephemeris.
- StelFileMgr::init();
-- #endif
-
- de430FilePath = StelFileMgr::findFile("ephem/" + QString(DE430_FILENAME), StelFileMgr::File);
- de431FilePath = StelFileMgr::findFile("ephem/" + QString(DE431_FILENAME), StelFileMgr::File);
-
-From 2620a64db14e5feb5db8cb085dacef592556ded1 Mon Sep 17 00:00:00 2001
-From: Alexey Sokolov <sokolov@google.com>
-Date: Sun, 6 Jan 2019 15:56:52 +0000
-Subject: [PATCH 2/2] Fix testExtinction on i686
-
-https://bugs.gentoo.org/674472
----
- src/tests/testExtinction.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/tests/testExtinction.cpp b/src/tests/testExtinction.cpp
-index bfb6ff8479..6a4c22212c 100644
---- a/src/tests/testExtinction.cpp
-+++ b/src/tests/testExtinction.cpp
-@@ -41,5 +41,5 @@ void TestExtinction::testBase()
- mag=2.0f;
- extCls.setExtinctionCoefficient(0.25);
- extCls.forward(vert, &mag);
-- QVERIFY(mag==2.25);
-+ QVERIFY(fabs(mag-2.25)<0.0001);
- }
-From 3ffebb1ce599e2f0062472ee05060a5de5838101 Mon Sep 17 00:00:00 2001
-From: Alexey Sokolov <sokolov@google.com>
-Date: Sun, 6 Jan 2019 18:00:41 +0000
-Subject: [PATCH 2/2] Try fix #587 differently
-
----
- src/CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 10db29593b..18cae6be4d 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -546,6 +546,8 @@ IF(ENABLE_TESTING)
- ADD_DEPENDENCIES(buildTests testStelFileMgr)
- ADD_TEST(testStelFileMgr testStelFileMgr)
- SET_TARGET_PROPERTIES(testStelFileMgr PROPERTIES FOLDER "src/tests")
-+ SET_TESTS_PROPERTIES(testStelFileMgr PROPERTIES
-+ ENVIRONMENT "STELLARIUM_DATA_ROOT=.")
-
- SET(tests_testStelSphereGeometry_SRCS
- tests/testStelSphereGeometry.hpp
diff --git a/sci-astronomy/stellarium/stellarium-0.18.2.ebuild b/sci-astronomy/stellarium/stellarium-0.18.2.ebuild
deleted file mode 100644
index 601819041146..000000000000
--- a/sci-astronomy/stellarium/stellarium-0.18.2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils desktop flag-o-matic gnome2-utils virtualx
-
-DESCRIPTION="3D photo-realistic skies in real time"
-HOMEPAGE="https://www.stellarium.org/"
-SRC_URI="
- https://github.com/Stellarium/stellarium/releases/download/v${PV}/${P}.tar.gz
- stars? (
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat
- )"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug gps media nls stars test"
-
-RDEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtopengl:5
- dev-qt/qtprintsupport:5
- dev-qt/qtscript:5
- dev-qt/qtserialport:5
- dev-qt/qtwidgets:5
- media-fonts/dejavu
- sys-libs/zlib
- virtual/opengl
- gps? ( dev-qt/qtpositioning:5 )
- media? ( dev-qt/qtmultimedia:5[widgets] )
-"
-DEPEND="${RDEPEND}
- dev-qt/qtconcurrent:5
- nls? ( dev-qt/linguist-tools:5 )
- test? ( dev-qt/qttest:5 )
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-as-needed.patch
- "${FILESDIR}"/${P}-fix-test.patch
-)
-
-src_prepare() {
- cmake-utils_src_prepare
- use debug || append-cppflags -DQT_NO_DEBUG #415769
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_GPS="$(usex gps)"
- -DENABLE_MEDIA="$(usex media)"
- -DENABLE_NLS="$(usex nls)"
- -DENABLE_TESTING="$(usex test)"
- )
- cmake-utils_src_configure
-}
-
-src_test() {
- virtx cmake-utils_src_test
-}
-
-src_install() {
- cmake-utils_src_install
-
- # use the more up-to-date system fonts
- rm "${ED%/}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf || die
- dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf
- dosym ../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf
-
- if use stars ; then
- insinto /usr/share/${PN}/stars/default
- doins "${DISTDIR}"/stars_4_1v0_2.cat
- doins "${DISTDIR}"/stars_{5,6,7,8}_2v0_1.cat
- fi
- newicon doc/images/stellarium-logo.png ${PN}.png
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}