From 633872bcb36a67784dc3947f633dbd20c48fd931 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Tue, 28 May 2024 14:38:02 +0200 Subject: [PATCH] Add KF6 frameworks, kguiaddons6 (fix for co-installable KF5 version) (#10488) --- .../kguiaddons/kguiaddons-5.115.0.recipe | 16 ++-- .../kguiaddons/kguiaddons6-6.2.0.recipe | 88 +++++++++++++++++++ .../patches/kguiaddons-5.116.0.patchset | 22 +++++ 3 files changed, 116 insertions(+), 10 deletions(-) create mode 100644 kde-frameworks/kguiaddons/kguiaddons6-6.2.0.recipe create mode 100644 kde-frameworks/kguiaddons/patches/kguiaddons-5.116.0.patchset diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.115.0.recipe b/kde-frameworks/kguiaddons/kguiaddons-5.115.0.recipe index 021abdabf..1270f009c 100644 --- a/kde-frameworks/kguiaddons/kguiaddons-5.115.0.recipe +++ b/kde-frameworks/kguiaddons/kguiaddons-5.115.0.recipe @@ -4,7 +4,7 @@ interfaces in the areas of colors, fonts, text, images, keyboard input." HOMEPAGE="https://invent.kde.org/frameworks/kguiaddons/" COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU LGPL v2" -REVISION="1" +REVISION="2" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kguiaddons-${portVersion}.tar.xz" CHECKSUM_SHA256="4f6dda36ea182c8f9f7a703301cea8258b094d7b9254f42ad70dedbeb73ff262" PATCHES="kguiaddons-$portVersion.patchset" @@ -14,7 +14,6 @@ SECONDARY_ARCHITECTURES="x86" PROVIDES=" kguiaddons$secondaryArchSuffix = $portVersion - cmd:kde_geo_uri_handler$secondaryArchSuffix = $portVersion lib:libKF5GuiAddons$secondaryArchSuffix = $portVersion compat >= 5 " REQUIRES=" @@ -43,11 +42,6 @@ BUILD_PREREQUIRES=" cmd:make " -PATCH() -{ - sed -e '/platforms:/ a \ \ \ \ - name: Haiku' -i $sourceDir/metainfo.yaml -} - BUILD() { mkdir -p build @@ -56,7 +50,9 @@ BUILD() cmake .. $cmakeDirArgs \ -DCMAKE_BUILD_TYPE=Release \ -DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt5/mkspecs \ - -DECM_DIR=/system/data/cmake/Modules/ECM/cmake + -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ + -DBUILD_GEO_SCHEME_HANDLER=OFF \ + -DBUILD_TESTING=OFF make $jobArgs } @@ -66,12 +62,12 @@ INSTALL() cd build make install - prepareInstalledDevelLibs \ + prepareInstalledDevelLib \ libKF5GuiAddons packageEntries devel \ $libDir/cmake \ - $dataDir/Qt5/mkspecs \ + $dataDir/Qt5 \ $developDir } diff --git a/kde-frameworks/kguiaddons/kguiaddons6-6.2.0.recipe b/kde-frameworks/kguiaddons/kguiaddons6-6.2.0.recipe new file mode 100644 index 000000000..56fdec991 --- /dev/null +++ b/kde-frameworks/kguiaddons/kguiaddons6-6.2.0.recipe @@ -0,0 +1,88 @@ +SUMMARY="Utilities for graphical user interfaces" +DESCRIPTION="The KDE GUI addons provide utilities for graphical user \ +interfaces in the areas of colors, fonts, text, images, keyboard input." +HOMEPAGE="https://invent.kde.org/frameworks/kguiaddons" +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" +SOURCE_DIR="kguiaddons-$portVersion" + +ARCHITECTURES="all !x86_gcc2" +SECONDARY_ARCHITECTURES="x86" + +libVersion="$portVersion" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" + +PROVIDES=" + kguiaddons6$secondaryArchSuffix = $portVersion + cmd:kde_geo_uri_handler$secondaryArchSuffix = $portVersion + lib:libKF6GuiAddons$secondaryArchSuffix = $libVersionCompat + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libGL$secondaryArchSuffix + lib:libQt6Core$secondaryArchSuffix + lib:libQt6Gui$secondaryArchSuffix + " + +PROVIDES_devel=" + kguiaddons6${secondaryArchSuffix}_devel = $portVersion + devel:libKF6GuiAddons$secondaryArchSuffix = $libVersionCompat + " +REQUIRES_devel=" + kguiaddons6$secondaryArchSuffix == $portVersion base + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + extra_cmake_modules$secondaryArchSuffix >= $portVersion + qt6_tools${secondaryArchSuffix}_devel + devel:libQt6Core$secondaryArchSuffix + devel:libQt6Gui$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:cmake + cmd:dot + cmd:doxygen >= 1.9 + cmd:g++$secondaryArchSuffix + cmd:make + " + +TEST_REQUIRES=" + qthaikuplugins$secondaryArchSuffix + " + +BUILD() +{ + cmake -Bbuild -S. $cmakeDirArgs \ + -DCMAKE_BUILD_TYPE=Release \ + -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 +} + +INSTALL() +{ + make -Cbuild install + + prepareInstalledDevelLib \ + libKF6GuiAddons + fixPkgconfig + + packageEntries devel \ + $developDir \ + $dataDir/doc \ + $libDir/cmake +} + +TEST() +{ + export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}" + make -Cbuild test +} diff --git a/kde-frameworks/kguiaddons/patches/kguiaddons-5.116.0.patchset b/kde-frameworks/kguiaddons/patches/kguiaddons-5.116.0.patchset new file mode 100644 index 000000000..a8f1f19a2 --- /dev/null +++ b/kde-frameworks/kguiaddons/patches/kguiaddons-5.116.0.patchset @@ -0,0 +1,22 @@ +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 +