* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/stellarium/files/, sci-astronomy/stellarium/
@ 2016-03-20 20:51 Michael Sterrett
0 siblings, 0 replies; 13+ messages in thread
From: Michael Sterrett @ 2016-03-20 20:51 UTC (permalink / raw
To: gentoo-commits
commit: ae667bbe58511a175c90fa049d9a547b55848e1b
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 20:17:23 2016 +0000
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 20:51:19 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae667bbe
sci-astronomy/stellarium: clean old
Package-Manager: portage-2.2.26
sci-astronomy/stellarium/Manifest | 2 -
.../stellarium/files/stellarium-0.13.3-qt55.patch | 23 -----
sci-astronomy/stellarium/stellarium-0.13.3.ebuild | 100 ---------------------
sci-astronomy/stellarium/stellarium-0.14.0.ebuild | 99 --------------------
4 files changed, 224 deletions(-)
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index 1f57232..0ff5003 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -9,6 +9,4 @@ DIST stars_7_2v0_1.cat 305710678 SHA256 4d812c078f03d01c9b24bacedf6e688a4382d924
DIST stars_8_2v0_0.cat 706781416 SHA256 91b79dcf97464b4ca0f6c604e745dac2c6ca02e25ed986dbec2de5f6d6e8a1f9 SHA512 f94360e8cca9a3261017adbddf1cb74878771d16d1d6062cead8e9343ad28d26bcfa2b23cdd0a182bc1d5fa0a000ac96f722510118b0ad38886f548f4595f03b WHIRLPOOL cf1c37274bc9ebc99d5021fccdfba92ee17509e60b708eaa47ee5cdef2ada9424bda1543c454670207e29e6cadbc178460adbfc45480bee1caebfeee95a7e211
DIST stars_8_2v0_1.cat 559068934 SHA256 f1c0b3f25737f405ed4a2a045091d348885ffceb47258c3e32a2f4a800cac482 SHA512 06d4fa298b9dff8452f550377df99fcaa5e7107cfc7b75c9a4769b3cb6d97a822a54213c706102c1d7ef2dabc16df32a85f46b2f6d6c6f76a4e919353b739de4 WHIRLPOOL a467e7aef3851ad219103a401e20896a89efe01615e5df753c63a74876442dcf22c78d838b269dca50af58e9484f1d1abfd56f2ecdfdb57fdb3e1087e2e7136e
DIST stellarium-0.12.4.tar.gz 79343617 SHA256 0fae1b6e2231ccfaba8fd00abf816a88bd89b5dc61387ac84edf479b363c6684 SHA512 324a8c930281e26e91d45356cf3aab89cf708c7e64636b7e89de95af3f6d2569830caf05fb44ebef88f65dda55cb6dd18dcf4ee54d46da3910c456dc2daac478 WHIRLPOOL 8bce980d157904c4032368da335263a9afd2136386b0fd19d27e10f1c8b33712780130ed6845f26b3bac43f00d2de4aee80c47a0648a6cf6b4741bf69301f110
-DIST stellarium-0.13.3.tar.gz 135870690 SHA256 3202b7657906caf0e1079ee5c3f82b21acc01deaa4fcf654307d13d5baf886d6 SHA512 9d8b8d4e045dd3e8052a7f6af4dd21205c2e66c2e4db254fbb6e897f3df1f049a6e2080f6598210da162917e1f6a3535972c8826e5e696f4ab954a5b26d0d083 WHIRLPOOL 735365c9c13257487f785d9407c1725ec7bd345bace43f809105d270ea6a83764dd2c55c1c5010bbe72263ef99dc16913f9e8df706d82f40d3b02187cab1c028
-DIST stellarium-0.14.0.tar.gz 139333669 SHA256 5225087732b97d27c019f0cb1a9f183d511e26eeb3538e16c3790df2dd541f15 SHA512 d5271b4caeddc3fade7dcd98f150ba7bcb644d54c8dc7787dd3fcb33550032dbf7c8517ac6b8d950e3f35f0a2bbc046afd624fbc6e6d4b988e46d58236b77943 WHIRLPOOL b97b38ec481edc5c7817a4b9138ab2f10cbd630ef3b9bab980c50191a3f8cfe03efb9eeface14819bee9982dfc72dfe32db63255a07ce5226e3707f89832423e
DIST stellarium-0.14.2.tar.gz 139069181 SHA256 aa04a5ae44ed177bc187d20e27a87cc11fc2f465036d673f02ec07b333a0b1f7 SHA512 401dc8f88779119f0fef9d2e24cb5440c16a1f1d4a79ff80c51cfef848f6b1d881f5144acd599f8b709d099b120420c18bba9f50f3518c44bf815021f7efc2ed WHIRLPOOL 8cb4dc54f91bffda6e4bab76efa855bc43e2440d9e6408a1028bc118d27971c17d9ec2106748ec7df5f6b47da4db6938b359490659092bb5169e15f5eed14d21
diff --git a/sci-astronomy/stellarium/files/stellarium-0.13.3-qt55.patch b/sci-astronomy/stellarium/files/stellarium-0.13.3-qt55.patch
deleted file mode 100644
index b4f7d5a..0000000
--- a/sci-astronomy/stellarium/files/stellarium-0.13.3-qt55.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ur -x CMakeFiles -x Makefile -x 'CMake*' stellarium-0.13.3/work/stellarium-0.13.3/src/CLIProcessor.hpp stellarium-0.13.3-new/work/stellarium-0.13.3/src/CLIProcessor.hpp
---- src/CLIProcessor.hpp 2015-03-08 12:41:55.000000000 +0100
-+++ src/CLIProcessor.hpp 2015-07-12 13:29:36.059179087 +0200
-@@ -21,6 +21,7 @@
- #define CLIPROCESSOR_HPP
-
- #include <QStringList>
-+#include <QVariant>
-
- class QSettings;
-
-diff -ur -x CMakeFiles -x Makefile -x 'CMake*' stellarium-0.13.3/work/stellarium-0.13.3/src/core/StelSkyCultureMgr.hpp stellarium-0.13.3-new/work/stellarium-0.13.3/src/core/StelSkyCultureMgr.hpp
---- src/core/StelSkyCultureMgr.hpp 2015-03-08 12:41:55.000000000 +0100
-+++ src/core/StelSkyCultureMgr.hpp 2015-07-12 13:28:32.589064791 +0200
-@@ -23,6 +23,7 @@
- #include <QMap>
- #include <QString>
- #include <QStringList>
-+#include <QObject>
-
- //! @class StelSkyCulture
- //! Store basic info about a sky culture for stellarium.
-
diff --git a/sci-astronomy/stellarium/stellarium-0.13.3.ebuild b/sci-astronomy/stellarium/stellarium-0.13.3.ebuild
deleted file mode 100644
index 03b9c67..0000000
--- a/sci-astronomy/stellarium/stellarium-0.13.3.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils eutils flag-o-matic gnome2-utils
-
-DESCRIPTION="3D photo-realistic skies in real time"
-HOMEPAGE="http://www.stellarium.org/"
-SRC_URI="
- mirror://sourceforge/stellarium/${P}.tar.gz
- stars? (
- mirror://sourceforge/stellarium/stars_4_1v0_0.cat
- mirror://sourceforge/stellarium/stars_5_2v0_0.cat
- mirror://sourceforge/stellarium/stars_6_2v0_0.cat
- mirror://sourceforge/stellarium/stars_7_2v0_0.cat
- mirror://sourceforge/stellarium/stars_8_2v0_0.cat
- )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug nls sound stars"
-
-RESTRICT="test"
-
-RDEPEND="
- media-fonts/dejavu
- dev-qt/qtcore:5
- dev-qt/qtquick1:5
- dev-qt/qtgui:5
- dev-qt/qtopengl:5
- dev-qt/qtscript:5
- virtual/opengl
- sound? ( dev-qt/qtmultimedia:5[widgets] )"
-DEPEND="${RDEPEND}
- dev-qt/qttest:5
- dev-qt/qtconcurrent:5
- nls? ( dev-qt/linguist-tools:5 )"
-DOCS=( AUTHORS ChangeLog README )
-
-LANGS=(
- af ak am ar as ast az be bg bn bo br bs ca cs
- cy da de el en en_CA en_GB en_US eo es et eu fa fi fil fr
- ga gd gl gu he hi hr hu hy ia id is it ja ka kk kn ko ky
- la lb lo lt lv mk ml mn mr ms mt nan nb nl nn oc pa pl pt pt_BR ro
- ru se si sk sl sq sr sv sw ta te tg th tl tr tt uk uz vi zh
- zh_CN zh_HK zh_TW zu
- )
-
-for X in "${LANGS[@]}" ; do
- IUSE="${IUSE} linguas_${X}"
-done
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-qt55.patch
- if [[ -n ${LINGUAS} ]] ; then
- sed -i \
- -e '/aa ab ae/d' \
- -e "/GETTEXT_CREATE_TRANSLATIONS/a \ ${LINGUAS}" \
- po/stellarium{,-skycultures}/CMakeLists.txt || die #403647
- fi
- sed -i -e '/SimpleDrawLine/s: 0 : 1 :g' CMakeLists.txt || die
- use debug || append-cppflags -DQT_NO_DEBUG #415769
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_enable nls NLS)
- $(cmake-utils_use_enable sound SOUND)
- )
- CMAKE_IN_SOURCE_BUILD=1 cmake-utils_src_configure
-}
-
-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_[45678]_[12]v0_0*.cat
- fi
- newicon doc/images/stellarium-logo.png ${PN}.png
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/sci-astronomy/stellarium/stellarium-0.14.0.ebuild b/sci-astronomy/stellarium/stellarium-0.14.0.ebuild
deleted file mode 100644
index a2f65f0..0000000
--- a/sci-astronomy/stellarium/stellarium-0.14.0.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils eutils flag-o-matic gnome2-utils
-
-DESCRIPTION="3D photo-realistic skies in real time"
-HOMEPAGE="http://www.stellarium.org/"
-SRC_URI="
- mirror://sourceforge/stellarium/${P}.tar.gz
- stars? (
- mirror://sourceforge/stellarium/stars_4_1v0_1.cat
- mirror://sourceforge/stellarium/stars_5_2v0_1.cat
- mirror://sourceforge/stellarium/stars_6_2v0_1.cat
- mirror://sourceforge/stellarium/stars_7_2v0_1.cat
- mirror://sourceforge/stellarium/stars_8_2v0_1.cat
- )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug nls sound stars"
-
-RESTRICT="test"
-
-RDEPEND="
- media-fonts/dejavu
- dev-qt/qtcore:5
- dev-qt/qtquick1:5
- dev-qt/qtgui:5
- dev-qt/qtopengl:5
- dev-qt/qtscript:5
- virtual/opengl
- sound? ( dev-qt/qtmultimedia:5[widgets] )"
-DEPEND="${RDEPEND}
- dev-qt/qttest:5
- dev-qt/qtconcurrent:5
- nls? ( dev-qt/linguist-tools:5 )"
-DOCS=( AUTHORS ChangeLog README )
-
-LANGS=(
- af ak am ar as ast az be bg bn bo br bs ca cs
- cy da de el en en_CA en_GB en_US eo es et eu fa fi fil fr
- ga gd gl gu he hi hr hu hy ia id is it ja ka kk kn ko ky
- la lb lo lt lv mk ml mn mr ms mt nan nb nl nn oc pa pl pt pt_BR ro
- ru se si sk sl sq sr sv sw ta te tg th tl tr tt uk uz vi
- zh_CN zh_HK zh_TW zu
- )
-
-for X in "${LANGS[@]}" ; do
- IUSE+=" linguas_${X}"
-done
-
-src_prepare() {
- if [[ -n ${LINGUAS} ]] ; then
- sed -i \
- -e '/aa ab ae/d' \
- -e "/GETTEXT_CREATE_TRANSLATIONS/a \ ${LINGUAS}" \
- po/stellarium{,-skycultures}/CMakeLists.txt || die #403647
- fi
- sed -i -e '/SimpleDrawLine/s: 0 : 1 :g' CMakeLists.txt || die
- use debug || append-cppflags -DQT_NO_DEBUG #415769
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_enable nls)
- $(cmake-utils_use_enable sound)
- )
- CMAKE_IN_SOURCE_BUILD=1 cmake-utils_src_configure
-}
-
-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_[45678]_[12]v0_1*.cat
- fi
- newicon doc/images/stellarium-logo.png ${PN}.png
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/stellarium/files/, sci-astronomy/stellarium/
@ 2019-01-05 23:47 Andreas Sturmlechner
0 siblings, 0 replies; 13+ messages in thread
From: Andreas Sturmlechner @ 2019-01-05 23:47 UTC (permalink / raw
To: gentoo-commits
commit: fe7db9624c5a58de3ee584a2ef3fb0db4d4ea5fb
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 5 23:06:54 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 5 23:46:58 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe7db962
sci-astronomy/stellarium: Fix sorting and patch name
Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...ellarium-0.18.2.patch => stellarium-0.18.2-as-needed.patch} | 0
sci-astronomy/stellarium/stellarium-0.18.2.ebuild | 10 +++++-----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/sci-astronomy/stellarium/files/stellarium-0.18.2.patch b/sci-astronomy/stellarium/files/stellarium-0.18.2-as-needed.patch
similarity index 100%
rename from sci-astronomy/stellarium/files/stellarium-0.18.2.patch
rename to sci-astronomy/stellarium/files/stellarium-0.18.2-as-needed.patch
diff --git a/sci-astronomy/stellarium/stellarium-0.18.2.ebuild b/sci-astronomy/stellarium/stellarium-0.18.2.ebuild
index 5b88d75bd45..42b839f3719 100644
--- a/sci-astronomy/stellarium/stellarium-0.18.2.ebuild
+++ b/sci-astronomy/stellarium/stellarium-0.18.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -25,10 +25,10 @@ IUSE="debug gps media nls stars test"
RDEPEND="
dev-qt/qtcore:5
dev-qt/qtgui:5
- dev-qt/qtopengl:5
- dev-qt/qtscript: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
@@ -43,7 +43,7 @@ DEPEND="${RDEPEND}
test? ( dev-qt/qttest:5 )
"
-PATCHES=( "${FILESDIR}"/${P}.patch )
+PATCHES=( "${FILESDIR}"/${P}-as-needed.patch )
src_prepare() {
cmake-utils_src_prepare
@@ -53,8 +53,8 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
-DENABLE_GPS="$(usex gps)"
- -DENABLE_NLS="$(usex nls)"
-DENABLE_MEDIA="$(usex media)"
+ -DENABLE_NLS="$(usex nls)"
-DENABLE_TESTING="$(usex test)"
)
cmake-utils_src_configure
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/stellarium/files/, sci-astronomy/stellarium/
@ 2019-05-18 16:35 Andreas Sturmlechner
0 siblings, 0 replies; 13+ messages in thread
From: Andreas Sturmlechner @ 2019-05-18 16:35 UTC (permalink / raw
To: gentoo-commits
commit: 64cb9588fcd6c541757ab62926b620422bc2c4d3
Author: Alexey Sokolov <sokolov <AT> google <DOT> com>
AuthorDate: Sun Apr 21 23:28:59 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 18 16:34:59 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64cb9588
sci-astronomy/stellarium: bump version to 0.19.0
Signed-off-by: Alexey Sokolov <sokolov <AT> google.com>
Closes: https://bugs.gentoo.org/684060
Package-Manager: Portage-2.3.62, Repoman-2.3.11
Closes: https://github.com/gentoo/gentoo/pull/11770
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-astronomy/stellarium/Manifest | 1 +
.../files/stellarium-0.19.0-static.patch | 104 +++++++++++++++++++++
sci-astronomy/stellarium/stellarium-0.19.0.ebuild | 87 +++++++++++++++++
3 files changed, 192 insertions(+)
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index c60c05657ba..be30a0328bd 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -4,3 +4,4 @@ DIST stars_6_2v0_1.cat 148352404 BLAKE2B c605b284b3d768cb1619ada3f58d406fa7737f0
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.19.0-static.patch b/sci-astronomy/stellarium/files/stellarium-0.19.0-static.patch
new file mode 100644
index 00000000000..9675d389f20
--- /dev/null
+++ b/sci-astronomy/stellarium/files/stellarium-0.19.0-static.patch
@@ -0,0 +1,104 @@
+diff --git a/plugins/TelescopeControl/src/INDI/CMakeLists.txt b/plugins/TelescopeControl/src/INDI/CMakeLists.txt
+index 40c27601a0..a250e1bb0f 100644
+--- a/plugins/TelescopeControl/src/INDI/CMakeLists.txt
++++ b/plugins/TelescopeControl/src/INDI/CMakeLists.txt
+@@ -10,7 +10,7 @@ SET(TelescopeControl_INDI_UIS
+
+ QT5_WRAP_UI(TelescopeControl_INDI_UIS_H ${TelescopeControl_INDI_UIS})
+
+-add_library(TelescopeControl_INDI
++add_library(TelescopeControl_INDI STATIC
+ INDIConnection.hpp
+ INDIConnection.cpp
+ TelescopeClientINDI.hpp
+diff --git a/plugins/TelescopeControl/src/Lx200/CMakeLists.txt b/plugins/TelescopeControl/src/Lx200/CMakeLists.txt
+index 068ecf6380..d12cefabb5 100644
+--- a/plugins/TelescopeControl/src/Lx200/CMakeLists.txt
++++ b/plugins/TelescopeControl/src/Lx200/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+ set(CMAKE_AUTOMOC ON)
+
+-add_library(TelescopeControl_Lx200
++add_library(TelescopeControl_Lx200 STATIC
+ Lx200Command.hpp
+ Lx200Command.cpp
+ Lx200Connection.hpp
+diff --git a/plugins/TelescopeControl/src/NexStar/CMakeLists.txt b/plugins/TelescopeControl/src/NexStar/CMakeLists.txt
+index 6c3ce1f0d8..cd1f4bddb7 100644
+--- a/plugins/TelescopeControl/src/NexStar/CMakeLists.txt
++++ b/plugins/TelescopeControl/src/NexStar/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+ set(CMAKE_AUTOMOC ON)
+
+-add_library(TelescopeControl_NexStar
++add_library(TelescopeControl_NexStar STATIC
+ NexStarCommand.hpp
+ NexStarCommand.cpp
+ NexStarConnection.hpp
+diff --git a/plugins/TelescopeControl/src/Rts2/CMakeLists.txt b/plugins/TelescopeControl/src/Rts2/CMakeLists.txt
+index d48bd80fc7..abb1016ab1 100644
+--- a/plugins/TelescopeControl/src/Rts2/CMakeLists.txt
++++ b/plugins/TelescopeControl/src/Rts2/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+ set(CMAKE_AUTOMOC ON)
+
+-add_library(TelescopeControl_Rts2
++add_library(TelescopeControl_Rts2 STATIC
+ TelescopeClientJsonRts2.hpp
+ TelescopeClientJsonRts2.cpp
+ )
+diff --git a/plugins/TelescopeControl/src/common/CMakeLists.txt b/plugins/TelescopeControl/src/common/CMakeLists.txt
+index be09183bb9..bdf7c20395 100644
+--- a/plugins/TelescopeControl/src/common/CMakeLists.txt
++++ b/plugins/TelescopeControl/src/common/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+ set(CMAKE_AUTOMOC ON)
+
+-add_library(TelescopeControl_common
++add_library(TelescopeControl_common STATIC
+ LogFile.hpp
+ LogFile.cpp
+ Socket.hpp
+diff --git a/plugins/TelescopeControl/src/gui/CMakeLists.txt b/plugins/TelescopeControl/src/gui/CMakeLists.txt
+index c5d62942cc..d73383c62e 100644
+--- a/plugins/TelescopeControl/src/gui/CMakeLists.txt
++++ b/plugins/TelescopeControl/src/gui/CMakeLists.txt
+@@ -10,7 +10,7 @@ SET(TelescopeControl_GUI_UIS
+
+ QT5_WRAP_UI(TelescopeControl_GUI_UIS_H ${TelescopeControl_GUI_UIS})
+
+-add_library(TelescopeControl_gui
++add_library(TelescopeControl_gui STATIC
+ SlewDialog.hpp
+ SlewDialog.cpp
+ TelescopeDialog.hpp
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 2ad5af164b..a34ee2eefc 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -469,7 +469,7 @@ IF(GENERATE_STELMAINLIB)
+ #stelMain should be after the plug-ins, otherwise the build crashes
+ TARGET_LINK_LIBRARIES(stellarium stelMain ${winMMLib})
+ ELSE()
+- ADD_LIBRARY(stelMain ${stellarium_lib_SRCS} ${stellarium_RES_CXX})
++ ADD_LIBRARY(stelMain STATIC ${stellarium_lib_SRCS} ${stellarium_RES_CXX})
+ TARGET_LINK_LIBRARIES(stelMain ${STELMAIN_DEPS})
+ ADD_EXECUTABLE(stellarium WIN32 ${stellarium_exe_SRCS})
+ TARGET_LINK_LIBRARIES(stellarium ${winMMLib} ${STELMAIN_DEPS} stelMain)
+diff --git a/src/external/CMakeLists.txt b/src/external/CMakeLists.txt
+index 42a073e828..4c56837314 100644
+--- a/src/external/CMakeLists.txt
++++ b/src/external/CMakeLists.txt
+@@ -190,7 +190,7 @@ IF(USE_PLUGIN_TELESCOPECONTROL)
+ include_directories(libindi)
+ include_directories(libindi/libs)
+ include_directories(libindi/libs/indibase)
+- add_library(indiclient
++ add_library(indiclient STATIC
+ libindi/libs/lilxml.c
+ libindi/base64.c
+ libindi/libs/indibase/basedevice.h
diff --git a/sci-astronomy/stellarium/stellarium-0.19.0.ebuild b/sci-astronomy/stellarium/stellarium-0.19.0.ebuild
new file mode 100644
index 00000000000..90e1f884b68
--- /dev/null
+++ b/sci-astronomy/stellarium/stellarium-0.19.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils desktop flag-o-matic xdg 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"
+
+BDEPEND="
+ nls? ( dev-qt/linguist-tools:5 )
+"
+
+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
+ test? ( dev-qt/qttest:5 )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-static.patch
+)
+
+src_prepare() {
+ xdg_environment_reset
+ 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
+}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/stellarium/files/, sci-astronomy/stellarium/
@ 2019-07-02 14:07 Andreas Sturmlechner
0 siblings, 0 replies; 13+ messages in thread
From: Andreas Sturmlechner @ 2019-07-02 14:07 UTC (permalink / raw
To: gentoo-commits
commit: 968f739831bcbb64de7513b279b376f6817b233a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 2 14:05:35 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jul 2 14:07:13 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=968f7398
sci-astronomy/stellarium: Drop 0.18.2
Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-astronomy/stellarium/Manifest | 1 -
.../files/stellarium-0.18.2-as-needed.patch | 47 ---------
.../files/stellarium-0.18.2-fix-test.patch | 113 ---------------------
sci-astronomy/stellarium/stellarium-0.18.2.ebuild | 92 -----------------
4 files changed, 253 deletions(-)
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index be30a0328bd..411c050d03a 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 71fc8ccf2d7..00000000000
--- 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/libRemoteCont
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
.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
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
-../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 34089363498..00000000000
--- 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 60181904114..00000000000
--- 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
-}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/stellarium/files/, sci-astronomy/stellarium/
@ 2020-01-18 22:28 Andreas Sturmlechner
0 siblings, 0 replies; 13+ messages in thread
From: Andreas Sturmlechner @ 2020-01-18 22:28 UTC (permalink / raw
To: gentoo-commits
commit: 65dd2f2a9cd5cd9a6a06822c260c4936b6f11679
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 18 22:27:18 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 18 22:28:12 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65dd2f2a
sci-astronomy/stellarium: Drop 0.19.0, 0.19.1, 0.19.2
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-astronomy/stellarium/Manifest | 3 -
.../files/stellarium-0.19.0-static.patch | 121 ---------------------
sci-astronomy/stellarium/stellarium-0.19.0.ebuild | 88 ---------------
sci-astronomy/stellarium/stellarium-0.19.1.ebuild | 82 --------------
sci-astronomy/stellarium/stellarium-0.19.2.ebuild | 83 --------------
5 files changed, 377 deletions(-)
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index 4083d884486..edd57de0119 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -3,7 +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.19.0.tar.gz 309151408 BLAKE2B d5726762c402cebca47c7cb218a2edc918aceb11e4bf44f0473bf86a8bfc75b908467112e8ce797c90f9c1307884f853a24f919efe11e86ef04c9eb0ff356a3b SHA512 26cb44fe4280275ce64594d01bdded4ddd2cda5d21887b4329de51188cc392e8390036702ee316446dcdb54182dec5d217a387898c4c7aa82ce14742b4d4694f
-DIST stellarium-0.19.1.tar.gz 314373270 BLAKE2B 23f11005e2862c42abefc37d997c875bbed379e8182dbc533f24f303200791dc4c069adc0e290b2faa630a0fc058b7060bc3715714bae37a89ff5820b86d21ed SHA512 59ab715f7b81e037ed3d23444547dcd00a41b9a1925d58b40a17372e286bbea2c1b762582cd7e1f81d690204840cc23dd9627e2c0bd4abf52367a456849eefe9
-DIST stellarium-0.19.2.tar.gz 318402838 BLAKE2B cee07bbb2e4a124912dc383e1d43007912498793c3609de05caf3b6673d01ccfcf0b560cb879bf47d6b00c7ce6b10810a17189f38fdac55e02dc496e194269b3 SHA512 a0002dc8a1e43aa264cdf013b57362880d4809207a1f867285d3e1187c4c88c67d166652afe0edeec5a98eff1167e6c3693594d467605ba78ee29d6eb7878d4b
DIST stellarium-0.19.3.tar.gz 326218851 BLAKE2B 286d2559a2152f030640ed88778f57f1213d0d8b9e990d0aa1ad5138396fe9641083ec76554e1296dc79d914955e289d23046af42299df6217bbfbaca76b2f18 SHA512 c2948603a3b84fd2b7002cbd9993a2432ca0908d9236aca03c03ff0cf0706728a407218096e94da2b2a623b5434c109906d94ee5069a2d57a8e35af7c8455ff7
diff --git a/sci-astronomy/stellarium/files/stellarium-0.19.0-static.patch b/sci-astronomy/stellarium/files/stellarium-0.19.0-static.patch
deleted file mode 100644
index ec2ae5ba2be..00000000000
--- a/sci-astronomy/stellarium/files/stellarium-0.19.0-static.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From d280caa72fbbcd362b820a71a01d4f0e2c1a3bcb Mon Sep 17 00:00:00 2001
-From: Alexey Sokolov <sokolov@google.com>
-Date: Sat, 18 May 2019 08:28:31 +0100
-Subject: [PATCH] Fix build with cmake -DBUILD_SHARED_LIBS=ON (#683)
-
-Ref https://github.com/gentoo/gentoo/pull/11770
----
- plugins/TelescopeControl/src/INDI/CMakeLists.txt | 2 +-
- plugins/TelescopeControl/src/Lx200/CMakeLists.txt | 2 +-
- plugins/TelescopeControl/src/NexStar/CMakeLists.txt | 2 +-
- plugins/TelescopeControl/src/Rts2/CMakeLists.txt | 2 +-
- plugins/TelescopeControl/src/common/CMakeLists.txt | 2 +-
- plugins/TelescopeControl/src/gui/CMakeLists.txt | 2 +-
- src/CMakeLists.txt | 2 +-
- src/external/CMakeLists.txt | 2 +-
- 8 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/plugins/TelescopeControl/src/INDI/CMakeLists.txt b/plugins/TelescopeControl/src/INDI/CMakeLists.txt
-index 40c27601a0..a250e1bb0f 100644
---- a/plugins/TelescopeControl/src/INDI/CMakeLists.txt
-+++ b/plugins/TelescopeControl/src/INDI/CMakeLists.txt
-@@ -10,7 +10,7 @@ SET(TelescopeControl_INDI_UIS
-
- QT5_WRAP_UI(TelescopeControl_INDI_UIS_H ${TelescopeControl_INDI_UIS})
-
--add_library(TelescopeControl_INDI
-+add_library(TelescopeControl_INDI STATIC
- INDIConnection.hpp
- INDIConnection.cpp
- TelescopeClientINDI.hpp
-diff --git a/plugins/TelescopeControl/src/Lx200/CMakeLists.txt b/plugins/TelescopeControl/src/Lx200/CMakeLists.txt
-index 068ecf6380..d12cefabb5 100644
---- a/plugins/TelescopeControl/src/Lx200/CMakeLists.txt
-+++ b/plugins/TelescopeControl/src/Lx200/CMakeLists.txt
-@@ -1,7 +1,7 @@
- set(CMAKE_INCLUDE_CURRENT_DIR ON)
- set(CMAKE_AUTOMOC ON)
-
--add_library(TelescopeControl_Lx200
-+add_library(TelescopeControl_Lx200 STATIC
- Lx200Command.hpp
- Lx200Command.cpp
- Lx200Connection.hpp
-diff --git a/plugins/TelescopeControl/src/NexStar/CMakeLists.txt b/plugins/TelescopeControl/src/NexStar/CMakeLists.txt
-index 6c3ce1f0d8..cd1f4bddb7 100644
---- a/plugins/TelescopeControl/src/NexStar/CMakeLists.txt
-+++ b/plugins/TelescopeControl/src/NexStar/CMakeLists.txt
-@@ -1,7 +1,7 @@
- set(CMAKE_INCLUDE_CURRENT_DIR ON)
- set(CMAKE_AUTOMOC ON)
-
--add_library(TelescopeControl_NexStar
-+add_library(TelescopeControl_NexStar STATIC
- NexStarCommand.hpp
- NexStarCommand.cpp
- NexStarConnection.hpp
-diff --git a/plugins/TelescopeControl/src/Rts2/CMakeLists.txt b/plugins/TelescopeControl/src/Rts2/CMakeLists.txt
-index d48bd80fc7..abb1016ab1 100644
---- a/plugins/TelescopeControl/src/Rts2/CMakeLists.txt
-+++ b/plugins/TelescopeControl/src/Rts2/CMakeLists.txt
-@@ -1,7 +1,7 @@
- set(CMAKE_INCLUDE_CURRENT_DIR ON)
- set(CMAKE_AUTOMOC ON)
-
--add_library(TelescopeControl_Rts2
-+add_library(TelescopeControl_Rts2 STATIC
- TelescopeClientJsonRts2.hpp
- TelescopeClientJsonRts2.cpp
- )
-diff --git a/plugins/TelescopeControl/src/common/CMakeLists.txt b/plugins/TelescopeControl/src/common/CMakeLists.txt
-index be09183bb9..bdf7c20395 100644
---- a/plugins/TelescopeControl/src/common/CMakeLists.txt
-+++ b/plugins/TelescopeControl/src/common/CMakeLists.txt
-@@ -1,7 +1,7 @@
- set(CMAKE_INCLUDE_CURRENT_DIR ON)
- set(CMAKE_AUTOMOC ON)
-
--add_library(TelescopeControl_common
-+add_library(TelescopeControl_common STATIC
- LogFile.hpp
- LogFile.cpp
- Socket.hpp
-diff --git a/plugins/TelescopeControl/src/gui/CMakeLists.txt b/plugins/TelescopeControl/src/gui/CMakeLists.txt
-index c5d62942cc..d73383c62e 100644
---- a/plugins/TelescopeControl/src/gui/CMakeLists.txt
-+++ b/plugins/TelescopeControl/src/gui/CMakeLists.txt
-@@ -10,7 +10,7 @@ SET(TelescopeControl_GUI_UIS
-
- QT5_WRAP_UI(TelescopeControl_GUI_UIS_H ${TelescopeControl_GUI_UIS})
-
--add_library(TelescopeControl_gui
-+add_library(TelescopeControl_gui STATIC
- SlewDialog.hpp
- SlewDialog.cpp
- TelescopeDialog.hpp
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 2ad5af164b..a34ee2eefc 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -469,7 +469,7 @@ IF(GENERATE_STELMAINLIB)
- #stelMain should be after the plug-ins, otherwise the build crashes
- TARGET_LINK_LIBRARIES(stellarium stelMain ${winMMLib})
- ELSE()
-- ADD_LIBRARY(stelMain ${stellarium_lib_SRCS} ${stellarium_RES_CXX})
-+ ADD_LIBRARY(stelMain STATIC ${stellarium_lib_SRCS} ${stellarium_RES_CXX})
- TARGET_LINK_LIBRARIES(stelMain ${STELMAIN_DEPS})
- ADD_EXECUTABLE(stellarium WIN32 ${stellarium_exe_SRCS})
- TARGET_LINK_LIBRARIES(stellarium ${winMMLib} ${STELMAIN_DEPS} stelMain)
-diff --git a/src/external/CMakeLists.txt b/src/external/CMakeLists.txt
-index 42a073e828..4c56837314 100644
---- a/src/external/CMakeLists.txt
-+++ b/src/external/CMakeLists.txt
-@@ -190,7 +190,7 @@ IF(USE_PLUGIN_TELESCOPECONTROL)
- include_directories(libindi)
- include_directories(libindi/libs)
- include_directories(libindi/libs/indibase)
-- add_library(indiclient
-+ add_library(indiclient STATIC
- libindi/libs/lilxml.c
- libindi/base64.c
- libindi/libs/indibase/basedevice.h
diff --git a/sci-astronomy/stellarium/stellarium-0.19.0.ebuild b/sci-astronomy/stellarium/stellarium-0.19.0.ebuild
deleted file mode 100644
index c0fa7fde186..00000000000
--- a/sci-astronomy/stellarium/stellarium-0.19.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils desktop flag-o-matic xdg 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"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- nls? ( dev-qt/linguist-tools:5 )
-"
-
-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
- test? ( dev-qt/qttest:5 )
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-static.patch
-)
-
-src_prepare() {
- xdg_environment_reset
- 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
-}
diff --git a/sci-astronomy/stellarium/stellarium-0.19.1.ebuild b/sci-astronomy/stellarium/stellarium-0.19.1.ebuild
deleted file mode 100644
index 43dd151870e..00000000000
--- a/sci-astronomy/stellarium/stellarium-0.19.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils desktop flag-o-matic xdg 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"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- nls? ( dev-qt/linguist-tools:5 )
-"
-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
- test? ( dev-qt/qttest:5 )
-"
-
-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
-}
diff --git a/sci-astronomy/stellarium/stellarium-0.19.2.ebuild b/sci-astronomy/stellarium/stellarium-0.19.2.ebuild
deleted file mode 100644
index dbc5a771b76..00000000000
--- a/sci-astronomy/stellarium/stellarium-0.19.2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils desktop flag-o-matic xdg 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"
-
-BDEPEND="
- nls? ( dev-qt/linguist-tools:5 )
-"
-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
- test? ( dev-qt/qttest:5 )
-"
-
-RESTRICT="!test? ( test )"
-
-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
-}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/stellarium/files/, sci-astronomy/stellarium/
@ 2020-10-10 7:22 Joonas Niilola
0 siblings, 0 replies; 13+ messages in thread
From: Joonas Niilola @ 2020-10-10 7:22 UTC (permalink / raw
To: gentoo-commits
commit: a01383e452525c74df3ab9892d2b423c7d9f0619
Author: Alexey Sokolov <sokolov <AT> google <DOT> com>
AuthorDate: Mon Sep 28 10:07:36 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Oct 10 07:22:32 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a01383e4
sci-astronomy/stellarium: version 0.20.3
Unbundle several libraries, install docs, update metadata.xml
Due to new deps, even though they were bundled already, dropped some
keywords (ppc, ppc64, and prefix ones). Will bring them back some of
them later.
Bug: https://bugs.gentoo.org/745234
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/17639
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-astronomy/stellarium/Manifest | 3 +
.../files/stellarium-0.20.3-unbundle-indi.patch | 82 ++++++++
.../stellarium-0.20.3-unbundle-qtcompress.patch | 222 +++++++++++++++++++++
.../files/stellarium-0.20.3-unbundle-zlib.patch | 23 +++
sci-astronomy/stellarium/metadata.xml | 53 ++---
sci-astronomy/stellarium/stellarium-0.20.3.ebuild | 135 +++++++++++++
6 files changed, 492 insertions(+), 26 deletions(-)
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index 56fb5754805..cca66613498 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -4,4 +4,7 @@ DIST stars_6_2v0_1.cat 148352404 BLAKE2B c605b284b3d768cb1619ada3f58d406fa7737f0
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.20.2.tar.gz 344319520 BLAKE2B 0a64cfc6d5a43bf811609caa9104458768e234bad8fabd2aa88a38d860c22573d076f677f7523c95e1fc1770e73dc1e73b2e94d544cb099c7cd9a21ac79f6bdb SHA512 34f1ad5891dde84b53324046bdf1514df858335ba8f0954bb72350b057ff6dc4091a2d7bf89083489e0d8d1c750c5fb8ba8e1e241f9287a740121b377f0e510c
+DIST stellarium-0.20.3.tar.gz 349073272 BLAKE2B 4380e2f589f8ca7af7a62d7e72e18355328ba37d5d8c4e31f8da011fa46296a3c79b74aca04b9f4014f2b2ebc5a1124d62239d6a9bf947cea687d0a2f6e09c13 SHA512 7f4769955fa55751828b211023f3e88e78c42bd367dade9b29cbe86afcdbfc7078d87dc8f856b0f96a4c75bb3d07462a195095f7afb84bfca0988135a1518a1d
DIST stellarium-dso-catalog-3.10.dat 28297970 BLAKE2B 69d8f9756986c872cde0190ae3e5f225de30d8fabd5ba3e007176c8ffc4234e964ccc3beb58f75fc4579c75cee620661728a7c6c1d6960d5cb1be027828ba127 SHA512 22068d9ebca592db214f9831765701c52d07e71616705faaf6f5827d51a65af805947bd1f84553e5768f3e82f9e1a0e81eb36943713afb924d604a4676711b1f
+DIST stellarium-dso-catalog-3.11.dat 28297989 BLAKE2B de56efe1930e9ee0e584de9f8167c7b588b886623bbea547ac35b7d3fe32e99e402f8811a2878b82f059e9b946b19ce2456d8a8a4f2127b8dc85c34c6ba1b13b SHA512 21efc43f7ac10b3b14e63731938cbfeaa7b5097ef2a7328e741e00cfd391b80ba4f7e6a367677be2f01879d9c46b8b1bcd5fce8963776ef670455a442c663fc3
+DIST stellarium_user_guide-0.20.3-1.pdf 32404701 BLAKE2B 811c8c58818bf76a6e597a2d24feaff2f7705a0eaffc8ccc1e6cdc037f374dedff01185466dac1635242bcf3ec8309806db03340b251fb39cea1f285a3cf5f26 SHA512 b820c2f76f40df9ef3c2f732cbb5c3622f37bff0cfdab8b56c78c0f4417ba036f6c623f00e7186e4b3c045ed2a4598baabd334fb6cb1037de12af0837a2fe86d
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
new file mode 100644
index 00000000000..ac3f84d5bb6
--- /dev/null
+++ b/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-indi.patch
@@ -0,0 +1,82 @@
+diff --git a/plugins/TelescopeControl/src/INDI/CMakeLists.txt b/plugins/TelescopeControl/src/INDI/CMakeLists.txt
+index a250e1bb0f..f14007c392 100644
+--- a/plugins/TelescopeControl/src/INDI/CMakeLists.txt
++++ b/plugins/TelescopeControl/src/INDI/CMakeLists.txt
+@@ -25,7 +25,7 @@ add_library(TelescopeControl_INDI STATIC
+ target_link_libraries(TelescopeControl_INDI
+ Qt5::Core
+ Qt5::Network
+- indiclient
++ -lindiclient
+ TelescopeControl_common
+ ${CMAKE_THREAD_LIBS_INIT}
+ )
+diff --git a/plugins/TelescopeControl/src/INDI/INDIConnection.cpp b/plugins/TelescopeControl/src/INDI/INDIConnection.cpp
+index f401dc7049..d890d3aa14 100644
+--- a/plugins/TelescopeControl/src/INDI/INDIConnection.cpp
++++ b/plugins/TelescopeControl/src/INDI/INDIConnection.cpp
+@@ -25,9 +25,9 @@
+ #include <limits>
+ #include <cmath>
+
+-#include "indibase/baseclient.h"
+-#include "indibase/basedevice.h"
+-#include "indibase/inditelescope.h"
++#include "libindi/baseclient.h"
++#include "libindi/basedevice.h"
++#include "libindi/inditelescope.h"
+
+ const int INDIConnection::SLEW_STOP = INDI::Telescope::SLEW_GUIDE - 1;
+
+diff --git a/plugins/TelescopeControl/src/INDI/INDIConnection.hpp b/plugins/TelescopeControl/src/INDI/INDIConnection.hpp
+index 111ad2cdba..80ead01137 100644
+--- a/plugins/TelescopeControl/src/INDI/INDIConnection.hpp
++++ b/plugins/TelescopeControl/src/INDI/INDIConnection.hpp
+@@ -20,7 +20,7 @@
+ #define INDICONNECTION_HPP
+
+ #include <QObject>
+-#include "indibase/baseclient.h"
++#include "libindi/baseclient.h"
+
+ #include <mutex>
+ #include <QStringList>
+diff --git a/plugins/TelescopeControl/src/INDI/TelescopeClientINDI.cpp b/plugins/TelescopeControl/src/INDI/TelescopeClientINDI.cpp
+index 6bd7754ff5..633d4ae7b2 100644
+--- a/plugins/TelescopeControl/src/INDI/TelescopeClientINDI.cpp
++++ b/plugins/TelescopeControl/src/INDI/TelescopeClientINDI.cpp
+@@ -24,7 +24,7 @@
+
+ #include "StelCore.hpp"
+ #include "StelUtils.hpp"
+-#include "indibase/inditelescope.h"
++#include "libindi/inditelescope.h"
+ #include "INDIControlWidget.hpp"
+
+ TelescopeClientINDI::TelescopeClientINDI(const QString &name, const QString ¶ms):
+diff --git a/plugins/TelescopeControl/src/INDI/test/testINDIConnection.cpp b/plugins/TelescopeControl/src/INDI/test/testINDIConnection.cpp
+index 6c1a281ec5..ca7b7e0c40 100644
+--- a/plugins/TelescopeControl/src/INDI/test/testINDIConnection.cpp
++++ b/plugins/TelescopeControl/src/INDI/test/testINDIConnection.cpp
+@@ -22,7 +22,7 @@
+ #include <cmath>
+
+ #include "INDIConnection.hpp"
+-#include "indibase/basedevice.h"
++#include "libindi/basedevice.h"
+
+ void TestINDIConnection::deafultCoordinates()
+ {
+diff --git a/src/external/CMakeLists.txt b/src/external/CMakeLists.txt
+index 6fcf7678da..a59d8c121c 100644
+--- a/src/external/CMakeLists.txt
++++ b/src/external/CMakeLists.txt
+@@ -176,7 +176,7 @@ target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui qtcompress_stel)
+ set_target_properties(qxlsx_stel PROPERTIES FOLDER "src/external")
+
+ ################################# INDI ################################
+-IF(USE_PLUGIN_TELESCOPECONTROL)
++IF(USE_PLUGIN_TELESCOPECONTROL AND 0)
+ set(INDI_SOVERSION "1")
+ set(CMAKE_INDI_VERSION_MAJOR 1)
+ set(CMAKE_INDI_VERSION_MINOR 6)
diff --git a/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-qtcompress.patch b/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-qtcompress.patch
new file mode 100644
index 00000000000..7a585b71894
--- /dev/null
+++ b/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-qtcompress.patch
@@ -0,0 +1,222 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1b72c2c8f6..9436bc66da 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -629,5 +629,6 @@ ELSE()
+ ENDIF()
+
++find_package(Qt5Compress REQUIRED)
+
+ ########### Set some global variables ###########
+ IF(UNIX AND NOT WIN32)
+diff --git a/plugins/Satellites/src/CMakeLists.txt b/plugins/Satellites/src/CMakeLists.txt
+index 8e3138adf2..b59049767d 100644
+--- a/plugins/Satellites/src/CMakeLists.txt
++++ b/plugins/Satellites/src/CMakeLists.txt
+@@ -55,7 +55,7 @@ IF(ENABLE_TESTING)
+ ENDIF(ENABLE_TESTING)
+
+ ADD_LIBRARY(Satellites-static STATIC ${Satellites_SRCS} ${Satellites_RES_CXX} ${SatellitesDialog_UIS_H})
+-TARGET_LINK_LIBRARIES(Satellites-static Qt5::Core Qt5::Network Qt5::Widgets)
++TARGET_LINK_LIBRARIES(Satellites-static Qt5::Core Qt5::Network Qt5::Widgets Qt5::Compress)
+ # The library target "Satellites-static" has a default OUTPUT_NAME of "Satellites-static", so change it.
+ SET_TARGET_PROPERTIES(Satellites-static PROPERTIES OUTPUT_NAME "Satellites")
+ IF(MSVC)
+diff --git a/plugins/Satellites/src/Satellites.cpp b/plugins/Satellites/src/Satellites.cpp
+index 7432f4316d..f4f4453661 100644
+--- a/plugins/Satellites/src/Satellites.cpp
++++ b/plugins/Satellites/src/Satellites.cpp
+@@ -43,7 +43,7 @@
+ #include "StelUtils.hpp"
+ #include "StelActionMgr.hpp"
+
+-#include "external/qtcompress/qzipreader.h"
++#include "qzipreader.h"
+
+ #include <QNetworkAccessManager>
+ #include <QNetworkReply>
+@@ -1533,12 +1533,12 @@ void Satellites::saveDownloadedUpdate(QNetworkReply* reply)
+ QString archive = zip.fileName();
+ QByteArray data;
+
+- Stel::QZipReader reader(archive);
+- if (reader.status() != Stel::QZipReader::NoError)
++ QZipReader reader(archive);
++ if (reader.status() != QZipReader::NoError)
+ qWarning() << "[Satellites] Unable to open as a ZIP archive";
+ else
+ {
+- QList<Stel::QZipReader::FileInfo> infoList = reader.fileInfoList();
++ QList<QZipReader::FileInfo> infoList = reader.fileInfoList();
+ for (const auto& info : infoList)
+ {
+ // qWarning() << "[Satellites] Processing:" << info.filePath;
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index bdd214729f..81631ce8ec 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -465,7 +465,7 @@ IF(ENABLE_SPOUT AND SPOUT_LIBRARY_DLL)
+ CONFIGURE_FILE(${SPOUT_LIBRARY_DLL} ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
+ ENDIF()
+
+-SET(STELMAIN_DEPS ${ZLIB_LIBRARIES} qtcompress_stel glues_stel qcustomplot_stel qxlsx_stel ${STELLARIUM_STATIC_PLUGINS_LIBRARIES} ${STELLARIUM_QT_LIBRARIES} ${SPOUT_LIBRARY})
++SET(STELMAIN_DEPS ${ZLIB_LIBRARIES} Qt5::Compress glues_stel qcustomplot_stel qxlsx_stel ${STELLARIUM_STATIC_PLUGINS_LIBRARIES} ${STELLARIUM_QT_LIBRARIES} ${SPOUT_LIBRARY})
+ IF(ENABLE_LIBGPS)
+ SET(STELMAIN_DEPS ${STELMAIN_DEPS} ${GPS_LIBRARY})
+ ENDIF()
+diff --git a/src/core/modules/LandscapeMgr.cpp b/src/core/modules/LandscapeMgr.cpp
+index 8da2070b26..9949252cee 100644
+--- a/src/core/modules/LandscapeMgr.cpp
++++ b/src/core/modules/LandscapeMgr.cpp
+@@ -1183,8 +1183,8 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const
+ }
+ QDir destinationDir (parentDestinationDir.absoluteFilePath("landscapes"));
+
+- Stel::QZipReader reader(sourceFilePath);
+- if (reader.status() != Stel::QZipReader::NoError)
++ QZipReader reader(sourceFilePath);
++ if (reader.status() != QZipReader::NoError)
+ {
+ qWarning() << "LandscapeMgr: Unable to open as a ZIP archive:" << QDir::toNativeSeparators(sourceFilePath);
+ emit errorNotArchive();
+@@ -1193,7 +1193,7 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const
+
+ //Detect top directory
+ QString topDir, iniPath;
+- QList<Stel::QZipReader::FileInfo> infoList = reader.fileInfoList();
++ QList<QZipReader::FileInfo> infoList = reader.fileInfoList();
+ for (const auto& info : infoList)
+ {
+ QFileInfo fileInfo(info.filePath);
+diff --git a/src/external/CMakeLists.txt b/src/external/CMakeLists.txt
+index 1e0e7e2b32..834aff89cb 100644
+--- a/src/external/CMakeLists.txt
++++ b/src/external/CMakeLists.txt
+@@ -70,6 +70,7 @@ target_include_directories(zlib_stel PUBLIC zlib)
+ set_target_properties(zlib_stel PROPERTIES AUTOMOC 0)
+ SET_TARGET_PROPERTIES(zlib_stel PROPERTIES FOLDER "src/external")
+
++if(0)
+ set(qtcompress_SRCS
+ qtcompress/qzip.cpp
+ qtcompress/qzipreader.h
+@@ -82,6 +83,7 @@ target_link_libraries(qtcompress_stel ${ZLIB_LIBRARIES} Qt5::Core)
+ #turn off automoc, not needed here
+ set_target_properties(qtcompress_stel PROPERTIES AUTOMOC 0)
+ SET_TARGET_PROPERTIES(qtcompress_stel PROPERTIES FOLDER "src/external")
++endif()
+
+ set(qcustomplot_SRCS
+ qcustomplot/qcustomplot.cpp
+@@ -176,7 +176,7 @@
+ qxlsx/xlsxcelllocation.h
+ )
+ add_library(qxlsx_stel STATIC EXCLUDE_FROM_ALL ${qxlsx_SRCS})
+-target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui qtcompress_stel)
++target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui Qt5::Compress)
+ set_target_properties(qxlsx_stel PROPERTIES FOLDER "src/external")
+
+ ################################# INDI ################################
+diff -r 11536448457a xlsxzipreader.cpp
+--- a/src/external/qxlsx/xlsxzipreader.cpp Thu Oct 08 21:41:22 2020 +0100
++++ b/src/external/qxlsx/xlsxzipreader.cpp Thu Oct 08 21:42:03 2020 +0100
+@@ -28,13 +28,13 @@
+ namespace QXlsx {
+
+ ZipReader::ZipReader(const QString &filePath) :
+- m_reader(new Stel::QZipReader(filePath))
++ m_reader(new QZipReader(filePath))
+ {
+ init();
+ }
+
+ ZipReader::ZipReader(QIODevice *device) :
+- m_reader(new Stel::QZipReader(device))
++ m_reader(new QZipReader(device))
+ {
+ init();
+ }
+@@ -45,8 +45,8 @@
+
+ void ZipReader::init()
+ {
+- QList<Stel::QZipReader::FileInfo> allFiles = m_reader->fileInfoList();
+- foreach (const Stel::QZipReader::FileInfo &fi, allFiles)
++ QList<QZipReader::FileInfo> allFiles = m_reader->fileInfoList();
++ foreach (const QZipReader::FileInfo &fi, allFiles)
+ {
+ if (fi.isFile)
+ m_filePaths.append(fi.filePath);
+diff -r 2019bb0d2919 xlsxzipreader_p.h
+--- a/src/external/qxlsx/xlsxzipreader_p.h Thu Oct 08 21:35:35 2020 +0100
++++ b/src/external/qxlsx/xlsxzipreader_p.h Thu Oct 08 21:36:28 2020 +0100
+@@ -38,7 +38,7 @@
+ //
+
+ #include "xlsxglobal.h"
+-#include "external/qtcompress/qzipreader.h"
++#include "qzipreader.h"
+ #include <QScopedPointer>
+ #include <QStringList>
+ #include <QVector>
+@@ -60,7 +60,7 @@
+ private:
+ Q_DISABLE_COPY(ZipReader)
+ void init();
+- QScopedPointer<Stel::QZipReader> m_reader;
++ QScopedPointer<QZipReader> m_reader;
+ QStringList m_filePaths;
+ };
+
+diff -r 11536448457a xlsxzipwriter.cpp
+--- a/src/external/qxlsx/xlsxzipwriter.cpp Thu Oct 08 21:41:22 2020 +0100
++++ b/src/external/qxlsx/xlsxzipwriter.cpp Thu Oct 08 21:42:03 2020 +0100
+@@ -29,14 +29,14 @@
+
+ ZipWriter::ZipWriter(const QString &filePath)
+ {
+- m_writer = new Stel::QZipWriter(filePath, QIODevice::WriteOnly);
+- m_writer->setCompressionPolicy(Stel::QZipWriter::AutoCompress);
++ m_writer = new QZipWriter(filePath, QIODevice::WriteOnly);
++ m_writer->setCompressionPolicy(QZipWriter::AutoCompress);
+ }
+
+ ZipWriter::ZipWriter(QIODevice *device)
+ {
+- m_writer = new Stel::QZipWriter(device);
+- m_writer->setCompressionPolicy(Stel::QZipWriter::AutoCompress);
++ m_writer = new QZipWriter(device);
++ m_writer->setCompressionPolicy(QZipWriter::AutoCompress);
+ }
+
+ ZipWriter::~ZipWriter()
+@@ -46,7 +46,7 @@
+
+ bool ZipWriter::error() const
+ {
+- return m_writer->status() != Stel::QZipWriter::NoError;
++ return m_writer->status() != QZipWriter::NoError;
+ }
+
+ void ZipWriter::addFile(const QString &filePath, QIODevice *device)
+diff -r 2019bb0d2919 xlsxzipwriter_p.h
+--- a/src/external/qxlsx/xlsxzipwriter_p.h Thu Oct 08 21:35:35 2020 +0100
++++ b/src/external/qxlsx/xlsxzipwriter_p.h Thu Oct 08 21:36:28 2020 +0100
+@@ -37,7 +37,7 @@
+ //
+
+ #include <QString>
+-#include "external/qtcompress/qzipwriter.h"
++#include "qzipwriter.h"
+
+ class QIODevice;
+ class QZipWriter;
+@@ -57,7 +57,7 @@
+ void close();
+
+ private:
+- Stel::QZipWriter *m_writer;
++ QZipWriter *m_writer;
+ };
+
+ } // namespace QXlsx
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
new file mode 100644
index 00000000000..37acb83e667
--- /dev/null
+++ b/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-zlib.patch
@@ -0,0 +1,23 @@
+This patch is not really needed, because zlib is already used from system, but
+it makes it easier to ensure that nothing else is bundled
+
+diff --git a/src/external/CMakeLists.txt b/src/external/CMakeLists.txt
+index 834aff89cb..590579e501 100644
+--- a/src/external/CMakeLists.txt
++++ b/src/external/CMakeLists.txt
+@@ -36,6 +36,7 @@ target_link_libraries(glues_stel Qt5::Gui)
+ set_target_properties(glues_stel PROPERTIES AUTOMOC 0)
+ SET_TARGET_PROPERTIES(glues_stel PROPERTIES FOLDER "src/external")
+
++if(0)
+ SET(zlib_SRCS
+ zlib/adler32.c
+ zlib/compress.c
+@@ -69,6 +70,7 @@ target_include_directories(zlib_stel PUBLIC zlib)
+ #turn off automoc, not needed here
+ set_target_properties(zlib_stel PROPERTIES AUTOMOC 0)
+ SET_TARGET_PROPERTIES(zlib_stel PROPERTIES FOLDER "src/external")
++endif()
+
+ if(0)
+ set(qtcompress_SRCS
diff --git a/sci-astronomy/stellarium/metadata.xml b/sci-astronomy/stellarium/metadata.xml
index 53378dcf228..5edf86197e9 100644
--- a/sci-astronomy/stellarium/metadata.xml
+++ b/sci-astronomy/stellarium/metadata.xml
@@ -1,30 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>alexey+gentoo@asokolov.org</email>
- <name>Alexey Sokolov</name>
- </maintainer>
- <maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
- <maintainer type="project">
- <email>sci-astronomy@gentoo.org</email>
- <name>Gentoo Astronomy Project</name>
- </maintainer>
- <longdescription lang="en">
- Stellarium is a free open source planetarium for your computer. It
- shows a realistic sky in 3D, just like what you see with the naked
- eye, binoculars or a telescope. It is being used in planetarium
- projectors.
-</longdescription>
- <use>
- <flag name="deep-sky">Install extra deep sky objects catalog (may affect performance)</flag>
- <flag name="media">Enable sound and video support</flag>
- <flag name="stars">Install extra star catalogs</flag>
- </use>
- <upstream>
- <remote-id type="sourceforge">stellarium</remote-id>
- </upstream>
+ <maintainer type="person">
+ <email>alexey+gentoo@asokolov.org</email>
+ <name>Alexey Sokolov</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>sci-astronomy@gentoo.org</email>
+ <name>Gentoo Astronomy Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ Stellarium is a free open source planetarium for your computer. It
+ shows a realistic sky in 3D, just like what you see with the naked
+ eye, binoculars or a telescope. It is being used in planetarium
+ projectors.
+ </longdescription>
+ <use>
+ <flag name="deep-sky">Install extra deep sky objects catalog (may affect performance)</flag>
+ <flag name="media">Enable sound and video support</flag>
+ <flag name="stars">Install extra star catalogs</flag>
+ <flag name="telescope">Enable telescope control via <pkg>sci-libs/indilib</pkg></flag>
+ </use>
+ <upstream>
+ <remote-id type="github">Stellarium/stellarium</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/sci-astronomy/stellarium/stellarium-0.20.3.ebuild b/sci-astronomy/stellarium/stellarium-0.20.3.ebuild
new file mode 100644
index 00000000000..00d5ddb9e3b
--- /dev/null
+++ b/sci-astronomy/stellarium/stellarium-0.20.3.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+inherit cmake desktop flag-o-matic python-any-r1 xdg virtualx
+
+DESCRIPTION="3D photo-realistic skies in real time"
+HOMEPAGE="https://stellarium.org/"
+MY_DSO_VERSION="3.11"
+SRC_URI="
+ https://github.com/Stellarium/stellarium/releases/download/v${PV}/${P}.tar.gz
+ deep-sky? (
+ https://github.com/Stellarium/stellarium-data/releases/download/dso-${MY_DSO_VERSION}/catalog.dat -> ${PN}-dso-catalog-${MY_DSO_VERSION}.dat
+ )
+ doc? (
+ https://github.com/Stellarium/stellarium/releases/download/v${PV}/stellarium_user_guide-${PV}-1.pdf
+ )
+ stars? (
+ https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat
+ https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat
+ https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat
+ https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat
+ https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat
+ )"
+
+LICENSE="GPL-2+ SGI-B-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug deep-sky doc gps media nls stars telescope test"
+
+# Python interpreter is used while building RemoteControl plugin
+BDEPEND="
+ ${PYTHON_DEPS}
+ doc? ( app-doc/doxygen[dot] )
+ nls? ( dev-qt/linguist-tools:5 )
+"
+RDEPEND="
+ dev-libs/qtcompress:=
+ 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] )
+ telescope? ( sci-libs/indilib:= )
+"
+DEPEND="${RDEPEND}
+ dev-qt/qtconcurrent:5
+ test? ( dev-qt/qttest:5 )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}/${P}-unbundle-indi.patch"
+ "${FILESDIR}/${P}-unbundle-qtcompress.patch"
+ "${FILESDIR}/${P}-unbundle-zlib.patch"
+)
+
+src_prepare() {
+ cmake_src_prepare
+ use debug || append-cppflags -DQT_NO_DEBUG #415769
+
+ # Several libraries are bundled, remove them.
+ rm -r src/external/{libindi,qtcompress,zlib}/ || die
+
+ # qcustomplot can't be easily unbundled because it uses qcustomplot 1
+ # while we have qcustomplot 2 in tree which changed API a bit
+ # Also the license of the external qcustomplot is incompatible with stellarium
+
+ # for glues_stel aka libtess I couldn't find an upstream with the same API
+
+ # unbundling of qxlsx depends on https://github.com/QtExcel/QXlsx/pull/114
+
+ local remaining="$(cd src/external/ && echo */)"
+ if [[ "${remaining}" != "glues_stel/ qcustomplot/ qxlsx/" ]]; then
+ eqawarn "Need to unbundle more deps: ${remaining}"
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_GPS="$(usex gps)"
+ -DENABLE_MEDIA="$(usex media)"
+ -DENABLE_NLS="$(usex nls)"
+ -DENABLE_TESTING="$(usex test)"
+ -DUSE_PLUGIN_TELESCOPECONTROL="$(usex telescope)"
+ )
+ cmake_src_configure
+}
+
+src_test() {
+ virtx cmake_src_test
+}
+
+src_compile() {
+ cmake_src_compile
+
+ if use doc ; then
+ cmake_build apidoc
+ fi
+}
+
+src_install() {
+ if use doc ; then
+ local HTML_DOCS=( "${BUILD_DIR}/doc/html/." )
+ dodoc "${DISTDIR}/stellarium_user_guide-${PV}-1.pdf"
+ fi
+ cmake_src_install
+
+ # use the more up-to-date system fonts
+ rm "${ED}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf || die
+ dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf
+ dosym ../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf
+
+ if use stars ; then
+ insinto /usr/share/${PN}/stars/default
+ doins "${DISTDIR}"/stars_4_1v0_2.cat
+ doins "${DISTDIR}"/stars_{5,6,7,8}_2v0_1.cat
+ fi
+ if use deep-sky ; then
+ insinto /usr/share/${PN}/nebulae/default
+ newins "${DISTDIR}/${PN}-dso-catalog-${MY_DSO_VERSION}.dat" catalog.dat
+ fi
+ newicon doc/images/stellarium-logo.png ${PN}.png
+}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/stellarium/files/, sci-astronomy/stellarium/
@ 2021-06-11 8:55 David Seifert
0 siblings, 0 replies; 13+ messages in thread
From: David Seifert @ 2021-06-11 8:55 UTC (permalink / raw
To: gentoo-commits
commit: b37ab8745b8e6a30c189633630a57b3bafa12aee
Author: Alexey Sokolov <sokolov <AT> google <DOT> com>
AuthorDate: Fri Jun 11 08:54:55 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Jun 11 08:54:55 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b37ab874
sci-astronomy/stellarium: drop old
Closes: https://github.com/gentoo/gentoo/pull/21148
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sci-astronomy/stellarium/Manifest | 5 -
.../files/stellarium-0.20.2-disable-x86-test.patch | 24 ----
sci-astronomy/stellarium/stellarium-0.20.2.ebuild | 96 ---------------
sci-astronomy/stellarium/stellarium-0.20.3.ebuild | 135 ---------------------
4 files changed, 260 deletions(-)
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index 5284117c8a2..e30d9ae46d6 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -3,13 +3,8 @@ 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.20.2.tar.gz 344319520 BLAKE2B 0a64cfc6d5a43bf811609caa9104458768e234bad8fabd2aa88a38d860c22573d076f677f7523c95e1fc1770e73dc1e73b2e94d544cb099c7cd9a21ac79f6bdb SHA512 34f1ad5891dde84b53324046bdf1514df858335ba8f0954bb72350b057ff6dc4091a2d7bf89083489e0d8d1c750c5fb8ba8e1e241f9287a740121b377f0e510c
-DIST stellarium-0.20.3.tar.gz 349073272 BLAKE2B 4380e2f589f8ca7af7a62d7e72e18355328ba37d5d8c4e31f8da011fa46296a3c79b74aca04b9f4014f2b2ebc5a1124d62239d6a9bf947cea687d0a2f6e09c13 SHA512 7f4769955fa55751828b211023f3e88e78c42bd367dade9b29cbe86afcdbfc7078d87dc8f856b0f96a4c75bb3d07462a195095f7afb84bfca0988135a1518a1d
DIST stellarium-0.20.4.tar.gz 347033776 BLAKE2B 91b7f63f74d36a1e1af7d758cb8bea7f51397bc9a8b8ebda2cbc0ea919c9f4bef2312ce979b50dc6ec0706783f35f60f4562290173fec673dc3d9f4097b9f46e SHA512 29e14d56a93db672b5163e6f21dda462fe6c5598d9791bf9a98f414f662c26e0826b3892e3a888688371d805bbddbf5fb47f193c4e16d754fe83fbfb9559e5ae
DIST stellarium-0.21.0.tar.gz 353736120 BLAKE2B e031cce8dbbaf622d451da9219bfae3b36135a8d2f9b8047e2f2c4256804fcc1953c53131bcde7260294e909a949b9010b383da6ebe36611f79342e1c162f7c7 SHA512 79844758f96a013759673b3f88bc13cd16613a57998ee69ae5627827f1a2de26c3c63e3bc1a55b572f6443a7e706951d96f32ab6ba0b37afe2a8274ae980083c
-DIST stellarium-dso-catalog-3.10.dat 28297970 BLAKE2B 69d8f9756986c872cde0190ae3e5f225de30d8fabd5ba3e007176c8ffc4234e964ccc3beb58f75fc4579c75cee620661728a7c6c1d6960d5cb1be027828ba127 SHA512 22068d9ebca592db214f9831765701c52d07e71616705faaf6f5827d51a65af805947bd1f84553e5768f3e82f9e1a0e81eb36943713afb924d604a4676711b1f
-DIST stellarium-dso-catalog-3.11.dat 28297989 BLAKE2B de56efe1930e9ee0e584de9f8167c7b588b886623bbea547ac35b7d3fe32e99e402f8811a2878b82f059e9b946b19ce2456d8a8a4f2127b8dc85c34c6ba1b13b SHA512 21efc43f7ac10b3b14e63731938cbfeaa7b5097ef2a7328e741e00cfd391b80ba4f7e6a367677be2f01879d9c46b8b1bcd5fce8963776ef670455a442c663fc3
DIST stellarium-dso-catalog-3.12.dat 28298461 BLAKE2B 0845981c1d35480eb0b1656e167f7f2dece00d82890c6605b6e5305e6c5be02bcce463c4a34ba3f9ee52f42c35b0a416a93b91361fdd9ce3c24f9bcb4be038f9 SHA512 0de88e559cc26c484edb0eb9d3dd33b4faf9a0e3579dc5ebfbcba70cc39a4e052248c159ace29c9a69027c8c121a832d510459d523b2e05bb0620556d2a49935
-DIST stellarium_user_guide-0.20.3-1.pdf 32404701 BLAKE2B 811c8c58818bf76a6e597a2d24feaff2f7705a0eaffc8ccc1e6cdc037f374dedff01185466dac1635242bcf3ec8309806db03340b251fb39cea1f285a3cf5f26 SHA512 b820c2f76f40df9ef3c2f732cbb5c3622f37bff0cfdab8b56c78c0f4417ba036f6c623f00e7186e4b3c045ed2a4598baabd334fb6cb1037de12af0837a2fe86d
DIST stellarium_user_guide-0.20.4-1.pdf 32523592 BLAKE2B 0ead51a575a5ea66c23d7bd2af287d4cf6a68170c254a9d03e75542b73dd81ba73d8e5a36e2f964d9b31eced34b204bd9940db0984b6abd6ff926d096c9bd0fc SHA512 caab87576e9b0f25a439acf1f111243af65b88288f34ae9e3382ed165453015f1301e693a6f9f1cc44b91466a168b1c02bc58fe642ea161e9eb78dcafbc16c13
DIST stellarium_user_guide-0.21.0-1.pdf 31132367 BLAKE2B d353b9160d7261c410aaa90b3f79955f03ca8453f44249fcec772cb435d4f909fbedeac940afc2f2728008a8c75b366232d943b4dc72698aec95f3ce3b0af38e SHA512 254fe13219b7be5604db28553bbfabb4aaf8c4b82a58a9854806352e25ba7cd419ac8ebbafec92553ccdb499aa6700fb6d7a8537484c12c8314084287a70290d
diff --git a/sci-astronomy/stellarium/files/stellarium-0.20.2-disable-x86-test.patch b/sci-astronomy/stellarium/files/stellarium-0.20.2-disable-x86-test.patch
deleted file mode 100644
index 27674eb7a1e..00000000000
--- a/sci-astronomy/stellarium/files/stellarium-0.20.2-disable-x86-test.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Disable broken tests on x86
-
-https://github.com/Stellarium/stellarium/issues/1153
-
---- a/src/tests/testConversions.cpp 2020-08-09 23:29:34.794246024 +0100
-+++ b/src/tests/testConversions.cpp 2020-08-09 23:30:30.441851564 +0100
-@@ -942,6 +942,7 @@ void TestConversions::testVec3fToHtmlCol
- }
- void TestConversions::testVec3dToHtmlColor()
- {
-+ return;
- QVariantList data;
-
- data << "#FFFFFF" << 1. << 1. << 1.;
---- a/src/tests/testStelSphereGeometry.cpp 2020-08-09 23:32:43.940770728 +0100
-+++ b/src/tests/testStelSphereGeometry.cpp 2020-08-09 23:33:06.671154228 +0100
-@@ -309,6 +309,7 @@ void TestStelSphericalGeometry::testEnla
-
- void TestStelSphericalGeometry::testSphericalPolygon()
- {
-+ return;
- SphericalRegionP holySquare2 = bigSquare.getSubtraction(smallSquare);
-
- QCOMPARE(holySquare2->getArea(), holySquare.getArea());
diff --git a/sci-astronomy/stellarium/stellarium-0.20.2.ebuild b/sci-astronomy/stellarium/stellarium-0.20.2.ebuild
deleted file mode 100644
index 72d532122ff..00000000000
--- a/sci-astronomy/stellarium/stellarium-0.20.2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop flag-o-matic xdg virtualx
-
-DESCRIPTION="3D photo-realistic skies in real time"
-HOMEPAGE="https://stellarium.org/"
-MY_DSO_VERSION="3.10"
-SRC_URI="
- https://github.com/Stellarium/stellarium/releases/download/v${PV}/${P}.tar.gz
- deep-sky? (
- https://github.com/Stellarium/stellarium-data/releases/download/dso-${MY_DSO_VERSION}/catalog.dat -> ${PN}-dso-catalog-${MY_DSO_VERSION}.dat
- )
- 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 deep-sky gps media nls stars test"
-
-BDEPEND="
- nls? ( dev-qt/linguist-tools:5 )
-"
-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
- test? ( dev-qt/qttest:5 )
-"
-
-RESTRICT="!test? ( test )"
-
-src_prepare() {
- cmake_src_prepare
- use debug || append-cppflags -DQT_NO_DEBUG #415769
-
- if use x86; then
- # https://github.com/Stellarium/stellarium/issues/1153
- eapply "${FILESDIR}/stellarium-0.20.2-disable-x86-test.patch"
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_GPS="$(usex gps)"
- -DENABLE_MEDIA="$(usex media)"
- -DENABLE_NLS="$(usex nls)"
- -DENABLE_TESTING="$(usex test)"
- )
- cmake_src_configure
-}
-
-src_test() {
- virtx cmake_src_test
-}
-
-src_install() {
- cmake_src_install
-
- # use the more up-to-date system fonts
- rm "${ED}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf || die
- dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf
- dosym ../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf
-
- if use stars ; then
- insinto /usr/share/${PN}/stars/default
- doins "${DISTDIR}"/stars_4_1v0_2.cat
- doins "${DISTDIR}"/stars_{5,6,7,8}_2v0_1.cat
- fi
- if use deep-sky ; then
- insinto /usr/share/${PN}/nebulae/default
- newins "${DISTDIR}/${PN}-dso-catalog-${MY_DSO_VERSION}.dat" catalog.dat
- fi
- newicon doc/images/stellarium-logo.png ${PN}.png
-}
diff --git a/sci-astronomy/stellarium/stellarium-0.20.3.ebuild b/sci-astronomy/stellarium/stellarium-0.20.3.ebuild
deleted file mode 100644
index f2c44c80618..00000000000
--- a/sci-astronomy/stellarium/stellarium-0.20.3.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit cmake desktop flag-o-matic python-any-r1 xdg virtualx
-
-DESCRIPTION="3D photo-realistic skies in real time"
-HOMEPAGE="https://stellarium.org/"
-MY_DSO_VERSION="3.11"
-SRC_URI="
- https://github.com/Stellarium/stellarium/releases/download/v${PV}/${P}.tar.gz
- deep-sky? (
- https://github.com/Stellarium/stellarium-data/releases/download/dso-${MY_DSO_VERSION}/catalog.dat -> ${PN}-dso-catalog-${MY_DSO_VERSION}.dat
- )
- doc? (
- https://github.com/Stellarium/stellarium/releases/download/v${PV}/stellarium_user_guide-${PV}-1.pdf
- )
- stars? (
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat
- )"
-
-LICENSE="GPL-2+ SGI-B-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="debug deep-sky doc gps media nls stars telescope test"
-
-# Python interpreter is used while building RemoteControl plugin
-BDEPEND="
- ${PYTHON_DEPS}
- doc? ( app-doc/doxygen[dot] )
- nls? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="
- dev-libs/qtcompress:=
- 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] )
- telescope? ( sci-libs/indilib:= )
-"
-DEPEND="${RDEPEND}
- dev-qt/qtconcurrent:5
- test? ( dev-qt/qttest:5 )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- "${FILESDIR}/${P}-unbundle-indi.patch"
- "${FILESDIR}/${P}-unbundle-qtcompress.patch"
- "${FILESDIR}/${P}-unbundle-zlib.patch"
-)
-
-src_prepare() {
- cmake_src_prepare
- use debug || append-cppflags -DQT_NO_DEBUG #415769
-
- # Several libraries are bundled, remove them.
- rm -r src/external/{libindi,qtcompress,zlib}/ || die
-
- # qcustomplot can't be easily unbundled because it uses qcustomplot 1
- # while we have qcustomplot 2 in tree which changed API a bit
- # Also the license of the external qcustomplot is incompatible with stellarium
-
- # for glues_stel aka libtess I couldn't find an upstream with the same API
-
- # unbundling of qxlsx depends on https://github.com/QtExcel/QXlsx/pull/114
-
- local remaining="$(cd src/external/ && echo */)"
- if [[ "${remaining}" != "glues_stel/ qcustomplot/ qxlsx/" ]]; then
- eqawarn "Need to unbundle more deps: ${remaining}"
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_GPS="$(usex gps)"
- -DENABLE_MEDIA="$(usex media)"
- -DENABLE_NLS="$(usex nls)"
- -DENABLE_TESTING="$(usex test)"
- -DUSE_PLUGIN_TELESCOPECONTROL="$(usex telescope)"
- )
- cmake_src_configure
-}
-
-src_test() {
- virtx cmake_src_test
-}
-
-src_compile() {
- cmake_src_compile
-
- if use doc ; then
- cmake_build apidoc
- fi
-}
-
-src_install() {
- if use doc ; then
- local HTML_DOCS=( "${BUILD_DIR}/doc/html/." )
- dodoc "${DISTDIR}/stellarium_user_guide-${PV}-1.pdf"
- fi
- cmake_src_install
-
- # use the more up-to-date system fonts
- rm "${ED}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf || die
- dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf
- dosym ../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf
-
- if use stars ; then
- insinto /usr/share/${PN}/stars/default
- doins "${DISTDIR}"/stars_4_1v0_2.cat
- doins "${DISTDIR}"/stars_{5,6,7,8}_2v0_1.cat
- fi
- if use deep-sky ; then
- insinto /usr/share/${PN}/nebulae/default
- newins "${DISTDIR}/${PN}-dso-catalog-${MY_DSO_VERSION}.dat" catalog.dat
- fi
- newicon doc/images/stellarium-logo.png ${PN}.png
-}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/stellarium/files/, sci-astronomy/stellarium/
@ 2021-09-29 8:07 David Seifert
0 siblings, 0 replies; 13+ messages in thread
From: David Seifert @ 2021-09-29 8:07 UTC (permalink / raw
To: gentoo-commits
commit: 322e1cc0f6f08d12e24880cf2ce79b05afc3df57
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Wed Sep 29 08:07:37 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Sep 29 08:07:37 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=322e1cc0
sci-astronomy/stellarium: 0.21.2 version bump
Closes: https://github.com/gentoo/gentoo/pull/22437
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sci-astronomy/stellarium/Manifest | 3 +
.../stellarium-0.21.2-unbundle-qtcompress.patch | 207 +++++++++++++++++++++
sci-astronomy/stellarium/stellarium-0.21.2.ebuild | 141 ++++++++++++++
3 files changed, 351 insertions(+)
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index 943e3f7c2fd..02259f1d146 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -4,5 +4,8 @@ DIST stars_6_2v0_1.cat 148352404 BLAKE2B c605b284b3d768cb1619ada3f58d406fa7737f0
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.21.1.tar.gz 362055145 BLAKE2B a7ea6327d415331848a53879e76ea973fbb51709a0bd561cd4e415b215e5c8494290e2e663bda9f463f565a771465e0e0133f46517a5798d607f076e2635764d SHA512 6dd935808c711da32c793a0cedad464a15bf35ede60cff385e96f1d5868e751ed2e09b61551f7a6fe599b702a6f4d0a62d4494a40b68e77685ba57b6a63b5031
+DIST stellarium-0.21.2.tar.gz 387061883 BLAKE2B 74878961efb01088c5c7c3031d989cccce5db2e072890d01a37a8b40d30838d7ee06f440abcd8279f14677f12c42f29d129499cf2e73c0bd2e771f201007d123 SHA512 91f4e263bcda25ba356decc99f46a3e278be24bcab25519522deac0ed540205ab8320365bb40a56b7f231635bf5b026b4f87f00eeb68a26eab2b7e37d38567bf
DIST stellarium-dso-catalog-3.12.dat 28298461 BLAKE2B 0845981c1d35480eb0b1656e167f7f2dece00d82890c6605b6e5305e6c5be02bcce463c4a34ba3f9ee52f42c35b0a416a93b91361fdd9ce3c24f9bcb4be038f9 SHA512 0de88e559cc26c484edb0eb9d3dd33b4faf9a0e3579dc5ebfbcba70cc39a4e052248c159ace29c9a69027c8c121a832d510459d523b2e05bb0620556d2a49935
+DIST stellarium-dso-catalog-3.13.dat 28683353 BLAKE2B 6d7587f98ccb06a83e6befb1d569c9639170c8a430901c1c6098a86a33fe8934cd4454a87b51752636a15ab1a96fd3ebd77cbd5d9e4260436ec2e4e4795f98b0 SHA512 3880ec776798599640fb083b0c9ebbccadef44f640fb2214052161ddbeb06bf5b0babc0c31d9ac02aa40e52e290d4f5613c11a6dadd83fd61114dbfb49ebe855
DIST stellarium_user_guide-0.21.1-1.pdf 31256531 BLAKE2B 511bbd2c7247156959966a038d387c0522f0539d6226c0db5c76abbe60a972a61530c7c0c5b4a93ad3d36a2eaf53260ad7d8ab09b207b90a56f35b0b67bfae42 SHA512 5ba8b4ccfc9ea2b374cc486bbd43d7aad344f8c1f204cf314f8b73b7a68199fcebac938021d7a94093514c95b61ac3dd1b6992a51ff7a5522cf025e430e51c7f
+DIST stellarium_user_guide-0.21.2-1.pdf 31351844 BLAKE2B f8a35dcc1c0d9a40ec8d640b3cc2ee1f5e154b0f06507e0ef9ccbabdc05add2c00704e611932710a60f2b21730c8398e52be0cb142428de77eec304489591db9 SHA512 7e0bb33583ac4e89ea3cd7be5585cc00d9ac473d99d4e0862be1a74edb66cbd13661bd5d7787b60a945e302e33e190cc30a51df10d363e1af49002129f8e399f
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
new file mode 100644
index 00000000000..f5d757b1bb1
--- /dev/null
+++ b/sci-astronomy/stellarium/files/stellarium-0.21.2-unbundle-qtcompress.patch
@@ -0,0 +1,207 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -594,6 +594,7 @@ ELSE(ENABLE_GPS)
+ MESSAGE(STATUS "GPS: disabled.")
+ ENDIF(ENABLE_GPS)
+
++find_package(Qt5Compress REQUIRED)
+
+ IF(USE_QTOPENGL)
+ # QtOpenGL module is deprecated. After merging the QOpenGLWidget branch, we don't use this module directly anymore,
+--- a/plugins/Satellites/src/CMakeLists.txt
++++ b/plugins/Satellites/src/CMakeLists.txt
+@@ -55,7 +55,7 @@ IF(ENABLE_TESTING)
+ ENDIF(ENABLE_TESTING)
+
+ ADD_LIBRARY(Satellites-static STATIC ${Satellites_SRCS} ${Satellites_RES_CXX} ${SatellitesDialog_UIS_H})
+-TARGET_LINK_LIBRARIES(Satellites-static Qt5::Core Qt5::Network Qt5::Widgets)
++TARGET_LINK_LIBRARIES(Satellites-static Qt5::Core Qt5::Network Qt5::Widgets Qt5::Compress)
+ # The library target "Satellites-static" has a default OUTPUT_NAME of "Satellites-static", so change it.
+ SET_TARGET_PROPERTIES(Satellites-static PROPERTIES OUTPUT_NAME "Satellites")
+ IF(MSVC)
+--- a/plugins/Satellites/src/Satellites.cpp
++++ b/plugins/Satellites/src/Satellites.cpp
+@@ -43,7 +43,7 @@
+ #include "StelUtils.hpp"
+ #include "StelActionMgr.hpp"
+
+-#include "external/qtcompress/qzipreader.h"
++#include "qzipreader.h"
+
+ #include <QNetworkAccessManager>
+ #include <QNetworkReply>
+@@ -1549,12 +1549,12 @@ void Satellites::saveDownloadedUpdate(QNetworkReply* reply)
+ QString archive = zip.fileName();
+ QByteArray data;
+
+- Stel::QZipReader reader(archive);
+- if (reader.status() != Stel::QZipReader::NoError)
++ QZipReader reader(archive);
++ if (reader.status() != QZipReader::NoError)
+ qWarning() << "[Satellites] Unable to open as a ZIP archive";
+ else
+ {
+- QList<Stel::QZipReader::FileInfo> infoList = reader.fileInfoList();
++ QList<QZipReader::FileInfo> infoList = reader.fileInfoList();
+ for (const auto& info : qAsConst(infoList))
+ {
+ // qWarning() << "[Satellites] Processing:" << info.filePath;
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -464,7 +464,7 @@ IF(ENABLE_SPOUT AND SPOUT_LIBRARY_DLL)
+ CONFIGURE_FILE(${SPOUT_LIBRARY_DLL} ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
+ ENDIF()
+
+-SET(STELMAIN_DEPS ${ZLIB_LIBRARIES} qtcompress_stel glues_stel qcustomplot_stel qxlsx_stel ${STELLARIUM_STATIC_PLUGINS_LIBRARIES} ${STELLARIUM_QT_LIBRARIES} ${SPOUT_LIBRARY})
++SET(STELMAIN_DEPS ${ZLIB_LIBRARIES} Qt5::Compress glues_stel qcustomplot_stel qxlsx_stel ${STELLARIUM_STATIC_PLUGINS_LIBRARIES} ${STELLARIUM_QT_LIBRARIES} ${SPOUT_LIBRARY})
+ IF(ENABLE_LIBGPS)
+ SET(STELMAIN_DEPS ${STELMAIN_DEPS} ${GPS_LIBRARY})
+ ENDIF()
+--- a/src/core/modules/LandscapeMgr.cpp
++++ b/src/core/modules/LandscapeMgr.cpp
+@@ -1322,8 +1322,8 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const
+ }
+ QDir destinationDir (parentDestinationDir.absoluteFilePath("landscapes"));
+
+- Stel::QZipReader reader(sourceFilePath);
+- if (reader.status() != Stel::QZipReader::NoError)
++ QZipReader reader(sourceFilePath);
++ if (reader.status() != QZipReader::NoError)
+ {
+ qWarning() << "LandscapeMgr: Unable to open as a ZIP archive:" << QDir::toNativeSeparators(sourceFilePath);
+ emit errorNotArchive();
+@@ -1332,7 +1332,7 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const
+
+ //Detect top directory
+ QString topDir, iniPath;
+- QList<Stel::QZipReader::FileInfo> infoList = reader.fileInfoList();
++ QList<QZipReader::FileInfo> infoList = reader.fileInfoList();
+ for (const auto& info : infoList)
+ {
+ QFileInfo fileInfo(info.filePath);
+--- a/src/external/CMakeLists.txt
++++ b/src/external/CMakeLists.txt
+@@ -70,6 +70,7 @@ target_include_directories(zlib_stel PUBLIC zlib)
+ set_target_properties(zlib_stel PROPERTIES AUTOMOC 0)
+ SET_TARGET_PROPERTIES(zlib_stel PROPERTIES FOLDER "src/external")
+
++if(0)
+ set(qtcompress_SRCS
+ qtcompress/qzip.cpp
+ qtcompress/qzipreader.h
+@@ -82,6 +83,7 @@ target_link_libraries(qtcompress_stel ${ZLIB_LIBRARIES} Qt5::Core)
+ #turn off automoc, not needed here
+ set_target_properties(qtcompress_stel PROPERTIES AUTOMOC 0)
+ SET_TARGET_PROPERTIES(qtcompress_stel PROPERTIES FOLDER "src/external")
++endif()
+
+ # QCustomPlot should not be unbundled, because upstream uses GPL 3, and
+ # Stellarium uses GPL 2. Author of QCustomPlot has agreed for GPL 2+ for this.
+@@ -180,7 +182,7 @@ SET(qxlsx_SRCS
+ qxlsx/xlsxcelllocation.h
+ )
+ add_library(qxlsx_stel STATIC EXCLUDE_FROM_ALL ${qxlsx_SRCS})
+-target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui qtcompress_stel)
++target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui Qt5::Compress)
+ set_target_properties(qxlsx_stel PROPERTIES FOLDER "src/external")
+
+ ################################# INDI ################################
+--- a/src/external/qxlsx/xlsxzipreader.cpp
++++ b/src/external/qxlsx/xlsxzipreader.cpp
+@@ -5,13 +5,13 @@
+ QT_BEGIN_NAMESPACE_XLSX
+
+ ZipReader::ZipReader(const QString &filePath) :
+- m_reader(new Stel::QZipReader(filePath))
++ m_reader(new QZipReader(filePath))
+ {
+ init();
+ }
+
+ ZipReader::ZipReader(QIODevice *device) :
+- m_reader(new Stel::QZipReader(device))
++ m_reader(new QZipReader(device))
+ {
+ init();
+ }
+@@ -23,8 +23,8 @@ ZipReader::~ZipReader()
+
+ void ZipReader::init()
+ {
+- QList<Stel::QZipReader::FileInfo> allFiles = m_reader->fileInfoList();
+- for (const Stel::QZipReader::FileInfo &fi : allFiles) {
++ QList<QZipReader::FileInfo> allFiles = m_reader->fileInfoList();
++ for (const QZipReader::FileInfo &fi : allFiles) {
+ if (fi.isFile || (!fi.isDir && !fi.isFile && !fi.isSymLink))
+ m_filePaths.append(fi.filePath);
+ }
+--- a/src/external/qxlsx/xlsxzipreader_p.h
++++ b/src/external/qxlsx/xlsxzipreader_p.h
+@@ -8,7 +8,7 @@
+ #include <QIODevice>
+
+ #include "xlsxglobal.h"
+-#include "external/qtcompress/qzipreader.h"
++#include "qzipreader.h"
+
+ #if QT_VERSION >= 0x050600
+ #include <QVector>
+@@ -31,7 +31,7 @@ public:
+ private:
+ Q_DISABLE_COPY(ZipReader)
+ void init();
+- QScopedPointer<Stel::QZipReader> m_reader;
++ QScopedPointer<QZipReader> m_reader;
+ QStringList m_filePaths;
+ };
+
+--- a/src/external/qxlsx/xlsxzipwriter.cpp
++++ b/src/external/qxlsx/xlsxzipwriter.cpp
+@@ -10,14 +10,14 @@ QT_BEGIN_NAMESPACE_XLSX
+
+ ZipWriter::ZipWriter(const QString &filePath)
+ {
+- m_writer = new Stel::QZipWriter(filePath, QIODevice::WriteOnly);
+- m_writer->setCompressionPolicy(Stel::QZipWriter::AutoCompress);
++ m_writer = new QZipWriter(filePath, QIODevice::WriteOnly);
++ m_writer->setCompressionPolicy(QZipWriter::AutoCompress);
+ }
+
+ ZipWriter::ZipWriter(QIODevice *device)
+ {
+- m_writer = new Stel::QZipWriter(device);
+- m_writer->setCompressionPolicy(Stel::QZipWriter::AutoCompress);
++ m_writer = new QZipWriter(device);
++ m_writer->setCompressionPolicy(QZipWriter::AutoCompress);
+ }
+
+ ZipWriter::~ZipWriter()
+@@ -27,7 +27,7 @@ ZipWriter::~ZipWriter()
+
+ bool ZipWriter::error() const
+ {
+- return m_writer->status() != Stel::QZipWriter::NoError;
++ return m_writer->status() != QZipWriter::NoError;
+ }
+
+ void ZipWriter::addFile(const QString &filePath, QIODevice *device)
+--- a/src/external/qxlsx/xlsxzipwriter_p.h
++++ b/src/external/qxlsx/xlsxzipwriter_p.h
+@@ -8,7 +8,7 @@
+ #include <QIODevice>
+
+ #include "xlsxglobal.h"
+-#include "external/qtcompress/qzipwriter.h"
++#include "qzipwriter.h"
+
+ class QZipWriter;
+
+@@ -27,7 +27,7 @@ public:
+ void close();
+
+ private:
+- Stel::QZipWriter *m_writer;
++ QZipWriter *m_writer;
+ };
+
+ QT_END_NAMESPACE_XLSX
diff --git a/sci-astronomy/stellarium/stellarium-0.21.2.ebuild b/sci-astronomy/stellarium/stellarium-0.21.2.ebuild
new file mode 100644
index 00000000000..6a6c1243304
--- /dev/null
+++ b/sci-astronomy/stellarium/stellarium-0.21.2.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake desktop flag-o-matic python-any-r1 xdg virtualx
+
+DESCRIPTION="3D photo-realistic skies in real time"
+HOMEPAGE="https://stellarium.org/"
+MY_DSO_VERSION="3.13"
+SRC_URI="
+ https://github.com/Stellarium/stellarium/releases/download/v${PV}/${P}.tar.gz
+ deep-sky? (
+ https://github.com/Stellarium/stellarium-data/releases/download/dso-${MY_DSO_VERSION}/catalog-${MY_DSO_VERSION}.dat -> ${PN}-dso-catalog-${MY_DSO_VERSION}.dat
+ )
+ doc? (
+ https://github.com/Stellarium/stellarium/releases/download/v${PV}/stellarium_user_guide-${PV}-1.pdf
+ )
+ stars? (
+ https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat
+ https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat
+ https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat
+ https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat
+ https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat
+ )"
+
+LICENSE="GPL-2+ SGI-B-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug deep-sky doc gps media nls stars telescope test"
+
+# Python interpreter is used while building RemoteControl plugin
+BDEPEND="
+ ${PYTHON_DEPS}
+ doc? ( app-doc/doxygen[dot] )
+ nls? ( dev-qt/linguist-tools:5 )
+"
+RDEPEND="
+ dev-libs/qtcompress:=
+ 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/qtwidgets:5
+ media-fonts/dejavu
+ sys-libs/zlib
+ virtual/opengl
+ gps? (
+ dev-qt/qtpositioning:5
+ dev-qt/qtserialport:5
+ sci-geosciences/gpsd:=[cxx]
+ )
+ media? ( dev-qt/qtmultimedia:5[widgets] )
+ telescope? (
+ dev-qt/qtserialport:5
+ sci-libs/indilib:=
+ )
+"
+DEPEND="${RDEPEND}
+ dev-qt/qtconcurrent:5
+ test? ( dev-qt/qttest:5 )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}/stellarium-0.20.3-unbundle-indi.patch"
+ "${FILESDIR}/stellarium-0.21.2-unbundle-qtcompress.patch"
+ "${FILESDIR}/stellarium-0.20.3-unbundle-zlib.patch"
+)
+
+src_prepare() {
+ cmake_src_prepare
+ use debug || append-cppflags -DQT_NO_DEBUG #415769
+
+ # Several libraries are bundled, remove them.
+ rm -r src/external/{libindi,qtcompress,zlib}/ || die
+
+ # qcustomplot can't be easily unbundled because it uses qcustomplot 1
+ # while we have qcustomplot 2 in tree which changed API a bit
+ # Also the license of the external qcustomplot is incompatible with stellarium
+
+ # for glues_stel aka libtess I couldn't find an upstream with the same API
+
+ # unbundling of qxlsx depends on https://github.com/QtExcel/QXlsx/pull/185
+
+ local remaining="$(cd src/external/ && echo */)"
+ if [[ "${remaining}" != "glues_stel/ qcustomplot/ qxlsx/" ]]; then
+ eqawarn "Need to unbundle more deps: ${remaining}"
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_GPS="$(usex gps)"
+ -DENABLE_MEDIA="$(usex media)"
+ -DENABLE_NLS="$(usex nls)"
+ -DENABLE_TESTING="$(usex test)"
+ -DUSE_PLUGIN_TELESCOPECONTROL="$(usex telescope)"
+ )
+ cmake_src_configure
+}
+
+src_test() {
+ virtx cmake_src_test
+}
+
+src_compile() {
+ cmake_src_compile
+
+ if use doc ; then
+ cmake_build apidoc
+ fi
+}
+
+src_install() {
+ if use doc ; then
+ local HTML_DOCS=( "${BUILD_DIR}/doc/html/." )
+ dodoc "${DISTDIR}/stellarium_user_guide-${PV}-1.pdf"
+ fi
+ cmake_src_install
+
+ # use the more up-to-date system fonts
+ rm "${ED}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf || die
+ dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf
+ dosym ../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf
+
+ if use stars ; then
+ insinto /usr/share/${PN}/stars/default
+ doins "${DISTDIR}"/stars_4_1v0_2.cat
+ doins "${DISTDIR}"/stars_{5,6,7,8}_2v0_1.cat
+ fi
+ if use deep-sky ; then
+ insinto /usr/share/${PN}/nebulae/default
+ newins "${DISTDIR}/${PN}-dso-catalog-${MY_DSO_VERSION}.dat" catalog.dat
+ fi
+ newicon doc/images/stellarium-logo.png ${PN}.png
+}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/stellarium/files/, sci-astronomy/stellarium/
@ 2021-09-29 8:07 David Seifert
0 siblings, 0 replies; 13+ messages in thread
From: David Seifert @ 2021-09-29 8:07 UTC (permalink / raw
To: gentoo-commits
commit: 8e9eafc77524e0abd307d4a23a27e4314f87ee6b
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Wed Sep 29 08:07:36 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Sep 29 08:07:36 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e9eafc7
sci-astronomy/stellarium: drop old
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sci-astronomy/stellarium/Manifest | 4 -
.../stellarium-0.20.3-unbundle-qtcompress.patch | 222 ---------------------
sci-astronomy/stellarium/stellarium-0.20.4.ebuild | 135 -------------
sci-astronomy/stellarium/stellarium-0.21.0.ebuild | 141 -------------
4 files changed, 502 deletions(-)
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index 8f4f9983e00..943e3f7c2fd 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -3,10 +3,6 @@ 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.20.4.tar.gz 347033776 BLAKE2B 91b7f63f74d36a1e1af7d758cb8bea7f51397bc9a8b8ebda2cbc0ea919c9f4bef2312ce979b50dc6ec0706783f35f60f4562290173fec673dc3d9f4097b9f46e SHA512 29e14d56a93db672b5163e6f21dda462fe6c5598d9791bf9a98f414f662c26e0826b3892e3a888688371d805bbddbf5fb47f193c4e16d754fe83fbfb9559e5ae
-DIST stellarium-0.21.0.tar.gz 353736120 BLAKE2B e031cce8dbbaf622d451da9219bfae3b36135a8d2f9b8047e2f2c4256804fcc1953c53131bcde7260294e909a949b9010b383da6ebe36611f79342e1c162f7c7 SHA512 79844758f96a013759673b3f88bc13cd16613a57998ee69ae5627827f1a2de26c3c63e3bc1a55b572f6443a7e706951d96f32ab6ba0b37afe2a8274ae980083c
DIST stellarium-0.21.1.tar.gz 362055145 BLAKE2B a7ea6327d415331848a53879e76ea973fbb51709a0bd561cd4e415b215e5c8494290e2e663bda9f463f565a771465e0e0133f46517a5798d607f076e2635764d SHA512 6dd935808c711da32c793a0cedad464a15bf35ede60cff385e96f1d5868e751ed2e09b61551f7a6fe599b702a6f4d0a62d4494a40b68e77685ba57b6a63b5031
DIST stellarium-dso-catalog-3.12.dat 28298461 BLAKE2B 0845981c1d35480eb0b1656e167f7f2dece00d82890c6605b6e5305e6c5be02bcce463c4a34ba3f9ee52f42c35b0a416a93b91361fdd9ce3c24f9bcb4be038f9 SHA512 0de88e559cc26c484edb0eb9d3dd33b4faf9a0e3579dc5ebfbcba70cc39a4e052248c159ace29c9a69027c8c121a832d510459d523b2e05bb0620556d2a49935
-DIST stellarium_user_guide-0.20.4-1.pdf 32523592 BLAKE2B 0ead51a575a5ea66c23d7bd2af287d4cf6a68170c254a9d03e75542b73dd81ba73d8e5a36e2f964d9b31eced34b204bd9940db0984b6abd6ff926d096c9bd0fc SHA512 caab87576e9b0f25a439acf1f111243af65b88288f34ae9e3382ed165453015f1301e693a6f9f1cc44b91466a168b1c02bc58fe642ea161e9eb78dcafbc16c13
-DIST stellarium_user_guide-0.21.0-1.pdf 31132367 BLAKE2B d353b9160d7261c410aaa90b3f79955f03ca8453f44249fcec772cb435d4f909fbedeac940afc2f2728008a8c75b366232d943b4dc72698aec95f3ce3b0af38e SHA512 254fe13219b7be5604db28553bbfabb4aaf8c4b82a58a9854806352e25ba7cd419ac8ebbafec92553ccdb499aa6700fb6d7a8537484c12c8314084287a70290d
DIST stellarium_user_guide-0.21.1-1.pdf 31256531 BLAKE2B 511bbd2c7247156959966a038d387c0522f0539d6226c0db5c76abbe60a972a61530c7c0c5b4a93ad3d36a2eaf53260ad7d8ab09b207b90a56f35b0b67bfae42 SHA512 5ba8b4ccfc9ea2b374cc486bbd43d7aad344f8c1f204cf314f8b73b7a68199fcebac938021d7a94093514c95b61ac3dd1b6992a51ff7a5522cf025e430e51c7f
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
deleted file mode 100644
index 64b19a54c88..00000000000
--- a/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-qtcompress.patch
+++ /dev/null
@@ -1,222 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1b72c2c8f6..9436bc66da 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -629,5 +629,6 @@ ELSE()
- ENDIF()
-
-+find_package(Qt5Compress REQUIRED)
-
- ########### Set some global variables ###########
- IF(UNIX AND NOT WIN32)
-diff --git a/plugins/Satellites/src/CMakeLists.txt b/plugins/Satellites/src/CMakeLists.txt
-index 8e3138adf2..b59049767d 100644
---- a/plugins/Satellites/src/CMakeLists.txt
-+++ b/plugins/Satellites/src/CMakeLists.txt
-@@ -55,7 +55,7 @@ IF(ENABLE_TESTING)
- ENDIF(ENABLE_TESTING)
-
- ADD_LIBRARY(Satellites-static STATIC ${Satellites_SRCS} ${Satellites_RES_CXX} ${SatellitesDialog_UIS_H})
--TARGET_LINK_LIBRARIES(Satellites-static Qt5::Core Qt5::Network Qt5::Widgets)
-+TARGET_LINK_LIBRARIES(Satellites-static Qt5::Core Qt5::Network Qt5::Widgets Qt5::Compress)
- # The library target "Satellites-static" has a default OUTPUT_NAME of "Satellites-static", so change it.
- SET_TARGET_PROPERTIES(Satellites-static PROPERTIES OUTPUT_NAME "Satellites")
- IF(MSVC)
-diff --git a/plugins/Satellites/src/Satellites.cpp b/plugins/Satellites/src/Satellites.cpp
-index 7432f4316d..f4f4453661 100644
---- a/plugins/Satellites/src/Satellites.cpp
-+++ b/plugins/Satellites/src/Satellites.cpp
-@@ -43,7 +43,7 @@
- #include "StelUtils.hpp"
- #include "StelActionMgr.hpp"
-
--#include "external/qtcompress/qzipreader.h"
-+#include "qzipreader.h"
-
- #include <QNetworkAccessManager>
- #include <QNetworkReply>
-@@ -1533,12 +1533,12 @@ void Satellites::saveDownloadedUpdate(QNetworkReply* reply)
- QString archive = zip.fileName();
- QByteArray data;
-
-- Stel::QZipReader reader(archive);
-- if (reader.status() != Stel::QZipReader::NoError)
-+ QZipReader reader(archive);
-+ if (reader.status() != QZipReader::NoError)
- qWarning() << "[Satellites] Unable to open as a ZIP archive";
- else
- {
-- QList<Stel::QZipReader::FileInfo> infoList = reader.fileInfoList();
-+ QList<QZipReader::FileInfo> infoList = reader.fileInfoList();
- for (const auto& info : infoList)
- {
- // qWarning() << "[Satellites] Processing:" << info.filePath;
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index bdd214729f..81631ce8ec 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -465,7 +465,7 @@ IF(ENABLE_SPOUT AND SPOUT_LIBRARY_DLL)
- CONFIGURE_FILE(${SPOUT_LIBRARY_DLL} ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
- ENDIF()
-
--SET(STELMAIN_DEPS ${ZLIB_LIBRARIES} qtcompress_stel glues_stel qcustomplot_stel qxlsx_stel ${STELLARIUM_STATIC_PLUGINS_LIBRARIES} ${STELLARIUM_QT_LIBRARIES} ${SPOUT_LIBRARY})
-+SET(STELMAIN_DEPS ${ZLIB_LIBRARIES} Qt5::Compress glues_stel qcustomplot_stel qxlsx_stel ${STELLARIUM_STATIC_PLUGINS_LIBRARIES} ${STELLARIUM_QT_LIBRARIES} ${SPOUT_LIBRARY})
- IF(ENABLE_LIBGPS)
- SET(STELMAIN_DEPS ${STELMAIN_DEPS} ${GPS_LIBRARY})
- ENDIF()
-diff --git a/src/core/modules/LandscapeMgr.cpp b/src/core/modules/LandscapeMgr.cpp
-index 8da2070b26..9949252cee 100644
---- a/src/core/modules/LandscapeMgr.cpp
-+++ b/src/core/modules/LandscapeMgr.cpp
-@@ -1183,8 +1183,8 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const
- }
- QDir destinationDir (parentDestinationDir.absoluteFilePath("landscapes"));
-
-- Stel::QZipReader reader(sourceFilePath);
-- if (reader.status() != Stel::QZipReader::NoError)
-+ QZipReader reader(sourceFilePath);
-+ if (reader.status() != QZipReader::NoError)
- {
- qWarning() << "LandscapeMgr: Unable to open as a ZIP archive:" << QDir::toNativeSeparators(sourceFilePath);
- emit errorNotArchive();
-@@ -1193,7 +1193,7 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const
-
- //Detect top directory
- QString topDir, iniPath;
-- QList<Stel::QZipReader::FileInfo> infoList = reader.fileInfoList();
-+ QList<QZipReader::FileInfo> infoList = reader.fileInfoList();
- for (const auto& info : infoList)
- {
- QFileInfo fileInfo(info.filePath);
-diff --git a/src/external/CMakeLists.txt b/src/external/CMakeLists.txt
-index 1e0e7e2b32..834aff89cb 100644
---- a/src/external/CMakeLists.txt
-+++ b/src/external/CMakeLists.txt
-@@ -70,6 +70,7 @@ target_include_directories(zlib_stel PUBLIC zlib)
- set_target_properties(zlib_stel PROPERTIES AUTOMOC 0)
- SET_TARGET_PROPERTIES(zlib_stel PROPERTIES FOLDER "src/external")
-
-+if(0)
- set(qtcompress_SRCS
- qtcompress/qzip.cpp
- qtcompress/qzipreader.h
-@@ -82,6 +83,7 @@ target_link_libraries(qtcompress_stel ${ZLIB_LIBRARIES} Qt5::Core)
- #turn off automoc, not needed here
- set_target_properties(qtcompress_stel PROPERTIES AUTOMOC 0)
- SET_TARGET_PROPERTIES(qtcompress_stel PROPERTIES FOLDER "src/external")
-+endif()
-
- set(qcustomplot_SRCS
- qcustomplot/qcustomplot.cpp
-@@ -176,7 +176,7 @@
- qxlsx/xlsxcelllocation.h
- )
- add_library(qxlsx_stel STATIC EXCLUDE_FROM_ALL ${qxlsx_SRCS})
--target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui qtcompress_stel)
-+target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui Qt5::Compress)
- set_target_properties(qxlsx_stel PROPERTIES FOLDER "src/external")
-
- ################################# INDI ################################
-diff -r 11536448457a xlsxzipreader.cpp
---- a/src/external/qxlsx/xlsxzipreader.cpp Thu Oct 08 21:41:22 2020 +0100
-+++ b/src/external/qxlsx/xlsxzipreader.cpp Thu Oct 08 21:42:03 2020 +0100
-@@ -28,13 +28,13 @@
- namespace QXlsx {
-
- ZipReader::ZipReader(const QString &filePath) :
-- m_reader(new Stel::QZipReader(filePath))
-+ m_reader(new QZipReader(filePath))
- {
- init();
- }
-
- ZipReader::ZipReader(QIODevice *device) :
-- m_reader(new Stel::QZipReader(device))
-+ m_reader(new QZipReader(device))
- {
- init();
- }
-@@ -45,8 +45,8 @@
-
- void ZipReader::init()
- {
-- QList<Stel::QZipReader::FileInfo> allFiles = m_reader->fileInfoList();
-- foreach (const Stel::QZipReader::FileInfo &fi, allFiles)
-+ QList<QZipReader::FileInfo> allFiles = m_reader->fileInfoList();
-+ foreach (const QZipReader::FileInfo &fi, allFiles)
- {
- if (fi.isFile)
- m_filePaths.append(fi.filePath);
-diff -r 2019bb0d2919 xlsxzipreader_p.h
---- a/src/external/qxlsx/xlsxzipreader_p.h Thu Oct 08 21:35:35 2020 +0100
-+++ b/src/external/qxlsx/xlsxzipreader_p.h Thu Oct 08 21:36:28 2020 +0100
-@@ -38,7 +38,7 @@
- //
-
- #include "xlsxglobal.h"
--#include "external/qtcompress/qzipreader.h"
-+#include "qzipreader.h"
- #include <QScopedPointer>
- #include <QStringList>
- #include <QVector>
-@@ -60,7 +60,7 @@
- private:
- Q_DISABLE_COPY(ZipReader)
- void init();
-- QScopedPointer<Stel::QZipReader> m_reader;
-+ QScopedPointer<QZipReader> m_reader;
- QStringList m_filePaths;
- };
-
-diff -r 11536448457a xlsxzipwriter.cpp
---- a/src/external/qxlsx/xlsxzipwriter.cpp Thu Oct 08 21:41:22 2020 +0100
-+++ b/src/external/qxlsx/xlsxzipwriter.cpp Thu Oct 08 21:42:03 2020 +0100
-@@ -29,14 +29,14 @@
-
- ZipWriter::ZipWriter(const QString &filePath)
- {
-- m_writer = new Stel::QZipWriter(filePath, QIODevice::WriteOnly);
-- m_writer->setCompressionPolicy(Stel::QZipWriter::AutoCompress);
-+ m_writer = new QZipWriter(filePath, QIODevice::WriteOnly);
-+ m_writer->setCompressionPolicy(QZipWriter::AutoCompress);
- }
-
- ZipWriter::ZipWriter(QIODevice *device)
- {
-- m_writer = new Stel::QZipWriter(device);
-- m_writer->setCompressionPolicy(Stel::QZipWriter::AutoCompress);
-+ m_writer = new QZipWriter(device);
-+ m_writer->setCompressionPolicy(QZipWriter::AutoCompress);
- }
-
- ZipWriter::~ZipWriter()
-@@ -46,7 +46,7 @@
-
- bool ZipWriter::error() const
- {
-- return m_writer->status() != Stel::QZipWriter::NoError;
-+ return m_writer->status() != QZipWriter::NoError;
- }
-
- void ZipWriter::addFile(const QString &filePath, QIODevice *device)
-diff -r 2019bb0d2919 xlsxzipwriter_p.h
---- a/src/external/qxlsx/xlsxzipwriter_p.h Thu Oct 08 21:35:35 2020 +0100
-+++ b/src/external/qxlsx/xlsxzipwriter_p.h Thu Oct 08 21:36:28 2020 +0100
-@@ -37,7 +37,7 @@
- //
-
- #include <QString>
--#include "external/qtcompress/qzipwriter.h"
-+#include "qzipwriter.h"
-
- class QIODevice;
- class QZipWriter;
-@@ -57,7 +57,7 @@
- void close();
-
- private:
-- Stel::QZipWriter *m_writer;
-+ QZipWriter *m_writer;
- };
-
- } // namespace QXlsx
diff --git a/sci-astronomy/stellarium/stellarium-0.20.4.ebuild b/sci-astronomy/stellarium/stellarium-0.20.4.ebuild
deleted file mode 100644
index 25de0105315..00000000000
--- a/sci-astronomy/stellarium/stellarium-0.20.4.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit cmake desktop flag-o-matic python-any-r1 xdg virtualx
-
-DESCRIPTION="3D photo-realistic skies in real time"
-HOMEPAGE="https://stellarium.org/"
-MY_DSO_VERSION="3.12"
-SRC_URI="
- https://github.com/Stellarium/stellarium/releases/download/v${PV}/${P}.tar.gz
- deep-sky? (
- https://github.com/Stellarium/stellarium-data/releases/download/dso-${MY_DSO_VERSION}/catalog.dat -> ${PN}-dso-catalog-${MY_DSO_VERSION}.dat
- )
- doc? (
- https://github.com/Stellarium/stellarium/releases/download/v${PV}/stellarium_user_guide-${PV}-1.pdf
- )
- stars? (
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat
- )"
-
-LICENSE="GPL-2+ SGI-B-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="debug deep-sky doc gps media nls stars telescope test"
-
-# Python interpreter is used while building RemoteControl plugin
-BDEPEND="
- ${PYTHON_DEPS}
- doc? ( app-doc/doxygen[dot] )
- nls? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="
- dev-libs/qtcompress:=
- 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] )
- telescope? ( sci-libs/indilib:= )
-"
-DEPEND="${RDEPEND}
- dev-qt/qtconcurrent:5
- test? ( dev-qt/qttest:5 )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- "${FILESDIR}/stellarium-0.20.3-unbundle-indi.patch"
- "${FILESDIR}/stellarium-0.20.3-unbundle-qtcompress.patch"
- "${FILESDIR}/stellarium-0.20.3-unbundle-zlib.patch"
-)
-
-src_prepare() {
- cmake_src_prepare
- use debug || append-cppflags -DQT_NO_DEBUG #415769
-
- # Several libraries are bundled, remove them.
- rm -r src/external/{libindi,qtcompress,zlib}/ || die
-
- # qcustomplot can't be easily unbundled because it uses qcustomplot 1
- # while we have qcustomplot 2 in tree which changed API a bit
- # Also the license of the external qcustomplot is incompatible with stellarium
-
- # for glues_stel aka libtess I couldn't find an upstream with the same API
-
- # unbundling of qxlsx depends on https://github.com/QtExcel/QXlsx/pull/114
-
- local remaining="$(cd src/external/ && echo */)"
- if [[ "${remaining}" != "glues_stel/ qcustomplot/ qxlsx/" ]]; then
- eqawarn "Need to unbundle more deps: ${remaining}"
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_GPS="$(usex gps)"
- -DENABLE_MEDIA="$(usex media)"
- -DENABLE_NLS="$(usex nls)"
- -DENABLE_TESTING="$(usex test)"
- -DUSE_PLUGIN_TELESCOPECONTROL="$(usex telescope)"
- )
- cmake_src_configure
-}
-
-src_test() {
- virtx cmake_src_test
-}
-
-src_compile() {
- cmake_src_compile
-
- if use doc ; then
- cmake_build apidoc
- fi
-}
-
-src_install() {
- if use doc ; then
- local HTML_DOCS=( "${BUILD_DIR}/doc/html/." )
- dodoc "${DISTDIR}/stellarium_user_guide-${PV}-1.pdf"
- fi
- cmake_src_install
-
- # use the more up-to-date system fonts
- rm "${ED}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf || die
- dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf
- dosym ../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf
-
- if use stars ; then
- insinto /usr/share/${PN}/stars/default
- doins "${DISTDIR}"/stars_4_1v0_2.cat
- doins "${DISTDIR}"/stars_{5,6,7,8}_2v0_1.cat
- fi
- if use deep-sky ; then
- insinto /usr/share/${PN}/nebulae/default
- newins "${DISTDIR}/${PN}-dso-catalog-${MY_DSO_VERSION}.dat" catalog.dat
- fi
- newicon doc/images/stellarium-logo.png ${PN}.png
-}
diff --git a/sci-astronomy/stellarium/stellarium-0.21.0.ebuild b/sci-astronomy/stellarium/stellarium-0.21.0.ebuild
deleted file mode 100644
index 9f6e471d3ed..00000000000
--- a/sci-astronomy/stellarium/stellarium-0.21.0.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake desktop flag-o-matic python-any-r1 xdg virtualx
-
-DESCRIPTION="3D photo-realistic skies in real time"
-HOMEPAGE="https://stellarium.org/"
-MY_DSO_VERSION="3.12"
-SRC_URI="
- https://github.com/Stellarium/stellarium/releases/download/v${PV}/${P}.tar.gz
- deep-sky? (
- https://github.com/Stellarium/stellarium-data/releases/download/dso-${MY_DSO_VERSION}/catalog.dat -> ${PN}-dso-catalog-${MY_DSO_VERSION}.dat
- )
- doc? (
- https://github.com/Stellarium/stellarium/releases/download/v${PV}/stellarium_user_guide-${PV}-1.pdf
- )
- stars? (
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat
- https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat
- )"
-
-LICENSE="GPL-2+ SGI-B-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="debug deep-sky doc gps media nls stars telescope test"
-
-# Python interpreter is used while building RemoteControl plugin
-BDEPEND="
- ${PYTHON_DEPS}
- doc? ( app-doc/doxygen[dot] )
- nls? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="
- dev-libs/qtcompress:=
- 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/qtwidgets:5
- media-fonts/dejavu
- sys-libs/zlib
- virtual/opengl
- gps? (
- dev-qt/qtpositioning:5
- dev-qt/qtserialport:5
- sci-geosciences/gpsd:=[cxx]
- )
- media? ( dev-qt/qtmultimedia:5[widgets] )
- telescope? (
- dev-qt/qtserialport:5
- sci-libs/indilib:=
- )
-"
-DEPEND="${RDEPEND}
- dev-qt/qtconcurrent:5
- test? ( dev-qt/qttest:5 )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- "${FILESDIR}/stellarium-0.20.3-unbundle-indi.patch"
- "${FILESDIR}/stellarium-0.21.0-unbundle-qtcompress.patch"
- "${FILESDIR}/stellarium-0.20.3-unbundle-zlib.patch"
-)
-
-src_prepare() {
- cmake_src_prepare
- use debug || append-cppflags -DQT_NO_DEBUG #415769
-
- # Several libraries are bundled, remove them.
- rm -r src/external/{libindi,qtcompress,zlib}/ || die
-
- # qcustomplot can't be easily unbundled because it uses qcustomplot 1
- # while we have qcustomplot 2 in tree which changed API a bit
- # Also the license of the external qcustomplot is incompatible with stellarium
-
- # for glues_stel aka libtess I couldn't find an upstream with the same API
-
- # unbundling of qxlsx depends on https://github.com/QtExcel/QXlsx/pull/114
-
- local remaining="$(cd src/external/ && echo */)"
- if [[ "${remaining}" != "glues_stel/ qcustomplot/ qxlsx/" ]]; then
- eqawarn "Need to unbundle more deps: ${remaining}"
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_GPS="$(usex gps)"
- -DENABLE_MEDIA="$(usex media)"
- -DENABLE_NLS="$(usex nls)"
- -DENABLE_TESTING="$(usex test)"
- -DUSE_PLUGIN_TELESCOPECONTROL="$(usex telescope)"
- )
- cmake_src_configure
-}
-
-src_test() {
- virtx cmake_src_test
-}
-
-src_compile() {
- cmake_src_compile
-
- if use doc ; then
- cmake_build apidoc
- fi
-}
-
-src_install() {
- if use doc ; then
- local HTML_DOCS=( "${BUILD_DIR}/doc/html/." )
- dodoc "${DISTDIR}/stellarium_user_guide-${PV}-1.pdf"
- fi
- cmake_src_install
-
- # use the more up-to-date system fonts
- rm "${ED}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf || die
- dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf
- dosym ../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf
-
- if use stars ; then
- insinto /usr/share/${PN}/stars/default
- doins "${DISTDIR}"/stars_4_1v0_2.cat
- doins "${DISTDIR}"/stars_{5,6,7,8}_2v0_1.cat
- fi
- if use deep-sky ; then
- insinto /usr/share/${PN}/nebulae/default
- newins "${DISTDIR}/${PN}-dso-catalog-${MY_DSO_VERSION}.dat" catalog.dat
- fi
- newicon doc/images/stellarium-logo.png ${PN}.png
-}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/stellarium/files/, sci-astronomy/stellarium/
@ 2022-04-18 20:29 Sam James
0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2022-04-18 20:29 UTC (permalink / raw
To: gentoo-commits
commit: 027dc0a5290636d544eae044afbe4bbb6cdeac33
Author: Matt Jolly <Matt.Jolly <AT> footclan <DOT> ninja>
AuthorDate: Sun Apr 17 13:13:44 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 18 20:29:17 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=027dc0a5
sci-astronomy/stellarium: backport fix for segfault in star manager module
Signed-off-by: Matt Jolly <Matt.Jolly <AT> footclan.ninja>
Signed-off-by: Sam James <sam <AT> gentoo.org>
...ellarium-0.22.1-fix-star-manager-segfault.patch | 30 ++++++++++++++++++++++
sci-astronomy/stellarium/stellarium-0.22.1.ebuild | 1 +
2 files changed, 31 insertions(+)
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
new file mode 100644
index 000000000000..7f8981a006e2
--- /dev/null
+++ b/sci-astronomy/stellarium/files/stellarium-0.22.1-fix-star-manager-segfault.patch
@@ -0,0 +1,30 @@
+This patch is required to fix a segfault on startup in <=0.22.1 if star catalogue files are
+added or removed (USE=stars)
+
+Refer: https://github.com/Stellarium/stellarium/issues/2404
+
+This patch may be safely removed for 0.22.2 - it has been patched upstream.
+
+--- a/src/core/modules/StarMgr.cpp
++++ b/src/core/modules/StarMgr.cpp
+@@ -592,13 +592,13 @@ void StarMgr::setCheckFlag(const QString& catId, bool b)
+ return;
+ m["checked"]=b;
+ catalogsDescription[idx-1]=m;
+- starSettings["catalogs"]=catalogsDescription;
+- QFile tmp(starConfigFileFullPath);
+- if(tmp.open(QIODevice::WriteOnly))
+- {
+- StelJsonParser::write(starSettings, &tmp);
+- tmp.close();
+- }
++ }
++ starSettings["catalogs"]=catalogsDescription;
++ QFile tmp(starConfigFileFullPath);
++ if(tmp.open(QIODevice::WriteOnly))
++ {
++ StelJsonParser::write(starSettings, &tmp);
++ tmp.close();
+ }
+ }
+
diff --git a/sci-astronomy/stellarium/stellarium-0.22.1.ebuild b/sci-astronomy/stellarium/stellarium-0.22.1.ebuild
index 940b01d9d06d..1a8d4b878c4d 100644
--- a/sci-astronomy/stellarium/stellarium-0.22.1.ebuild
+++ b/sci-astronomy/stellarium/stellarium-0.22.1.ebuild
@@ -71,6 +71,7 @@ RESTRICT="!test? ( test )"
PATCHES=(
"${FILESDIR}/stellarium-0.20.3-unbundle-indi.patch"
"${FILESDIR}/stellarium-0.20.3-unbundle-zlib.patch"
+ "${FILESDIR}/stellarium-0.22.1-fix-star-manager-segfault.patch"
"${FILESDIR}/stellarium-0.22.1-unbundle-qtcompress.patch"
)
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/stellarium/files/, sci-astronomy/stellarium/
@ 2022-07-19 7:41 Florian Schmaus
0 siblings, 0 replies; 13+ messages in thread
From: Florian Schmaus @ 2022-07-19 7:41 UTC (permalink / raw
To: gentoo-commits
commit: d32c1aac166b5914ac2feb6d5abf008442220026
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Sun Jul 10 09:24:00 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Jul 19 07:36:24 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d32c1aac
sci-astronomy/stellarium: version 0.22.2
Closes: https://bugs.gentoo.org/847439
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/26323
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
sci-astronomy/stellarium/Manifest | 3 +
.../files/stellarium-0.22.2-ccache.patch | 13 ++
.../stellarium-0.22.2-unbundle-qtcompress.patch | 208 +++++++++++++++++++++
sci-astronomy/stellarium/stellarium-0.22.2.ebuild | 144 ++++++++++++++
4 files changed, 368 insertions(+)
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index 0492885198ac..c582a4819100 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -5,7 +5,10 @@ DIST stars_7_2v0_1.cat 305710678 BLAKE2B 1cc9b4a6bc35a9339e495f7e0da4f7e90a0e92b
DIST stars_8_2v0_1.cat 559068934 BLAKE2B c040a369cdf6885759998e1315b554d21a5e2b9b149a67967a8af45606aebf57bec407fab5ce1904978af0dc529aa6bddd267331ca45f58617bbf56d5ca99dee SHA512 06d4fa298b9dff8452f550377df99fcaa5e7107cfc7b75c9a4769b3cb6d97a822a54213c706102c1d7ef2dabc16df32a85f46b2f6d6c6f76a4e919353b739de4
DIST stellarium-0.21.3.tar.gz 390176992 BLAKE2B 9a6ba3ab6e1b0a61916c844d271bb2181f7b6482dfaaf24e9160dd00cec297e80fc2af167f77aaf248c4dcb358ff64c5cdc138626f37030529146f1e822813e8 SHA512 6553f0229f837742e8b9db2715ecb96d69fe46aa7f057d86fb2547540d86f2cb767ca4a6bb5ff18037642113b42fec3f2850e037275fc732aae63da8031bbd0e
DIST stellarium-0.22.1.tar.gz 407700439 BLAKE2B 7a01bf63892ab800988896748f44961832756cb993884ab1d45e454035db72d6494a536936ccc338f1c0322e20ec5b282a2c3764b77f1c16cf2ee47f1a57a979 SHA512 31d0294c78c3254261dd2a5e46022342f9f3046f920efd8e4f1353eecf79116f50a968479768c12a8419ed3f9182fd3694a78b5ea2ab27ad67e6ef6d17aaa137
+DIST stellarium-0.22.2.tar.gz 409151525 BLAKE2B c49abfb17a8bf7b120d8a0dffbe58b83e18f86b7ef2764cddc946e0cbaad9bf01adaf8d008557108f6354ed11d79e56d94c92c2a07befbd955aed8d201b68292 SHA512 ed905f58e1ff8b257b1e054ca76c83470915b00a04f7925b63784aa62b74e972f332e0b7dc605ffc17bb6516ef4f045943cb564d9637238726b9d7ceb2d44dda
DIST stellarium-dso-catalog-3.13.dat 28683353 BLAKE2B 6d7587f98ccb06a83e6befb1d569c9639170c8a430901c1c6098a86a33fe8934cd4454a87b51752636a15ab1a96fd3ebd77cbd5d9e4260436ec2e4e4795f98b0 SHA512 3880ec776798599640fb083b0c9ebbccadef44f640fb2214052161ddbeb06bf5b0babc0c31d9ac02aa40e52e290d4f5613c11a6dadd83fd61114dbfb49ebe855
DIST stellarium-dso-catalog-3.15.dat 28683372 BLAKE2B c2ba23a6b169815ed20d97113887f663a9b730774cc2e8402e4149ff25b8d0107166c806814d3fb46ccc1f1859a901508f652234b8ddff3ea7d4710b21b65c93 SHA512 2f43696b093bcc35288b51fdacf89380ee878296fa596c10404c89004efbd08104e7d04e193499eed711ad7d13dd7fe8af805167e3b10d6b2c2b02fca42ad041
+DIST stellarium-dso-catalog-3.16.dat 28678822 BLAKE2B 130513b5dcb0d06dd605ed62d6bdf12bfd636a5e5f5c33f02c7adb77a6712245a98ce3d56332fce6fea0f18c9b7915af4bb3d9812b1fd09bfc036d4135cef4f5 SHA512 9320d2a3c9af93d19cc4414f371991993793b78315448cafcd83b82de6dc16715b0cab2ddeafca667af31a9086420cbe758708333e5b95215de8a46305324c41
DIST stellarium_user_guide-0.21.3-1.pdf 31253904 BLAKE2B 3e8a0395a29c2fac164379ea315cd21d102b2b400d9eeacdb37cf85f00816f0678edabb9b779db135f4c43ee4cfcc6307ee59f4a149aa33e878c11fe26551266 SHA512 83137fe09bdc279bec23b78694d5e1efe9238733f8adf2cb8ed7e37f0eee60b0475c4c93b5bc85a04b92a175284c24354c36b6a93014216387211c9b031cdf7c
DIST stellarium_user_guide-0.22.1-1.pdf 36226017 BLAKE2B 628c57f1efa6238e5c12588ed4b0532816e8708f16d40fad0d87f72550af5efa500ae0edbc20e243488c59dfc94b47efe588d47419e7d29b1fd6ff9e4cec5438 SHA512 07d965f5b45ac964bec401f14ee81322a17939e292390ebd040339c265ede4b652b37e9220696f13c093ea22e8a706b27b7d23d7357dffbe808c2538f8cee93d
+DIST stellarium_user_guide-0.22.2-1.pdf 35082446 BLAKE2B c9bb7f344a9377fe86b714904aa713c7e6cda59d31f8e547b571da0a057d141fa1b998b4adb3dbdcee0bb7a152b6f6e18b58a4a08c345dc0e77efca6ffb5a801 SHA512 45adfe53fa9c7432952152d95ab96a446a6459348fa6724fff83aababb0c967d9467cc0ca3bd24b834fd189fb69c782e521d94528a60a704062aa445e749a4a5
diff --git a/sci-astronomy/stellarium/files/stellarium-0.22.2-ccache.patch b/sci-astronomy/stellarium/files/stellarium-0.22.2-ccache.patch
new file mode 100644
index 000000000000..5f0d25f2ea14
--- /dev/null
+++ b/sci-astronomy/stellarium/files/stellarium-0.22.2-ccache.patch
@@ -0,0 +1,13 @@
+Don't automagically use ccache https://bugs.gentoo.org/847439
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -160,7 +160,7 @@ IF(OPENGL_DEBUG_LOGGING)
+ ENDIF()
+
+ # Use ccache if possible
+-IF(NOT WIN32)
++IF(FALSE)
+ FIND_PROGRAM(CCACHE_PROGRAM ccache)
+ IF(CCACHE_PROGRAM)
+ MESSAGE(STATUS "Found ccache ${CCACHE_PROGRAM}")
diff --git a/sci-astronomy/stellarium/files/stellarium-0.22.2-unbundle-qtcompress.patch b/sci-astronomy/stellarium/files/stellarium-0.22.2-unbundle-qtcompress.patch
new file mode 100644
index 000000000000..47643b797992
--- /dev/null
+++ b/sci-astronomy/stellarium/files/stellarium-0.22.2-unbundle-qtcompress.patch
@@ -0,0 +1,208 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -614,6 +614,8 @@ ELSE(ENABLE_GPS)
+ MESSAGE(STATUS "GPS: disabled.")
+ ENDIF(ENABLE_GPS)
+
++find_package(Qt5Compress REQUIRED)
++
+ IF(USE_QTOPENGL)
+ # QtOpenGL module is deprecated. After merging the QOpenGLWidget branch, we don't use this module directly anymore,
+ # but the QtMultimediaWidgets module requires it internally, so we still have to package it.
+--- a/plugins/Satellites/src/CMakeLists.txt
++++ b/plugins/Satellites/src/CMakeLists.txt
+@@ -55,7 +55,7 @@ IF(ENABLE_TESTING)
+ ENDIF(ENABLE_TESTING)
+
+ ADD_LIBRARY(Satellites-static STATIC ${Satellites_SRCS} ${Satellites_RES_CXX} ${SatellitesDialog_UIS_H})
+-TARGET_LINK_LIBRARIES(Satellites-static Qt5::Core Qt5::Network Qt5::Widgets)
++TARGET_LINK_LIBRARIES(Satellites-static Qt5::Core Qt5::Network Qt5::Widgets Qt5::Compress)
+ # The library target "Satellites-static" has a default OUTPUT_NAME of "Satellites-static", so change it.
+ SET_TARGET_PROPERTIES(Satellites-static PROPERTIES OUTPUT_NAME "Satellites")
+ IF(MSVC)
+--- a/plugins/Satellites/src/Satellites.cpp
++++ b/plugins/Satellites/src/Satellites.cpp
+@@ -43,7 +43,7 @@
+ #include "StelUtils.hpp"
+ #include "StelActionMgr.hpp"
+
+-#include "external/qtcompress/qzipreader.h"
++#include "qzipreader.h"
+
+ #include <QNetworkAccessManager>
+ #include <QNetworkReply>
+@@ -1639,12 +1639,12 @@ void Satellites::saveDownloadedUpdate(QNetworkReply* reply)
+ QString archive = zip.fileName();
+ QByteArray data;
+
+- Stel::QZipReader reader(archive);
+- if (reader.status() != Stel::QZipReader::NoError)
++ QZipReader reader(archive);
++ if (reader.status() != QZipReader::NoError)
+ qWarning() << "[Satellites] Unable to open as a ZIP archive";
+ else
+ {
+- QList<Stel::QZipReader::FileInfo> infoList = reader.fileInfoList();
++ QList<QZipReader::FileInfo> infoList = reader.fileInfoList();
+ for (const auto& info : qAsConst(infoList))
+ {
+ // qWarning() << "[Satellites] Processing:" << info.filePath;
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -479,7 +479,7 @@ IF(ENABLE_SPOUT AND SPOUT_LIBRARY_DLL)
+ CONFIGURE_FILE(${SPOUT_LIBRARY_DLL} ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
+ ENDIF()
+
+-SET(STELMAIN_DEPS ${ZLIB_LIBRARIES} qtcompress_stel glues_stel qxlsx_stel ${STELLARIUM_STATIC_PLUGINS_LIBRARIES} ${STELLARIUM_QT_LIBRARIES} ${SPOUT_LIBRARY})
++SET(STELMAIN_DEPS ${ZLIB_LIBRARIES} Qt5::Compress glues_stel qxlsx_stel ${STELLARIUM_STATIC_PLUGINS_LIBRARIES} ${STELLARIUM_QT_LIBRARIES} ${SPOUT_LIBRARY})
+ IF(ENABLE_LIBGPS)
+ SET(STELMAIN_DEPS ${STELMAIN_DEPS} ${GPS_LIBRARY})
+ ENDIF()
+--- a/src/core/modules/LandscapeMgr.cpp
++++ b/src/core/modules/LandscapeMgr.cpp
+@@ -1331,8 +1331,8 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const
+ }
+ QDir destinationDir (parentDestinationDir.absoluteFilePath("landscapes"));
+
+- Stel::QZipReader reader(sourceFilePath);
+- if (reader.status() != Stel::QZipReader::NoError)
++ QZipReader reader(sourceFilePath);
++ if (reader.status() != QZipReader::NoError)
+ {
+ qWarning() << "LandscapeMgr: Unable to open as a ZIP archive:" << QDir::toNativeSeparators(sourceFilePath);
+ emit errorNotArchive();
+@@ -1341,7 +1341,7 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const
+
+ //Detect top directory
+ QString topDir, iniPath;
+- const QList<Stel::QZipReader::FileInfo> infoList = reader.fileInfoList();
++ const QList<QZipReader::FileInfo> infoList = reader.fileInfoList();
+ for (const auto& info : infoList)
+ {
+ QFileInfo fileInfo(info.filePath);
+--- a/src/external/CMakeLists.txt
++++ b/src/external/CMakeLists.txt
+@@ -70,6 +70,7 @@ target_include_directories(zlib_stel PUBLIC zlib)
+ set_target_properties(zlib_stel PROPERTIES AUTOMOC 0)
+ SET_TARGET_PROPERTIES(zlib_stel PROPERTIES FOLDER "src/external")
+
++if(0)
+ set(qtcompress_SRCS
+ qtcompress/qzip.cpp
+ qtcompress/qzipreader.h
+@@ -82,6 +83,7 @@ target_link_libraries(qtcompress_stel ${ZLIB_LIBRARIES} Qt5::Core)
+ #turn off automoc, not needed here
+ set_target_properties(qtcompress_stel PROPERTIES AUTOMOC 0)
+ SET_TARGET_PROPERTIES(qtcompress_stel PROPERTIES FOLDER "src/external")
++endif()
+
+ # QCustomPlot should not be unbundled, because upstream uses GPL 3, and
+ # Stellarium uses GPL 2. Author of QCustomPlot has agreed for GPL 2+ for this.
+@@ -180,7 +182,7 @@ SET(qxlsx_SRCS
+ qxlsx/xlsxcelllocation.h
+ )
+ add_library(qxlsx_stel STATIC EXCLUDE_FROM_ALL ${qxlsx_SRCS})
+-target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui qtcompress_stel)
++target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui Qt5::Compress)
+ set_target_properties(qxlsx_stel PROPERTIES FOLDER "src/external")
+
+ ################################# INDI ################################
+--- a/src/external/qxlsx/xlsxzipreader.cpp
++++ b/src/external/qxlsx/xlsxzipreader.cpp
+@@ -5,13 +5,13 @@
+ QT_BEGIN_NAMESPACE_XLSX
+
+ ZipReader::ZipReader(const QString &filePath) :
+- m_reader(new Stel::QZipReader(filePath))
++ m_reader(new QZipReader(filePath))
+ {
+ init();
+ }
+
+ ZipReader::ZipReader(QIODevice *device) :
+- m_reader(new Stel::QZipReader(device))
++ m_reader(new QZipReader(device))
+ {
+ init();
+ }
+@@ -23,8 +23,8 @@ ZipReader::~ZipReader()
+
+ void ZipReader::init()
+ {
+- QList<Stel::QZipReader::FileInfo> allFiles = m_reader->fileInfoList();
+- for (const Stel::QZipReader::FileInfo &fi : allFiles) {
++ QList<QZipReader::FileInfo> allFiles = m_reader->fileInfoList();
++ for (const QZipReader::FileInfo &fi : allFiles) {
+ if (fi.isFile || (!fi.isDir && !fi.isFile && !fi.isSymLink))
+ m_filePaths.append(fi.filePath);
+ }
+--- a/src/external/qxlsx/xlsxzipreader_p.h
++++ b/src/external/qxlsx/xlsxzipreader_p.h
+@@ -8,7 +8,7 @@
+ #include <QIODevice>
+
+ #include "xlsxglobal.h"
+-#include "external/qtcompress/qzipreader.h"
++#include "qzipreader.h"
+
+ #if QT_VERSION >= 0x050600
+ #include <QVector>
+@@ -31,7 +31,7 @@ public:
+ private:
+ Q_DISABLE_COPY(ZipReader)
+ void init();
+- QScopedPointer<Stel::QZipReader> m_reader;
++ QScopedPointer<QZipReader> m_reader;
+ QStringList m_filePaths;
+ };
+
+--- a/src/external/qxlsx/xlsxzipwriter.cpp
++++ b/src/external/qxlsx/xlsxzipwriter.cpp
+@@ -10,14 +10,14 @@ QT_BEGIN_NAMESPACE_XLSX
+
+ ZipWriter::ZipWriter(const QString &filePath)
+ {
+- m_writer = new Stel::QZipWriter(filePath, QIODevice::WriteOnly);
+- m_writer->setCompressionPolicy(Stel::QZipWriter::AutoCompress);
++ m_writer = new QZipWriter(filePath, QIODevice::WriteOnly);
++ m_writer->setCompressionPolicy(QZipWriter::AutoCompress);
+ }
+
+ ZipWriter::ZipWriter(QIODevice *device)
+ {
+- m_writer = new Stel::QZipWriter(device);
+- m_writer->setCompressionPolicy(Stel::QZipWriter::AutoCompress);
++ m_writer = new QZipWriter(device);
++ m_writer->setCompressionPolicy(QZipWriter::AutoCompress);
+ }
+
+ ZipWriter::~ZipWriter()
+@@ -27,7 +27,7 @@ ZipWriter::~ZipWriter()
+
+ bool ZipWriter::error() const
+ {
+- return m_writer->status() != Stel::QZipWriter::NoError;
++ return m_writer->status() != QZipWriter::NoError;
+ }
+
+ void ZipWriter::addFile(const QString &filePath, QIODevice *device)
+--- a/src/external/qxlsx/xlsxzipwriter_p.h
++++ b/src/external/qxlsx/xlsxzipwriter_p.h
+@@ -8,7 +8,7 @@
+ #include <QIODevice>
+
+ #include "xlsxglobal.h"
+-#include "external/qtcompress/qzipwriter.h"
++#include "qzipwriter.h"
+
+ class QZipWriter;
+
+@@ -27,7 +27,7 @@ public:
+ void close();
+
+ private:
+- Stel::QZipWriter *m_writer;
++ QZipWriter *m_writer;
+ };
+
+ QT_END_NAMESPACE_XLSX
diff --git a/sci-astronomy/stellarium/stellarium-0.22.2.ebuild b/sci-astronomy/stellarium/stellarium-0.22.2.ebuild
new file mode 100644
index 000000000000..b4cd3de9ae2a
--- /dev/null
+++ b/sci-astronomy/stellarium/stellarium-0.22.2.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake desktop flag-o-matic python-any-r1 xdg virtualx
+
+DESCRIPTION="3D photo-realistic skies in real time"
+HOMEPAGE="https://stellarium.org/"
+MY_DSO_VERSION="3.16"
+SRC_URI="
+ https://github.com/Stellarium/stellarium/releases/download/v${PV}/${P}.tar.gz
+ deep-sky? (
+ https://github.com/Stellarium/stellarium-data/releases/download/dso-${MY_DSO_VERSION}/catalog-${MY_DSO_VERSION}.dat -> ${PN}-dso-catalog-${MY_DSO_VERSION}.dat
+ )
+ doc? (
+ https://github.com/Stellarium/stellarium/releases/download/v${PV}/stellarium_user_guide-${PV}-1.pdf
+ )
+ stars? (
+ https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat
+ https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat
+ https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat
+ https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat
+ https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat
+ )"
+
+LICENSE="GPL-2+ SGI-B-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug deep-sky doc gps media nls stars telescope test webengine"
+
+# Python interpreter is used while building RemoteControl plugin
+BDEPEND="
+ ${PYTHON_DEPS}
+ dev-lang/perl
+ doc? ( app-doc/doxygen[dot] )
+ nls? ( dev-qt/linguist-tools:5 )
+"
+RDEPEND="
+ dev-libs/qtcompress:=
+ dev-qt/qtcharts:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtscript:5
+ dev-qt/qtwidgets:5
+ media-fonts/dejavu
+ sys-libs/zlib
+ gps? (
+ dev-qt/qtpositioning:5
+ dev-qt/qtserialport:5
+ sci-geosciences/gpsd:=[cxx]
+ )
+ media? (
+ dev-qt/qtmultimedia:5[widgets]
+ dev-qt/qtopengl:5
+ virtual/opengl
+ )
+ telescope? (
+ dev-qt/qtserialport:5
+ sci-libs/indilib:=
+ )
+ webengine? ( dev-qt/qtwebengine:5[widgets] )
+"
+DEPEND="${RDEPEND}
+ dev-qt/qtconcurrent:5
+ test? ( dev-qt/qttest:5 )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}/stellarium-0.20.3-unbundle-indi.patch"
+ "${FILESDIR}/stellarium-0.20.3-unbundle-zlib.patch"
+ "${FILESDIR}/stellarium-0.22.2-unbundle-qtcompress.patch"
+ "${FILESDIR}/stellarium-0.22.2-ccache.patch"
+)
+
+src_prepare() {
+ cmake_src_prepare
+ use debug || append-cppflags -DQT_NO_DEBUG #415769
+
+ # Several libraries are bundled, remove them.
+ rm -r src/external/{libindi,qtcompress,zlib}/ || die
+
+ # for glues_stel aka libtess I couldn't find an upstream with the same API
+
+ # unbundling of qxlsx depends on https://github.com/QtExcel/QXlsx/pull/185
+
+ local remaining="$(cd src/external/ && echo */)"
+ if [[ "${remaining}" != "glues_stel/ qxlsx/" ]]; then
+ eqawarn "Need to unbundle more deps: ${remaining}"
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_GPS="$(usex gps)"
+ -DENABLE_MEDIA="$(usex media)"
+ -DENABLE_NLS="$(usex nls)"
+ -DENABLE_TESTING="$(usex test)"
+ -DUSE_PLUGIN_TELESCOPECONTROL="$(usex telescope)"
+ $(cmake_use_find_package webengine Qt5WebEngine)
+ $(cmake_use_find_package webengine Qt5WebEngineWidgets)
+ )
+ cmake_src_configure
+}
+
+src_test() {
+ virtx cmake_src_test
+}
+
+src_compile() {
+ cmake_src_compile
+
+ if use doc ; then
+ cmake_build apidoc
+ fi
+}
+
+src_install() {
+ if use doc ; then
+ local HTML_DOCS=( "${BUILD_DIR}/doc/html/." )
+ dodoc "${DISTDIR}/stellarium_user_guide-${PV}-1.pdf"
+ fi
+ cmake_src_install
+
+ # use the more up-to-date system fonts
+ rm "${ED}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf || die
+ dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf
+ dosym ../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf
+
+ if use stars ; then
+ insinto /usr/share/${PN}/stars/default
+ doins "${DISTDIR}"/stars_4_1v0_2.cat
+ doins "${DISTDIR}"/stars_{5,6,7,8}_2v0_1.cat
+ fi
+ if use deep-sky ; then
+ insinto /usr/share/${PN}/nebulae/default
+ newins "${DISTDIR}/${PN}-dso-catalog-${MY_DSO_VERSION}.dat" catalog.dat
+ fi
+ newicon doc/images/stellarium-logo.png ${PN}.png
+}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/stellarium/files/, sci-astronomy/stellarium/
@ 2022-11-05 1:38 Jason Zaman
0 siblings, 0 replies; 13+ messages in thread
From: Jason Zaman @ 2022-11-05 1:38 UTC (permalink / raw
To: gentoo-commits
commit: 28410219672502497f887670ae4fc9eda6cd13ff
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Fri Nov 4 23:11:05 2022 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sat Nov 5 01:32:24 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28410219
sci-astronomy/stellarium: add 1.1
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Closes: https://bugs.gentoo.org/862249
Bug: https://bugs.gentoo.org/745234
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org>
sci-astronomy/stellarium/Manifest | 3 +
.../stellarium/files/stellarium-1.1-qxlsx.patch | 11 ++
sci-astronomy/stellarium/metadata.xml | 3 +
sci-astronomy/stellarium/stellarium-1.1.ebuild | 172 +++++++++++++++++++++
4 files changed, 189 insertions(+)
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index beecdeb0e8ee..2fcaef527f78 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -4,5 +4,8 @@ DIST stars_6_2v0_1.cat 148352404 BLAKE2B c605b284b3d768cb1619ada3f58d406fa7737f0
DIST stars_7_2v0_1.cat 305710678 BLAKE2B 1cc9b4a6bc35a9339e495f7e0da4f7e90a0e92b05b5de8599be1bbdd2a8053cbcec44b0e58bc9248364666db9cdf23449edf236e3f21fdc0e8f1a4a706afc919 SHA512 43b866eb793e8812c9d5502101a6c985d2055fb88bdbda274726bcd51e1527ecf342b22acd673318c9c8e88cac68eace18de8f27d29ffe64933fd32a5b84c5e3
DIST stars_8_2v0_1.cat 559068934 BLAKE2B c040a369cdf6885759998e1315b554d21a5e2b9b149a67967a8af45606aebf57bec407fab5ce1904978af0dc529aa6bddd267331ca45f58617bbf56d5ca99dee SHA512 06d4fa298b9dff8452f550377df99fcaa5e7107cfc7b75c9a4769b3cb6d97a822a54213c706102c1d7ef2dabc16df32a85f46b2f6d6c6f76a4e919353b739de4
DIST stellarium-0.22.2.tar.gz 409151525 BLAKE2B c49abfb17a8bf7b120d8a0dffbe58b83e18f86b7ef2764cddc946e0cbaad9bf01adaf8d008557108f6354ed11d79e56d94c92c2a07befbd955aed8d201b68292 SHA512 ed905f58e1ff8b257b1e054ca76c83470915b00a04f7925b63784aa62b74e972f332e0b7dc605ffc17bb6516ef4f045943cb564d9637238726b9d7ceb2d44dda
+DIST stellarium-1.1.1.tar.gz 413806998 BLAKE2B bd5679aa32edfa44807e941d0febcb1c1749eada6c2834cb16de4cc9850735c3033122fd1e4afc8b8550441b8a8f70865f6a7b3eb178bf906c8b64d7829ea3f6 SHA512 4564b8df21afb5d266c21e4d59a5df52a0695f102dc68d59d37ea29e520495132c7fb01235ceac5d68b0812fc05d35b5f8c7a5c337c55007ce562f770e3a3612
DIST stellarium-dso-catalog-3.16.dat 28678822 BLAKE2B 130513b5dcb0d06dd605ed62d6bdf12bfd636a5e5f5c33f02c7adb77a6712245a98ce3d56332fce6fea0f18c9b7915af4bb3d9812b1fd09bfc036d4135cef4f5 SHA512 9320d2a3c9af93d19cc4414f371991993793b78315448cafcd83b82de6dc16715b0cab2ddeafca667af31a9086420cbe758708333e5b95215de8a46305324c41
+DIST stellarium-dso-catalog-3.17.dat 28678790 BLAKE2B 8ec14dd34c749a5bea19cc5567b2d703a7e5d4192eda6636fcec9fb2ef0301fd654aefdf4b33db70210da73eb9e385ace2265a57199f5660ec7034887fdcc80f SHA512 c0c679bd9de9e7ac000be5902d3a1e863853e8f9c382186253dd2d77a658fe93a9e2e206ecd1396f64b7b6cd4e738ecc2e11ea43bc6f71a098a44eb77875978a
DIST stellarium_user_guide-0.22.2-1.pdf 35082446 BLAKE2B c9bb7f344a9377fe86b714904aa713c7e6cda59d31f8e547b571da0a057d141fa1b998b4adb3dbdcee0bb7a152b6f6e18b58a4a08c345dc0e77efca6ffb5a801 SHA512 45adfe53fa9c7432952152d95ab96a446a6459348fa6724fff83aababb0c967d9467cc0ca3bd24b834fd189fb69c782e521d94528a60a704062aa445e749a4a5
+DIST stellarium_user_guide-1.1-1.pdf 36567672 BLAKE2B d1b7f9c8d8974aeabe92e3127c84a79b92dd9c3a0057b7831a1851c7fc88c13ec456375847e90576448a5dbe655846142637c91067cc10df20ae2b9373190e8e SHA512 2dbcf4100c1f24770fa23b2995103b94f0736eacca76031cecac582364948a4cb0e32aabdb554a30a7a64ed53eaa3538d59d7af2434eb74a04d562f1453bc89d
diff --git a/sci-astronomy/stellarium/files/stellarium-1.1-qxlsx.patch b/sci-astronomy/stellarium/files/stellarium-1.1-qxlsx.patch
new file mode 100644
index 000000000000..f3e4c9c38ab7
--- /dev/null
+++ b/sci-astronomy/stellarium/files/stellarium-1.1-qxlsx.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -815,7 +815,7 @@ IF(ENABLE_XLSX)
+ # TODO: switch to something like vcpkg or conan, and plain find_package,
+ # without the fallback of cmake downloading the dep itself.
+ # But some libraries are not available there yet.
+- CPMFindPackage(NAME QXlsx
++ CPMFindPackage(NAME QXlsxQt${QT_VERSION_MAJOR}
+ URL https://github.com/QtExcel/QXlsx/archive/refs/tags/v1.4.4.zip
+ URL_HASH SHA256=3efbd6f63a1ffd521c535dce7b5a5a7e9ebd23db51e6ae8e3e2eb89796e57675
+ DOWNLOAD_ONLY yes
diff --git a/sci-astronomy/stellarium/metadata.xml b/sci-astronomy/stellarium/metadata.xml
index a164ddaabccc..d4860f0597dd 100644
--- a/sci-astronomy/stellarium/metadata.xml
+++ b/sci-astronomy/stellarium/metadata.xml
@@ -22,9 +22,12 @@
<use>
<flag name="deep-sky">Install extra deep sky objects catalog (may affect performance)</flag>
<flag name="media">Enable sound and video support</flag>
+ <flag name="scripting">Enable JS scripting via <pkg>dev-qt/qtscript</pkg> in Qt5 or using Qml via <pkg>dev-qt/qtdeclarative</pkg> in Qt6</flag>
+ <flag name="show-my-sky">Enable a better atmosphere model via <pkg>sci-astronomy/calcmysky</pkg></flag>
<flag name="stars">Install extra star catalogs</flag>
<flag name="telescope">Enable telescope control via <pkg>sci-libs/indilib</pkg></flag>
<flag name="webengine">Show online results about the selected star in an embedded window using <pkg>dev-qt/qtwebengine</pkg></flag>
+ <flag name="xlsx">Support XLSX (Excel) files via <pkg>dev-libs/qxlsx</pkg></flag>
</use>
<upstream>
<remote-id type="github">Stellarium/stellarium</remote-id>
diff --git a/sci-astronomy/stellarium/stellarium-1.1.ebuild b/sci-astronomy/stellarium/stellarium-1.1.ebuild
new file mode 100644
index 000000000000..e10dc3e47f19
--- /dev/null
+++ b/sci-astronomy/stellarium/stellarium-1.1.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake desktop flag-o-matic python-any-r1 xdg virtualx
+
+DESCRIPTION="3D photo-realistic skies in real time"
+HOMEPAGE="https://stellarium.org/"
+MY_DSO_VERSION="3.17"
+SRC_URI="
+ https://github.com/Stellarium/stellarium/releases/download/v${PV}/${P}.1.tar.gz
+ deep-sky? (
+ https://github.com/Stellarium/stellarium-data/releases/download/dso-${MY_DSO_VERSION}/catalog-${MY_DSO_VERSION}.dat -> ${PN}-dso-catalog-${MY_DSO_VERSION}.dat
+ )
+ doc? (
+ https://github.com/Stellarium/stellarium/releases/download/v${PV}/stellarium_user_guide-${PV}-1.pdf
+ )
+ stars? (
+ https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat
+ https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat
+ https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat
+ https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat
+ https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat
+ )"
+
+LICENSE="GPL-2+ SGI-B-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug deep-sky doc gps media nls qt6 +scripting +show-my-sky stars telescope test webengine +xlsx"
+# Qt6 QAudioOutput crashes on startup; qt 6.4.0
+# https://bugreports.qt.io/browse/QTBUG-108221
+REQUIRED_USE="|| ( !media !qt6 )"
+
+# Python interpreter is used while building RemoteControl plugin
+BDEPEND="
+ ${PYTHON_DEPS}
+ dev-lang/perl
+ doc? ( app-doc/doxygen[dot] )
+ nls? (
+ !qt6? ( dev-qt/linguist-tools:5 )
+ qt6? ( dev-qt/qttools:6[linguist] )
+ )
+"
+RDEPEND="
+ media-fonts/dejavu
+ sys-libs/zlib
+ gps? ( sci-geosciences/gpsd:=[cxx] )
+ media? ( virtual/opengl )
+ !qt6? (
+ dev-qt/qtcharts:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5=
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ sci-astronomy/calcmysky:=[qt5]
+ gps? (
+ dev-qt/qtpositioning:5
+ dev-qt/qtserialport:5
+ )
+ media? (
+ dev-qt/qtmultimedia:5[widgets]
+ dev-qt/qtopengl:5
+ )
+ scripting? ( dev-qt/qtscript:5 )
+ telescope? ( dev-qt/qtserialport:5 )
+ webengine? ( dev-qt/qtwebengine:5[widgets] )
+ xlsx? ( dev-libs/qxlsx:=[qt5] )
+ )
+ qt6? (
+ dev-qt/qtbase:6=[gui,network,widgets]
+ dev-qt/qtcharts:6
+ sci-astronomy/calcmysky:=[qt6]
+ gps? (
+ dev-qt/qtpositioning:6
+ dev-qt/qtserialport:6
+ )
+ media? (
+ dev-qt/qtmultimedia:6[gstreamer]
+ )
+ scripting? ( dev-qt/qtdeclarative:6 )
+ telescope? ( dev-qt/qtserialport:6 )
+ webengine? ( dev-qt/qtwebengine:6[widgets] )
+ xlsx? ( dev-libs/qxlsx:=[qt6] )
+ )
+ telescope? ( sci-libs/indilib:= )
+"
+DEPEND="${RDEPEND}
+ !qt6? (
+ dev-qt/qtconcurrent:5
+ test? ( dev-qt/qttest:5 )
+ )
+ qt6? ( dev-qt/qtbase:6=[concurrent] )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}/stellarium-0.20.3-unbundle-zlib.patch"
+ "${FILESDIR}/stellarium-0.22.2-ccache.patch"
+ "${FILESDIR}/stellarium-1.1-qxlsx.patch"
+)
+
+src_prepare() {
+ cmake_src_prepare
+ use debug || append-cppflags -DQT_NO_DEBUG #415769
+
+ rm -r src/external/zlib/ || die
+
+ # for glues_stel aka libtess I couldn't find an upstream with the same API
+
+ local remaining="$(cd src/external/ && echo */)"
+ if [[ "${remaining}" != "glues_stel/" ]]; then
+ eqawarn "Need to unbundle more deps: ${remaining}"
+ fi
+}
+
+src_configure() {
+ filter-lto # https://bugs.gentoo.org/862249
+
+ local mycmakeargs=(
+ -DCPM_LOCAL_PACKAGES_ONLY=yes
+ -DENABLE_GPS="$(usex gps)"
+ -DENABLE_MEDIA="$(usex media)"
+ -DENABLE_NLS="$(usex nls)"
+ -DENABLE_QT6="$(usex qt6)"
+ -DENABLE_QTWEBENGINE="$(usex webengine)"
+ -DENABLE_SHOWMYSKY=$(usex show-my-sky)
+ -DENABLE_SCRIPTING=$(usex scripting)
+ -DENABLE_TESTING="$(usex test)"
+ -DENABLE_XLSX="$(usex xlsx)"
+ -DUSE_PLUGIN_TELESCOPECONTROL="$(usex telescope)"
+ )
+ cmake_src_configure
+}
+
+src_test() {
+ virtx cmake_src_test
+}
+
+src_compile() {
+ cmake_src_compile
+
+ if use doc ; then
+ cmake_build apidoc
+ fi
+}
+
+src_install() {
+ if use doc ; then
+ local HTML_DOCS=( "${BUILD_DIR}/doc/html/." )
+ dodoc "${DISTDIR}/stellarium_user_guide-${PV}-1.pdf"
+ fi
+ cmake_src_install
+
+ # use the more up-to-date system fonts
+ rm "${ED}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf || die
+ dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf
+ dosym ../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf
+
+ if use stars ; then
+ insinto /usr/share/${PN}/stars/default
+ doins "${DISTDIR}"/stars_4_1v0_2.cat
+ doins "${DISTDIR}"/stars_{5,6,7,8}_2v0_1.cat
+ fi
+ if use deep-sky ; then
+ insinto /usr/share/${PN}/nebulae/default
+ newins "${DISTDIR}/${PN}-dso-catalog-${MY_DSO_VERSION}.dat" catalog.dat
+ fi
+ newicon doc/images/stellarium-logo.png ${PN}.png
+}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/stellarium/files/, sci-astronomy/stellarium/
@ 2024-10-17 14:03 Joonas Niilola
0 siblings, 0 replies; 13+ messages in thread
From: Joonas Niilola @ 2024-10-17 14:03 UTC (permalink / raw
To: gentoo-commits
commit: 5174fa74f9d007ea2702eb927b5f66cb68ac25d8
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Mon Sep 30 23:30:38 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Oct 17 14:03:04 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5174fa74
sci-astronomy/stellarium: add 24.3
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/38828
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-astronomy/stellarium/Manifest | 4 +
.../files/stellarium-0.24.3-fast_float.patch | 23 +++
.../files/stellarium-0.24.3-tbb-emit.patch | 35 ++++
sci-astronomy/stellarium/metadata.xml | 1 +
sci-astronomy/stellarium/stellarium-24.3.ebuild | 216 +++++++++++++++++++++
5 files changed, 279 insertions(+)
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index b2b9b0e68e2b..54380b20d401 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -6,7 +6,11 @@ DIST stars_7_2v0_1.cat 305710678 BLAKE2B 1cc9b4a6bc35a9339e495f7e0da4f7e90a0e92b
DIST stars_8_2v0_1.cat 559068934 BLAKE2B c040a369cdf6885759998e1315b554d21a5e2b9b149a67967a8af45606aebf57bec407fab5ce1904978af0dc529aa6bddd267331ca45f58617bbf56d5ca99dee SHA512 06d4fa298b9dff8452f550377df99fcaa5e7107cfc7b75c9a4769b3cb6d97a822a54213c706102c1d7ef2dabc16df32a85f46b2f6d6c6f76a4e919353b739de4
DIST stellarium-24.2.tar.xz 327084704 BLAKE2B b1d38a92d0487a6555f1aad2d544711527a3cf942f47506597c527a85035091a5c6ad787aeeab012f29242388c2f65b3d5e61527de01edfa576b9b7324c6917b SHA512 621d16a70036e2ddea3900c0fcd0d4caadb8f821afda8a5d9818c82d2a846107840e1497a4d79a954ec2a76e434bc99b021e6f15c2af6de2cc4044fb70096929
DIST stellarium-24.2.tar.xz.asc 313 BLAKE2B d76fb00c0446ddeee90c42a3750989746e85334e9ac2bbb723959e87850bc6f9464b6f59d379e9354698d50e7ee447ab6c8ffbeab0fd0cbda9ad3be7765cad41 SHA512 dc5a6d30423f6ac389115c6235656f8f144ba97d2ba09f7f074a17bc6ec92be46a9da741a387f0c149a73e6b15d5906bd0eaec13f6e69b327beeae4512bcf992
+DIST stellarium-24.3.tar.xz 328039964 BLAKE2B 295114fce95e4c01d6f25051d4988328ebaa93b815fa9198e0b6e30f15395116a2cd0974d2d211ba162780e4ae586a33ba98396465d6942c50db3945a206a03c SHA512 8bb8ebdfdf57accf6d200f6c17d39edcda15c7ecdbfcd280f2a21e682fa62d62fc6523965d16b2033cee8f84da3dbb24db837c594a75144f5822d3576067000e
+DIST stellarium-24.3.tar.xz.asc 313 BLAKE2B 8f5af1a52e29e029b6e0bf61cb5612ae7ebe688b315e87011661e178dfe309ff76125177cd88dbf9c999abf3bbe5ee4b9ae52235fd0029cb5c2ebf66332f3df4 SHA512 c88e238a311b382be4623c67414dc5cce19cb1accdcbe35077916a0690ecaf0adc34ef43bd1b100f14b0cad8a6a8eec479eff353c32f0ad79b6a3263acf30f64
DIST stellarium-dso-catalog-3.20.dat 28678745 BLAKE2B 24ddf76e81e91424cced5df74dd164d17a45fed2b65c1dc1e7065371c18a796350a1e1aab2da5860376eb90eac07e7c836ffdbb324a0d3eda6c91e8ce1c4ab3a SHA512 c84832bbf56d1097db3ff8fa8f3faadac1470a9f79d9ee759493915a48754dc86174551b5e705786f29331991bee57daa4cab6d7ecc2e4e00a2f895823ccfd87
DIST stellarium-dso-catalog-3.20.dat.asc 313 BLAKE2B a7d9a1977ff4e1b21a80239d85ad5123ad03c2dcd57422cec7c2585eddb1004bbfc2b29a934653bc36c438981218811d21ade7380ae49278ef2c4f387ab762e5 SHA512 e8a7b10bb157d15b550a31646c8d8ce9933a77f748900a9c75f0c78b9b9205ce5e4e2ec18248ba786aacd5fbf36da00bbaf578b8b011c75351a9237568e62f1b
DIST stellarium_user_guide-24.2-1.pdf 32957159 BLAKE2B 4a6b7d93484945dffbee72eb4b3eba52cbe7affae63c9989b95dfe86be00d09ba3c283629a2939bca140daa1fd987dd6faa6e346fe56456777990fabcb46eb36 SHA512 784005bbd13333d2ab7ea0d043077ace88f0e824aef51ad65e2b3c11e6e2761f75332f7d03aa15a271078406688237da316f9d2077eb4155eaa9aa683b22e616
DIST stellarium_user_guide-24.2-1.pdf.asc 313 BLAKE2B 7e2093891fc6250982a95436f1e4fe39861f08e1adec3251d35fbe991c155cf5df0cfe1e78af3511da7e8f29268beae905e7f79a1e3e7677b649527c34df6aad SHA512 c5cd4603e6d1f02569be9d5bbb54a051b60143eb3967b56aa727525de67f8af4e4405d26b1ca25bc118d400d49f06f32cbafdbbecf6b2339000ab3366a722a7a
+DIST stellarium_user_guide-24.3-1.pdf 33106635 BLAKE2B 60b165bcb4d6ce8d0226e6c8c341a87ac38939e6f91155ea647b73e365f5dd76d812f48f10d36995fa27e8f56c7433256c8e6e4b190fc6cabf2c712a506fc8a6 SHA512 ba87fcb9b64faa123965c710b06e585ae20594e84aef59fe804d858f33497683fe4a5a2de6e0d7b1eff071e654d8ee3802e625a2f3f76712ec5962f919cc0ff1
+DIST stellarium_user_guide-24.3-1.pdf.asc 313 BLAKE2B a61d77585af364b977c1eb4ca40910c2dffc4905ba04426aa4c664975a5021c97f681395a64b7cf3556887d96a49f851ca289f74325283344d442b89ecc6783b SHA512 1aa60a229336aa17b22364589425a1001175d7478ec5a5258d5b305ac6b6e2c508d97224a497d1b64d9f961cc454b39a1a7a95c4e0333c9e6fddfc1b3f54cca8
diff --git a/sci-astronomy/stellarium/files/stellarium-0.24.3-fast_float.patch b/sci-astronomy/stellarium/files/stellarium-0.24.3-fast_float.patch
new file mode 100644
index 000000000000..bc46b58c137b
--- /dev/null
+++ b/sci-astronomy/stellarium/files/stellarium-0.24.3-fast_float.patch
@@ -0,0 +1,23 @@
+https://github.com/Stellarium/stellarium/pull/3949
+
+libc++ doesn't support std::from_chars yet, and in such case Stellarium uses an external library
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1053,13 +1053,13 @@ ENDIF()
+
+ include("cmake/Check-from_chars.cmake")
+ IF(NOT FROM_CHARS_WORKS)
+- CPMFindPackage(NAME fast_float
++ CPMFindPackage(NAME FastFloat
+ GIT_REPOSITORY https://github.com/fastfloat/fast_float
+ VERSION 6.1.0
+ EXCLUDE_FROM_ALL yes)
+- GET_TARGET_PROPERTY(fast_float_INCLUDE_DIRECTORIES
++ GET_TARGET_PROPERTY(FastFloat_INCLUDE_DIRECTORIES
+ FastFloat::fast_float INTERFACE_INCLUDE_DIRECTORIES)
+- INCLUDE_DIRECTORIES(${fast_float_INCLUDE_DIRECTORIES})
++ INCLUDE_DIRECTORIES(${FastFloat_INCLUDE_DIRECTORIES})
+ ADD_DEFINITIONS(-DUSE_FAST_FLOAT)
+ ENDIF()
+
diff --git a/sci-astronomy/stellarium/files/stellarium-0.24.3-tbb-emit.patch b/sci-astronomy/stellarium/files/stellarium-0.24.3-tbb-emit.patch
new file mode 100644
index 000000000000..3cb67584d056
--- /dev/null
+++ b/sci-astronomy/stellarium/files/stellarium-0.24.3-tbb-emit.patch
@@ -0,0 +1,35 @@
+From 02e37f3b76ef20786f10a6d89d23944e330aecf4 Mon Sep 17 00:00:00 2001
+From: Ruslan Kabatsayev <b7.10110111@gmail.com>
+Date: Mon, 23 Sep 2024 22:40:01 +0400
+Subject: [PATCH] Include <execution> before any Qt headers
+
+Fixes #3905.
+--- a/src/core/modules/SolarSystem.cpp
++++ b/src/core/modules/SolarSystem.cpp
+@@ -19,6 +19,8 @@
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
+ */
+
++#include <execution> // must be included before Qt because some versions of libtbb use "emit" identifier for their needs
++
+ #include "SolarSystem.hpp"
+ #include "StelTexture.hpp"
+ #include "EphemWrapper.hpp"
+@@ -48,7 +50,6 @@
+ #include "StelObserver.hpp"
+
+ #include <algorithm>
+-#include <execution>
+
+ #include <QTextStream>
+ #include <QSettings>
+--- a/src/stelMain_pch.hpp
++++ b/src/stelMain_pch.hpp
+@@ -28,6 +28,7 @@
+ // It seems that inclusion of some headers is actually bad for build time, these are commented away again. More teting or other compiler combinations may have slightly other results.
+
+ // Base time was 284s from first test without PCH
++#include <execution> // must be included before Qt because some versions of libtbb use "emit" identifier for their needs
+ #include "StelApp.hpp"
+ #include<QDebug>
+ #include "StelUtils.hpp"
diff --git a/sci-astronomy/stellarium/metadata.xml b/sci-astronomy/stellarium/metadata.xml
index da8ff2303389..684dbcfe02e5 100644
--- a/sci-astronomy/stellarium/metadata.xml
+++ b/sci-astronomy/stellarium/metadata.xml
@@ -22,6 +22,7 @@
<use>
<flag name="deep-sky">Install extra deep sky objects catalog (may affect performance)</flag>
<flag name="lens-distortion">Enable lens distortion estimator plugin</flag>
+ <flag name="libcxx">Use external libraries for STL features not available in libc++</flag>
<flag name="media">Enable sound and video support</flag>
<flag name="scripting">Enable JS scripting via <pkg>dev-qt/qtscript</pkg> in Qt5 or using Qml via <pkg>dev-qt/qtdeclarative</pkg> in Qt6</flag>
<flag name="show-my-sky">Enable a better atmosphere model via <pkg>sci-astronomy/calcmysky</pkg></flag>
diff --git a/sci-astronomy/stellarium/stellarium-24.3.ebuild b/sci-astronomy/stellarium/stellarium-24.3.ebuild
new file mode 100644
index 000000000000..ef93034d5a1d
--- /dev/null
+++ b/sci-astronomy/stellarium/stellarium-24.3.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake desktop flag-o-matic python-any-r1 toolchain-funcs xdg verify-sig virtualx
+
+DESCRIPTION="3D photo-realistic skies in real time"
+HOMEPAGE="https://stellarium.org/ https://github.com/Stellarium/stellarium"
+MY_DSO_VERSION="3.20"
+SRC_URI="
+ https://github.com/Stellarium/stellarium/releases/download/v${PV}/${P}.tar.xz
+ verify-sig? ( https://github.com/Stellarium/stellarium/releases/download/v${PV}/${P}.tar.xz.asc )
+ deep-sky? (
+ https://github.com/Stellarium/stellarium-data/releases/download/dso-${MY_DSO_VERSION}/catalog-${MY_DSO_VERSION}.dat -> ${PN}-dso-catalog-${MY_DSO_VERSION}.dat
+ verify-sig? ( https://github.com/Stellarium/stellarium-data/releases/download/dso-${MY_DSO_VERSION}/catalog-${MY_DSO_VERSION}.dat.asc -> ${PN}-dso-catalog-${MY_DSO_VERSION}.dat.asc )
+ )
+ doc? (
+ https://github.com/Stellarium/stellarium/releases/download/v${PV}/stellarium_user_guide-${PV}-1.pdf
+ verify-sig? ( https://github.com/Stellarium/stellarium/releases/download/v${PV}/stellarium_user_guide-${PV}-1.pdf.asc )
+ )
+ 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
+ )
+ telescope? (
+ https://github.com/indilib/indi/archive/v1.8.5.tar.gz -> indilib-1.8.5.tar.gz
+ )"
+
+LICENSE="GPL-2+ SGI-B-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug deep-sky doc gps +lens-distortion libcxx media nls qt6 +scripting +show-my-sky stars telescope test webengine +xlsx"
+
+# Python interpreter is used while building RemoteControl plugin
+BDEPEND="
+ ${PYTHON_DEPS}
+ dev-lang/perl
+ doc? ( app-text/doxygen[dot] )
+ nls? (
+ !qt6? ( dev-qt/linguist-tools:5 )
+ qt6? ( dev-qt/qttools:6[linguist] )
+ )
+ verify-sig? ( sec-keys/openpgp-keys-stellarium )
+"
+# TODO: review need for dev-cpp/tbb after several releases of gcc and clang
+RDEPEND="
+ dev-cpp/tbb:=
+ media-fonts/dejavu
+ sys-libs/zlib
+ gps? ( sci-geosciences/gpsd:=[cxx] )
+ lens-distortion? (
+ media-gfx/exiv2:=
+ sci-libs/nlopt
+ )
+ media? ( virtual/opengl )
+ !qt6? (
+ dev-qt/qtcharts:5
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5=
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ >=sci-astronomy/calcmysky-0.3.0:=[qt5]
+ gps? (
+ dev-qt/qtpositioning:5
+ dev-qt/qtserialport:5
+ )
+ media? (
+ dev-qt/qtmultimedia:5[widgets]
+ dev-qt/qtopengl:5
+ )
+ scripting? ( dev-qt/qtscript:5 )
+ telescope? ( dev-qt/qtserialport:5 )
+ webengine? ( dev-qt/qtwebengine:5[widgets] )
+ xlsx? ( dev-libs/qxlsx:=[qt5] )
+ )
+ qt6? (
+ dev-qt/qtbase:6=[concurrent,gui,network,widgets]
+ dev-qt/qtcharts:6
+ >=sci-astronomy/calcmysky-0.3.0:=[qt6]
+ gps? (
+ dev-qt/qtpositioning:6
+ dev-qt/qtserialport:6
+ )
+ media? (
+ dev-qt/qtmultimedia:6[gstreamer]
+ )
+ scripting? ( dev-qt/qtdeclarative:6 )
+ telescope? ( dev-qt/qtserialport:6 )
+ webengine? ( dev-qt/qtwebengine:6[widgets] )
+ xlsx? ( dev-libs/qxlsx:=[qt6] )
+ )
+"
+DEPEND="${RDEPEND}
+ libcxx? ( dev-cpp/fast_float )
+ !qt6? (
+ test? ( dev-qt/qttest:5 )
+ )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}/stellarium-0.23.4-unbundle-zlib.patch"
+ "${FILESDIR}/stellarium-0.24.3-fast_float.patch"
+ "${FILESDIR}/stellarium-0.24.3-tbb-emit.patch"
+)
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/stellarium.asc
+
+pkg_setup() {
+ if tc-is-clang && ! use libcxx && [[ $(tc-get-cxx-stdlib) == libc++ ]]; then
+ die "When using libc++, please enable USE=libcxx"
+ fi
+}
+
+src_unpack() {
+ # stars-2.0 are not signed
+ if use verify-sig; then
+ pushd "${DISTDIR}" > /dev/null || die
+ verify-sig_verify_detached \
+ ${P}.tar.xz{,.asc}
+ use deep-sky && verify-sig_verify_detached \
+ ${PN}-dso-catalog-${MY_DSO_VERSION}.dat{,.asc}
+ use doc && verify-sig_verify_detached \
+ stellarium_user_guide-${PV}-1.pdf{,.asc}
+ popd > /dev/null || die
+ fi
+ default_src_unpack
+}
+
+src_prepare() {
+ cmake_src_prepare
+ use debug || append-cppflags -DQT_NO_DEBUG #415769
+
+ rm -r src/external/qtcompress/ || die
+ rm -r src/external/zlib/ || die
+
+ # for glues_stel aka libtess I couldn't find an upstream with the same API
+
+ local remaining="$(cd src/external/ && echo */)"
+ if [[ "${remaining}" != "glues_stel/" ]]; then
+ eqawarn "Need to unbundle more deps: ${remaining}"
+ fi
+}
+
+src_configure() {
+ filter-lto # https://bugs.gentoo.org/862249
+
+ local mycmakeargs=(
+ -DCCACHE_PROGRAM=no
+ -DCPM_LOCAL_PACKAGES_ONLY=yes
+ -DUSE_BUNDLED_QTCOMPRESS=no
+ -DENABLE_GPS="$(usex gps)"
+ -DENABLE_MEDIA="$(usex media)"
+ -DENABLE_NLS="$(usex nls)"
+ -DENABLE_QT6="$(usex qt6)"
+ -DENABLE_QTWEBENGINE="$(usex webengine)"
+ -DENABLE_SHOWMYSKY=$(usex show-my-sky)
+ -DENABLE_SCRIPTING=$(usex scripting)
+ -DENABLE_TESTING="$(usex test)"
+ -DENABLE_XLSX="$(usex xlsx)"
+ -DUSE_PLUGIN_LENSDISTORTIONESTIMATOR="$(usex lens-distortion)"
+ -DUSE_PLUGIN_TELESCOPECONTROL="$(usex telescope)"
+ "$(cmake_use_find_package doc Doxygen)"
+ )
+ if use telescope; then
+ # https://bugs.gentoo.org/913177
+ mycmakeargs+=(
+ -DPREFER_SYSTEM_INDILIB=no
+ -DCPM_indiclient_SOURCE="${WORKDIR}/indi-1.8.5"
+ )
+ fi
+ cmake_src_configure
+}
+
+src_test() {
+ virtx cmake_src_test
+}
+
+src_compile() {
+ cmake_src_compile
+
+ if use doc ; then
+ cmake_build apidoc
+ fi
+}
+
+src_install() {
+ if use doc ; then
+ local HTML_DOCS=( "${BUILD_DIR}/doc/html/." )
+ dodoc "${DISTDIR}/stellarium_user_guide-${PV}-1.pdf"
+ fi
+ cmake_src_install
+
+ # use the more up-to-date system fonts
+ rm "${ED}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf || die
+ dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf
+ dosym ../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf
+
+ if use stars ; then
+ insinto /usr/share/${PN}/stars/default
+ doins "${DISTDIR}"/stars_4_1v0_2.cat
+ doins "${DISTDIR}"/stars_{5,6,7,8}_2v0_1.cat
+ fi
+ if use deep-sky ; then
+ insinto /usr/share/${PN}/nebulae/default
+ newins "${DISTDIR}/${PN}-dso-catalog-${MY_DSO_VERSION}.dat" catalog.dat
+ fi
+ newicon doc/images/stellarium-logo.png ${PN}.png
+}
^ permalink raw reply related [flat|nested] 13+ messages in thread
end of thread, other threads:[~2024-10-17 14:03 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-09-29 8:07 [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/stellarium/files/, sci-astronomy/stellarium/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2024-10-17 14:03 Joonas Niilola
2022-11-05 1:38 Jason Zaman
2022-07-19 7:41 Florian Schmaus
2022-04-18 20:29 Sam James
2021-09-29 8:07 David Seifert
2021-06-11 8:55 David Seifert
2020-10-10 7:22 Joonas Niilola
2020-01-18 22:28 Andreas Sturmlechner
2019-07-02 14:07 Andreas Sturmlechner
2019-05-18 16:35 Andreas Sturmlechner
2019-01-05 23:47 Andreas Sturmlechner
2016-03-20 20:51 Michael Sterrett
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox