* [gentoo-commits] repo/gentoo:master commit in: kde-apps/step/files/, kde-apps/step/
@ 2024-12-30 14:21 Andreas Sturmlechner
0 siblings, 0 replies; only message in thread
From: Andreas Sturmlechner @ 2024-12-30 14:21 UTC (permalink / raw
To: gentoo-commits
commit: 385ad2601de0f98b81f9305f34ef3c97e361561b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 29 21:31:27 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 30 14:20:34 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=385ad260
kde-apps/step: Backport enable Qalculate support to be on par w/ KF5
See also:
https://invent.kde.org/education/step/-/merge_requests/34
https://mail.kde.org/pipermail/release-team/2024-December/013598.html
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/step/files/step-24.12.0-qalculate.patch | 37 +++++++++++++++++
kde-apps/step/step-24.12.0-r1.ebuild | 53 ++++++++++++++++++++++++
2 files changed, 90 insertions(+)
diff --git a/kde-apps/step/files/step-24.12.0-qalculate.patch b/kde-apps/step/files/step-24.12.0-qalculate.patch
new file mode 100644
index 000000000000..55d67d0786a5
--- /dev/null
+++ b/kde-apps/step/files/step-24.12.0-qalculate.patch
@@ -0,0 +1,37 @@
+From 32ef71cac432dd61d7f631e88dece23721a793e9 Mon Sep 17 00:00:00 2001
+From: Luigi Toscano <luigi.toscano@tiscali.it>
+Date: Sun, 29 Dec 2024 23:49:39 +0100
+Subject: [PATCH] Enable qalculate, which is not a Qt library
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Qalculate has a separate Qt based interface (and a Gtk one)
+but the library does not depend on Qt.
+Enabling the library allows the program to parse the units
+again when setting some values with a unit in the property editor
+(for example 32 dm ± 10 cm is converted into 3.2 [m] ± 0.1 [m]).
+
+(cherry picked from commit bba6986d36f0857463be8bc945951079d300f6ed)
+---
+ CMakeLists.txt | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 76a494c..4c352a5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -73,10 +73,6 @@ set_package_properties(GSL PROPERTIES
+ set(STEPCORE_WITH_GSL ${GSL_FOUND} CACHE BOOL "Enable GSL-powered features for StepCore")
+ set(STEPCORE_WITH_QT ON) # CACHE BOOL "Enable QT-powered features for StepCore")
+ set(STEP_WITH_QALCULATE ${QALCULATE_FOUND} CACHE BOOL "Enable unit conversion support using libqalculate")
+-if (QT_MAJOR_VERSION STREQUAL "6")
+- MESSAGE(STATUS "QALCULATE was not ported to QT6 yet")
+- set(STEP_WITH_QALCULATE false)
+-endif()
+
+ # Compiler specific options
+ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+--
+GitLab
+
diff --git a/kde-apps/step/step-24.12.0-r1.ebuild b/kde-apps/step/step-24.12.0-r1.ebuild
new file mode 100644
index 000000000000..4f5d5ebb9bbb
--- /dev/null
+++ b/kde-apps/step/step-24.12.0-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=6.5.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Interactive physics simulator"
+HOMEPAGE="https://apps.kde.org/step/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="+gsl +qalculate"
+
+DEPEND="
+ >=dev-cpp/eigen-3.2:3
+ >=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
+ >=dev-qt/qtsvg-${QTMIN}:6
+ >=kde-frameworks/kcompletion-${KFMIN}:6
+ >=kde-frameworks/kconfig-${KFMIN}:6
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:6
+ >=kde-frameworks/kcoreaddons-${KFMIN}:6
+ >=kde-frameworks/kcrash-${KFMIN}:6
+ >=kde-frameworks/ki18n-${KFMIN}:6
+ >=kde-frameworks/kiconthemes-${KFMIN}:6
+ >=kde-frameworks/kio-${KFMIN}:6
+ >=kde-frameworks/knewstuff-${KFMIN}:6
+ >=kde-frameworks/kparts-${KFMIN}:6
+ >=kde-frameworks/kplotting-${KFMIN}:6
+ >=kde-frameworks/ktextwidgets-${KFMIN}:6
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+ >=kde-frameworks/kxmlgui-${KFMIN}:6
+ sci-libs/cln
+ gsl? ( sci-libs/gsl:= )
+ qalculate? ( >=sci-libs/libqalculate-0.9.5:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
+
+PATCHES=( "${FILESDIR}/${P}-qalculate.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package gsl GSL)
+ $(cmake_use_find_package qalculate Qalculate)
+ )
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2024-12-30 14:21 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-30 14:21 [gentoo-commits] repo/gentoo:master commit in: kde-apps/step/files/, kde-apps/step/ Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox