diff --git a/kde-apps/ktouch/ktouch-24.05.0.recipe b/kde-apps/ktouch/ktouch-24.12.3.recipe similarity index 90% rename from kde-apps/ktouch/ktouch-24.05.0.recipe rename to kde-apps/ktouch/ktouch-24.12.3.recipe index c24829785..33a1c8162 100644 --- a/kde-apps/ktouch/ktouch-24.05.0.recipe +++ b/kde-apps/ktouch/ktouch-24.12.3.recipe @@ -11,13 +11,12 @@ created. During training, KTouch collects comprehensive statistical information to help you or your \ teacher to analyze your progress." HOMEPAGE="https://apps.kde.org/ktouch/" -COPYRIGHT="2010-2024 KDE Organisation" +COPYRIGHT="2010-2025 KDE Organisation" LICENSE="GNU GPL v2" -REVISION="2" +REVISION="1" SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/ktouch-$portVersion.tar.xz" -CHECKSUM_SHA256="7560e80a21f5cac4c680aa314f7c00d0d8cb6c1c292c4db783993513389dd162" +CHECKSUM_SHA256="c59edd722c425e0df86efccf0d79f7883d82c5baaf0673165051f5e13aaa1feb" SOURCE_DIR="ktouch-$portVersion" -PATCHES="ktouch-$portVersion.patchset" ADDITIONAL_FILES="ktouch.rdef.in" ARCHITECTURES="all !x86_gcc2" @@ -37,7 +36,6 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix kqtquickcharts$secondaryArchSuffix - kquickcharts$secondaryArchSuffix lib:libKF5AuthCore$secondaryArchSuffix lib:libKF5Codecs$secondaryArchSuffix lib:libKF5Completion$secondaryArchSuffix @@ -65,8 +63,7 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix >= 6.0.0 - kquickcharts${secondaryArchSuffix}_devel + extra_cmake_modules$secondaryArchSuffix devel:kqtquickcharts$secondaryArchSuffix devel:libKF5Auth$secondaryArchSuffix devel:libKF5Codecs$secondaryArchSuffix @@ -74,6 +71,7 @@ BUILD_REQUIRES=" devel:libKF5ConfigCore$secondaryArchSuffix devel:libKF5ConfigWidgets$secondaryArchSuffix devel:libKF5CoreAddons$secondaryArchSuffix + devel:libKF5DocTools$secondaryArchSuffix devel:libKF5I18n$secondaryArchSuffix devel:libKF5IconThemes$secondaryArchSuffix devel:libKF5ItemViews$secondaryArchSuffix @@ -96,12 +94,20 @@ BUILD_PREREQUIRES=" cmd:qdbuscpp2xml$secondaryArchSuffix >= 5 " +PATCH() +{ + # disable docs generation + sed -e '/ecm_optional_add_subdirectory(doc)/ s/^#*/#/' -i CMakeLists.txt + sed -e '/ kdoctools_install(po)/ s/^#*/#/' -i CMakeLists.txt +} + BUILD() { - cmake -Bbuild -S. $cmakeDirArgs \ + cmake -B build -S . $cmakeDirArgs \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_BINDIR=$commandBinDir \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake + make -C build $jobArgs } diff --git a/kde-apps/ktouch/patches/ktouch-24.05.0.patchset b/kde-apps/ktouch/patches/ktouch-24.05.0.patchset deleted file mode 100644 index e4ddf55a2..000000000 --- a/kde-apps/ktouch/patches/ktouch-24.05.0.patchset +++ /dev/null @@ -1,53 +0,0 @@ -From 98f32f58dc17d01b0a587b86d0d3339f1d59a60c Mon Sep 17 00:00:00 2001 -From: Begasus -Date: Fri, 19 Jan 2024 13:57:22 +0100 -Subject: Disable DocTools - - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c1032f7..e4fb9a5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -48,7 +48,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS - Config - ConfigWidgets - CoreAddons -- DocTools - I18n - ItemViews - KCMUtils -@@ -90,7 +89,6 @@ ecm_set_disabled_deprecation_versions(QT 5.15.2 KF 5.101.0) - - # subdirectories to build - ecm_optional_add_subdirectory(data) --ecm_optional_add_subdirectory(doc) - ecm_optional_add_subdirectory(src) - # ecm_optional_add_subdirectory(sounds) - ecm_optional_add_subdirectory(icons) --- -2.45.1 - - -From 4c188ad03199d8d9f87ace2e34514de1dca76ccd Mon Sep 17 00:00:00 2001 -From: Schrijvers Luc -Date: Mon, 3 Jun 2024 14:54:12 +0200 -Subject: Use software rendering - - -diff --git a/src/main.cpp b/src/main.cpp -index d5645bf..155ebb7 100644 ---- a/src/main.cpp -+++ b/src/main.cpp -@@ -15,6 +15,9 @@ - - int main(int argc, char **argv) - { -+#if defined(Q_OS_HAIKU) -+ qputenv("QT_QUICK_BACKEND", "software"); -+#endif - // TODO ktouch doesn't detect keyboard presses on wayland at the moment so force X11/XWayland for now - #ifdef Q_OS_LINUX - qputenv("QT_QPA_PLATFORM", "xcb"); --- -2.45.1 -