diff options
Diffstat (limited to 'user/lxqt-notificationd')
| -rw-r--r-- | user/lxqt-notificationd/APKBUILD | 32 | ||||
| -rw-r--r-- | user/lxqt-notificationd/revert-kwindowsystem-bump.patch | 32 |
2 files changed, 48 insertions, 16 deletions
diff --git a/user/lxqt-notificationd/APKBUILD b/user/lxqt-notificationd/APKBUILD index 76bf8585f..5351994d7 100644 --- a/user/lxqt-notificationd/APKBUILD +++ b/user/lxqt-notificationd/APKBUILD @@ -1,23 +1,24 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> +# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=lxqt-notificationd -pkgver=0.14.1 +pkgver=1.4.0 +_lxqt=0.13.0 pkgrel=0 pkgdesc="Daemon for notifications in LXQt" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" +options="!check" # No test suite. license="LGPL-2.1+" depends="" -makedepends="cmake extra-cmake-modules qt5-qttools-dev liblxqt-dev>=${pkgver%.*}.0 - lxqt-build-tools>=0.6.0 kwindowsystem-dev" -source="https://github.com/lxqt/lxqt-notificationd/releases/download/$pkgver/lxqt-notificationd-$pkgver.tar.xz" +makedepends="cmake extra-cmake-modules qt5-qttools-dev liblxqt-dev>=${pkgver%.*} + lxqt-build-tools>=$_lxqt kwindowsystem-dev" +source="https://github.com/lxqt/lxqt-notificationd/releases/download/$pkgver/lxqt-notificationd-$pkgver.tar.xz + revert-kwindowsystem-bump.patch" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi - mkdir -p build && cd build cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ @@ -25,18 +26,17 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} .. - make + ${CMAKE_CROSSOPTS} -Bbuild + make -C build } check() { - cd "$builddir"/build - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } -sha512sums="dcd1892ff66d6beb5c8953c6731f798a59272365fb7439277732b145cc9e6479314415481d9e8aae9fd670d779011c3d7bb3874b05a67cfad2a722f467866795 lxqt-notificationd-0.14.1.tar.xz" +sha512sums="5ae28b0f49e1e01c8d0fe96f23b961ca962dab33f16025af172777f385d0fd3471c64a7acb78b46e7dc0c370d324a17f10ec9a4c4b3afbde95d47164a5246d0a lxqt-notificationd-1.4.0.tar.xz +b67f16f2fb37cb50700ecb925e709a3cfe74dcf8a9d4f74909cfd08ec7af9b0ff3e6b20a1a1d3f5d966392be2f25b1a295c9db5b47c7d890e7d026dd6faf2c9a revert-kwindowsystem-bump.patch" diff --git a/user/lxqt-notificationd/revert-kwindowsystem-bump.patch b/user/lxqt-notificationd/revert-kwindowsystem-bump.patch new file mode 100644 index 000000000..844e6596f --- /dev/null +++ b/user/lxqt-notificationd/revert-kwindowsystem-bump.patch @@ -0,0 +1,32 @@ +diff '--color=auto' -Nurd lxqt-notificationd-1.4.0/CMakeLists.txt lxqt-notificationd-1.4.0.new/CMakeLists.txt +--- lxqt-notificationd-1.4.0/CMakeLists.txt 2023-11-05 03:44:38.000000000 -0800 ++++ lxqt-notificationd-1.4.0.new/CMakeLists.txt 2023-11-26 03:02:51.780473894 -0800 +@@ -16,7 +16,7 @@ + option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF) + option(LXQT_NOTIFICATION_BUILD_TESTS "Build LXQt Notification tests" OFF) + +-set(KF5_MINIMUM_VERSION "5.101.0") ++set(KF5_MINIMUM_VERSION "5.36.0") + set(LXQT_MINIMUM_VERSION "1.4.0") + set(QT_MINIMUM_VERSION "5.15.0") + +diff '--color=auto' -Nurd lxqt-notificationd-1.4.0/src/notification.cpp lxqt-notificationd-1.4.0.new/src/notification.cpp +--- lxqt-notificationd-1.4.0/src/notification.cpp 2023-11-05 03:44:38.000000000 -0800 ++++ lxqt-notificationd-1.4.0.new/src/notification.cpp 2023-11-26 03:03:40.300079116 -0800 +@@ -33,7 +33,6 @@ + #include <QDebug> + #include <XdgIcon> + #include <KWindowSystem/KWindowSystem> +-#include <KWindowSystem/KX11Extras> + #include <QMouseEvent> + #include <QPushButton> + #include <QStyle> +@@ -327,7 +326,7 @@ + return; + } + +- const auto ids = KX11Extras::stackingOrder(); ++ const auto ids = KWindowSystem::stackingOrder(); + for (const WId &i : ids) + { + KWindowInfo info = KWindowInfo(i, NET::WMName | NET::WMVisibleName); |