From fe7f494a5248251c0a6e01f51ae940cfec8ddb8b Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Mon, 15 Jul 2024 19:17:13 +0200 Subject: [PATCH] rkward, bump version (#10700) --- ...d-0.7.3.patchset => rkward-0.7.5.patchset} | 37 ++++++++++--------- ...kward-0.7.3.recipe => rkward-0.7.5.recipe} | 6 +-- 2 files changed, 22 insertions(+), 21 deletions(-) rename sci-mathematics/rkward/patches/{rkward-0.7.3.patchset => rkward-0.7.5.patchset} (67%) rename sci-mathematics/rkward/{rkward-0.7.3.recipe => rkward-0.7.5.recipe} (95%) diff --git a/sci-mathematics/rkward/patches/rkward-0.7.3.patchset b/sci-mathematics/rkward/patches/rkward-0.7.5.patchset similarity index 67% rename from sci-mathematics/rkward/patches/rkward-0.7.3.patchset rename to sci-mathematics/rkward/patches/rkward-0.7.5.patchset index b9eaa3ef2..c1e65e8ef 100644 --- a/sci-mathematics/rkward/patches/rkward-0.7.3.patchset +++ b/sci-mathematics/rkward/patches/rkward-0.7.5.patchset @@ -1,56 +1,59 @@ -From 75414e5b38a92f88e2ef349252575dcfc4b6c76a Mon Sep 17 00:00:00 2001 -From: Begasus -Date: Wed, 27 Dec 2023 18:49:36 +0100 -Subject: Disable DocTools +From a3d6a5bd76865eeb98289c5dc42615a708f272b8 Mon Sep 17 00:00:00 2001 +From: Schrijvers Luc +Date: Mon, 15 Jul 2024 14:14:21 +0200 +Subject: Disable doctools diff --git a/CMakeLists.txt b/CMakeLists.txt -index b14f974..20ab1e4 100644 +index 0e130c8..472367a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ INCLUDE(ECMMarkNonGuiExecutable) INCLUDE(FeatureSummary) - FIND_PACKAGE(Qt5 5.9 CONFIG REQUIRED COMPONENTS Widgets Core Xml Network Script PrintSupport) + FIND_PACKAGE(Qt5 5.9 CONFIG REQUIRED COMPONENTS Widgets Core Xml Network Qml PrintSupport) -FIND_PACKAGE(KF5 5.44 REQUIRED COMPONENTS CoreAddons DocTools I18n XmlGui TextEditor WidgetsAddons Parts Config Notifications WindowSystem Archive OPTIONAL_COMPONENTS Crash) +FIND_PACKAGE(KF5 5.44 REQUIRED COMPONENTS CoreAddons I18n XmlGui TextEditor WidgetsAddons Parts Config Notifications WindowSystem Archive OPTIONAL_COMPONENTS Crash) IF(NOT NO_QT_WEBENGINE) FIND_PACKAGE(Qt5 5.9 OPTIONAL_COMPONENTS WebEngineWidgets) IF(NOT Qt5WebEngineWidgets_FOUND OR Qt5WebEngineWidgets_VERSION VERSION_LESS "5.12.0") -@@ -60,9 +60,7 @@ ADD_DEFINITIONS(-DQT_NO_URL_CAST_FROM_STRING) +@@ -48,9 +48,9 @@ ADD_DEFINITIONS(-DQT_NO_URL_CAST_FROM_STRING) ADD_SUBDIRECTORY(rkward) ADD_SUBDIRECTORY(i18n) -ADD_SUBDIRECTORY(doc) ++#ADD_SUBDIRECTORY(doc) ADD_SUBDIRECTORY(tests) KI18N_INSTALL(po) -KDOCTOOLS_INSTALL(po) ++#KDOCTOOLS_INSTALL(po) FEATURE_SUMMARY(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) -- -2.42.1 +2.45.2 -From 6dcfd47cc4e2b2ff378359867009534574231f4d Mon Sep 17 00:00:00 2001 -From: Begasus -Date: Wed, 27 Dec 2023 18:58:09 +0100 -Subject: Silence deprecated warnings +From 3bfcaa9fe70b771fab9827b29652d4587889e786 Mon Sep 17 00:00:00 2001 +From: Schrijvers Luc +Date: Mon, 15 Jul 2024 14:14:54 +0200 +Subject: Silense deprecated warnings diff --git a/CMakeLists.txt b/CMakeLists.txt -index 20ab1e4..90bafd3 100644 +index 472367a..cff78bc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -54,6 +54,9 @@ ENDIF(USE_QJSENGINE) - ADD_DEFINITIONS(${QT_DEFINITIONS} -DQT_NO_CAST_TO_ASCII) +@@ -43,6 +43,10 @@ ADD_DEFINITIONS(${QT_DEFINITIONS} -DQT_NO_CAST_TO_ASCII) ADD_DEFINITIONS(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) ADD_DEFINITIONS(-DQT_NO_URL_CAST_FROM_STRING) + +IF(HAIKU) + add_definitions(-Wno-deprecated-declarations) +ENDIF(HAIKU) - ++ #uncomment the line below to save ~250-350kB in object size #ADD_DEFINITIONS(-DRKWARD_NO_TRACE) + -- -2.42.1 +2.45.2 diff --git a/sci-mathematics/rkward/rkward-0.7.3.recipe b/sci-mathematics/rkward/rkward-0.7.5.recipe similarity index 95% rename from sci-mathematics/rkward/rkward-0.7.3.recipe rename to sci-mathematics/rkward/rkward-0.7.5.recipe index fc9132d08..1ad9d062c 100644 --- a/sci-mathematics/rkward/rkward-0.7.3.recipe +++ b/sci-mathematics/rkward/rkward-0.7.5.recipe @@ -4,9 +4,8 @@ HOMEPAGE="https://invent.kde.org/education/rkward" COPYRIGHT="2010-2023 KDE Organisation" LICENSE="GNU GPL v2" REVISION="1" -SOURCE_URI="$HOMEPAGE/-/archive/v$portVersion/rkward-v$portVersion.tar.bz2" -CHECKSUM_SHA256="e5fd15d90d7ea4900b7fb8a32d888c4ddee99909331daa9110499b7a7569aad4" -SOURCE_DIR="rkward-v$portVersion" +SOURCE_URI="https://download.kde.org/stable/rkward/$portVersion/rkward-$portVersion.tar.gz" +CHECKSUM_SHA256="eb7d385b0b9e694fd639c858340ac14cdc7c932ec5e06b61adffbf77d12cd8c8" PATCHES="rkward-$portVersion.patchset" ADDITIONAL_FILES="rkward.rdef.in" @@ -102,7 +101,6 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix cmd:qdbuscpp2xml$secondaryArchSuffix >= 5 cmd:r - cmd:xsltproc " BUILD()