From 240b57012ace855bbfd9934b07642416ceeeb5b8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Jul 2023 22:29:02 +0100 Subject: gentoo auto-resync : 25:07:2023 - 22:29:01 --- sci-astronomy/Manifest.gz | Bin 6848 -> 6847 bytes sci-astronomy/kstars/Manifest | 4 + .../kstars/files/kstars-3.6.5-buildfix.patch | 33 ++++++ sci-astronomy/kstars/files/kstars-3.6.5-gsl.patch | 59 +++++++++++ sci-astronomy/kstars/kstars-3.6.5-r1.ebuild | 113 +++++++++++++++++++++ 5 files changed, 209 insertions(+) create mode 100644 sci-astronomy/kstars/files/kstars-3.6.5-buildfix.patch create mode 100644 sci-astronomy/kstars/files/kstars-3.6.5-gsl.patch create mode 100644 sci-astronomy/kstars/kstars-3.6.5-r1.ebuild (limited to 'sci-astronomy') diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz index 2386791154db..82302412acee 100644 Binary files a/sci-astronomy/Manifest.gz and b/sci-astronomy/Manifest.gz differ diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest index 25656771e21a..591bd0869a54 100644 --- a/sci-astronomy/kstars/Manifest +++ b/sci-astronomy/kstars/Manifest @@ -1,3 +1,7 @@ +AUX kstars-3.6.5-buildfix.patch 1135 BLAKE2B 60ab7ce1941a30a6248315b22df55163d58fc35a656c6be45c5bc417845cbd9f170f62ee00fe4afac5e6377120bc8b8e716ec000b478001a6d57ed1710297bed SHA512 32bb95190ba9fb8b45d91d3a19eafb1ede285912789f8f88471e84c8e4fa09c5440fafb483ddd57bec459ffc5a8d5b08ea8c96cd1c574e54ef5a25151b3f1caf +AUX kstars-3.6.5-gsl.patch 2302 BLAKE2B 7aae7a99680bbda71c07dfab7d467ea000ca1ff391cfd73fb41c3d90ef83fcf25cdf1b3e13c08cb8abe53e1aaef27c4d1a8e522054a13e39ccca69e13ae32c82 SHA512 f43fe7c67ab6f62af6a4477a58deecb665b5edd928d1b16917fc262b31cd2376a49ba670e1175769d2a50ab3c4523dc59d3fcba984a4ed9fab3a143ce789486e DIST kstars-3.6.2.tar.xz 111110944 BLAKE2B 8a2c5821b982ee62167e2ba28d70d3931d9643d7c9410097169f87556ec4b2ea137e6595089960c63c6063f69c1415968664b8dd1e05a8f8a619b37d2539c26e SHA512 8519aaab748afe948af332cf3b54a031aa65ac0d36f4dc3b5da7de9bffd9eab402221a11378ebe4d97cf4d4b0754b1a7c644f8222c93e0fca089f26545f10283 +DIST kstars-3.6.5.tar.xz 114135376 BLAKE2B eebd8406782239193d1e7d08b1d2c86ad6a235f5159e08fc0942537846dbaae690af7156a6fd31231c79025ef8e68f15e76472b1365b1df3682e98508a403cc1 SHA512 91a461529af2a78e130c13f92006f7293cee2161f952301c6e0b87c91094d6147b59b74cc70ec1166dd413343f940e319f88a1d205d93adf9caf4723d8b52318 EBUILD kstars-3.6.2.ebuild 2636 BLAKE2B 5522231cc0444c6e8e57909c622851e6a3cdbea8dd519555c0a0232a617d4c0daea5d649eae7d463fac92e9ba748cc1d827081f3679dad282e9e3049d496f272 SHA512 76c91f64024ca6b966e4e59ae415e027e6eaec56c969ac52211c7f24fc52341b25347f44174c08356e9d5b88a9c497700281c9a9f89a4b6f7323cfdf056400f9 +EBUILD kstars-3.6.5-r1.ebuild 2841 BLAKE2B 34de94e4057527a51a832664a45a6724991753f39ab5b63016155c66a9907e55f086d927c2e2ccd91574bcaf33a021be01f2914631b8056f92903a960ee852c6 SHA512 b842de5ccb184aca8e8ebde6a1f57a06b4a69fbbf5d4dcfa04b12eb63c6bd7db7634ea6bb813747db29228760b718e1a4eef2de86345321d090023903f96c776 MISC metadata.xml 692 BLAKE2B a1be7f22ffff993276aaa943528cf39811e6567fdd9fe757d1045ab83e25010230f7d702bfef9c74ec71d62ff647edb4d7073e90dfb6147d100e4de6a225dfa1 SHA512 152e114ca9826e0599b530f6421e2ad5441b50b053cb81135cbf84dda3a7a37e7c7f989bb1d2f9bf826d9bf0cca97a3f0de5d9523f25fd0acbd3482348df0ed8 diff --git a/sci-astronomy/kstars/files/kstars-3.6.5-buildfix.patch b/sci-astronomy/kstars/files/kstars-3.6.5-buildfix.patch new file mode 100644 index 000000000000..793cb2fcead4 --- /dev/null +++ b/sci-astronomy/kstars/files/kstars-3.6.5-buildfix.patch @@ -0,0 +1,33 @@ +From ea6f3578b047be156c89137dc61ad874775b94b4 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Tue, 25 Jul 2023 15:51:40 +0200 +Subject: [PATCH] Drop superfluous definition + +While build fails only under certain downstream circumstances, +this line should not be here in the first place. + +Follow-up to a56e12970b2e10305e2942f7aa47cc8bb9f0d53f + +See also: https://invent.kde.org/education/kstars/-/issues/251 + +Signed-off-by: Andreas Sturmlechner +--- + kstars/skycomponents/supernovaecomponent.cpp | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/kstars/skycomponents/supernovaecomponent.cpp b/kstars/skycomponents/supernovaecomponent.cpp +index bb427b8e8..3b3866f7d 100644 +--- a/kstars/skycomponents/supernovaecomponent.cpp ++++ b/kstars/skycomponents/supernovaecomponent.cpp +@@ -36,8 +36,6 @@ + + #include + +-gzFile gzopen OF((const char *path, const char *mode)); +- + const QString SupernovaeComponent::tnsDataFilename("tns_public_objects.csv"); + const QString SupernovaeComponent::tnsDataFilenameZip("tns-daily.csv.gz"); + const QString SupernovaeComponent::tnsDataUrl( +-- +2.41.0 + diff --git a/sci-astronomy/kstars/files/kstars-3.6.5-gsl.patch b/sci-astronomy/kstars/files/kstars-3.6.5-gsl.patch new file mode 100644 index 000000000000..1aaa348ba8c1 --- /dev/null +++ b/sci-astronomy/kstars/files/kstars-3.6.5-gsl.patch @@ -0,0 +1,59 @@ +From b83de34310d13920e1be5e980d0774f35c1d9a2a Mon Sep 17 00:00:00 2001 +From: Heiko Becker +Date: Wed, 31 May 2023 21:19:12 +0200 +Subject: [PATCH] Fix build without INDI + +Without INDI present I get the following error: + +"x86_64-pc-linux-gnu-ld: ../lib/libKStarsLib.a(robuststatistics.cpp.o): +in function `Mathematics::GSLHelpers::gslMedianFromSortedData( +double const*, unsigned long, unsigned long)': +.../work/kstars-3.6.5/kstars/auxiliary/gslhelpers.h:306: undefined +reference to `gsl_stats_median_from_sorted_data'" + +That is the case because Mathematics::RobustStatistics is used +unconditionally, which pulls in gslhelpers and the need to link with +GSL. + +Also drop the duplicate linking of KF5::Notifications, KStarsLib already +links to it in the NOT ANDROID case. +--- + kstars/CMakeLists.txt | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/kstars/CMakeLists.txt b/kstars/CMakeLists.txt +index 747ce79a95..b755be5737 100644 +--- a/kstars/CMakeLists.txt ++++ b/kstars/CMakeLists.txt +@@ -1169,6 +1169,8 @@ set(kstars_SRCS ${kstars_SRCS} ${fits2_SRCS} ${sep_SRCS} ${gpg_SRCS} ${hough_SRC + set(kstarslite_SRCS ${kstarslite_SRCS} ${fits_klite_SRCS} ${sep_SRCS} ${hough_SRCS} ${fits2_klite_SRCS} ${kstarslite_libtess_SRC}) + + IF (NOT ANDROID) ++ # GSL ++ find_package(GSL REQUIRED) + qt5_add_dbus_adaptor(kstars_SRCS org.kde.kstars.xml kstars.h KStars) + qt5_add_dbus_adaptor(kstars_SRCS org.kde.kstars.SimClock.xml simclock.h SimClock) + qt5_add_dbus_adaptor(kstars_SRCS org.kde.kstars.FOV.xml fov.h FOV) +@@ -1243,6 +1245,7 @@ IF (NOT ANDROID) + Qt5::WebSockets + ${ZLIB_LIBRARIES} + Eigen3::Eigen ++ GSL::gsl + ) + + if (Qt5Keychain_FOUND) +@@ -1313,10 +1316,7 @@ if(INDI_FOUND) + ## Linux + MacOS Lite: Requires INDI Qt5 Client + ## Android: Requires INDI Qt5 Client built for Android + if (NOT ANDROID) +- # GSL +- find_package(GSL REQUIRED) +- include_directories(${GSL_INCLUDE_DIRS}) +- target_link_libraries(KStarsLib ${GSL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} KF5::Notifications) ++ target_link_libraries(KStarsLib ${CMAKE_THREAD_LIBS_INIT}) + # StellarSolver + target_link_libraries(KStarsLib StellarSolver::stellarsolver) + endif () +-- +GitLab + diff --git a/sci-astronomy/kstars/kstars-3.6.5-r1.ebuild b/sci-astronomy/kstars/kstars-3.6.5-r1.ebuild new file mode 100644 index 000000000000..483df20a980a --- /dev/null +++ b/sci-astronomy/kstars/kstars-3.6.5-r1.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="true" +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm kde.org optfeature + +DESCRIPTION="Desktop Planetarium" +HOMEPAGE="https://apps.kde.org/kstars/ https://edu.kde.org/kstars/" + +if [[ ${KDE_BUILD_TYPE} = release ]]; then + SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-2+ GPL-3+" +SLOT="5" +IUSE="fits indi +password raw wcs" + +REQUIRED_USE="indi? ( fits ) ${PYTHON_REQUIRED_USE}" + +COMMON_DEPEND=" + >=dev-qt/qtdatavis3d-${QTMIN}:5 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtsql-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwebsockets-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/knewstuff-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/knotifyconfig-${KFMIN}:5 + >=kde-frameworks/kplotting-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + sci-libs/gsl:= + sys-libs/zlib + fits? ( sci-libs/cfitsio:= ) + indi? ( + >=sci-libs/indilib-2.0.2 + sci-libs/libnova:= + >=sci-libs/stellarsolver-2.2 + ) + password? ( dev-libs/qtkeychain:=[qt5(+)] ) + raw? ( media-libs/libraw:= ) + wcs? ( sci-astronomy/wcslib:= ) +" +# TODO: Add back when re-enabled by upstream +# opengl? ( +# >=dev-qt/qtopengl-${QTMIN}:5 +# virtual/opengl +# ) +DEPEND="${COMMON_DEPEND} + dev-cpp/eigen:3 + >=dev-qt/qtconcurrent-${QTMIN}:5 +" +RDEPEND="${COMMON_DEPEND} + >=dev-qt/qtgraphicaleffects-${QTMIN}:5 + >=dev-qt/qtpositioning-${QTMIN}:5 + >=dev-qt/qtquickcontrols-${QTMIN}:5 + >=dev-qt/qtquickcontrols2-${QTMIN}:5 +" + +PATCHES=( + # https://invent.kde.org/education/kstars/-/issues/251 + "${FILESDIR}/${P}-buildfix.patch" + "${FILESDIR}/${P}-gsl.patch" # bug 911199 +) + +src_configure() { + local mycmakeargs=( + -DBUILD_PYKSTARS=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_LibXISF=ON # not packaged + -DBUILD_DOC=$(usex handbook) + $(cmake_use_find_package fits CFitsio) + $(cmake_use_find_package indi INDI) + $(cmake_use_find_package indi Nova) + $(cmake_use_find_package password Qt5Keychain) + $(cmake_use_find_package raw LibRaw) + $(cmake_use_find_package wcs WCSLIB) + ) + + ecm_src_configure +} + +src_test() { + # bug 842768, test declared unstable by upstream + local myctestargs=( + -E "(TestKSPaths)" + ) + + ecm_src_test +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + optfeature "Display 'current' pictures of planets" x11-misc/xplanet + fi + ecm_pkg_postinst +} -- cgit v1.2.3