From 2e36bcecf24a3f583ae8f27b71ba13b3cfd39778 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 31 Dec 2024 06:31:03 +0000 Subject: gentoo auto-resync : 31:12:2024 - 06:31:02 --- kde-apps/step/Manifest | 3 +- kde-apps/step/files/step-24.12.0-qalculate.patch | 37 +++++++++++++++++ kde-apps/step/step-24.12.0-r1.ebuild | 53 ++++++++++++++++++++++++ kde-apps/step/step-24.12.0.ebuild | 51 ----------------------- 4 files changed, 92 insertions(+), 52 deletions(-) create mode 100644 kde-apps/step/files/step-24.12.0-qalculate.patch create mode 100644 kde-apps/step/step-24.12.0-r1.ebuild delete mode 100644 kde-apps/step/step-24.12.0.ebuild (limited to 'kde-apps/step') diff --git a/kde-apps/step/Manifest b/kde-apps/step/Manifest index ca96de727b80..d0a5ce9c6ce1 100644 --- a/kde-apps/step/Manifest +++ b/kde-apps/step/Manifest @@ -1,5 +1,6 @@ +AUX step-24.12.0-qalculate.patch 1419 BLAKE2B bd835df15959179e6cba00b7eb28bdb04ba4deb51293a9fff57e710994112ad710aa2b8d2dc5135e6050236138e682626b9432f835b4dc9693443e6745bcccaa SHA512 3d4edb5e6df5cd93790ce5262ddef80b1c7f89fee14082247a8abb5f27b890d2263307b0bdd666b128785b2610647490b85ce01742cf4bf5a2a6748a00340001 DIST step-24.08.3.tar.xz 987736 BLAKE2B 8479d670d1bbcea91682ed41f7bf7079032e42989c6a60b1c641169fbab5b61a21fed35d413a792a1b517b5b48e6ae1e81dedca9a7de7e033807d289b86f5d23 SHA512 59aaa5cfc0c1d1237f75b44e8ac1ef310422df2a1c282c896d56f443e6131d91fea3859c9ebdf71b796c6429365e700e27bc797bdbed7817648bfbf158df773d DIST step-24.12.0.tar.xz 988548 BLAKE2B f6fcf280ec41fb54aa6167990b649029c46617289a23125833d82d194df0cb352fd141746c60ded16209ca48428cefbf03d49c97da13493884dcb89752524cad SHA512 5d7209b197082b6bb721a8a392e47ed9ed65ec57525956139432a2da472e3802df1b27b60b4a78226b34f2e494270b675529bef510ca4140ed2f0145ee974ca0 EBUILD step-24.08.3.ebuild 1378 BLAKE2B 4c3f57e2a00837c3fa60200b1fd2d4ce8ed801fd1a69f95020cc1af77c000bbab67dca129ef4bbe4ea18152930863bdb28b68ec655ae895f1406ef97cb1bee5c SHA512 3bc78e0ba48e17c7f73d1e4921cbf64a1555f6da256b3ae1981179b73694b432fd0fb5d0890b30743192b2561ce3613465ec0e8ea4b7493ff8ab161bae5c00db -EBUILD step-24.12.0.ebuild 1340 BLAKE2B df054c0b9e0db2c2759e43a90806c4f767adfcbf2399ef085270056bb672cad48dfc821bb2c5a77ff5decbcded21ded871422b7adffaeb4c179e45e52b15772d SHA512 a711ba942039a981bfc72b0b0f35d503a1ec3780a5c4436e75631427b6e1a2e5e92b8255ea58635512833700a4776122c6c7924c843319626191bab77220cc9f +EBUILD step-24.12.0-r1.ebuild 1388 BLAKE2B 5a42b7ed554e5c511d33e195d85034bf33af69327911e599996fd8d9367ba3547d15959dfa2accdeae52c15c18628b1ca26a80bc51f0fa93aaaef6379b856859 SHA512 087e80125c56f124ecaf0969cfc19c3f6c1825876c7197457de625803c191c24de5551198dd91e41e50771fac37f740967a1cdac36b1da766e7d283f5cdb5b7d MISC metadata.xml 417 BLAKE2B de9527c46129517ecc1eac9da86866a8196d7256cd1e6b73fd9c415b18f3278099bb08200e16b791bea345daf84a6b3392ae583530f848e699fb8102c2f99b4f SHA512 ff67c68e133f784d4819a3b475ca8090bf6a2ee7d4266f4f48bc3a3032fc3778ae4004206981098f304a3c32fbb9a36a0488dca095cdff55e2abfafc16424fff 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 +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 +} diff --git a/kde-apps/step/step-24.12.0.ebuild b/kde-apps/step/step-24.12.0.ebuild deleted file mode 100644 index 6e2512d79bd6..000000000000 --- a/kde-apps/step/step-24.12.0.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# 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]" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package gsl GSL) - $(cmake_use_find_package qalculate Qalculate) - ) - ecm_src_configure -} -- cgit v1.2.3