diff options
Diffstat (limited to 'sci-astronomy/stellarium')
5 files changed, 270 insertions, 2 deletions
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest index 2b3226658192..d59601fbcd42 100644 --- a/sci-astronomy/stellarium/Manifest +++ b/sci-astronomy/stellarium/Manifest @@ -1,7 +1,9 @@ AUX stellarium-0.20.3-unbundle-indi.patch 3217 BLAKE2B 9de42cc423655ef8280fc5d40c917211ae9904310defc9f16d2a2cc3448b209c6aba67c34a48c884cd7f09a6b6a9e964c9fd8b9faa7ca6a3cd2101290bb2bb5d SHA512 f6da77375632ff5c2b99d30f5d361fa1cd4bc2dca89afb1b4c5a9b47d9396687c473cb4acc3d87f4242207de2dee9dce44899cc7de3baebb2dba9d550d25e294 AUX stellarium-0.20.3-unbundle-zlib.patch 844 BLAKE2B 24468924728aa9f77ebb2a48d87ecef2eb98768dabc8fcf914972da70feca1dc1de9e32e658afdfb796c769244a2882be8a46c4b9145c6e0109498a5f090baae SHA512 e8a645a302f890e0590369ea6b1642fe38f91b20a3076f8c5201b2b23581394dccc6a0b56e2423e3ab45e926e1a3266bf1fb24e0647ea05e59219147e8b53a1d AUX stellarium-0.21.2-unbundle-qtcompress.patch 7484 BLAKE2B f3cf62bf45247c2b4a09a55dcfbc3424869ce4c294da0a4ebc4daa3a19baa7ba377ff9ff4e271d2aab098f20ecde5018793901cacc54be9849bccad510831ca1 SHA512 81934b0b9ba8b2d1d8fa75eacdf146e374bbc29b862fe5585a4846d14c17174ef0c936d22c1a80eb61d3041d79d0f981d01bdb215e4530833b9d00e2613d0dae +AUX stellarium-0.22.1-fix-conv.patch 845 BLAKE2B d0147bef1e9c9c80e03b8690d801c7af3acfd66735426d095a1fc21ac4696e7b367c38a4c8c7b526013723159a8b47519ae418745f6110f0a305929cc7e2f623 SHA512 2ff0f6ef0b52817f576d829a21901a0e96b2724210eff5066666cd0c9e5c9778a4cbe1a19c60f010779ee65beeabfb2d7fd9ee68ad07ee107e3fed3fba02493d AUX stellarium-0.22.1-fix-star-manager-segfault.patch 873 BLAKE2B 5f970fd0f30fe6e73d0479d603e572bd4e6db5545d584badb11cecb09d2ba704c420398734e0f943c2ca34d1d5c7a93cea3da446d3b0e72bc2d18db1a455246b SHA512 f85d5c7614ba3dda8dc752c76a55ac361d194345cc926127d7428b82057dd19da27813f0071abfc2deb3ee729d7c33703ed3d5dfb3a2644c16d95ead400ca882 +AUX stellarium-0.22.1-fix-test-x86.patch 3578 BLAKE2B 8121746cdf9efaa023e2eadb9c8f451d781834a8bab0e96bc74b4e3b77cba62ccdfa1354d79d5409db042f002974551d6989bb58b7bde4c85394be48ac242b05 SHA512 b902e91542774ee7955442ed78938c336719aa93ca7ee644ea5f47987234603bc4fb7f271ba1a5d3f6298c325da78582d6b39b5909a46b881be483d56c6fd2ad AUX stellarium-0.22.1-unbundle-qtcompress.patch 7595 BLAKE2B 650c9de68a42c101df436c32c7f42f8623903c969d82f1de2c411c34d5237601df401129b950e407ff0e558f2c1e5c18bdbef5bf26bae2d499fda5377ef67c3d SHA512 8550ec4d9cd0b044491bb592a099bb7b28c8de03cef2ca38e8ad420303bc02b053bf896265cdbb08629befc0086dae9be31b0ed78c10756fd67eaa692a69ca64 DIST stars_4_1v0_2.cat 16948302 BLAKE2B 6efe02c6343fa3cd121879dddd3017dbd42a7c8965481b1ab79a258cedc4adc85df25240003b95c325eb35a8ed9686c38b2590f78aff9cd400ecac675583232d SHA512 80e5b2d0bc78c09658e84e7ee57309be290ba66a131ff38aa471235ff513d7824b28f6852ba1fdb485f86ede1fb2388cfb6327b2f1fe60bb097ce0cdbe48d2cb DIST stars_5_2v0_1.cat 42580300 BLAKE2B eb6528c0577b3f2001a8b03cc5a4e08fa4e75723f677d0dda98d27c50791d9825c0e0feca7b00f0cb82ce362bc83f3e8dc2260d14e81e4a070cbbfa44f2107ba SHA512 6fc0f7352d1165a0744cc932b6d379741e4614d5a95edd136522c789eaa8d1bcf05d7445f7dfd6896e8183aa64bf37b3610d87902b54542f62f2418b285892e0 @@ -15,5 +17,6 @@ DIST stellarium-dso-catalog-3.15.dat 28683372 BLAKE2B c2ba23a6b169815ed20d971138 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 EBUILD stellarium-0.21.3.ebuild 4231 BLAKE2B d865110272f4d1108a654e0cfc901ba2f33f9bfc4450723ce05004a056ad9bc29e87a118024f9861978808cf95629619a2f15985c88e54c77d3cad23823ad5be SHA512 0eb62c03aececa55b69fb061391d23531651a1e897e457aa52902ee9c087594c21453268269f6527092450112391dcfea2c18c3e2e58d7038d46b704015363a5 -EBUILD stellarium-0.22.1.ebuild 4319 BLAKE2B 9ca380bac74bf39c77f0a1e8d9f65cfb91b8e9734bbafe95a56d20345fd6cbc47e6b9cfba4cf0364eace660c9eb9dd196c3c450e8462fad735f578026881b9ab SHA512 2b56eaf926526f18783eacc101d52c0aaa2163075835f3016606996eefc888f902c4d946f80fd152a716c9313616bc8d2b9ca6ae4abe7e3694d24fec66b07d2a +EBUILD stellarium-0.22.1-r1.ebuild 4434 BLAKE2B a63d4cb0a7cf6fdb0b5e961d71c1bcb98d18f999b570c54b18a617826f7c61c95c55501758dc8b00a5bdf4e62dd28c95d8c926641f4d20915bc147943c193f43 SHA512 0b820802f07e3443dd055aaf59fd7db53321a9b30bb643331ca5db45c042bb3ca63a5ced6d307bdcf6feda19bc06f6ad4cbc552d5a89c10056a7ed47a9791606 +EBUILD stellarium-0.22.1.ebuild 4316 BLAKE2B 16d0509c9f07b6b459f9a7881af96c518e069a02378a826fb314009c89189593eeca2227cfbb153ac578dc3e993cccdc1d6a1541e18b326554ccbe5b0bf6fb6c SHA512 bb7c3c26913b8a42546e7fe8c548415a8c8163792db6bc631fd9527d19c1901600e7bc205f1171af418dcddc9efbb5f99c96edbdea759e912eadd3bc75031245 MISC metadata.xml 1331 BLAKE2B 858e48ee46003e8f9d5cb7c6dfe0dd0dab5126c069592c7edbdf2ddf0e3b281d4e5cab5cf21b6197dbde7d7a152225999773265cc4319a4550f15ee2c9903626 SHA512 7e801dbdccaef56276bde6a96bfd61811e6d6b6fcba21238d889d8b882afb9e983ed921dd4d30015107cc48afe6539c19a7bb6692300800ed9f8cc5e4166b5e7 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..224aff001b9d --- /dev/null +++ b/sci-astronomy/stellarium/stellarium-0.22.1-r1.ebuild @@ -0,0 +1,149 @@ +# 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 index 20e481ce1cc5..b200ab6bbf5c 100644 --- a/sci-astronomy/stellarium/stellarium-0.22.1.ebuild +++ b/sci-astronomy/stellarium/stellarium-0.22.1.ebuild @@ -27,7 +27,7 @@ SRC_URI=" LICENSE="GPL-2+ SGI-B-2.0" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86" +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 |