diff --git a/kde-frameworks/knotifications/knotifications6-6.2.0.recipe b/kde-frameworks/knotifications/knotifications6-6.5.0.recipe similarity index 91% rename from kde-frameworks/knotifications/knotifications6-6.2.0.recipe rename to kde-frameworks/knotifications/knotifications6-6.5.0.recipe index 2cb2f47e9..cd240f3a8 100644 --- a/kde-frameworks/knotifications/knotifications6-6.2.0.recipe +++ b/kde-frameworks/knotifications/knotifications6-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%.*}/knotifications-${portVersion}.tar.xz" -CHECKSUM_SHA256="9627c200f58de5e5dc4e74d1a13005624115b6d23da034e64aa1bf3143e78164" +CHECKSUM_SHA256="3d73dc682176138cba995b6954eeafdd4507097313f1b2102a4d5ed905a3eee6" SOURCE_DIR="knotifications-$portVersion" PATCHES="knotifications-$portVersion.patchset" @@ -76,6 +76,7 @@ BUILD() cmake -Bbuild -S. $cmakeDirArgs \ -DCMAKE_BUILD_TYPE=Release \ -DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \ + -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ -DBUILD_QCH=ON \ -DBUILD_TESTING=OFF @@ -91,15 +92,15 @@ INSTALL() packageEntries devel \ $developDir \ - $dataDir/doc \ + $documentationDir \ $libDir/cmake } TEST() { - make -Cbuild test + export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}" + ctest --test-dir build --output-on-failure # individual tests, opens window, manual intervention needed - # export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}" # build/bin/knotificationdbustest # no dbus-launch # build/bin/notificationtester # build/bin/unitylaunchertest --version diff --git a/kde-frameworks/knotifications/patches/knotifications-6.2.0.patchset b/kde-frameworks/knotifications/patches/knotifications-6.2.0.patchset deleted file mode 100644 index 5847e966f..000000000 --- a/kde-frameworks/knotifications/patches/knotifications-6.2.0.patchset +++ /dev/null @@ -1,22 +0,0 @@ -From 14f42afcee3b6dfd5adb9faa68377577c54fef9a Mon Sep 17 00:00:00 2001 -From: Begasus -Date: Sun, 14 Jan 2024 19:28:13 +0100 -Subject: Disable Canberra check - - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9f3af3e..0b68354 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -68,7 +68,7 @@ endif() - - find_package(KF6Config ${KF_DEP_VERSION} REQUIRED) - --if (NOT APPLE AND NOT ANDROID AND NOT WIN32 OR (WIN32 AND NOT WITH_SNORETOAST)) -+if (NOT APPLE AND NOT ANDROID AND NOT WIN32 AND NOT HAIKU OR (WIN32 AND NOT WITH_SNORETOAST)) - find_package(Qt6 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus) - find_package(Canberra REQUIRED) - set_package_properties(Canberra PROPERTIES --- -2.43.2 - diff --git a/kde-frameworks/knotifications/patches/knotifications-6.5.0.patchset b/kde-frameworks/knotifications/patches/knotifications-6.5.0.patchset new file mode 100644 index 000000000..6b0fadcc7 --- /dev/null +++ b/kde-frameworks/knotifications/patches/knotifications-6.5.0.patchset @@ -0,0 +1,45 @@ +From 088d89a8b62e6d3b76dcf89233a417814a2105bb Mon Sep 17 00:00:00 2001 +From: Begasus +Date: Sun, 14 Jan 2024 19:28:13 +0100 +Subject: Disable Canberra check + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 82605f7..81da790 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -77,7 +77,7 @@ endif() + + find_package(KF6Config ${KF_DEP_VERSION} REQUIRED) + +-if (NOT APPLE AND NOT ANDROID AND NOT WIN32 OR (WIN32 AND NOT WITH_SNORETOAST)) ++if (NOT APPLE AND NOT ANDROID AND NOT WIN32 AND NOT HAIKU OR (WIN32 AND NOT WITH_SNORETOAST)) + find_package(Qt6 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus) + find_package(Canberra REQUIRED) + set_package_properties(Canberra PROPERTIES +-- +2.45.2 + + +From a61d5f8442361ff8ef415ee4478e91647bafdf00 Mon Sep 17 00:00:00 2001 +From: Schrijvers Luc +Date: Wed, 10 Jul 2024 17:31:35 +0200 +Subject: Revert disabling Qt6Dbus + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 81da790..fdc8e8a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -53,7 +53,7 @@ endif() + # shall we use DBus? + # enabled per default on Linux & BSD systems + set(USE_DBUS_DEFAULT OFF) +-if(UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAIKU) ++if(UNIX AND NOT APPLE AND NOT ANDROID) + set(USE_DBUS_DEFAULT ON) + endif() + option(USE_DBUS "Build components using DBus" ${USE_DBUS_DEFAULT}) +-- +2.45.2 +