* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/stellarium/, sci-astronomy/stellarium/files/
@ 2023-09-27 8:34 Florian Schmaus
0 siblings, 0 replies; 13+ messages in thread
From: Florian Schmaus @ 2023-09-27 8:34 UTC (permalink / raw
To: gentoo-commits
commit: be66c616e363d402e57cb12146fc80e08d8c3805
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Tue Sep 26 21:08:25 2023 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Sep 27 08:33:55 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be66c616
sci-astronomy/stellarium: simplify disabling of ccache
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/33078
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
.../stellarium/files/stellarium-0.23.3-ccache.patch | 13 -------------
sci-astronomy/stellarium/stellarium-23.3.ebuild | 2 +-
2 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/sci-astronomy/stellarium/files/stellarium-0.23.3-ccache.patch b/sci-astronomy/stellarium/files/stellarium-0.23.3-ccache.patch
deleted file mode 100644
index e71c9f7f90ea..000000000000
--- a/sci-astronomy/stellarium/files/stellarium-0.23.3-ccache.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Don't automagically use ccache https://bugs.gentoo.org/847439
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -196,7 +196,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/stellarium-23.3.ebuild b/sci-astronomy/stellarium/stellarium-23.3.ebuild
index 3df848b94c87..0287f1b313ff 100644
--- a/sci-astronomy/stellarium/stellarium-23.3.ebuild
+++ b/sci-astronomy/stellarium/stellarium-23.3.ebuild
@@ -101,7 +101,6 @@ RESTRICT="!test? ( test )"
PATCHES=(
"${FILESDIR}/stellarium-0.20.3-unbundle-zlib.patch"
- "${FILESDIR}/stellarium-0.23.3-ccache.patch"
)
VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/stellarium.asc
@@ -138,6 +137,7 @@ src_configure() {
filter-lto # https://bugs.gentoo.org/862249
local mycmakeargs=(
+ -DCCACHE_PROGRAM=no
-DCPM_LOCAL_PACKAGES_ONLY=yes
-DENABLE_GPS="$(usex gps)"
-DENABLE_MEDIA="$(usex media)"
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/stellarium/, sci-astronomy/stellarium/files/
@ 2024-04-30 6:42 Sam James
0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2024-04-30 6:42 UTC (permalink / raw
To: gentoo-commits
commit: 1c3c020f494cf946bdb6675cc286809505ec9eed
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Wed Mar 27 21:38:28 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 30 06:39:32 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c3c020f
sci-astronomy/stellarium: drop 23.3
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-astronomy/stellarium/Manifest | 4 -
.../files/stellarium-0.20.3-unbundle-zlib.patch | 23 ---
sci-astronomy/stellarium/stellarium-23.3.ebuild | 198 ---------------------
3 files changed, 225 deletions(-)
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index 9e312f7503d8..128365df765d 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -4,13 +4,9 @@ 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-23.3.tar.xz 320086976 BLAKE2B 38e6c7710b071f6c3086f9c428723a55ba76c9d14d919d3fa712040286cb1d866094918c25c18d245d86644851046e89ccad5c5e008e0f6b66b4cc2bd3672ca7 SHA512 da52d2c8981a3db4086539d2b32c42c6e85600cb4675aae2305bb82cf14398be162d8643f3f3ea38f1020c4650d8d2d4165fbd32be701562ab665e4c31fe99fb
-DIST stellarium-23.3.tar.xz.asc 313 BLAKE2B 6efd2402c7b3c0ee5647a2ad506c7b7b17f481c1305ed10601459f1cf0cf3b77042a3131840bba27d411d293f6f73e7339c9878cfabd708dd3d9538a3cc75c82 SHA512 57a4feafe161d2fac3f0592d56372eca3cff9cd8b9c90876f63a3468a326bcf1104b54ed2ae7ae1e84c44a05cb35d64b6c6ca2fe26d7064f90a5e3d7e897eaf4
DIST stellarium-23.4.tar.xz 324945696 BLAKE2B 8642015bf2d8b40b2310953a265f831ee4527062d0d30fdfada4ac8a2fe9b9b644b72dd0dfb8969dd241b5188fd9602842516173c7832decd4175e753ff3fcdc SHA512 877b2b07c3135763b038075c9d24487829d852da040601cf5e170dfbcb882d564946814f0ff95497aee157e6285ca5c5fbb714b7942b588c6a93af1c809bc17c
DIST stellarium-23.4.tar.xz.asc 313 BLAKE2B 7fc6b8dc82d12817ec41d00a365fdde0da888dcf06ea7daf86b7b5ff58fae2b2a3bff95da0f35b48dc85346f342472255ac8dae198ed91d4b1f790c7974d0fb0 SHA512 0aa11282c746f05bb128a6ab2fbdcb2008690dd6ca2c4a43bef65756bd21796a74891330dc7296f924eb8e390942a632b0ec5df28f404ec0f69bbcec0bc1747b
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-23.3-1.pdf 32929394 BLAKE2B 0d4c1c4a667d963981dc7625cd2d0b229351393cf3ef6073cbb7b76947256906186cf72195f1c34081a9771b451f79adf459e45e01253675285efe8747d0aa91 SHA512 c5b4b41caf4a36ae85527ab33511e1d69da663714744d78cebd7513472227ef045db38944e9800ad9be0fe34902a7e7b09db7518194790e64eb93141eadf8d7e
-DIST stellarium_user_guide-23.3-1.pdf.asc 313 BLAKE2B 8e976d2528bfa3b35761c968da5970ce3b76694a1c9980f90dcd51e7f55b9f34fbf778acb6c0999c544787382274ff747edacaf23e685a6b0ac2d75170296132 SHA512 be300a11072b17df4e0ecd7e1fd25193e23e0214ccfee3e1748461732f7065a9c2c7c38bfaf838607204b0f7b1bda4917ac5973d6ff081718f1ed7cd12f29c7b
DIST stellarium_user_guide-23.4-1.pdf 32943744 BLAKE2B 0f118a27cd0ce4e043702321ed79ffc185e6fcd755975176b9f2642373249970fd8d1e3af3d256e96fe3950265a938e3b4b1b02f11dc07e306dde320ded02919 SHA512 259a7b17d1d03979ac068564c9bafb1f275af56116f43a342c5d155cc4fc50a63a3ad053bb4e15513e6176d240f417f55749980d9d1f6cec69853309541d31d6
DIST stellarium_user_guide-23.4-1.pdf.asc 313 BLAKE2B 0eb7556dc59b78b10ccefabefbfd96f635a4a560ef5b533b50ad4cc60c23b289709d2ffde9a946eb07512885e728e3fd4e13af82daf9f55e9540ff00ae17481a SHA512 5b72207483431eb2f8e4fc3fc8ce5d1f1e4d7ef61c944c7b3a21dfb1379f6fe3c3e15ffb87bf3de5d259d54a5ad9d1b65aa6d7c0e8aaa4bd1a2ffe8417862aaf
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
deleted file mode 100644
index 6fb7fb4f7859..000000000000
--- a/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-zlib.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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/stellarium-23.3.ebuild b/sci-astronomy/stellarium/stellarium-23.3.ebuild
deleted file mode 100644
index 9b121e46f6c5..000000000000
--- a/sci-astronomy/stellarium/stellarium-23.3.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake desktop flag-o-matic python-any-r1 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 ~ppc ppc64 ~riscv ~x86"
-IUSE="debug deep-sky doc gps 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 )
-"
-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-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=[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}
- !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"
-)
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/stellarium.asc
-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/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
- -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_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* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/stellarium/, sci-astronomy/stellarium/files/
@ 2024-01-10 7:11 Joonas Niilola
0 siblings, 0 replies; 13+ messages in thread
From: Joonas Niilola @ 2024-01-10 7:11 UTC (permalink / raw
To: gentoo-commits
commit: 23b226c140dca5b7b543ba2ec72306e0830cfd32
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Sat Dec 23 18:25:24 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Jan 10 07:11:35 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23b226c1
sci-astronomy/stellarium: add 23.4
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/34451
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-astronomy/stellarium/Manifest | 4 +
.../files/stellarium-0.23.4-unbundle-zlib.patch | 23 +++
sci-astronomy/stellarium/metadata.xml | 1 +
sci-astronomy/stellarium/stellarium-23.4.ebuild | 203 +++++++++++++++++++++
4 files changed, 231 insertions(+)
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index a9b7856aa68c..9e312f7503d8 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-23.3.tar.xz 320086976 BLAKE2B 38e6c7710b071f6c3086f9c428723a55ba76c9d14d919d3fa712040286cb1d866094918c25c18d245d86644851046e89ccad5c5e008e0f6b66b4cc2bd3672ca7 SHA512 da52d2c8981a3db4086539d2b32c42c6e85600cb4675aae2305bb82cf14398be162d8643f3f3ea38f1020c4650d8d2d4165fbd32be701562ab665e4c31fe99fb
DIST stellarium-23.3.tar.xz.asc 313 BLAKE2B 6efd2402c7b3c0ee5647a2ad506c7b7b17f481c1305ed10601459f1cf0cf3b77042a3131840bba27d411d293f6f73e7339c9878cfabd708dd3d9538a3cc75c82 SHA512 57a4feafe161d2fac3f0592d56372eca3cff9cd8b9c90876f63a3468a326bcf1104b54ed2ae7ae1e84c44a05cb35d64b6c6ca2fe26d7064f90a5e3d7e897eaf4
+DIST stellarium-23.4.tar.xz 324945696 BLAKE2B 8642015bf2d8b40b2310953a265f831ee4527062d0d30fdfada4ac8a2fe9b9b644b72dd0dfb8969dd241b5188fd9602842516173c7832decd4175e753ff3fcdc SHA512 877b2b07c3135763b038075c9d24487829d852da040601cf5e170dfbcb882d564946814f0ff95497aee157e6285ca5c5fbb714b7942b588c6a93af1c809bc17c
+DIST stellarium-23.4.tar.xz.asc 313 BLAKE2B 7fc6b8dc82d12817ec41d00a365fdde0da888dcf06ea7daf86b7b5ff58fae2b2a3bff95da0f35b48dc85346f342472255ac8dae198ed91d4b1f790c7974d0fb0 SHA512 0aa11282c746f05bb128a6ab2fbdcb2008690dd6ca2c4a43bef65756bd21796a74891330dc7296f924eb8e390942a632b0ec5df28f404ec0f69bbcec0bc1747b
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-23.3-1.pdf 32929394 BLAKE2B 0d4c1c4a667d963981dc7625cd2d0b229351393cf3ef6073cbb7b76947256906186cf72195f1c34081a9771b451f79adf459e45e01253675285efe8747d0aa91 SHA512 c5b4b41caf4a36ae85527ab33511e1d69da663714744d78cebd7513472227ef045db38944e9800ad9be0fe34902a7e7b09db7518194790e64eb93141eadf8d7e
DIST stellarium_user_guide-23.3-1.pdf.asc 313 BLAKE2B 8e976d2528bfa3b35761c968da5970ce3b76694a1c9980f90dcd51e7f55b9f34fbf778acb6c0999c544787382274ff747edacaf23e685a6b0ac2d75170296132 SHA512 be300a11072b17df4e0ecd7e1fd25193e23e0214ccfee3e1748461732f7065a9c2c7c38bfaf838607204b0f7b1bda4917ac5973d6ff081718f1ed7cd12f29c7b
+DIST stellarium_user_guide-23.4-1.pdf 32943744 BLAKE2B 0f118a27cd0ce4e043702321ed79ffc185e6fcd755975176b9f2642373249970fd8d1e3af3d256e96fe3950265a938e3b4b1b02f11dc07e306dde320ded02919 SHA512 259a7b17d1d03979ac068564c9bafb1f275af56116f43a342c5d155cc4fc50a63a3ad053bb4e15513e6176d240f417f55749980d9d1f6cec69853309541d31d6
+DIST stellarium_user_guide-23.4-1.pdf.asc 313 BLAKE2B 0eb7556dc59b78b10ccefabefbfd96f635a4a560ef5b533b50ad4cc60c23b289709d2ffde9a946eb07512885e728e3fd4e13af82daf9f55e9540ff00ae17481a SHA512 5b72207483431eb2f8e4fc3fc8ce5d1f1e4d7ef61c944c7b3a21dfb1379f6fe3c3e15ffb87bf3de5d259d54a5ad9d1b65aa6d7c0e8aaa4bd1a2ffe8417862aaf
diff --git a/sci-astronomy/stellarium/files/stellarium-0.23.4-unbundle-zlib.patch b/sci-astronomy/stellarium/files/stellarium-0.23.4-unbundle-zlib.patch
new file mode 100644
index 000000000000..077b1b5710a6
--- /dev/null
+++ b/sci-astronomy/stellarium/files/stellarium-0.23.4-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 e5af410..6d7bf6b 100644
+--- a/src/external/CMakeLists.txt
++++ b/src/external/CMakeLists.txt
+@@ -36,6 +36,7 @@ target_link_libraries(glues_stel Qt${QT_VERSION_MAJOR}::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()
+
+ ################################# INDI ################################
+ IF(USE_PLUGIN_TELESCOPECONTROL)
diff --git a/sci-astronomy/stellarium/metadata.xml b/sci-astronomy/stellarium/metadata.xml
index d4860f0597dd..da8ff2303389 100644
--- a/sci-astronomy/stellarium/metadata.xml
+++ b/sci-astronomy/stellarium/metadata.xml
@@ -21,6 +21,7 @@
</longdescription>
<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="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-23.4.ebuild b/sci-astronomy/stellarium/stellarium-23.4.ebuild
new file mode 100644
index 000000000000..e9f209b0755d
--- /dev/null
+++ b/sci-astronomy/stellarium/stellarium-23.4.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake desktop flag-o-matic python-any-r1 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 ~x86"
+IUSE="debug deep-sky doc gps +lens-distortion 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-doc/doxygen[dot] )
+ nls? (
+ !qt6? ( dev-qt/linguist-tools:5 )
+ qt6? ( dev-qt/qttools:6[linguist] )
+ )
+ verify-sig? ( sec-keys/openpgp-keys-stellarium )
+"
+RDEPEND="
+ 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/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=[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}
+ !qt6? (
+ dev-qt/qtconcurrent:5
+ test? ( dev-qt/qttest:5 )
+ )
+ qt6? ( dev-qt/qtbase:6=[concurrent] )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}/stellarium-0.23.4-unbundle-zlib.patch"
+)
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/stellarium.asc
+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/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
+ -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* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/stellarium/, sci-astronomy/stellarium/files/
@ 2023-12-13 8:06 Florian Schmaus
0 siblings, 0 replies; 13+ messages in thread
From: Florian Schmaus @ 2023-12-13 8:06 UTC (permalink / raw
To: gentoo-commits
commit: 86310e602de543c348738a6208e078e6f46b5e9b
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Thu Nov 30 00:55:53 2023 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Dec 13 08:01:43 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86310e60
sci-astronomy/stellarium: drop 23.1, 23.2-r1
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
sci-astronomy/stellarium/Manifest | 10 --
.../files/stellarium-0.22.2-ccache.patch | 13 --
sci-astronomy/stellarium/stellarium-23.1.ebuild | 189 --------------------
sci-astronomy/stellarium/stellarium-23.2-r1.ebuild | 198 ---------------------
4 files changed, 410 deletions(-)
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index 29694c1b5062..a9b7856aa68c 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -4,19 +4,9 @@ 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-23.1.tar.xz 347455652 BLAKE2B 1cd367b91a77bd9ace1afe667d9579fad9c1f8cb5c30b851bc2dfcfcd389913a5c3014b589d3c9454a27a8f48ea97c763030f6dfa7bf2c684e29f5ae38db53f4 SHA512 94077b0408fd78b12706760b9ca20cb9b8a24e94ad7daedca922ab310714b6a6fea03a0cdf3fa9dc614be14472b17416e1d5849283c6faba7f8bf91eaa6ab9d6
-DIST stellarium-23.1.tar.xz.asc 313 BLAKE2B 69a9c88defbd1fa955ad3f93af98d33a1b959fdbe7a8138590f5fbd88c25d5b25b3929a31d235eaf43af562e9eb2bd70a2ca4999dffeb3cb5d71f9bf4d692025 SHA512 d9ee09317d0bfc1758fb771ac15a2d4c29cb6cd77cbffd2f4046137a243d31c2253a3f367a12c2a089a4c09b865a78670ab626b8e7f40a8500c2f0abb5d60474
-DIST stellarium-23.2.tar.xz 317080088 BLAKE2B ac1d0473ba6c8e5c56a95113b48fb710e0dfb61c7fe45b39165e994b22f58c3de899f0d147158a2fcc933f91c5328ee0f6b4ce4c6a56b818f2db20fa5d89930f SHA512 ba1ab70367eb626fdc831a5845a25d5deb6ed4d89c1bd6acc9b769e1cd739afb6bc98263a842e3153e1015796e5ef132fd1077b590010c4de1090e13928a7200
-DIST stellarium-23.2.tar.xz.asc 313 BLAKE2B e1ac6d32211edff8dfdd44d0b2bc98ea54e17f33ed9c0e3b49036aabcc20608bcee7a478d8763eb23dfd045c5151961f733bcbd894b61f806788c897eda60b3b SHA512 c2867bc9b0aca5c47b32bd5ae8c91a563d896b392bcb3d705e9f0b8246f0396bc79fba5681e8f5a7b423535f08e3f11fa5b5db20715b9e2a962390f6c1471c22
DIST stellarium-23.3.tar.xz 320086976 BLAKE2B 38e6c7710b071f6c3086f9c428723a55ba76c9d14d919d3fa712040286cb1d866094918c25c18d245d86644851046e89ccad5c5e008e0f6b66b4cc2bd3672ca7 SHA512 da52d2c8981a3db4086539d2b32c42c6e85600cb4675aae2305bb82cf14398be162d8643f3f3ea38f1020c4650d8d2d4165fbd32be701562ab665e4c31fe99fb
DIST stellarium-23.3.tar.xz.asc 313 BLAKE2B 6efd2402c7b3c0ee5647a2ad506c7b7b17f481c1305ed10601459f1cf0cf3b77042a3131840bba27d411d293f6f73e7339c9878cfabd708dd3d9538a3cc75c82 SHA512 57a4feafe161d2fac3f0592d56372eca3cff9cd8b9c90876f63a3468a326bcf1104b54ed2ae7ae1e84c44a05cb35d64b6c6ca2fe26d7064f90a5e3d7e897eaf4
-DIST stellarium-dso-catalog-3.19.dat 28678714 BLAKE2B 855ec3370efa2ad33d9a99cf473659c76cbcfce87c10df67a6f81514fe3fa2385e295e1a092e55db8164093628e5038399dd62b837e39efc2306be15a0292dc5 SHA512 4187c574789c2bb387791039465eed9c915fec16ae4edbf0c160406dd7bdf7dae0c70846f0208ca639909bb6842c2bc3c2337302bfaf1394f4e081707df5079c
-DIST stellarium-dso-catalog-3.19.dat.asc 313 BLAKE2B 6ae0acdb9b1012e71c346e5834b88dd1e8146789158a5d81e7e992b1730ab5a74899aac76b84b269fb1ccdc2494ddb258209c580751705bda6023fc59132e7d7 SHA512 95a1cf3911c67e2104d6240b9a5e0ce0d0f2d8ed5edcb40303432d17b3d4ccd8875eb9b9e8b7f94e81d1103dba98d3ac5cb6354933f78ebda83015a45297a159
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-23.1-1.pdf 32513574 BLAKE2B 30e971f186d88bdfe5d8346dd4385444eb75e84ce8f5acc8d9f3a6050ac5a7c734b6f74e681738cdb4d4af91645b50a81bb65798b5caa58a9a23691bb40b5593 SHA512 5e5a69f9377496fb42ce2e2ce72e4caf0d35e475e586ccba2814ca7d2e2a3f60bfc46e496f9153a7b4157977460ac7c574d7f452f4af746799ecc9231e32e49d
-DIST stellarium_user_guide-23.1-1.pdf.asc 313 BLAKE2B b573ea45b236ad35cca1614919bb1e2076d4785f2d5d878a874f9536df9c454c9aa2a90797ea930f669676bc23db545ca051996f2ba2124e3eb3acc0890bc975 SHA512 124f9a4ee2452297d6ffdf696cb32c7087d7b5e31c08c56016842414b407fd8c14ce1dd59d160b7d685a0db88982e0a9b6410fbe69ef476a3a16649e16c591a2
-DIST stellarium_user_guide-23.2-1.pdf 32767542 BLAKE2B feb317354b0e696b585fb9edbe2a643bd57ba9da7657173506c1989d63618dcc4e2dd15fd1a9009d919d99ab4b28bd56599b569df11a573aa8d0af8ab85522ef SHA512 d699c9acd048d44221409515657a1f8a3be01629e64e233a1fb114c3935ee1c0fdffe9c7cd1ac60337d8168858f8d9ca3f5624965ff3343463b1a1a0b1b32849
-DIST stellarium_user_guide-23.2-1.pdf.asc 313 BLAKE2B bbc579e34b00a5e5b3497955e7cafcefbf9400063c97dee11bcc0c66e46f446f247c20e1d0205cf9b2117330d4209b6289808a59db4ff298c986771ca962a136 SHA512 d8fac13754bde068cb581ca21149ebcb6307bf4c71c95083fa4bf6e01f953f8d586ed5e149d91ca6439995d6fb7049254be09001ad0c8ff354ea75f7600e5de6
DIST stellarium_user_guide-23.3-1.pdf 32929394 BLAKE2B 0d4c1c4a667d963981dc7625cd2d0b229351393cf3ef6073cbb7b76947256906186cf72195f1c34081a9771b451f79adf459e45e01253675285efe8747d0aa91 SHA512 c5b4b41caf4a36ae85527ab33511e1d69da663714744d78cebd7513472227ef045db38944e9800ad9be0fe34902a7e7b09db7518194790e64eb93141eadf8d7e
DIST stellarium_user_guide-23.3-1.pdf.asc 313 BLAKE2B 8e976d2528bfa3b35761c968da5970ce3b76694a1c9980f90dcd51e7f55b9f34fbf778acb6c0999c544787382274ff747edacaf23e685a6b0ac2d75170296132 SHA512 be300a11072b17df4e0ecd7e1fd25193e23e0214ccfee3e1748461732f7065a9c2c7c38bfaf838607204b0f7b1bda4917ac5973d6ff081718f1ed7cd12f29c7b
diff --git a/sci-astronomy/stellarium/files/stellarium-0.22.2-ccache.patch b/sci-astronomy/stellarium/files/stellarium-0.22.2-ccache.patch
deleted file mode 100644
index 5f0d25f2ea14..000000000000
--- a/sci-astronomy/stellarium/files/stellarium-0.22.2-ccache.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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/stellarium-23.1.ebuild b/sci-astronomy/stellarium/stellarium-23.1.ebuild
deleted file mode 100644
index d9aed9a8fc5a..000000000000
--- a/sci-astronomy/stellarium/stellarium-23.1.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake desktop flag-o-matic python-any-r1 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.19"
-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
- )"
-
-LICENSE="GPL-2+ SGI-B-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 ~riscv ~x86"
-IUSE="debug deep-sky doc gps 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-doc/doxygen[dot] )
- nls? (
- !qt6? ( dev-qt/linguist-tools:5 )
- qt6? ( dev-qt/qttools:6[linguist] )
- )
- verify-sig? ( sec-keys/openpgp-keys-stellarium )
-"
-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-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=[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] )
- )
- 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"
-)
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/stellarium.asc
-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/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_use_find_package doc Doxygen)"
- )
- 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-23.2-r1.ebuild b/sci-astronomy/stellarium/stellarium-23.2-r1.ebuild
deleted file mode 100644
index 29083d064138..000000000000
--- a/sci-astronomy/stellarium/stellarium-23.2-r1.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake desktop flag-o-matic python-any-r1 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.19"
-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 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="debug deep-sky doc gps 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-doc/doxygen[dot] )
- nls? (
- !qt6? ( dev-qt/linguist-tools:5 )
- qt6? ( dev-qt/qttools:6[linguist] )
- )
- verify-sig? ( sec-keys/openpgp-keys-stellarium )
-"
-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-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=[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}
- !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"
-)
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/stellarium.asc
-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/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_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* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/stellarium/, sci-astronomy/stellarium/files/
@ 2023-02-23 7:04 Joonas Niilola
0 siblings, 0 replies; 13+ messages in thread
From: Joonas Niilola @ 2023-02-23 7:04 UTC (permalink / raw
To: gentoo-commits
commit: e3048a5a5a887614f309c7cccd9bac7040d2fd97
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Sun Jan 29 23:31:17 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Feb 23 07:02:00 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3048a5a
sci-astronomy/stellarium: drop 0.22.2, 1.1
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-astronomy/stellarium/Manifest | 6 -
.../files/stellarium-0.20.3-unbundle-indi.patch | 82 --------
.../stellarium-0.22.2-unbundle-qtcompress.patch | 208 ---------------------
.../stellarium/files/stellarium-1.1-qxlsx.patch | 11 --
sci-astronomy/stellarium/stellarium-0.22.2.ebuild | 144 --------------
sci-astronomy/stellarium/stellarium-1.1.ebuild | 172 -----------------
6 files changed, 623 deletions(-)
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index 0d6c89fc2489..4a1371b9ec7b 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -3,15 +3,9 @@ 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.22.2.tar.gz 409151525 BLAKE2B c49abfb17a8bf7b120d8a0dffbe58b83e18f86b7ef2764cddc946e0cbaad9bf01adaf8d008557108f6354ed11d79e56d94c92c2a07befbd955aed8d201b68292 SHA512 ed905f58e1ff8b257b1e054ca76c83470915b00a04f7925b63784aa62b74e972f332e0b7dc605ffc17bb6516ef4f045943cb564d9637238726b9d7ceb2d44dda
-DIST stellarium-1.1.1.tar.gz 413806998 BLAKE2B bd5679aa32edfa44807e941d0febcb1c1749eada6c2834cb16de4cc9850735c3033122fd1e4afc8b8550441b8a8f70865f6a7b3eb178bf906c8b64d7829ea3f6 SHA512 4564b8df21afb5d266c21e4d59a5df52a0695f102dc68d59d37ea29e520495132c7fb01235ceac5d68b0812fc05d35b5f8c7a5c337c55007ce562f770e3a3612
DIST stellarium-1.2.tar.xz 344579192 BLAKE2B 56aa497cfd57a3e43ed0f153fbfe0cf348fd1b4e14bc54fbade20063d61211972d2f717c46c872f858b23798521a00390135044ab58625322f88ba9d87513c48 SHA512 d27a038ce51a2a7c5145c40d6ff54938820e98e432adb56f7e986d7cd0c23d87f76c0616641173c1c047652f570069dcb3a5959806262188642e5ac29ffeb003
DIST stellarium-1.2.tar.xz.asc 313 BLAKE2B 147a58a70f98c45bf3446a0fc92ade5ce464a160279192533af00bb0361beeb03e3bc89f3ea59c385010bd211ad33cb203f4e67d354bce3be47ef2e62b8b3cc2 SHA512 b62381bfc49ea8f209224c4afb6515adbc3a8a9e30b0313f63e4db3aa8409a8912795ffbc3fd3de576ef720784674912cafcb88f5f247497e42910f20c067fdd
-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-dso-catalog-3.18.dat 28678602 BLAKE2B 163eecf1bc26728f88f9f322c950fd26570bf52f63f462756e94ce0c6788d58c8d8fd39f34201c8536745e70afe426aec5f1bc079830fdca9723d9a8797a053e SHA512 ff86d47b7b777ae6de76c4bb41870f18de9a309d2b188d01e5c854bd79ae5d022ad1d46a3e80001bed49166df424096e53482398d810eabc792ca1f4829deacd
DIST stellarium-dso-catalog-3.18.dat.asc 313 BLAKE2B 98ef5f9181d5a597328cee2b87963adc81033f2e6539b8db1d155fd2c1ef13fc2d3967e5ad52a892ddfee34d4482dbd174d2d39af9390efdea39b773e0bf7b44 SHA512 71967a83d0720b560895e9369f862b977b5600bad66e095c9b5987dd25a67e49c86bf2abeb0119efb6f1c945b5346153cf5a4c4f279c34e07f3be1c7d044e7f9
-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
DIST stellarium_user_guide-1.2-1.pdf 36821463 BLAKE2B f7ddf7bee8f06c323ee3a493a04cfcad0bd78244ba67f1e9fa159e66533a9e5156358d9466e91bebcf3642f252b07535d93a480be0cfdc9991be0a8abb327a6e SHA512 7d1a62bb4dca645789469c2f84daf929494a342168b011cdcc6cc2b0cace0f133eade110e75dcc26d29479550f6a60bbc791b3cf2e9f2a44f4c19ec3333406c0
DIST stellarium_user_guide-1.2-1.pdf.asc 313 BLAKE2B 95a3a5c88a3d4ea37c6fa99ac808caf87fd8e2f24ff57119a16b1d849e1da5280cddb42a5fd300d684bb018a8e6f0f5e80e2de9600e6231a1cddda7cdb40e29a SHA512 8c9e087f38a7e006440a91545d911872adc37dcd865ee75287b493c8ecbaffb6d2d1ca628c332d00910903eb35ac04050d360e6f3b16c7151a3bb84d90b1ec72
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
deleted file mode 100644
index 33d355f842f4..000000000000
--- a/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-indi.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-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.22.2-unbundle-qtcompress.patch b/sci-astronomy/stellarium/files/stellarium-0.22.2-unbundle-qtcompress.patch
deleted file mode 100644
index 47643b797992..000000000000
--- a/sci-astronomy/stellarium/files/stellarium-0.22.2-unbundle-qtcompress.patch
+++ /dev/null
@@ -1,208 +0,0 @@
---- 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/files/stellarium-1.1-qxlsx.patch b/sci-astronomy/stellarium/files/stellarium-1.1-qxlsx.patch
deleted file mode 100644
index f3e4c9c38ab7..000000000000
--- a/sci-astronomy/stellarium/files/stellarium-1.1-qxlsx.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/stellarium-0.22.2.ebuild b/sci-astronomy/stellarium/stellarium-0.22.2.ebuild
deleted file mode 100644
index ec1e66781138..000000000000
--- a/sci-astronomy/stellarium/stellarium-0.22.2.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..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
-}
diff --git a/sci-astronomy/stellarium/stellarium-1.1.ebuild b/sci-astronomy/stellarium/stellarium-1.1.ebuild
deleted file mode 100644
index 8f98ea2eb1d2..000000000000
--- a/sci-astronomy/stellarium/stellarium-1.1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..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 ppc ppc64 ~riscv"
-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/, sci-astronomy/stellarium/files/
@ 2022-09-27 14:01 Andrew Ammerlaan
0 siblings, 0 replies; 13+ messages in thread
From: Andrew Ammerlaan @ 2022-09-27 14:01 UTC (permalink / raw
To: gentoo-commits
commit: 5031361f5d72d15120456a3a4bd853afe65ac5c2
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Sun Sep 25 02:02:27 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Sep 27 14:00:45 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5031361f
sci-astronomy/stellarium: drop 0.21.3, 0.22.1, 0.22.1-r1
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-astronomy/stellarium/Manifest | 6 -
.../stellarium-0.21.2-unbundle-qtcompress.patch | 207 --------------------
.../files/stellarium-0.22.1-fix-conv.patch | 23 ---
...ellarium-0.22.1-fix-star-manager-segfault.patch | 30 ---
.../files/stellarium-0.22.1-fix-test-x86.patch | 93 ---------
.../stellarium-0.22.1-unbundle-qtcompress.patch | 208 ---------------------
sci-astronomy/stellarium/stellarium-0.21.3.ebuild | 144 --------------
.../stellarium/stellarium-0.22.1-r1.ebuild | 149 ---------------
sci-astronomy/stellarium/stellarium-0.22.1.ebuild | 146 ---------------
9 files changed, 1006 deletions(-)
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index c582a4819100..beecdeb0e8ee 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -3,12 +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.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.21.2-unbundle-qtcompress.patch b/sci-astronomy/stellarium/files/stellarium-0.21.2-unbundle-qtcompress.patch
deleted file mode 100644
index f5d757b1bb16..000000000000
--- a/sci-astronomy/stellarium/files/stellarium-0.21.2-unbundle-qtcompress.patch
+++ /dev/null
@@ -1,207 +0,0 @@
---- 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/files/stellarium-0.22.1-fix-conv.patch b/sci-astronomy/stellarium/files/stellarium-0.22.1-fix-conv.patch
deleted file mode 100644
index 5187837fbb61..000000000000
--- a/sci-astronomy/stellarium/files/stellarium-0.22.1-fix-conv.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From dd65fdf5a332d62834ac1cfe9639e220ea635c55 Mon Sep 17 00:00:00 2001
-From: "Alexander V. Wolf" <alex.v.wolf@gmail.com>
-Date: Wed, 25 May 2022 20:55:15 +0700
-Subject: [PATCH] Fixed conversion tool radToHms(): avoiding possible negative
- zero for value of seconds (see #2460)
-
----
- src/core/StelUtils.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/core/StelUtils.cpp b/src/core/StelUtils.cpp
-index 93a55ebb957..b03f55a68ec 100644
---- a/src/core/StelUtils.cpp
-+++ b/src/core/StelUtils.cpp
-@@ -140,7 +140,7 @@ void radToHms(double angle, unsigned int& h, unsigned int& m, double& s)
-
- h = static_cast<unsigned int>(angle);
- m = static_cast<unsigned int>((angle-h)*60);
-- s = (angle-h)*3600.-60.*m;
-+ s = qAbs((angle-h)*3600.-60.*m);
- }
-
- /*************************************************************************
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
deleted file mode 100644
index 7f8981a006e2..000000000000
--- a/sci-astronomy/stellarium/files/stellarium-0.22.1-fix-star-manager-segfault.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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/files/stellarium-0.22.1-fix-test-x86.patch b/sci-astronomy/stellarium/files/stellarium-0.22.1-fix-test-x86.patch
deleted file mode 100644
index 784b388b2534..000000000000
--- a/sci-astronomy/stellarium/files/stellarium-0.22.1-fix-test-x86.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 802065e025c8b435dc39b4fdd9262efdc1dcd2a8 Mon Sep 17 00:00:00 2001
-From: "Alexander V. Wolf" <alex.v.wolf@gmail.com>
-Date: Tue, 24 May 2022 14:47:50 +0700
-Subject: [PATCH] Fixed something strange in radToHMSStr and radToHMSStrAdapt
- convertors
-
-probably ancient bug (?), maybe related to issue #2460
----
- src/core/StelUtils.cpp | 6 +++---
- src/tests/testConversions.cpp | 16 ++++++----------
- 2 files changed, 9 insertions(+), 13 deletions(-)
-
-diff --git a/src/core/StelUtils.cpp b/src/core/StelUtils.cpp
-index 521d538315e..93a55ebb957 100644
---- a/src/core/StelUtils.cpp
-+++ b/src/core/StelUtils.cpp
-@@ -225,9 +225,9 @@ QString radToHmsStr(const double angle, const bool decimal)
- {
- unsigned int h,m;
- double s;
-- StelUtils::radToHms(angle+0.005*M_PI/12/(60*60), h, m, s);
-+ StelUtils::radToHms(angle, h, m, s);
- int width, precision;
-- QString carry, r;
-+ QString carry;
- if (decimal)
- {
- width=5;
-@@ -268,7 +268,7 @@ QString radToDmsStrAdapt(const double angle, const bool useD)
- bool sign;
- unsigned int d,m;
- double s;
-- StelUtils::radToDms(angle+0.005*M_PI/180/(60*60)*(angle<0?-1.:1.), sign, d, m, s); // NOTE: WTF???
-+ StelUtils::radToDms(angle, sign, d, m, s);
- QString str;
- QTextStream os(&str);
-
-diff --git a/src/tests/testConversions.cpp b/src/tests/testConversions.cpp
-index a37db14307c..6e8a4c6f04c 100644
---- a/src/tests/testConversions.cpp
-+++ b/src/tests/testConversions.cpp
-@@ -248,12 +248,12 @@ void TestConversions::testRadToDMSStrAdapt()
- data << 61*M_PI/360 << "+30°30'" << false;
- data << M_PI/648000 << "+0°0'1\"" << false;
- data << 1213*M_PI/2400 << "+90°58'30\"" << false;
-- data << 39599*M_PI/648000 << "+10°59'59\"" << false;
-+ data << 39599*M_PI/648000 << "+10°59'59.00\"" << false;
- data << -M_PI/36 << "-5°" << false;
- data << -7*M_PI/8 << "-157°30'" << false;
- data << -2*M_PI/5 << "-72°" << false;
- data << -M_PI << "-180°" << false;
-- data << -10*M_PI/648 << "-2°46'40\"" << false;
-+ data << -10*M_PI/648 << "-2°46'40.00\"" << false;
-
- data << 0. << "+0d" << true;
- data << M_PI/6 << "+30d" << true;
-@@ -268,12 +268,12 @@ void TestConversions::testRadToDMSStrAdapt()
- data << 61*M_PI/360 << "+30d30'" << true;
- data << M_PI/648000 << "+0d0'1\"" << true;
- data << 1213*M_PI/2400 << "+90d58'30\"" << true;
-- data << 39599*M_PI/648000 << "+10d59'59\"" << true;
-+ data << 39599*M_PI/648000 << "+10d59'59.00\"" << true;
- data << -M_PI/36 << "-5d" << true;
- data << -7*M_PI/8 << "-157d30'" << true;
- data << -2*M_PI/5 << "-72d" << true;
- data << -M_PI << "-180d" << true;
-- data << -10*M_PI/648 << "-2d46'40\"" << true;
-+ data << -10*M_PI/648 << "-2d46'40.00\"" << true;
-
- while (data.count()>=3)
- {
-@@ -282,9 +282,7 @@ void TestConversions::testRadToDMSStrAdapt()
- bool flag = data.takeFirst().toBool();
- QString rdms = StelUtils::radToDmsStrAdapt(rad, flag);
- QVERIFY2(rdms==edms, qPrintable(QString("%1 radians = %2 (expected %3) [flag: %4]")
-- .arg(QString::number(rad, 'f', 5))
-- .arg(rdms)
-- .arg(edms)
-+ .arg(QString::number(rad, 'f', 5), rdms, edms)
- .arg(flag)));
- }
- }
-@@ -381,9 +379,7 @@ void TestConversions::testRadToDMSStr()
- bool useDF = data.takeFirst().toBool();
- QString rdms = StelUtils::radToDmsStr(rad, decimalF, useDF);
- QVERIFY2(rdms==edms, qPrintable(QString("%1 radians = %2 (expected %3) [flags: %4, %5]")
-- .arg(QString::number(rad, 'f', 5))
-- .arg(rdms)
-- .arg(edms)
-+ .arg(QString::number(rad, 'f', 5), rdms, edms)
- .arg(decimalF)
- .arg(useDF)));
- }
diff --git a/sci-astronomy/stellarium/files/stellarium-0.22.1-unbundle-qtcompress.patch b/sci-astronomy/stellarium/files/stellarium-0.22.1-unbundle-qtcompress.patch
deleted file mode 100644
index 41721046ed03..000000000000
--- a/sci-astronomy/stellarium/files/stellarium-0.22.1-unbundle-qtcompress.patch
+++ /dev/null
@@ -1,208 +0,0 @@
---- 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 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
-@@ -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.21.3.ebuild b/sci-astronomy/stellarium/stellarium-0.21.3.ebuild
deleted file mode 100644
index 30d58b14eedc..000000000000
--- a/sci-astronomy/stellarium/stellarium-0.21.3.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# 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.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 ~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}
- 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:=
- )
- 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.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_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
-}
diff --git a/sci-astronomy/stellarium/stellarium-0.22.1-r1.ebuild b/sci-astronomy/stellarium/stellarium-0.22.1-r1.ebuild
deleted file mode 100644
index 224aff001b9d..000000000000
--- a/sci-astronomy/stellarium/stellarium-0.22.1-r1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# 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.15"
-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/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:=
- )
- 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.1-fix-star-manager-segfault.patch"
- "${FILESDIR}/stellarium-0.22.1-unbundle-qtcompress.patch"
- "${FILESDIR}/stellarium-0.22.1-fix-test-x86.patch"
- "${FILESDIR}/stellarium-0.22.1-fix-conv.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_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
-}
diff --git a/sci-astronomy/stellarium/stellarium-0.22.1.ebuild b/sci-astronomy/stellarium/stellarium-0.22.1.ebuild
deleted file mode 100644
index b200ab6bbf5c..000000000000
--- a/sci-astronomy/stellarium/stellarium-0.22.1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# 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.15"
-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}
- 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/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:=
- )
- 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.1-fix-star-manager-segfault.patch"
- "${FILESDIR}/stellarium-0.22.1-unbundle-qtcompress.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_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/, sci-astronomy/stellarium/files/
@ 2022-05-26 12:58 Joonas Niilola
0 siblings, 0 replies; 13+ messages in thread
From: Joonas Niilola @ 2022-05-26 12:58 UTC (permalink / raw
To: gentoo-commits
commit: 15111b1b893f75756fafbbb4757825dcc810af19
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Tue May 24 21:53:03 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu May 26 12:58:04 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15111b1b
sci-astronomy/stellarium: fix test on x86
Patches from https://github.com/Stellarium/stellarium/issues/2460
Closes: https://bugs.gentoo.org/847064
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/25626
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../files/stellarium-0.22.1-fix-conv.patch | 23 ++++
.../files/stellarium-0.22.1-fix-test-x86.patch | 93 +++++++++++++
.../stellarium/stellarium-0.22.1-r1.ebuild | 148 +++++++++++++++++++++
3 files changed, 264 insertions(+)
diff --git a/sci-astronomy/stellarium/files/stellarium-0.22.1-fix-conv.patch b/sci-astronomy/stellarium/files/stellarium-0.22.1-fix-conv.patch
new file mode 100644
index 000000000000..5187837fbb61
--- /dev/null
+++ b/sci-astronomy/stellarium/files/stellarium-0.22.1-fix-conv.patch
@@ -0,0 +1,23 @@
+From dd65fdf5a332d62834ac1cfe9639e220ea635c55 Mon Sep 17 00:00:00 2001
+From: "Alexander V. Wolf" <alex.v.wolf@gmail.com>
+Date: Wed, 25 May 2022 20:55:15 +0700
+Subject: [PATCH] Fixed conversion tool radToHms(): avoiding possible negative
+ zero for value of seconds (see #2460)
+
+---
+ src/core/StelUtils.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/StelUtils.cpp b/src/core/StelUtils.cpp
+index 93a55ebb957..b03f55a68ec 100644
+--- a/src/core/StelUtils.cpp
++++ b/src/core/StelUtils.cpp
+@@ -140,7 +140,7 @@ void radToHms(double angle, unsigned int& h, unsigned int& m, double& s)
+
+ h = static_cast<unsigned int>(angle);
+ m = static_cast<unsigned int>((angle-h)*60);
+- s = (angle-h)*3600.-60.*m;
++ s = qAbs((angle-h)*3600.-60.*m);
+ }
+
+ /*************************************************************************
diff --git a/sci-astronomy/stellarium/files/stellarium-0.22.1-fix-test-x86.patch b/sci-astronomy/stellarium/files/stellarium-0.22.1-fix-test-x86.patch
new file mode 100644
index 000000000000..784b388b2534
--- /dev/null
+++ b/sci-astronomy/stellarium/files/stellarium-0.22.1-fix-test-x86.patch
@@ -0,0 +1,93 @@
+From 802065e025c8b435dc39b4fdd9262efdc1dcd2a8 Mon Sep 17 00:00:00 2001
+From: "Alexander V. Wolf" <alex.v.wolf@gmail.com>
+Date: Tue, 24 May 2022 14:47:50 +0700
+Subject: [PATCH] Fixed something strange in radToHMSStr and radToHMSStrAdapt
+ convertors
+
+probably ancient bug (?), maybe related to issue #2460
+---
+ src/core/StelUtils.cpp | 6 +++---
+ src/tests/testConversions.cpp | 16 ++++++----------
+ 2 files changed, 9 insertions(+), 13 deletions(-)
+
+diff --git a/src/core/StelUtils.cpp b/src/core/StelUtils.cpp
+index 521d538315e..93a55ebb957 100644
+--- a/src/core/StelUtils.cpp
++++ b/src/core/StelUtils.cpp
+@@ -225,9 +225,9 @@ QString radToHmsStr(const double angle, const bool decimal)
+ {
+ unsigned int h,m;
+ double s;
+- StelUtils::radToHms(angle+0.005*M_PI/12/(60*60), h, m, s);
++ StelUtils::radToHms(angle, h, m, s);
+ int width, precision;
+- QString carry, r;
++ QString carry;
+ if (decimal)
+ {
+ width=5;
+@@ -268,7 +268,7 @@ QString radToDmsStrAdapt(const double angle, const bool useD)
+ bool sign;
+ unsigned int d,m;
+ double s;
+- StelUtils::radToDms(angle+0.005*M_PI/180/(60*60)*(angle<0?-1.:1.), sign, d, m, s); // NOTE: WTF???
++ StelUtils::radToDms(angle, sign, d, m, s);
+ QString str;
+ QTextStream os(&str);
+
+diff --git a/src/tests/testConversions.cpp b/src/tests/testConversions.cpp
+index a37db14307c..6e8a4c6f04c 100644
+--- a/src/tests/testConversions.cpp
++++ b/src/tests/testConversions.cpp
+@@ -248,12 +248,12 @@ void TestConversions::testRadToDMSStrAdapt()
+ data << 61*M_PI/360 << "+30°30'" << false;
+ data << M_PI/648000 << "+0°0'1\"" << false;
+ data << 1213*M_PI/2400 << "+90°58'30\"" << false;
+- data << 39599*M_PI/648000 << "+10°59'59\"" << false;
++ data << 39599*M_PI/648000 << "+10°59'59.00\"" << false;
+ data << -M_PI/36 << "-5°" << false;
+ data << -7*M_PI/8 << "-157°30'" << false;
+ data << -2*M_PI/5 << "-72°" << false;
+ data << -M_PI << "-180°" << false;
+- data << -10*M_PI/648 << "-2°46'40\"" << false;
++ data << -10*M_PI/648 << "-2°46'40.00\"" << false;
+
+ data << 0. << "+0d" << true;
+ data << M_PI/6 << "+30d" << true;
+@@ -268,12 +268,12 @@ void TestConversions::testRadToDMSStrAdapt()
+ data << 61*M_PI/360 << "+30d30'" << true;
+ data << M_PI/648000 << "+0d0'1\"" << true;
+ data << 1213*M_PI/2400 << "+90d58'30\"" << true;
+- data << 39599*M_PI/648000 << "+10d59'59\"" << true;
++ data << 39599*M_PI/648000 << "+10d59'59.00\"" << true;
+ data << -M_PI/36 << "-5d" << true;
+ data << -7*M_PI/8 << "-157d30'" << true;
+ data << -2*M_PI/5 << "-72d" << true;
+ data << -M_PI << "-180d" << true;
+- data << -10*M_PI/648 << "-2d46'40\"" << true;
++ data << -10*M_PI/648 << "-2d46'40.00\"" << true;
+
+ while (data.count()>=3)
+ {
+@@ -282,9 +282,7 @@ void TestConversions::testRadToDMSStrAdapt()
+ bool flag = data.takeFirst().toBool();
+ QString rdms = StelUtils::radToDmsStrAdapt(rad, flag);
+ QVERIFY2(rdms==edms, qPrintable(QString("%1 radians = %2 (expected %3) [flag: %4]")
+- .arg(QString::number(rad, 'f', 5))
+- .arg(rdms)
+- .arg(edms)
++ .arg(QString::number(rad, 'f', 5), rdms, edms)
+ .arg(flag)));
+ }
+ }
+@@ -381,9 +379,7 @@ void TestConversions::testRadToDMSStr()
+ bool useDF = data.takeFirst().toBool();
+ QString rdms = StelUtils::radToDmsStr(rad, decimalF, useDF);
+ QVERIFY2(rdms==edms, qPrintable(QString("%1 radians = %2 (expected %3) [flags: %4, %5]")
+- .arg(QString::number(rad, 'f', 5))
+- .arg(rdms)
+- .arg(edms)
++ .arg(QString::number(rad, 'f', 5), rdms, edms)
+ .arg(decimalF)
+ .arg(useDF)));
+ }
diff --git a/sci-astronomy/stellarium/stellarium-0.22.1-r1.ebuild b/sci-astronomy/stellarium/stellarium-0.22.1-r1.ebuild
new file mode 100644
index 000000000000..1a50f8899404
--- /dev/null
+++ b/sci-astronomy/stellarium/stellarium-0.22.1-r1.ebuild
@@ -0,0 +1,148 @@
+# 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.15"
+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}
+ 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/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:=
+ )
+ 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.1-fix-star-manager-segfault.patch"
+ "${FILESDIR}/stellarium-0.22.1-unbundle-qtcompress.patch"
+ "${FILESDIR}/stellarium-0.22.1-fix-test-x86.patch"
+ "${FILESDIR}/stellarium-0.22.1-fix-conv.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_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/, sci-astronomy/stellarium/files/
@ 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: af9765266fbc35d8c50b29a4cb81d7d88d2c107d
Author: Matt Jolly <Matt.Jolly <AT> footclan <DOT> ninja>
AuthorDate: Sun Apr 17 07:31:32 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 18 20:29:15 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af976526
sci-astronomy/stellarium: add 0.22.1
Signed-off-by: Matt Jolly <Matt.Jolly <AT> footclan.ninja>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-astronomy/stellarium/Manifest | 2 +
.../stellarium-0.22.1-unbundle-qtcompress.patch | 208 +++++++++++++++++++++
sci-astronomy/stellarium/stellarium-0.22.1.ebuild | 145 ++++++++++++++
3 files changed, 355 insertions(+)
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index dccc451abef6..56f135d83c3b 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -5,6 +5,8 @@ DIST stars_7_2v0_1.cat 305710678 BLAKE2B 1cc9b4a6bc35a9339e495f7e0da4f7e90a0e92b
DIST stars_8_2v0_1.cat 559068934 BLAKE2B c040a369cdf6885759998e1315b554d21a5e2b9b149a67967a8af45606aebf57bec407fab5ce1904978af0dc529aa6bddd267331ca45f58617bbf56d5ca99dee SHA512 06d4fa298b9dff8452f550377df99fcaa5e7107cfc7b75c9a4769b3cb6d97a822a54213c706102c1d7ef2dabc16df32a85f46b2f6d6c6f76a4e919353b739de4
DIST stellarium-0.21.2.tar.gz 387061883 BLAKE2B 74878961efb01088c5c7c3031d989cccce5db2e072890d01a37a8b40d30838d7ee06f440abcd8279f14677f12c42f29d129499cf2e73c0bd2e771f201007d123 SHA512 91f4e263bcda25ba356decc99f46a3e278be24bcab25519522deac0ed540205ab8320365bb40a56b7f231635bf5b026b4f87f00eeb68a26eab2b7e37d38567bf
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-dso-catalog-3.13.dat 28683353 BLAKE2B 6d7587f98ccb06a83e6befb1d569c9639170c8a430901c1c6098a86a33fe8934cd4454a87b51752636a15ab1a96fd3ebd77cbd5d9e4260436ec2e4e4795f98b0 SHA512 3880ec776798599640fb083b0c9ebbccadef44f640fb2214052161ddbeb06bf5b0babc0c31d9ac02aa40e52e290d4f5613c11a6dadd83fd61114dbfb49ebe855
DIST stellarium_user_guide-0.21.2-1.pdf 31351844 BLAKE2B f8a35dcc1c0d9a40ec8d640b3cc2ee1f5e154b0f06507e0ef9ccbabdc05add2c00704e611932710a60f2b21730c8398e52be0cb142428de77eec304489591db9 SHA512 7e0bb33583ac4e89ea3cd7be5585cc00d9ac473d99d4e0862be1a74edb66cbd13661bd5d7787b60a945e302e33e190cc30a51df10d363e1af49002129f8e399f
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
diff --git a/sci-astronomy/stellarium/files/stellarium-0.22.1-unbundle-qtcompress.patch b/sci-astronomy/stellarium/files/stellarium-0.22.1-unbundle-qtcompress.patch
new file mode 100644
index 000000000000..41721046ed03
--- /dev/null
+++ b/sci-astronomy/stellarium/files/stellarium-0.22.1-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 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
+@@ -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.1.ebuild b/sci-astronomy/stellarium/stellarium-0.22.1.ebuild
new file mode 100644
index 000000000000..8ed916628542
--- /dev/null
+++ b/sci-astronomy/stellarium/stellarium-0.22.1.ebuild
@@ -0,0 +1,145 @@
+# 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.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 ~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}
+ 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/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:=
+ )
+ 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.22.1-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_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/, sci-astronomy/stellarium/files/
@ 2022-01-03 19:07 Florian Schmaus
0 siblings, 0 replies; 13+ messages in thread
From: Florian Schmaus @ 2022-01-03 19:07 UTC (permalink / raw
To: gentoo-commits
commit: 9394c9b752e5418ea3e025075f4819687c56eae8
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Sat Dec 25 15:44:24 2021 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon Jan 3 19:02:53 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9394c9b7
sci-astronomy/stellarium: drop old
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
sci-astronomy/stellarium/Manifest | 3 -
.../stellarium-0.21.0-unbundle-qtcompress.patch | 222 ---------------------
sci-astronomy/stellarium/stellarium-0.21.1.ebuild | 141 -------------
3 files changed, 366 deletions(-)
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index 02259f1d1468..3d724de878bb 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -3,9 +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.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.0-unbundle-qtcompress.patch b/sci-astronomy/stellarium/files/stellarium-0.21.0-unbundle-qtcompress.patch
deleted file mode 100644
index 179afb56fc62..000000000000
--- a/sci-astronomy/stellarium/files/stellarium-0.21.0-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 : qAsConst(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.21.1.ebuild b/sci-astronomy/stellarium/stellarium-0.21.1.ebuild
deleted file mode 100644
index 4d9988841090..000000000000
--- a/sci-astronomy/stellarium/stellarium-0.21.1.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/, sci-astronomy/stellarium/files/
@ 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: 83634befc8004fea25a723efc58ad0d95d2bde52
Author: Alexey Sokolov <sokolov <AT> google <DOT> com>
AuthorDate: Fri Jun 11 08:54:52 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Jun 11 08:54:52 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83634bef
sci-astronomy/stellarium: 0.21.0
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 | 2 +
.../stellarium-0.21.0-unbundle-qtcompress.patch | 222 +++++++++++++++++++++
sci-astronomy/stellarium/stellarium-0.21.0.ebuild | 141 +++++++++++++
3 files changed, 365 insertions(+)
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index a78059c5c8c..5284117c8a2 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -6,8 +6,10 @@ DIST stars_8_2v0_1.cat 559068934 BLAKE2B c040a369cdf6885759998e1315b554d21a5e2b9
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.21.0-unbundle-qtcompress.patch b/sci-astronomy/stellarium/files/stellarium-0.21.0-unbundle-qtcompress.patch
new file mode 100644
index 00000000000..179afb56fc6
--- /dev/null
+++ b/sci-astronomy/stellarium/files/stellarium-0.21.0-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 : qAsConst(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.21.0.ebuild b/sci-astronomy/stellarium/stellarium-0.21.0.ebuild
new file mode 100644
index 00000000000..9f6e471d3ed
--- /dev/null
+++ b/sci-astronomy/stellarium/stellarium-0.21.0.ebuild
@@ -0,0 +1,141 @@
+# 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/, sci-astronomy/stellarium/files/
@ 2020-08-21 7:15 Joonas Niilola
0 siblings, 0 replies; 13+ messages in thread
From: Joonas Niilola @ 2020-08-21 7:15 UTC (permalink / raw
To: gentoo-commits
commit: 5072f7bc81e4d5bf101e55abf7cb45d452a5ebd3
Author: Alexey Sokolov <sokolov <AT> google <DOT> com>
AuthorDate: Sun Aug 9 22:45:31 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Aug 21 07:14:42 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5072f7bc
sci-astronomy/stellarium: disable broken tests on x86
Closes: https://bugs.gentoo.org/730116
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/17065
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../files/stellarium-0.20.2-disable-x86-test.patch | 24 ++++++++++++++++++++++
sci-astronomy/stellarium/stellarium-0.20.2.ebuild | 5 +++++
2 files changed, 29 insertions(+)
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
new file mode 100644
index 00000000000..27674eb7a1e
--- /dev/null
+++ b/sci-astronomy/stellarium/files/stellarium-0.20.2-disable-x86-test.patch
@@ -0,0 +1,24 @@
+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
index b9d232ba256..934e215fc13 100644
--- a/sci-astronomy/stellarium/stellarium-0.20.2.ebuild
+++ b/sci-astronomy/stellarium/stellarium-0.20.2.ebuild
@@ -54,6 +54,11 @@ 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() {
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/stellarium/, sci-astronomy/stellarium/files/
@ 2019-01-18 11:01 Andreas Sturmlechner
0 siblings, 0 replies; 13+ messages in thread
From: Andreas Sturmlechner @ 2019-01-18 11:01 UTC (permalink / raw
To: gentoo-commits
commit: d84d15c6f33b9af216df308f2cf03ef194915c08
Author: Alexey Sokolov <sokolov <AT> google <DOT> com>
AuthorDate: Sun Jan 6 16:12:00 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 18 11:00:57 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d84d15c6
sci-astronomy/stellarium: Fix tests
The patch is merged upstream at
https://github.com/Stellarium/stellarium/pull/586
Closes: https://bugs.gentoo.org/674472
Signed-off-by: Alexey Sokolov <sokolov <AT> google.com>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Closes: https://github.com/gentoo/gentoo/pull/10759
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/stellarium-0.18.2-fix-test.patch | 113 +++++++++++++++++++++
sci-astronomy/stellarium/stellarium-0.18.2.ebuild | 5 +-
2 files changed, 117 insertions(+), 1 deletion(-)
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
new file mode 100644
index 00000000000..34089363498
--- /dev/null
+++ b/sci-astronomy/stellarium/files/stellarium-0.18.2-fix-test.patch
@@ -0,0 +1,113 @@
+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
index 42b839f3719..78116c5ed4a 100644
--- a/sci-astronomy/stellarium/stellarium-0.18.2.ebuild
+++ b/sci-astronomy/stellarium/stellarium-0.18.2.ebuild
@@ -43,7 +43,10 @@ DEPEND="${RDEPEND}
test? ( dev-qt/qttest:5 )
"
-PATCHES=( "${FILESDIR}"/${P}-as-needed.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-as-needed.patch
+ "${FILESDIR}"/${P}-fix-test.patch
+)
src_prepare() {
cmake-utils_src_prepare
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/stellarium/, sci-astronomy/stellarium/files/
@ 2018-11-12 23:00 Andreas Sturmlechner
0 siblings, 0 replies; 13+ messages in thread
From: Andreas Sturmlechner @ 2018-11-12 23:00 UTC (permalink / raw
To: gentoo-commits
commit: d98bb3a1271beddc2e923838e6b1dba0696d6141
Author: Alexey Sokolov <sokolov <AT> google <DOT> com>
AuthorDate: Thu Nov 8 23:51:02 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 12 23:00:27 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d98bb3a1
sci-astronomy/stellarium: version 0.18.2
The changes from 0.16.0-r1:
* URL update
* stars filenames update
* patch, upstreaming at https://github.com/Stellarium/stellarium/pull/545
Closes: https://bugs.gentoo.org/618158
Signed-off-by: Alexey Sokolov <sokolov <AT> google.com>
Closes: https://github.com/gentoo/gentoo/pull/10368
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-astronomy/stellarium/Manifest | 2 +
.../stellarium/files/stellarium-0.18.2.patch | 47 +++++++++
sci-astronomy/stellarium/stellarium-0.18.2.ebuild | 111 +++++++++++++++++++++
3 files changed, 160 insertions(+)
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index 913abbbf52b..f2dc414ff2e 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -1,6 +1,8 @@
DIST stars_4_1v0_1.cat 17040932 BLAKE2B 6715c129b27bb82b4b9b432bd56ed56dcbb1fbe9b9b608154656431119e75ab27e3c8afa66bce0fed1b2f7d080df49e770ddf63241f253e9f6f139be8238349d SHA512 adf2241d0a8b58eb6b8ad5f885dd8a3a66610a63ae949f17f26e81f1ac8d1094d77879e361a0de3929e0d447b0de77142e0c7de0f1f123bd145e130fbfbe0f9a
+DIST stars_4_1v0_2.cat 16948302 BLAKE2B 6efe02c6343fa3cd121879dddd3017dbd42a7c8965481b1ab79a258cedc4adc85df25240003b95c325eb35a8ed9686c38b2590f78aff9cd400ecac675583232d SHA512 80e5b2d0bc78c09658e84e7ee57309be290ba66a131ff38aa471235ff513d7824b28f6852ba1fdb485f86ede1fb2388cfb6327b2f1fe60bb097ce0cdbe48d2cb
DIST stars_5_2v0_1.cat 42580300 BLAKE2B eb6528c0577b3f2001a8b03cc5a4e08fa4e75723f677d0dda98d27c50791d9825c0e0feca7b00f0cb82ce362bc83f3e8dc2260d14e81e4a070cbbfa44f2107ba SHA512 6fc0f7352d1165a0744cc932b6d379741e4614d5a95edd136522c789eaa8d1bcf05d7445f7dfd6896e8183aa64bf37b3610d87902b54542f62f2418b285892e0
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.16.0.tar.gz 204675673 BLAKE2B fe34ab611569e23277ae9f273d1ae72139d5b860d0ae1b5650a9744960ce8bac6953d7de98b60bd224374aa77db33c00081ed90d1683b2007ef1b5068af158ff SHA512 0f75441435ff1d0fa149264116e9ae6ec3b3553f7c66e78832bdb0ffd55cbef656b820680134d95f89c73e80ef283372660ea7545db7fff205da66cf4cf8e9d6
+DIST stellarium-0.18.2.tar.gz 265334731 BLAKE2B d8527f93f2ea856466f98e7ab326a34e4265c4937c4d399755878cc6bbb1202580c825a6253e090986ebc80119fb33881b120a1ed6873278dacef75a1e69c517 SHA512 f658b19524b78739a5125ac7c89f5d2b48284d8696da54e39d2390bbbe5eeb8da70837c4e9055a650a492f3f71ebbc966c4c1341729982ba37d93b26fcb91912
diff --git a/sci-astronomy/stellarium/files/stellarium-0.18.2.patch b/sci-astronomy/stellarium/files/stellarium-0.18.2.patch
new file mode 100644
index 00000000000..71fc8ccf2d7
--- /dev/null
+++ b/sci-astronomy/stellarium/files/stellarium-0.18.2.patch
@@ -0,0 +1,47 @@
+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/stellarium-0.18.2.ebuild b/sci-astronomy/stellarium/stellarium-0.18.2.ebuild
new file mode 100644
index 00000000000..5e6e6cc48c8
--- /dev/null
+++ b/sci-astronomy/stellarium/stellarium-0.18.2.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils desktop flag-o-matic gnome2-utils
+
+DESCRIPTION="3D photo-realistic skies in real time"
+HOMEPAGE="http://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
+ )"
+
+PATCHES=( "${FILESDIR}"/${P}.patch )
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug gps media nls stars"
+
+RESTRICT="test" # There are no tests
+
+RDEPEND="
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtopengl:5
+ dev-qt/qtscript:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtserialport:5
+ dev-qt/qtwidgets:5
+ gps? ( dev-qt/qtpositioning:5 )
+ media? ( dev-qt/qtmultimedia:5[widgets] )
+ media-fonts/dejavu
+ sys-libs/zlib
+ virtual/opengl
+"
+DEPEND="${RDEPEND}
+ dev-qt/qtconcurrent:5
+ dev-qt/qttest:5
+ nls? ( dev-qt/linguist-tools:5 )"
+
+LANGS=(
+ af am ar as ast az be bg bn bo br bs ca cs
+ cy da de el en 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 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+=" l10n_${X}"
+done
+unset X
+
+src_prepare() {
+ cmake-utils_src_prepare
+ if [[ -n ${L10N} ]] ; then
+ local d
+ for d in po/* ; do
+ [[ -e ${d}/CMakeLists.txt ]] || continue
+ local l loc=""
+ for l in ${L10N//-/_}; do
+ [[ -e ${d}/${l}.po ]] && loc="${loc} ${l}"
+ done
+ sed -e 's/STRING(REGEX REPLACE ".po" "" \([a-z]*\).*$/SET(\1 '"${loc})/" \
+ -i ${d}/CMakeLists.txt || die
+ done
+ fi
+ use debug || append-cppflags -DQT_NO_DEBUG #415769
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_GPS="$(usex gps)"
+ -DENABLE_NLS="$(usex nls)"
+ -DENABLE_MEDIA="$(usex media)"
+ )
+ 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_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
end of thread, other threads:[~2024-04-30 6:42 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-27 8:34 [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/stellarium/, sci-astronomy/stellarium/files/ Florian Schmaus
-- strict thread matches above, loose matches on Subject: below --
2024-04-30 6:42 Sam James
2024-01-10 7:11 Joonas Niilola
2023-12-13 8:06 Florian Schmaus
2023-02-23 7:04 Joonas Niilola
2022-09-27 14:01 Andrew Ammerlaan
2022-05-26 12:58 Joonas Niilola
2022-04-18 20:29 Sam James
2022-01-03 19:07 Florian Schmaus
2021-06-11 8:55 David Seifert
2020-08-21 7:15 Joonas Niilola
2019-01-18 11:01 Andreas Sturmlechner
2018-11-12 23:00 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox