diff options
| author | Síle Ekaterin Liszka <sheila@vulpine.house> | 2023-11-26 03:05:53 -0800 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2023-11-27 09:59:05 +0000 |
| commit | 8696cb27a42362b19872a9e11a3494f78b18a2ff (patch) | |
| tree | a92c69e2d6d302330687b9e73c8ce6ddae75a384 | |
| parent | 0018d98ccbd93db845e9e47f1f6b4164a13adce4 (diff) | |
| download | packages-8696cb27a42362b19872a9e11a3494f78b18a2ff.tar.gz packages-8696cb27a42362b19872a9e11a3494f78b18a2ff.tar.bz2 packages-8696cb27a42362b19872a9e11a3494f78b18a2ff.tar.xz packages-8696cb27a42362b19872a9e11a3494f78b18a2ff.zip | |
user/lxqt-notificationsd: upgrade to 1.4.0
The patch accompanying this upgrade should be removed when kwindowsystem
is bumped.
| -rw-r--r-- | user/lxqt-notificationd/APKBUILD | 10 | ||||
| -rw-r--r-- | user/lxqt-notificationd/revert-kwindowsystem-bump.patch | 32 |
2 files changed, 38 insertions, 4 deletions
diff --git a/user/lxqt-notificationd/APKBUILD b/user/lxqt-notificationd/APKBUILD index e3b4aa41c..5351994d7 100644 --- a/user/lxqt-notificationd/APKBUILD +++ b/user/lxqt-notificationd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=lxqt-notificationd -pkgver=1.3.0 +pkgver=1.4.0 _lxqt=0.13.0 pkgrel=0 pkgdesc="Daemon for notifications in LXQt" @@ -10,9 +10,10 @@ arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" -makedepends="cmake extra-cmake-modules qt5-qttools-dev liblxqt-dev>=${pkgver%.*}.0 +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" +source="https://github.com/lxqt/lxqt-notificationd/releases/download/$pkgver/lxqt-notificationd-$pkgver.tar.xz + revert-kwindowsystem-bump.patch" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -37,4 +38,5 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="8bc57c8a6710aaa5d050802a588530ec446611362eaa7c87aae2dae74b7ed9745486a90efbd854dedf79bc9994e13b5444f8b5259452614e01a8b393dd796607 lxqt-notificationd-1.3.0.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); |