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

commit:     43f5b07e80f1a2b934733729cb69aa9baca67fe7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 25 20:30:00 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 26 03:29:34 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43f5b07e

sci-astronomy/kstars: Fix build with Qt 5.11

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 .../kstars/files/kstars-2.9.5-qt-5.11.patch        | 31 ++++++++++++++++++++++
 sci-astronomy/kstars/kstars-2.9.5.ebuild           |  2 ++
 2 files changed, 33 insertions(+)

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
new file mode 100644
index 00000000000..72d4b8e4a48
--- /dev/null
+++ b/sci-astronomy/kstars/files/kstars-2.9.5-qt-5.11.patch
@@ -0,0 +1,31 @@
+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
index a481533f110..cb8577f0137 100644
--- a/sci-astronomy/kstars/kstars-2.9.5.ebuild
+++ b/sci-astronomy/kstars/kstars-2.9.5.ebuild
@@ -61,6 +61,8 @@ RDEPEND="${COMMON_DEPEND}
 	${PYTHON_DEPS}
 "
 
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package fits CFitsio)


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

commit:     5a36d6651fcd49e5f9c2264ab52ec0dba552eb4c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 20 21:51:20 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 20 21:51:33 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a36d665

sci-astronomy/kstars: Fix build with IUSE="-raw fits"

Closes: https://bugs.gentoo.org/790638
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/kstars-3.5.3-fits-w-o-libraw.patch       | 25 ++++++++++++++++++++++
 sci-astronomy/kstars/kstars-3.5.3.ebuild           |  2 ++
 2 files changed, 27 insertions(+)

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
new file mode 100644
index 00000000000..a0bb66046f0
--- /dev/null
+++ b/sci-astronomy/kstars/files/kstars-3.5.3-fits-w-o-libraw.patch
@@ -0,0 +1,25 @@
+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
index 8c5431d2e41..49493cc295d 100644
--- a/sci-astronomy/kstars/kstars-3.5.3.ebuild
+++ b/sci-astronomy/kstars/kstars-3.5.3.ebuild
@@ -74,6 +74,8 @@ RDEPEND="${COMMON_DEPEND}
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 "
 
+PATCHES=( "${FILESDIR}/${P}-fits-w-o-libraw.patch" ) # bug 790638
+
 src_configure() {
 	local mycmakeargs=(
 		-DFETCH_TRANSLATIONS=OFF


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

commit:     aa5e606c70e257749eb885e69215ba48fac9ecad
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  7 17:14:52 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct  2 11:20:37 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa5e606c

sci-astronomy/kstars: 3.5.5 version bump

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

 sci-astronomy/kstars/Manifest                      |   1 +
 .../kstars/files/kstars-3.5.5-FindERFA.cmake.patch | 125 +++++++++++++++++++++
 sci-astronomy/kstars/kstars-3.5.5.ebuild           | 100 +++++++++++++++++
 3 files changed, 226 insertions(+)

diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest
index 3ff6b55029c..846b1abcbb2 100644
--- a/sci-astronomy/kstars/Manifest
+++ b/sci-astronomy/kstars/Manifest
@@ -1 +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

diff --git a/sci-astronomy/kstars/files/kstars-3.5.5-FindERFA.cmake.patch b/sci-astronomy/kstars/files/kstars-3.5.5-FindERFA.cmake.patch
new file mode 100644
index 00000000000..920cdf9c72b
--- /dev/null
+++ b/sci-astronomy/kstars/files/kstars-3.5.5-FindERFA.cmake.patch
@@ -0,0 +1,125 @@
+From b920b785f8193414fd66fe2a6d69c2e2ebf22023 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heiko.becker@kde.org>
+Date: Tue, 21 Sep 2021 16:56:02 +0200
+Subject: [PATCH] Add FindERFA cmake module
+
+ERFA doesn't seem to come with a cmake find module or a config file,
+so I wrote one, which also provides an imported target.
+---
+ CMakeLists.txt                  |  5 +--
+ Tests/skyobjects/CMakeLists.txt |  5 ++-
+ cmake/modules/FindERFA.cmake    | 72 +++++++++++++++++++++++++++++++++
+ 3 files changed, 77 insertions(+), 5 deletions(-)
+ create mode 100644 cmake/modules/FindERFA.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b7b02258a..052987438 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -229,10 +229,7 @@ if(BUILD_TESTING)
+     # Find liberfa, which we check our computation against
+     find_package(ERFA)
+     MACRO_BOOL_TO_01(ERFA_FOUND HAVE_LIBERFA)
+-    set_package_properties(ERFA PROPERTIES DESCRIPTION "Essential Routines for Fundamental Astronomy" URL "https://github.com/liberfa/erfa" TYPE OPTIONAL PURPOSE "BSD-compatible version of SOFA, used to test core computations of KStars (only needed by tests)")
+-    if (ERFA_FOUND)
+-    include_directories(${ERFA_INCLUDE_DIR})
+-    endif()
++    set_package_properties(ERFA PROPERTIES TYPE OPTIONAL PURPOSE "BSD-compatible version of SOFA, used to test core computations of KStars (only needed by tests)")
+ endif ()
+ 
+ ## Libraw
+diff --git a/Tests/skyobjects/CMakeLists.txt b/Tests/skyobjects/CMakeLists.txt
+index 7dc9b918c..ca2d06209 100644
+--- a/Tests/skyobjects/CMakeLists.txt
++++ b/Tests/skyobjects/CMakeLists.txt
+@@ -5,5 +5,8 @@ ADD_TEST( NAME TestSkyPoint COMMAND test_skypoint )
+ endif()
+ 
+ ADD_EXECUTABLE( test_starobject test_starobject.cpp )
+-TARGET_LINK_LIBRARIES( test_starobject ${TEST_LIBRARIES} ${ERFA_LIBRARIES})
++TARGET_LINK_LIBRARIES( test_starobject ${TEST_LIBRARIES} )
++if (TARGET ERFA::ERFA)
++    TARGET_LINK_LIBRARIES( test_starobject ERFA::ERFA )
++endif()
+ ADD_TEST( NAME TestStarobject COMMAND test_starobject )
+diff --git a/cmake/modules/FindERFA.cmake b/cmake/modules/FindERFA.cmake
+new file mode 100644
+index 000000000..ea6f3e7d8
+--- /dev/null
++++ b/cmake/modules/FindERFA.cmake
+@@ -0,0 +1,72 @@
++# SPDX-FileCopyrightText: 2021 Heiko Becker <heiko.becker@kde.org>
++#
++# SPDX-License-Identifier: BSD-3-Clause
++
++#[=======================================================================[.rst:
++FindERFA
++----------
++
++Try to find the ERFA (Essential Routines for Fundamental Astronomy) library.
++
++This will define the following variables:
++
++``ERFA_FOUND``
++      True if the system has the ERFA library of at least the minimum
++      version specified by the version parameter to find_package()
++``ERFA_INCLUDE_DIRS``
++      The ERFA include dirs for use with target_include_directories
++``ERFA_LIBRARIES``
++      The ERFA libraries for use with target_link_libraries()
++``ERFA_VERSION``
++      The version of ERFA that was found
++
++If ``ERFA_FOUND` is TRUE, it will also define the following imported
++target:
++
++``ERFA::ERFA``
++      The ERFA library
++
++#]=======================================================================]
++
++find_package(PkgConfig QUIET)
++
++pkg_check_modules(PC_ERFA QUIET erfa)
++
++find_path(ERFA_INCLUDE_DIRS
++    NAMES erfa.h
++    HINTS ${PC_ERFA_INCLUDEDIR}
++)
++
++find_library(ERFA_LIBRARIES
++    NAMES erfa
++    HINTS ${PC_ERFA_LIBDIR}
++)
++
++set(ERFA_VERSION ${PC_ERFA_VERSION})
++
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(ERFA
++    FOUND_VAR
++        ERFA_FOUND
++    REQUIRED_VARS
++        ERFA_LIBRARIES
++        ERFA_INCLUDE_DIRS
++    VERSION_VAR
++        ERFA_VERSION
++)
++
++if (ERFA_FOUND AND NOT TARGET ERFA::ERFA)
++    add_library(ERFA::ERFA UNKNOWN IMPORTED)
++    set_target_properties(ERFA::ERFA PROPERTIES
++        IMPORTED_LOCATION "${ERFA_LIBRARIES}"
++        INTERFACE_INCLUDE_DIRECTORIES "${ERFA_INCLUDE_DIRS}"
++    )
++endif()
++
++mark_as_advanced(ERFA_LIBRARIES ERFA_INCLUDE_DIRS)
++
++include(FeatureSummary)
++set_package_properties(ERFA PROPERTIES
++    URL "https://github.com/liberfa/erfa/"
++    DESCRIPTION "Essential Routines for Fundamental Astronomy"
++)
+-- 
+GitLab
+

diff --git a/sci-astronomy/kstars/kstars-3.5.5.ebuild b/sci-astronomy/kstars/kstars-3.5.5.ebuild
new file mode 100644
index 00000000000..204ec4d9076
--- /dev/null
+++ b/sci-astronomy/kstars/kstars-3.5.5.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.82.0
+QTMIN=5.15.2
+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/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.1
+		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}-FindERFA.cmake.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DFETCH_TRANSLATIONS=OFF
+		-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
+}
+
+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] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/kstars/, sci-astronomy/kstars/files/
@ 2022-10-07 10:08 Andreas Sturmlechner
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2022-10-07 10:08 UTC (permalink / raw
  To: gentoo-commits

commit:     3b11acb69aa0818f2bd052563257370193724fd5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  7 10:08:08 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Oct  7 10:08:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b11acb6

sci-astronomy/kstars: drop 3.5.5

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

 sci-astronomy/kstars/Manifest                      |   1 -
 .../kstars/files/kstars-3.5.5-FindERFA.cmake.patch | 125 ---------------------
 sci-astronomy/kstars/kstars-3.5.5.ebuild           | 100 -----------------
 3 files changed, 226 deletions(-)

diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest
index 96402061cfd3..2d920f9138be 100644
--- a/sci-astronomy/kstars/Manifest
+++ b/sci-astronomy/kstars/Manifest
@@ -1,3 +1,2 @@
-DIST kstars-3.5.5.tar.xz 79302220 BLAKE2B df8503c72c689301e70345169491dbc8e27116b44c75a78088f91da0d103965f4da359d4de22c3a177898cfe734f66b06810440c2d4dd7ec15862f0ad4d4edf0 SHA512 03ed4db0e3998c9501f77fb22e26046177d4bc427e769be1964ba3d54701a1240908117bc65424768917252710b73811e38ec61e2391182794b30ad6c9d68d96
 DIST kstars-3.5.9.tar.xz 104914664 BLAKE2B ae87000c6c5b106b1a0c748feb6c578d2a6d9b71e5bff05e1be392e576a8e5ac0eb663eb22c14a20e91ea4df7d12fc9e0a3477492ff9b920f5d36cc410138eeb SHA512 25ed432bc4276216c82e43f9ac952f6fa973d9baf64b2b89a62855e853f42cd1ee39cf5f0496ce1b3c6b894da227ba32c4246ab972301cd67b80679240fad757
 DIST kstars-3.6.1.tar.xz 110215912 BLAKE2B 8bb0e4a966124adfe0a6fbda36879ab6d1331c8ab21ad9666e863c6b97acb4ae821a156a6433db8bc40ecec95d1ad4e5b1e6a2c615079268371ed006aae291b1 SHA512 6b5cdba4363d87ba462d2d98b101cae41dc1ae35861aec61ebb8d335b0186fff9625b566dc816bd792ae7746b711a044d5173a8f63063448ff5f55ddfcdb0b75

diff --git a/sci-astronomy/kstars/files/kstars-3.5.5-FindERFA.cmake.patch b/sci-astronomy/kstars/files/kstars-3.5.5-FindERFA.cmake.patch
deleted file mode 100644
index 920cdf9c72b5..000000000000
--- a/sci-astronomy/kstars/files/kstars-3.5.5-FindERFA.cmake.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-From b920b785f8193414fd66fe2a6d69c2e2ebf22023 Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heiko.becker@kde.org>
-Date: Tue, 21 Sep 2021 16:56:02 +0200
-Subject: [PATCH] Add FindERFA cmake module
-
-ERFA doesn't seem to come with a cmake find module or a config file,
-so I wrote one, which also provides an imported target.
----
- CMakeLists.txt                  |  5 +--
- Tests/skyobjects/CMakeLists.txt |  5 ++-
- cmake/modules/FindERFA.cmake    | 72 +++++++++++++++++++++++++++++++++
- 3 files changed, 77 insertions(+), 5 deletions(-)
- create mode 100644 cmake/modules/FindERFA.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b7b02258a..052987438 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -229,10 +229,7 @@ if(BUILD_TESTING)
-     # Find liberfa, which we check our computation against
-     find_package(ERFA)
-     MACRO_BOOL_TO_01(ERFA_FOUND HAVE_LIBERFA)
--    set_package_properties(ERFA PROPERTIES DESCRIPTION "Essential Routines for Fundamental Astronomy" URL "https://github.com/liberfa/erfa" TYPE OPTIONAL PURPOSE "BSD-compatible version of SOFA, used to test core computations of KStars (only needed by tests)")
--    if (ERFA_FOUND)
--    include_directories(${ERFA_INCLUDE_DIR})
--    endif()
-+    set_package_properties(ERFA PROPERTIES TYPE OPTIONAL PURPOSE "BSD-compatible version of SOFA, used to test core computations of KStars (only needed by tests)")
- endif ()
- 
- ## Libraw
-diff --git a/Tests/skyobjects/CMakeLists.txt b/Tests/skyobjects/CMakeLists.txt
-index 7dc9b918c..ca2d06209 100644
---- a/Tests/skyobjects/CMakeLists.txt
-+++ b/Tests/skyobjects/CMakeLists.txt
-@@ -5,5 +5,8 @@ ADD_TEST( NAME TestSkyPoint COMMAND test_skypoint )
- endif()
- 
- ADD_EXECUTABLE( test_starobject test_starobject.cpp )
--TARGET_LINK_LIBRARIES( test_starobject ${TEST_LIBRARIES} ${ERFA_LIBRARIES})
-+TARGET_LINK_LIBRARIES( test_starobject ${TEST_LIBRARIES} )
-+if (TARGET ERFA::ERFA)
-+    TARGET_LINK_LIBRARIES( test_starobject ERFA::ERFA )
-+endif()
- ADD_TEST( NAME TestStarobject COMMAND test_starobject )
-diff --git a/cmake/modules/FindERFA.cmake b/cmake/modules/FindERFA.cmake
-new file mode 100644
-index 000000000..ea6f3e7d8
---- /dev/null
-+++ b/cmake/modules/FindERFA.cmake
-@@ -0,0 +1,72 @@
-+# SPDX-FileCopyrightText: 2021 Heiko Becker <heiko.becker@kde.org>
-+#
-+# SPDX-License-Identifier: BSD-3-Clause
-+
-+#[=======================================================================[.rst:
-+FindERFA
-+----------
-+
-+Try to find the ERFA (Essential Routines for Fundamental Astronomy) library.
-+
-+This will define the following variables:
-+
-+``ERFA_FOUND``
-+      True if the system has the ERFA library of at least the minimum
-+      version specified by the version parameter to find_package()
-+``ERFA_INCLUDE_DIRS``
-+      The ERFA include dirs for use with target_include_directories
-+``ERFA_LIBRARIES``
-+      The ERFA libraries for use with target_link_libraries()
-+``ERFA_VERSION``
-+      The version of ERFA that was found
-+
-+If ``ERFA_FOUND` is TRUE, it will also define the following imported
-+target:
-+
-+``ERFA::ERFA``
-+      The ERFA library
-+
-+#]=======================================================================]
-+
-+find_package(PkgConfig QUIET)
-+
-+pkg_check_modules(PC_ERFA QUIET erfa)
-+
-+find_path(ERFA_INCLUDE_DIRS
-+    NAMES erfa.h
-+    HINTS ${PC_ERFA_INCLUDEDIR}
-+)
-+
-+find_library(ERFA_LIBRARIES
-+    NAMES erfa
-+    HINTS ${PC_ERFA_LIBDIR}
-+)
-+
-+set(ERFA_VERSION ${PC_ERFA_VERSION})
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(ERFA
-+    FOUND_VAR
-+        ERFA_FOUND
-+    REQUIRED_VARS
-+        ERFA_LIBRARIES
-+        ERFA_INCLUDE_DIRS
-+    VERSION_VAR
-+        ERFA_VERSION
-+)
-+
-+if (ERFA_FOUND AND NOT TARGET ERFA::ERFA)
-+    add_library(ERFA::ERFA UNKNOWN IMPORTED)
-+    set_target_properties(ERFA::ERFA PROPERTIES
-+        IMPORTED_LOCATION "${ERFA_LIBRARIES}"
-+        INTERFACE_INCLUDE_DIRECTORIES "${ERFA_INCLUDE_DIRS}"
-+    )
-+endif()
-+
-+mark_as_advanced(ERFA_LIBRARIES ERFA_INCLUDE_DIRS)
-+
-+include(FeatureSummary)
-+set_package_properties(ERFA PROPERTIES
-+    URL "https://github.com/liberfa/erfa/"
-+    DESCRIPTION "Essential Routines for Fundamental Astronomy"
-+)
--- 
-GitLab
-

diff --git a/sci-astronomy/kstars/kstars-3.5.5.ebuild b/sci-astronomy/kstars/kstars-3.5.5.ebuild
deleted file mode 100644
index f5f47a84c1d5..000000000000
--- a/sci-astronomy/kstars/kstars-3.5.5.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.82.0
-QTMIN=5.15.2
-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/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.1
-		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}-FindERFA.cmake.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DFETCH_TRANSLATIONS=OFF
-		-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
-}
-
-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] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/kstars/, sci-astronomy/kstars/files/
@ 2022-11-03  8:40 Andreas Sturmlechner
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2022-11-03  8:40 UTC (permalink / raw
  To: gentoo-commits

commit:     5f8463939eeb0ecc62d5ba04c4ab0b0965752564
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  3 08:33:13 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Nov  3 08:33:13 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f846393

sci-astronomy/kstars: drop 3.5.9

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

 sci-astronomy/kstars/Manifest                      |   1 -
 .../files/kstars-3.5.9-obsolete-header.patch       |  26 -----
 sci-astronomy/kstars/kstars-3.5.9.ebuild           | 109 ---------------------
 3 files changed, 136 deletions(-)

diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest
index 2d920f9138be..12e11899b393 100644
--- a/sci-astronomy/kstars/Manifest
+++ b/sci-astronomy/kstars/Manifest
@@ -1,2 +1 @@
-DIST kstars-3.5.9.tar.xz 104914664 BLAKE2B ae87000c6c5b106b1a0c748feb6c578d2a6d9b71e5bff05e1be392e576a8e5ac0eb663eb22c14a20e91ea4df7d12fc9e0a3477492ff9b920f5d36cc410138eeb SHA512 25ed432bc4276216c82e43f9ac952f6fa973d9baf64b2b89a62855e853f42cd1ee39cf5f0496ce1b3c6b894da227ba32c4246ab972301cd67b80679240fad757
 DIST kstars-3.6.1.tar.xz 110215912 BLAKE2B 8bb0e4a966124adfe0a6fbda36879ab6d1331c8ab21ad9666e863c6b97acb4ae821a156a6433db8bc40ecec95d1ad4e5b1e6a2c615079268371ed006aae291b1 SHA512 6b5cdba4363d87ba462d2d98b101cae41dc1ae35861aec61ebb8d335b0186fff9625b566dc816bd792ae7746b711a044d5173a8f63063448ff5f55ddfcdb0b75

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
deleted file mode 100644
index 6cad0329d3ba..000000000000
--- a/sci-astronomy/kstars/files/kstars-3.5.9-obsolete-header.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
deleted file mode 100644
index c76af5d9b626..000000000000
--- a/sci-astronomy/kstars/kstars-3.5.9.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2022 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.2
-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:= )
-	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}-obsolete-header.patch" ) # bug 867814
-
-src_configure() {
-	local mycmakeargs=(
-		-DFETCH_TRANSLATIONS=OFF
-		-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
-}


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

commit:     2b6bd84e91ed64ab29ad2a81176e7341572f71a1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 25 13:21:12 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jul 25 14:04:52 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b6bd84e

sci-astronomy/kstars: add 3.6.5

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

 sci-astronomy/kstars/Manifest                      |   1 +
 .../kstars/files/kstars-3.6.5-buildfix.patch       |  33 +++++++
 sci-astronomy/kstars/kstars-3.6.5.ebuild           | 110 +++++++++++++++++++++
 3 files changed, 144 insertions(+)

diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest
index 1c6e8b1aacce..dfde830d2fb0 100644
--- a/sci-astronomy/kstars/Manifest
+++ b/sci-astronomy/kstars/Manifest
@@ -1 +1,2 @@
 DIST kstars-3.6.2.tar.xz 111110944 BLAKE2B 8a2c5821b982ee62167e2ba28d70d3931d9643d7c9410097169f87556ec4b2ea137e6595089960c63c6063f69c1415968664b8dd1e05a8f8a619b37d2539c26e SHA512 8519aaab748afe948af332cf3b54a031aa65ac0d36f4dc3b5da7de9bffd9eab402221a11378ebe4d97cf4d4b0754b1a7c644f8222c93e0fca089f26545f10283
+DIST kstars-3.6.5.tar.xz 114135376 BLAKE2B eebd8406782239193d1e7d08b1d2c86ad6a235f5159e08fc0942537846dbaae690af7156a6fd31231c79025ef8e68f15e76472b1365b1df3682e98508a403cc1 SHA512 91a461529af2a78e130c13f92006f7293cee2161f952301c6e0b87c91094d6147b59b74cc70ec1166dd413343f940e319f88a1d205d93adf9caf4723d8b52318

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 <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/kstars-3.6.5.ebuild b/sci-astronomy/kstars/kstars-3.6.5.ebuild
new file mode 100644
index 000000000000..795566f25b35
--- /dev/null
+++ b/sci-astronomy/kstars/kstars-3.6.5.ebuild
@@ -0,0 +1,110 @@
+# 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
+	sys-libs/zlib
+	fits? ( sci-libs/cfitsio:= )
+	indi? (
+		sci-libs/gsl:=
+		>=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
+"
+
+# https://invent.kde.org/education/kstars/-/issues/251
+PATCHES=( "${FILESDIR}/${P}-buildfix.patch" )
+
+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] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/kstars/, sci-astronomy/kstars/files/
@ 2023-12-25 17:04 Andreas Sturmlechner
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2023-12-25 17:04 UTC (permalink / raw
  To: gentoo-commits

commit:     0996fd5e72bd550f5d0815b9548fa6ae23114e83
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 15:41:01 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 17:03:52 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0996fd5e

sci-astronomy/kstars: drop 3.6.6

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

 sci-astronomy/kstars/Manifest                      |   1 -
 .../files/kstars-3.6.6-missing-headers.patch       |  38 -------
 sci-astronomy/kstars/kstars-3.6.6.ebuild           | 112 ---------------------
 sci-astronomy/kstars/metadata.xml                  |   2 -
 4 files changed, 153 deletions(-)

diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest
index 8209699045d0..98a2ef68d846 100644
--- a/sci-astronomy/kstars/Manifest
+++ b/sci-astronomy/kstars/Manifest
@@ -1,2 +1 @@
-DIST kstars-3.6.6.tar.xz 135870036 BLAKE2B 20a313b4df8c266cf406677ed062b8788b1840670c88c86043a84ef15947f16247d0733f2b91b623a951e53659fcd6e3bbd25b22c105a3ac3df3481fe57078a3 SHA512 ef2cbd12578cc336e46dda875e8d6b077922c9732b4afb35b7782ae1573c2a6ccd0337d1ba1206d2e5ac5922f8b9c91ddc45f59b6a487f22b779f8d1100b1636
 DIST kstars-3.6.7.tar.xz 138532496 BLAKE2B 173cea5d81b72a181dd7c17ea8159d739675fe60bfab3fb9ccd0a47b32a7f2e2231d5eaa26074eb6d2479b1f62a3c5236494763d82370d844dfaebbc14adc3a0 SHA512 bfefad8c3cd55a2b01e8be240ede7c2ea7cadf99d44c9558e56ac0b0d890c96c3392a6de4c062341f3aff994fc7e95b79a69454a436bc8bce760942cd42f80cd

diff --git a/sci-astronomy/kstars/files/kstars-3.6.6-missing-headers.patch b/sci-astronomy/kstars/files/kstars-3.6.6-missing-headers.patch
deleted file mode 100644
index 22ec88b215f9..000000000000
--- a/sci-astronomy/kstars/files/kstars-3.6.6-missing-headers.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 8f749bd3ae3d052c9b38fecbb40c5180348e2787 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 1 Aug 2023 11:17:03 +0200
-Subject: [PATCH] Add missing Qt headers
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- kstars/dialogs/finddialog.cpp | 1 +
- kstars/dialogs/fovdialog.cpp  | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/kstars/dialogs/finddialog.cpp b/kstars/dialogs/finddialog.cpp
-index 77df85c49..188e8c8ad 100644
---- a/kstars/dialogs/finddialog.cpp
-+++ b/kstars/dialogs/finddialog.cpp
-@@ -20,6 +20,7 @@
- #include "catalogscomponent.h"
- #include <KMessageBox>
- 
-+#include <QPointer>
- #include <QSortFilterProxyModel>
- #include <QStringListModel>
- #include <QTimer>
-diff --git a/kstars/dialogs/fovdialog.cpp b/kstars/dialogs/fovdialog.cpp
-index d45727967..3d7d35853 100644
---- a/kstars/dialogs/fovdialog.cpp
-+++ b/kstars/dialogs/fovdialog.cpp
-@@ -9,6 +9,7 @@
- #include <QFile>
- #include <QFrame>
- #include <QPainter>
-+#include <QPointer>
- #include <QTextStream>
- #include <QPaintEvent>
- #include <QDebug>
--- 
-2.41.0
-

diff --git a/sci-astronomy/kstars/kstars-3.6.6.ebuild b/sci-astronomy/kstars/kstars-3.6.6.ebuild
deleted file mode 100644
index 38ef3076fed2..000000000000
--- a/sci-astronomy/kstars/kstars-3.6.6.ebuild
+++ /dev/null
@@ -1,112 +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/-/merge_requests/960
-	"${FILESDIR}/${P}-missing-headers.patch"
-)
-
-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
-}

diff --git a/sci-astronomy/kstars/metadata.xml b/sci-astronomy/kstars/metadata.xml
index 75867d29e217..576d990a2f03 100644
--- a/sci-astronomy/kstars/metadata.xml
+++ b/sci-astronomy/kstars/metadata.xml
@@ -9,8 +9,6 @@
 		<bugs-to>https://bugs.kde.org/</bugs-to>
 	</upstream>
 	<use>
-		<flag name="fits">Enable support for NASA's <pkg>sci-libs/cfitsio</pkg> library</flag>
-		<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>
 	</use>


^ permalink raw reply related	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2023-12-25 17:05 UTC | newest]

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

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