From c61b7de8447d3c6fa48ef5950a7a92e530e15360 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Tue, 27 Aug 2024 12:54:33 +0200 Subject: [PATCH] kguiaddons6, bump version (#10934) --- ...-6.2.0.recipe => kguiaddons6-6.5.0.recipe} | 12 +++++----- .../patches/kguiaddons-5.116.0.patchset | 22 ------------------- 2 files changed, 7 insertions(+), 27 deletions(-) rename kde-frameworks/kguiaddons/{kguiaddons6-6.2.0.recipe => kguiaddons6-6.5.0.recipe} (88%) delete mode 100644 kde-frameworks/kguiaddons/patches/kguiaddons-5.116.0.patchset diff --git a/kde-frameworks/kguiaddons/kguiaddons6-6.2.0.recipe b/kde-frameworks/kguiaddons/kguiaddons6-6.5.0.recipe similarity index 88% rename from kde-frameworks/kguiaddons/kguiaddons6-6.2.0.recipe rename to kde-frameworks/kguiaddons/kguiaddons6-6.5.0.recipe index 56fdec991..8bde59df0 100644 --- a/kde-frameworks/kguiaddons/kguiaddons6-6.2.0.recipe +++ b/kde-frameworks/kguiaddons/kguiaddons6-6.5.0.recipe @@ -6,7 +6,7 @@ COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kguiaddons-${portVersion}.tar.xz" -CHECKSUM_SHA256="ba5a5e42d5b9b94486419263836074429fd3facfc364fd4e3a29a54bc6de5ddb" +CHECKSUM_SHA256="7193fa930b85fa6e7fda3a85f1e52f362ecd3e110e80055d9084eeafaeac4807" SOURCE_DIR="kguiaddons-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -58,12 +58,11 @@ BUILD() { cmake -Bbuild -S. $cmakeDirArgs \ -DCMAKE_BUILD_TYPE=Release \ + -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ -DWITH_WAYLAND=OFF \ - -DWITH_X11=OFF \ -DBUILD_QCH=ON \ -DBUILD_TESTING=OFF - # needs "-DBUILD_GEO_SCHEME_HANDLER=OFF" for KF5 make -Cbuild $jobArgs } @@ -71,18 +70,21 @@ INSTALL() { make -Cbuild install + # cleanup + rm -rf $dataDir/applications + prepareInstalledDevelLib \ libKF6GuiAddons fixPkgconfig packageEntries devel \ $developDir \ - $dataDir/doc \ + $documentationDir \ $libDir/cmake } TEST() { export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}" - make -Cbuild test + ctest --test-dir build --output-on-failure } diff --git a/kde-frameworks/kguiaddons/patches/kguiaddons-5.116.0.patchset b/kde-frameworks/kguiaddons/patches/kguiaddons-5.116.0.patchset deleted file mode 100644 index a8f1f19a2..000000000 --- a/kde-frameworks/kguiaddons/patches/kguiaddons-5.116.0.patchset +++ /dev/null @@ -1,22 +0,0 @@ -From 80ffe631ee9dda9933e80820a7d080b03de46fe9 Mon Sep 17 00:00:00 2001 -From: Sergei Reznikov -Date: Thu, 18 Mar 2021 15:56:20 +0300 -Subject: Disable Wayland on Haiku - - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cef4429..54c80ad 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -27,7 +27,7 @@ option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, - add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)") - option(BUILD_GEO_SCHEME_HANDLER "Build the geo: URI scheme handler. Disable this if you are building two major versions for co-installability in the older variant." ON) - --if (UNIX AND NOT ANDROID AND NOT APPLE) -+if (UNIX AND NOT ANDROID AND NOT APPLE AND NOT HAIKU) - option(WITH_WAYLAND "Build with support for KModifierKeyInfo, KSystemClipboard and KeySequenceRecorder inhibiting shortcuts on Wayland" ON) - add_feature_info(WAYLAND ${WITH_WAYLAND} "KeySequenceEditor inhibiting shortcuts on Wayland") - --- -2.43.2 -