Compare commits

..

1 Commits

Author SHA1 Message Date
f73c3f65a7 Backport to Jammy. 2023-08-11 13:05:57 -05:00
6 changed files with 6 additions and 51 deletions

13
debian/changelog vendored
View File

@ -1,17 +1,8 @@
lxqt-notificationd (1.4.0-0ubuntu1~ppa1) jammy; urgency=medium lxqt-notificationd (1.3.0-0ubuntu1~ppa1) jammy; urgency=medium
* Backport to Jammy. * Backport to Jammy.
-- Simon Quigley <tsimonq2@ubuntu.com> Sun, 12 Nov 2023 18:30:44 -0600 -- Simon Quigley <tsimonq2@ubuntu.com> Fri, 11 Aug 2023 13:02:36 -0500
lxqt-notificationd (1.4.0-0ubuntu1) noble; urgency=medium
* New upstream release.
* Bump build dependencies.
* Fix outdated Lintian override formatting.
* Add an upstream metadata file in the packaging.
-- Simon Quigley <tsimonq2@ubuntu.com> Sun, 12 Nov 2023 18:28:09 -0600
lxqt-notificationd (1.3.0-0ubuntu1) mantic; urgency=medium lxqt-notificationd (1.3.0-0ubuntu1) mantic; urgency=medium

2
debian/control vendored
View File

@ -8,7 +8,7 @@ Section: x11
Priority: optional Priority: optional
Build-Depends: debhelper-compat (= 13), Build-Depends: debhelper-compat (= 13),
libkf5windowsystem-dev, libkf5windowsystem-dev,
liblxqt1-dev (>= 1.4.0), liblxqt1-dev (>= 1.3.0),
libqt5svg5-dev, libqt5svg5-dev,
libqt5x11extras5-dev, libqt5x11extras5-dev,
libx11-dev, libx11-dev,

View File

@ -1,6 +1,6 @@
# there will not be manpages in a foreseable future # there will not be manpages in a foreseable future
lxqt-notificationd: no-manual-page [usr/bin/lxqt-config-notificationd] lxqt-notificationd: no-manual-page usr/bin/lxqt-config-notificationd
lxqt-notificationd: no-manual-page [usr/bin/lxqt-notificationd] lxqt-notificationd: no-manual-page usr/bin/lxqt-notificationd
# LXQt is not in freedesktop specs yet # LXQt is not in freedesktop specs yet
lxqt-notificationd: desktop-entry-invalid-category LXQt [usr/share/applications/lxqt-config-notificationd.desktop] lxqt-notificationd: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config-notificationd.desktop

View File

@ -1,30 +0,0 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,7 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
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")
--- a/src/notification.cpp
+++ b/src/notification.cpp
@@ -33,7 +33,6 @@
#include <QDebug>
#include <XdgIcon>
#include <KWindowSystem/KWindowSystem>
-#include <KWindowSystem/KX11Extras>
#include <QMouseEvent>
#include <QPushButton>
#include <QStyle>
@@ -327,7 +326,7 @@ void Notification::mouseReleaseEvent(QMo
return;
}
- const auto ids = KX11Extras::stackingOrder();
+ const auto ids = KWindowSystem::stackingOrder();
for (const WId &i : ids)
{
KWindowInfo info = KWindowInfo(i, NET::WMName | NET::WMVisibleName);

View File

@ -1 +0,0 @@
revert-kwindowsystem-port.patch

View File

@ -1,5 +0,0 @@
Bug-Database: https://github.com/lxqt/lxqt-notificationd/issues
Bug-Submit: https://github.com/lxqt/lxqt-notificationd/issues/new
Changelog: https://github.com/lxqt/lxqt-notificationd/blob/master/CHANGELOG
Repository: https://github.com/lxqt/lxqt-notificationd.git
Repository-Browse: https://github.com/lxqt/lxqt-notificationd