public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/kstars/files/, sci-astronomy/kstars/
@ 2018-12-23  1:25 Andreas Sturmlechner
  0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2018-12-23  1:25 UTC (permalink / raw
  To: gentoo-commits

commit:     1c3e0a72809a70349aebc2ae75fb7bf04acbeb3d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 23 00:11:33 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 23 01:25:27 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c3e0a72

sci-astronomy/kstars: Fix build with >=libraw-0.19

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../kstars/files/kstars-2.9.5-libraw-0.19.patch    | 73 ++++++++++++++++++++++
 sci-astronomy/kstars/kstars-2.9.5.ebuild           |  7 ++-
 2 files changed, 78 insertions(+), 2 deletions(-)

diff --git a/sci-astronomy/kstars/files/kstars-2.9.5-libraw-0.19.patch b/sci-astronomy/kstars/files/kstars-2.9.5-libraw-0.19.patch
new file mode 100644
index 00000000000..7db3faada9b
--- /dev/null
+++ b/sci-astronomy/kstars/files/kstars-2.9.5-libraw-0.19.patch
@@ -0,0 +1,73 @@
+From 25630e41c71990d619f9f96693624056a8d89039 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino@kde.org>
+Date: Tue, 31 Jul 2018 20:48:17 +0200
+Subject: cmake: fix enabling of exceptions
+
+Use the ECM module KDECompilerSettings unconditionally on every
+platform, as it provides the kde_enable_exceptions cmake macro needed.
+This might break build on android, but then the exclusion of
+KDECompilerSettings on android is a 2 years old hack, most probably
+working around a different issue which will need its own investigation,
+and fix.
+
+Use kde_enable_exceptions() unconditionally, which will do the right job
+for all the different compilers. This also removes the -Dfexceptions
+defines (which effectively does nothing), and the manual -fexceptions in
+htmesh.
+
+Incidentally, this fixes the build with libraw 0.19.0, which requires
+the usage of exceptions in case LIBRAW_NO_MEMPOOL_CHECK is not defined.
+
+* 2018-12-23: asturm@gentoo.org: backported to 2.9.5.
+
+---
+ CMakeLists.txt               | 9 ++++-----
+ kstars/htmesh/CMakeLists.txt | 4 ----
+ 2 files changed, 4 insertions(+), 9 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 69f2409..73224cc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -87,10 +87,7 @@ include(ECMAddAppIcon)
+ include(KDEInstallDirs)
+ include(MacroBoolTo01)
+ include(ECMQtDeclareLoggingCategory)
+-if(NOT CMAKE_TOOLCHAIN_FILE STREQUAL ${CMAKE_SOURCE_DIR}/android/toolchain-android.cmake)
+-    #We get error "could not find main method" with this module
+-    include(KDECompilerSettings NO_POLICY_SCOPE)
+-endif()
++include(KDECompilerSettings NO_POLICY_SCOPE)
+ include(KDECMakeSettings)
+ include(FeatureSummary)
+ 
+@@ -252,8 +249,10 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+ endif()
+ add_definitions(-DQT_NO_CAST_TO_ASCII)
+ 
++# Needed for htmesh, and libraw
++kde_enable_exceptions()
++
+ if (UNIX)
+-  add_definitions(-Dfexceptions)
+ 
+   # TEMPORARY: To disable QCustomPlot warning until 2.0.0 is released which fixes these warnings
+   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-non-virtual-dtor")
+diff --git a/kstars/htmesh/CMakeLists.txt b/kstars/htmesh/CMakeLists.txt
+index e76d84e..0dbdc8f 100644
+--- a/kstars/htmesh/CMakeLists.txt
++++ b/kstars/htmesh/CMakeLists.txt
+@@ -32,10 +32,6 @@ IF (ANDROID)
+     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+ ENDIF ()
+ 
+-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
+-#TODO is there KF5_ENABLE_EXCEPTIONS?
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions")
+-
+ add_library(htmesh STATIC ${HTMesh_LIB_SRC})
+ 
+ add_definitions(-D_EXPORTING)
+-- 
+cgit v1.1
+

diff --git a/sci-astronomy/kstars/kstars-2.9.5.ebuild b/sci-astronomy/kstars/kstars-2.9.5.ebuild
index a982e58b095..5bc717c962f 100644
--- a/sci-astronomy/kstars/kstars-2.9.5.ebuild
+++ b/sci-astronomy/kstars/kstars-2.9.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -61,7 +61,10 @@ RDEPEND="${COMMON_DEPEND}
 	${PYTHON_DEPS}
 "
 
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-qt-5.11.patch"
+	"${FILESDIR}/${P}-libraw-0.19.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/kstars/files/, sci-astronomy/kstars/
@ 2019-02-15 20:10 Andreas Sturmlechner
  0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2019-02-15 20:10 UTC (permalink / raw
  To: gentoo-commits

commit:     bcdf8dffe47f2dc08a6520b1b4bc7c404392cd84
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 15 20:06:21 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Feb 15 20:10:32 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcdf8dff

sci-astronomy/kstars: Drop 2.9.5

Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-astronomy/kstars/Manifest                      |  1 -
 .../kstars/files/kstars-2.9.5-libraw-0.19.patch    | 73 --------------------
 .../kstars/files/kstars-2.9.5-qt-5.11.patch        | 31 ---------
 sci-astronomy/kstars/kstars-2.9.5.ebuild           | 79 ----------------------
 sci-astronomy/kstars/metadata.xml                  |  1 -
 5 files changed, 185 deletions(-)

diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest
index e609ffbb963..34c3cb56d04 100644
--- a/sci-astronomy/kstars/Manifest
+++ b/sci-astronomy/kstars/Manifest
@@ -1,2 +1 @@
-DIST kstars-2.9.5.tar.xz 64033600 BLAKE2B 1d858d40d1ebccb1ae3217d8f3a464089171a6a9777cf759902017b373ceac3c7e56febf6ec3b2bed5db6cef779252e2d653e3c513545bf55261465465df2274 SHA512 850e3ad31f0c60547c406dc24bf3064f86867557f97acd63fb951d49fb09d7d20462a85016f8c645f316de0310cf7969e08c19e00fc0bedb5c1b006dfda0622b
 DIST kstars-3.0.0.tar.xz 63604404 BLAKE2B 23754eb1d29b9e7793fac71869045a4e172f8c9aa32dc55d529ef40bf03251d035a2edc68508d887c204389364c2dceba2c9984985bf2ddcc357fc835924f215 SHA512 e574c2529898d66bc79e1cf88ce778dddeedfdfed4ea23921219226121b60be042a94e6865e9076efff038a0a529587901f9a4ab2cd5b658440a8bf39c0c4d08

diff --git a/sci-astronomy/kstars/files/kstars-2.9.5-libraw-0.19.patch b/sci-astronomy/kstars/files/kstars-2.9.5-libraw-0.19.patch
deleted file mode 100644
index 7db3faada9b..00000000000
--- a/sci-astronomy/kstars/files/kstars-2.9.5-libraw-0.19.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 25630e41c71990d619f9f96693624056a8d89039 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino@kde.org>
-Date: Tue, 31 Jul 2018 20:48:17 +0200
-Subject: cmake: fix enabling of exceptions
-
-Use the ECM module KDECompilerSettings unconditionally on every
-platform, as it provides the kde_enable_exceptions cmake macro needed.
-This might break build on android, but then the exclusion of
-KDECompilerSettings on android is a 2 years old hack, most probably
-working around a different issue which will need its own investigation,
-and fix.
-
-Use kde_enable_exceptions() unconditionally, which will do the right job
-for all the different compilers. This also removes the -Dfexceptions
-defines (which effectively does nothing), and the manual -fexceptions in
-htmesh.
-
-Incidentally, this fixes the build with libraw 0.19.0, which requires
-the usage of exceptions in case LIBRAW_NO_MEMPOOL_CHECK is not defined.
-
-* 2018-12-23: asturm@gentoo.org: backported to 2.9.5.
-
----
- CMakeLists.txt               | 9 ++++-----
- kstars/htmesh/CMakeLists.txt | 4 ----
- 2 files changed, 4 insertions(+), 9 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 69f2409..73224cc 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -87,10 +87,7 @@ include(ECMAddAppIcon)
- include(KDEInstallDirs)
- include(MacroBoolTo01)
- include(ECMQtDeclareLoggingCategory)
--if(NOT CMAKE_TOOLCHAIN_FILE STREQUAL ${CMAKE_SOURCE_DIR}/android/toolchain-android.cmake)
--    #We get error "could not find main method" with this module
--    include(KDECompilerSettings NO_POLICY_SCOPE)
--endif()
-+include(KDECompilerSettings NO_POLICY_SCOPE)
- include(KDECMakeSettings)
- include(FeatureSummary)
- 
-@@ -252,8 +249,10 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
- endif()
- add_definitions(-DQT_NO_CAST_TO_ASCII)
- 
-+# Needed for htmesh, and libraw
-+kde_enable_exceptions()
-+
- if (UNIX)
--  add_definitions(-Dfexceptions)
- 
-   # TEMPORARY: To disable QCustomPlot warning until 2.0.0 is released which fixes these warnings
-   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-non-virtual-dtor")
-diff --git a/kstars/htmesh/CMakeLists.txt b/kstars/htmesh/CMakeLists.txt
-index e76d84e..0dbdc8f 100644
---- a/kstars/htmesh/CMakeLists.txt
-+++ b/kstars/htmesh/CMakeLists.txt
-@@ -32,10 +32,6 @@ IF (ANDROID)
-     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
- ENDIF ()
- 
--#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
--#TODO is there KF5_ENABLE_EXCEPTIONS?
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions")
--
- add_library(htmesh STATIC ${HTMesh_LIB_SRC})
- 
- add_definitions(-D_EXPORTING)
--- 
-cgit v1.1
-

diff --git a/sci-astronomy/kstars/files/kstars-2.9.5-qt-5.11.patch b/sci-astronomy/kstars/files/kstars-2.9.5-qt-5.11.patch
deleted file mode 100644
index 72d4b8e4a48..00000000000
--- a/sci-astronomy/kstars/files/kstars-2.9.5-qt-5.11.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From cf510e4aee93bf1392df8e35931ba9bb9a07fc16 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 25 Apr 2018 22:05:50 +0200
-Subject: [PATCH] Fix build with Qt 5.11 (missing QDoubleValidator)
-
-Reviewers: mutlaqja
-
-Subscribers: #kde_edu
-
-Tags: #kde_edu
-
-Differential Revision: https://phabricator.kde.org/D12525
----
- kstars/dialogs/focusdialog.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/kstars/dialogs/focusdialog.cpp b/kstars/dialogs/focusdialog.cpp
-index d09ce9273..b264ee5c9 100644
---- a/kstars/dialogs/focusdialog.cpp
-+++ b/kstars/dialogs/focusdialog.cpp
-@@ -24,6 +24,7 @@
- #include "skyobjects/skypoint.h"
- 
- #include <KLocalizedString>
-+#include <QDoubleValidator>
- #include <KMessageBox>
- #include <QPushButton>
- 
--- 
-2.17.0
-

diff --git a/sci-astronomy/kstars/kstars-2.9.5.ebuild b/sci-astronomy/kstars/kstars-2.9.5.ebuild
deleted file mode 100644
index 5bc717c962f..00000000000
--- a/sci-astronomy/kstars/kstars-2.9.5.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python2_7 )
-inherit kde5 python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Desktop Planetarium"
-HOMEPAGE="https://www.kde.org/applications/education/kstars https://edu.kde.org/kstars"
-IUSE="fits indi raw wcs xplanet"
-
-REQUIRED_USE="indi? ( fits ) ${PYTHON_REQUIRED_USE}"
-
-# TODO: AstrometryNet requires new package
-COMMON_DEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kplotting)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	sys-libs/zlib
-	fits? ( sci-libs/cfitsio )
-	indi? ( >=sci-libs/indilib-1.4.0 )
-	raw? ( media-libs/libraw:= )
-	wcs? ( sci-astronomy/wcslib )
-	xplanet? ( x11-misc/xplanet )
-"
-# TODO: Add back when re-enabled by upstream
-# 	opengl? (
-# 		$(add_qt_dep qtopengl)
-# 		virtual/opengl
-# 	)
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtconcurrent)
-	dev-cpp/eigen:3
-"
-RDEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-qt-5.11.patch"
-	"${FILESDIR}/${P}-libraw-0.19.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package fits CFitsio)
-		$(cmake-utils_use_find_package indi INDI)
-		$(cmake-utils_use_find_package raw LibRaw)
-		$(cmake-utils_use_find_package wcs WCSLIB)
-		$(cmake-utils_use_find_package xplanet Xplanet)
-	)
-
-	kde5_src_configure
-}

diff --git a/sci-astronomy/kstars/metadata.xml b/sci-astronomy/kstars/metadata.xml
index 0b308e6b13c..5dba7fdb56a 100644
--- a/sci-astronomy/kstars/metadata.xml
+++ b/sci-astronomy/kstars/metadata.xml
@@ -10,6 +10,5 @@
 		<flag name="indi">Enable support for Astronomical control library using libindi</flag>
 		<flag name="password">Store passwords securely via <pkg>dev-libs/qtkeychain</pkg></flag>
 		<flag name="wcs">Enable support for World Coordinate System library using wcslib</flag>
-		<flag name="xplanet">Enable support for Xplanet</flag>
 	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/kstars/files/, sci-astronomy/kstars/
@ 2020-05-26 10:51 Andreas Sturmlechner
  0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2020-05-26 10:51 UTC (permalink / raw
  To: gentoo-commits

commit:     2c09e45056318e64b64629926dd8bd303166f91e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May 26 10:34:54 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May 26 10:51:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c09e450

sci-astronomy/kstars: 3.4.2 version bump

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-astronomy/kstars/Manifest                      |  1 +
 .../files/kstars-3.4.2-cfitsio-optional.patch      | 38 +++++++++
 sci-astronomy/kstars/kstars-3.4.2.ebuild           | 99 ++++++++++++++++++++++
 3 files changed, 138 insertions(+)

diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest
index d7250a27a2b..5a78e2ced9b 100644
--- a/sci-astronomy/kstars/Manifest
+++ b/sci-astronomy/kstars/Manifest
@@ -1,2 +1,3 @@
 DIST kstars-3.3.9.tar.xz 71097252 BLAKE2B d8593be78f30de8e9ce00744f71ef23eda51bdfdd4fea1aa5b4e25605b2d45c337f66c76b8804b292c8277a768aa08d7acc1d52cb0ad955bc67a54a370e15b74 SHA512 51a8687d8f438eda2e6c079ce9bec25aa1e84b4cff697da08e91d38388e85595bea8ed06a2a8d6a8a4ce133e768e28fb5a6a0ff763514e751d693c32f91e95c6
 DIST kstars-3.4.1.tar.xz 71067324 BLAKE2B a794af21feb5254ca5e2898b048f9b33682dd70130d83b0874b30a7465920734ca0d581479a8b489202046c7be8b0ff6d7e5667ad1deb30f9c1b851b58f86d01 SHA512 f6380ad578d1fd39bf1cb115fb47dd519fe7ba3067e55ec9296d01559cba529f0f6a3aba363c2c107f3c0648db0d733d34de8c7b196c748f409b8d006ebe26af
+DIST kstars-3.4.2.tar.xz 76494596 BLAKE2B 228f4d9250ef6584e6de1164fc0fc2ba506574f34cfda4ad1347984adeeaaa4eee8e8d93cb2d8822635ad200e2df5d43ccc2cf48d2cd24449f21627de9189c9c SHA512 10e806c82b0704c6185c852c74035e7f74ef29d921df3bcde07cb161d86257e7deb4b13941294b699ed46ae5c8197a2f76dcd45599f0222139c584a626881304

diff --git a/sci-astronomy/kstars/files/kstars-3.4.2-cfitsio-optional.patch b/sci-astronomy/kstars/files/kstars-3.4.2-cfitsio-optional.patch
new file mode 100644
index 00000000000..b486debf3e4
--- /dev/null
+++ b/sci-astronomy/kstars/files/kstars-3.4.2-cfitsio-optional.patch
@@ -0,0 +1,38 @@
+From f66d634768fb8d18caded24646946f134b8e70c2 Mon Sep 17 00:00:00 2001
+From: Jasem Mutlaq <mutlaqja@ikarustech.com>
+Date: Sun, 3 May 2020 20:13:15 +0300
+Subject: Don't run fitsviewer test if no fitsio
+
+Summary: Should fix https://build.kde.org/view/Failing/job/Extragear/job/kstars/job/kf5-qt5%20WindowsMSVCQt5.14/ (tests are not working as fitsio not available on Windows)
+
+Reviewers: #kstars, TallFurryMan, mutlaqja
+
+Reviewed By: #kstars, TallFurryMan, mutlaqja
+
+Subscribers: TallFurryMan, kde-edu
+
+Tags: #kstars, #kde_edu
+
+Differential Revision: https://phabricator.kde.org/D29388
+---
+ Tests/CMakeLists.txt | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
+index 020f697..1e3a09a 100644
+--- a/Tests/CMakeLists.txt
++++ b/Tests/CMakeLists.txt
+@@ -32,7 +32,10 @@ SET( TEST_KSLITE_LIBRARIES
+ 
+ add_subdirectory(auxiliary)
+ add_subdirectory(skyobjects)
+-add_subdirectory(fitsviewer)
++
++IF (CFITSIO_FOUND)
++    add_subdirectory(fitsviewer)
++ENDIF ()
+ 
+ IF (UNIX AND NOT APPLE AND CFITSIO_FOUND)
+     IF (BUILD_KSTARS_LITE)
+-- 
+cgit v1.1

diff --git a/sci-astronomy/kstars/kstars-3.4.2.ebuild b/sci-astronomy/kstars/kstars-3.4.2.ebuild
new file mode 100644
index 00000000000..0b20d1db44c
--- /dev/null
+++ b/sci-astronomy/kstars/kstars-3.4.2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Desktop Planetarium"
+HOMEPAGE="https://kde.org/applications/education/org.kde.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/kauth-${KFMIN}: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
+	sys-libs/zlib
+	fits? ( sci-libs/cfitsio )
+	indi? (
+		>=sci-libs/indilib-1.7.5
+		sci-libs/libnova
+	)
+	password? ( dev-libs/qtkeychain:= )
+	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=( "${FILESDIR}/${P}-cfitsio-optional.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DFETCH_TRANSLATIONS=OFF
+		-DBUILD_DOC=$(usex handbook)
+		$(cmake_use_find_package fits CFitsio)
+		$(cmake_use_find_package indi INDI)
+		$(cmake_use_find_package password Qt5Keychain)
+		$(cmake_use_find_package raw LibRaw)
+		$(cmake_use_find_package wcs WCSLIB)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst () {
+	ecm_pkg_postinst
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version "x11-misc/xplanet" ; then
+		elog "${PN} has optional runtime support for x11-misc/xplanet"
+	fi
+	# same for AstrometryNet, which is not packaged.
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/kstars/files/, sci-astronomy/kstars/
@ 2020-09-04 13:45 Andreas Sturmlechner
  0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2020-09-04 13:45 UTC (permalink / raw
  To: gentoo-commits

commit:     b34bde4819abff5fd53cfca0cf54393524ef82f7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  4 13:26:24 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Sep  4 13:45:14 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b34bde48

sci-astronomy/kstars: Drop 3.4.2

Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-astronomy/kstars/Manifest                      |  1 -
 .../files/kstars-3.4.2-cfitsio-optional.patch      | 38 ---------
 sci-astronomy/kstars/kstars-3.4.2.ebuild           | 99 ----------------------
 3 files changed, 138 deletions(-)

diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest
index c54c45ecb02..94385f55f47 100644
--- a/sci-astronomy/kstars/Manifest
+++ b/sci-astronomy/kstars/Manifest
@@ -1,3 +1,2 @@
 DIST kstars-3.3.9.tar.xz 71097252 BLAKE2B d8593be78f30de8e9ce00744f71ef23eda51bdfdd4fea1aa5b4e25605b2d45c337f66c76b8804b292c8277a768aa08d7acc1d52cb0ad955bc67a54a370e15b74 SHA512 51a8687d8f438eda2e6c079ce9bec25aa1e84b4cff697da08e91d38388e85595bea8ed06a2a8d6a8a4ce133e768e28fb5a6a0ff763514e751d693c32f91e95c6
-DIST kstars-3.4.2.tar.xz 76494596 BLAKE2B 228f4d9250ef6584e6de1164fc0fc2ba506574f34cfda4ad1347984adeeaaa4eee8e8d93cb2d8822635ad200e2df5d43ccc2cf48d2cd24449f21627de9189c9c SHA512 10e806c82b0704c6185c852c74035e7f74ef29d921df3bcde07cb161d86257e7deb4b13941294b699ed46ae5c8197a2f76dcd45599f0222139c584a626881304
 DIST kstars-3.4.3.tar.xz 77697704 BLAKE2B a64901f74952268fb05ab9ef90d4161f48ada210a0c3099218488bb0c327d29855c58f7226ac399e522abe9846fe7109dcbecbdb789d9c3afc1180448ba1fe69 SHA512 47adad28cccd749a7ac3c71df4b06d59a4bdf94bacc064fe5d658dcbe3150f2e4d13aaf23e0aedea57c64c28357452d731caaf764e8c91bc67f5469166cf7ad4

diff --git a/sci-astronomy/kstars/files/kstars-3.4.2-cfitsio-optional.patch b/sci-astronomy/kstars/files/kstars-3.4.2-cfitsio-optional.patch
deleted file mode 100644
index b486debf3e4..00000000000
--- a/sci-astronomy/kstars/files/kstars-3.4.2-cfitsio-optional.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From f66d634768fb8d18caded24646946f134b8e70c2 Mon Sep 17 00:00:00 2001
-From: Jasem Mutlaq <mutlaqja@ikarustech.com>
-Date: Sun, 3 May 2020 20:13:15 +0300
-Subject: Don't run fitsviewer test if no fitsio
-
-Summary: Should fix https://build.kde.org/view/Failing/job/Extragear/job/kstars/job/kf5-qt5%20WindowsMSVCQt5.14/ (tests are not working as fitsio not available on Windows)
-
-Reviewers: #kstars, TallFurryMan, mutlaqja
-
-Reviewed By: #kstars, TallFurryMan, mutlaqja
-
-Subscribers: TallFurryMan, kde-edu
-
-Tags: #kstars, #kde_edu
-
-Differential Revision: https://phabricator.kde.org/D29388
----
- Tests/CMakeLists.txt | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
-index 020f697..1e3a09a 100644
---- a/Tests/CMakeLists.txt
-+++ b/Tests/CMakeLists.txt
-@@ -32,7 +32,10 @@ SET( TEST_KSLITE_LIBRARIES
- 
- add_subdirectory(auxiliary)
- add_subdirectory(skyobjects)
--add_subdirectory(fitsviewer)
-+
-+IF (CFITSIO_FOUND)
-+    add_subdirectory(fitsviewer)
-+ENDIF ()
- 
- IF (UNIX AND NOT APPLE AND CFITSIO_FOUND)
-     IF (BUILD_KSTARS_LITE)
--- 
-cgit v1.1

diff --git a/sci-astronomy/kstars/kstars-3.4.2.ebuild b/sci-astronomy/kstars/kstars-3.4.2.ebuild
deleted file mode 100644
index 0b20d1db44c..00000000000
--- a/sci-astronomy/kstars/kstars-3.4.2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Desktop Planetarium"
-HOMEPAGE="https://kde.org/applications/education/org.kde.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/kauth-${KFMIN}: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
-	sys-libs/zlib
-	fits? ( sci-libs/cfitsio )
-	indi? (
-		>=sci-libs/indilib-1.7.5
-		sci-libs/libnova
-	)
-	password? ( dev-libs/qtkeychain:= )
-	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=( "${FILESDIR}/${P}-cfitsio-optional.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DFETCH_TRANSLATIONS=OFF
-		-DBUILD_DOC=$(usex handbook)
-		$(cmake_use_find_package fits CFitsio)
-		$(cmake_use_find_package indi INDI)
-		$(cmake_use_find_package password Qt5Keychain)
-		$(cmake_use_find_package raw LibRaw)
-		$(cmake_use_find_package wcs WCSLIB)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst () {
-	ecm_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version "x11-misc/xplanet" ; then
-		elog "${PN} has optional runtime support for x11-misc/xplanet"
-	fi
-	# same for AstrometryNet, which is not packaged.
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/kstars/files/, sci-astronomy/kstars/
@ 2021-11-26 12:25 Andreas Sturmlechner
  0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2021-11-26 12:25 UTC (permalink / raw
  To: gentoo-commits

commit:     15f977698ea5f719260bc7d1e42e49c0f98fd19a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 26 12:24:30 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Nov 26 12:25:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15f97769

sci-astronomy/kstars: Drop 3.5.3

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-astronomy/kstars/Manifest                      |  1 -
 .../files/kstars-3.5.3-fits-w-o-libraw.patch       | 25 ------
 sci-astronomy/kstars/kstars-3.5.3.ebuild           | 99 ----------------------
 3 files changed, 125 deletions(-)

diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest
index dd3c016948fe..4f5cf604a32c 100644
--- a/sci-astronomy/kstars/Manifest
+++ b/sci-astronomy/kstars/Manifest
@@ -1,3 +1,2 @@
-DIST kstars-3.5.3.tar.xz 79228112 BLAKE2B c82e76398630a657887a8b6720a801bce74bb2ebff5bb86f4546672794709a68c970c897074e9cc6846210250ad2d05e2b53af75b70ef2c0fa5504be12aa592b SHA512 383071130fa4674ba373cba2ecd46143a9cdef9f9e636f0bf33f66d9302baa913af4aa1713ba871dd7cee6eed95d8196055a02ab41c24e2729d74950aea742f8
 DIST kstars-3.5.5.tar.xz 79302220 BLAKE2B df8503c72c689301e70345169491dbc8e27116b44c75a78088f91da0d103965f4da359d4de22c3a177898cfe734f66b06810440c2d4dd7ec15862f0ad4d4edf0 SHA512 03ed4db0e3998c9501f77fb22e26046177d4bc427e769be1964ba3d54701a1240908117bc65424768917252710b73811e38ec61e2391182794b30ad6c9d68d96
 DIST kstars-3.5.6.tar.xz 79127060 BLAKE2B bb5b2971a6a730237217709c599a11f4f09afa8c37fe56c4da9621c3b178aa9f8158aa3e21fb3461e512d47e6f32660c9a5cbfa2926fa1c2cc978182fce9b5b0 SHA512 5a1fb0e1d9226bdaca2657cf667f882ffca0b79a7be3286e8ba4346b7fee780ca37af1c4ef21d02ddbd25341b750ea95b0d33193baa0dca8d8aafe7d75261ec2

diff --git a/sci-astronomy/kstars/files/kstars-3.5.3-fits-w-o-libraw.patch b/sci-astronomy/kstars/files/kstars-3.5.3-fits-w-o-libraw.patch
deleted file mode 100644
index a0bb66046f01..000000000000
--- a/sci-astronomy/kstars/files/kstars-3.5.3-fits-w-o-libraw.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 1adf58605d18ee24c68ca6762a94de75a09d738a Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heiko.becker@kde.org>
-Date: Mon, 26 Apr 2021 12:53:19 +0200
-Subject: [PATCH] Fix build without BUILD_KSTARS_LITE and libraw
-
----
- kstars/fitsviewer/fitsdata.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kstars/fitsviewer/fitsdata.cpp b/kstars/fitsviewer/fitsdata.cpp
-index 8300e9687..ca59d808e 100644
---- a/kstars/fitsviewer/fitsdata.cpp
-+++ b/kstars/fitsviewer/fitsdata.cpp
-@@ -524,7 +524,7 @@ bool FITSData::loadRAWImage(const QByteArray &buffer, const QString &extension,
-     Q_UNUSED(extension);
- 
- #if !defined(KSTARS_LITE) && !defined(HAVE_LIBRAW)
--    lastError = i18n("Unable to find dcraw and cjpeg. Please install the required tools to convert CR2/NEF to JPEG.");
-+    m_LastError = i18n("Unable to find dcraw and cjpeg. Please install the required tools to convert CR2/NEF to JPEG.");
-     return false;
- #else
- 
--- 
-GitLab
-

diff --git a/sci-astronomy/kstars/kstars-3.5.3.ebuild b/sci-astronomy/kstars/kstars-3.5.3.ebuild
deleted file mode 100644
index b9300d695e86..000000000000
--- a/sci-astronomy/kstars/kstars-3.5.3.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Desktop Planetarium"
-HOMEPAGE="https://apps.kde.org/en/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/kauth-${KFMIN}: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
-	sys-libs/zlib
-	fits? ( sci-libs/cfitsio:= )
-	indi? (
-		sci-libs/gsl:=
-		>=sci-libs/indilib-1.9.0
-		sci-libs/libnova:=
-		sci-libs/stellarsolver
-	)
-	password? ( dev-libs/qtkeychain:= )
-	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=( "${FILESDIR}/${P}-fits-w-o-libraw.patch" ) # bug 790638
-
-src_configure() {
-	local mycmakeargs=(
-		-DFETCH_TRANSLATIONS=OFF
-		-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
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "Display 'current' pictures of planets" x11-misc/xplanet
-	fi
-	ecm_pkg_postinst
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/kstars/files/, sci-astronomy/kstars/
@ 2022-10-05 20:47 Andreas Sturmlechner
  0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2022-10-05 20:47 UTC (permalink / raw
  To: gentoo-commits

commit:     c0593dbf15bc7cd2397321cf31e4b393c42a060b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  5 19:47:04 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Oct  5 20:46:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0593dbf

sci-astronomy/kstars: Drop obsolete header

Upstream commit bc80093354457d8f057115a75877ce330e65e79e

Closes: https://bugs.gentoo.org/867814
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/kstars-3.5.9-obsolete-header.patch       | 26 ++++++++++++++++++++++
 sci-astronomy/kstars/kstars-3.5.9.ebuild           |  2 ++
 2 files changed, 28 insertions(+)

diff --git a/sci-astronomy/kstars/files/kstars-3.5.9-obsolete-header.patch b/sci-astronomy/kstars/files/kstars-3.5.9-obsolete-header.patch
new file mode 100644
index 000000000000..6cad0329d3ba
--- /dev/null
+++ b/sci-astronomy/kstars/files/kstars-3.5.9-obsolete-header.patch
@@ -0,0 +1,26 @@
+From bc80093354457d8f057115a75877ce330e65e79e Mon Sep 17 00:00:00 2001
+From: Jasem Mutlaq <mutlaqja@ikarustech.com>
+Date: Fri, 1 Jul 2022 22:04:52 +0300
+Subject: [PATCH] engine.h no longer available with latest KF5
+
+* asturm 2022-10-05: Cleanup unrelated style changes.
+
+---
+ Tests/kstars_ui/test_catalog_download.cpp | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/Tests/kstars_ui/test_catalog_download.cpp b/Tests/kstars_ui/test_catalog_download.cpp
+index 111e5a70f..d94c99f5f 100644
+--- a/Tests/kstars_ui/test_catalog_download.cpp
++++ b/Tests/kstars_ui/test_catalog_download.cpp
+@@ -4,7 +4,6 @@
+ #include "test_kstars_startup.h"
+ 
+ #include "Options.h"
+-#include <engine.h>
+ #include <KNS3/DownloadWidget>
+ #include <KNS3/Button>
+ #include <KMessageBox>
+-- 
+GitLab
+

diff --git a/sci-astronomy/kstars/kstars-3.5.9.ebuild b/sci-astronomy/kstars/kstars-3.5.9.ebuild
index 4a205c269d69..8a67421da78e 100644
--- a/sci-astronomy/kstars/kstars-3.5.9.ebuild
+++ b/sci-astronomy/kstars/kstars-3.5.9.ebuild
@@ -73,6 +73,8 @@ RDEPEND="${COMMON_DEPEND}
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 "
 
+PATCHES=( "${FILESDIR}/${P}-obsolete-header.patch" ) # bug 867814
+
 src_configure() {
 	local mycmakeargs=(
 		-DFETCH_TRANSLATIONS=OFF


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/kstars/files/, sci-astronomy/kstars/
@ 2023-07-25 14:42 Andreas Sturmlechner
  0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2023-07-25 14:42 UTC (permalink / raw
  To: gentoo-commits

commit:     7f52155b9806f7420eae1ae850d1a126967462ff
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 25 14:38:54 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jul 25 14:38:54 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f52155b

sci-astronomy/kstars: Fix build w/ USE=-indi

Closes: https://bugs.gentoo.org/911199
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-astronomy/kstars/files/kstars-3.6.5-gsl.patch | 59 +++++++++++++++++++++++
 sci-astronomy/kstars/kstars-3.6.5.ebuild          |  7 ++-
 2 files changed, 64 insertions(+), 2 deletions(-)

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 <heiko.becker@kde.org>
+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.ebuild b/sci-astronomy/kstars/kstars-3.6.5.ebuild
index 795566f25b35..79f688b6c33e 100644
--- a/sci-astronomy/kstars/kstars-3.6.5.ebuild
+++ b/sci-astronomy/kstars/kstars-3.6.5.ebuild
@@ -74,8 +74,11 @@ RDEPEND="${COMMON_DEPEND}
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 "
 
-# https://invent.kde.org/education/kstars/-/issues/251
-PATCHES=( "${FILESDIR}/${P}-buildfix.patch" )
+PATCHES=(
+	# https://invent.kde.org/education/kstars/-/issues/251
+	"${FILESDIR}/${P}-buildfix.patch"
+	"${FILESDIR}/${P}-gsl.patch" # bug 911199
+)
 
 src_configure() {
 	local mycmakeargs=(


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/kstars/files/, sci-astronomy/kstars/
@ 2023-08-25 10:03 Andreas Sturmlechner
  0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2023-08-25 10:03 UTC (permalink / raw
  To: gentoo-commits

commit:     3b75e02143c7e262ec10c6bf14bb6a56cdb2e2c5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 25 09:58:15 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 25 10:03:39 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b75e021

sci-astronomy/kstars: drop 3.6.2, 3.6.5-r1

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-astronomy/kstars/Manifest                      |   2 -
 .../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.2.ebuild           | 106 -------------------
 sci-astronomy/kstars/kstars-3.6.5-r1.ebuild        | 113 ---------------------
 5 files changed, 313 deletions(-)

diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest
index 8426372e13f1..05d2d0b84cff 100644
--- a/sci-astronomy/kstars/Manifest
+++ b/sci-astronomy/kstars/Manifest
@@ -1,3 +1 @@
-DIST kstars-3.6.2.tar.xz 111110944 BLAKE2B 8a2c5821b982ee62167e2ba28d70d3931d9643d7c9410097169f87556ec4b2ea137e6595089960c63c6063f69c1415968664b8dd1e05a8f8a619b37d2539c26e SHA512 8519aaab748afe948af332cf3b54a031aa65ac0d36f4dc3b5da7de9bffd9eab402221a11378ebe4d97cf4d4b0754b1a7c644f8222c93e0fca089f26545f10283
-DIST kstars-3.6.5.tar.xz 114135376 BLAKE2B eebd8406782239193d1e7d08b1d2c86ad6a235f5159e08fc0942537846dbaae690af7156a6fd31231c79025ef8e68f15e76472b1365b1df3682e98508a403cc1 SHA512 91a461529af2a78e130c13f92006f7293cee2161f952301c6e0b87c91094d6147b59b74cc70ec1166dd413343f940e319f88a1d205d93adf9caf4723d8b52318
 DIST kstars-3.6.6.tar.xz 135870036 BLAKE2B 20a313b4df8c266cf406677ed062b8788b1840670c88c86043a84ef15947f16247d0733f2b91b623a951e53659fcd6e3bbd25b22c105a3ac3df3481fe57078a3 SHA512 ef2cbd12578cc336e46dda875e8d6b077922c9732b4afb35b7782ae1573c2a6ccd0337d1ba1206d2e5ac5922f8b9c91ddc45f59b6a487f22b779f8d1100b1636

diff --git a/sci-astronomy/kstars/files/kstars-3.6.5-buildfix.patch b/sci-astronomy/kstars/files/kstars-3.6.5-buildfix.patch
deleted file mode 100644
index 793cb2fcead4..000000000000
--- a/sci-astronomy/kstars/files/kstars-3.6.5-buildfix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From ea6f3578b047be156c89137dc61ad874775b94b4 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-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 <asturm@gentoo.org>
----
- 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 <csv.h>
- 
--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
deleted file mode 100644
index 1aaa348ba8c1..000000000000
--- a/sci-astronomy/kstars/files/kstars-3.6.5-gsl.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From b83de34310d13920e1be5e980d0774f35c1d9a2a Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heiko.becker@kde.org>
-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.2.ebuild b/sci-astronomy/kstars/kstars-3.6.2.ebuild
deleted file mode 100644
index 6c9297ac84a4..000000000000
--- a/sci-astronomy/kstars/kstars-3.6.2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# 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.82.0
-QTMIN=5.15.5
-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
-	sys-libs/zlib
-	fits? ( sci-libs/cfitsio:= )
-	indi? (
-		sci-libs/gsl:=
-		>=sci-libs/indilib-1.9.1
-		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
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_PYKSTARS=OFF
-		-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
-}

diff --git a/sci-astronomy/kstars/kstars-3.6.5-r1.ebuild b/sci-astronomy/kstars/kstars-3.6.5-r1.ebuild
deleted file mode 100644
index 483df20a980a..000000000000
--- a/sci-astronomy/kstars/kstars-3.6.5-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# 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
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2023-08-25 10:03 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-05 20:47 [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/kstars/files/, sci-astronomy/kstars/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2023-08-25 10:03 Andreas Sturmlechner
2023-07-25 14:42 Andreas Sturmlechner
2021-11-26 12:25 Andreas Sturmlechner
2020-09-04 13:45 Andreas Sturmlechner
2020-05-26 10:51 Andreas Sturmlechner
2019-02-15 20:10 Andreas Sturmlechner
2018-12-23  1:25 Andreas Sturmlechner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox