Compare commits

..

No commits in common. "07e12fc4e5f0f0d03f67fe5f0a302da9f37e2415" and "9fe1f7a7617fc8c6348a7597bde739d99e321883" have entirely different histories.

4 changed files with 4 additions and 100 deletions

Binary file not shown.

View File

@ -1,43 +0,0 @@
From ed4f2fb961c274d99c8ca66c232ca13b6e855f61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BE=AF=E7=BA=A2=E5=8B=8B?= <houhongxun@kylinos.cn>
Date: Thu, 25 Apr 2024 09:41:37 +0800
Subject: [PATCH] fix wrong assignment operator implementation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: 侯红勋 <houhongxun@kylinos.cn>
---
src/notifyreceiveinfo.cpp | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/notifyreceiveinfo.cpp b/src/notifyreceiveinfo.cpp
index 0c28cd1..8c1e04e 100644
--- a/src/notifyreceiveinfo.cpp
+++ b/src/notifyreceiveinfo.cpp
@@ -49,8 +49,20 @@ notifyReceiveInfo::notifyReceiveInfo(const notifyReceiveInfo &notify) :
notifyReceiveInfo &notifyReceiveInfo::operator=(const notifyReceiveInfo &notify)
{
- notifyReceiveInfo ent(notify);
- return ent;
+ m_appName = notify.m_appName;
+ m_id = notify.m_id;
+ m_appIcon = notify.m_appIcon;
+ m_summary = notify.m_summary;
+ m_body = notify.m_body;
+ m_actions = notify.m_actions;
+ m_hints = notify.m_hints;
+ m_ctime = notify.m_ctime;
+ m_replacesId = notify.m_replacesId;
+ m_timeout = notify.m_timeout;
+ m_urlStr = notify.m_urlStr;
+ m_actionStr = notify.m_actionStr;
+
+ return *this;
}
QString notifyReceiveInfo::appName() const
--
2.43.0

View File

@ -1,28 +0,0 @@
From 0e06e1110a0ea4fcff9ff3380ad657d80db95305 Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
Date: Fri, 21 Jul 2023 17:19:50 +0800
Subject: [PATCH] fix ukui-notification-daemon SIGSEGV
---
src/main.cpp | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/main.cpp b/src/main.cpp
index 0309f7b..0bc1028 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -36,6 +36,11 @@
int getScreenWidth() {
Display *disp = XOpenDisplay(NULL);
+ if (disp == NULL) {
+ fprintf(stderr, "Cannot connect to X server\n");
+ return 0;
+ }
+
Screen *scrn = DefaultScreenOfDisplay(disp);
if (NULL == scrn) {
return 0;
--
2.33.0

View File

@ -1,13 +1,12 @@
%define debug_package %{nil}
Name: ukui-notification-daemon
Version: 3.3.1
Release: 6
Release: 1
Summary: daemon to display passive popup notifications
License: GPL-3+
URL: https://github.com/ukui/ukui-notification-daemon
Source0: %{name}-%{version}.tar.gz
Patch01: 0001-add-translations-file.patch
Patch02: 0002-fix-ukui-notification-daemon-SIGSEGV.patch
Patch03: 0001-fix-wrong-assignment-operator-implementation.patch
BuildRequires: qt5-qtbase-devel
BuildRequires: qt5-qtsvg-devel
@ -23,8 +22,6 @@ Requires: gsettings-qt
Requires: libX11
Requires: dconf
Provides: desktop-notification-daemon
%description
daemon to display passive popup notifications
ukui-notification-daemon displays passive popup notifications, as per
@ -39,9 +36,6 @@ Desktop Notifications spec.
%prep
%setup -q
%patch -p1 1
%patch -p1 2
%patch -p1 3
%build
export PATH=%{_qt5_bindir}:$PATH
@ -54,7 +48,7 @@ popd
%install
pushd qmake-build
%{make_install} INSTALL_ROOT=%{buildroot}
popd
popd
%files
@ -64,27 +58,8 @@ popd
%{_datadir}/dbus-1/services/org.ukui.freedesktop.Notification.service
%{_datadir}/glib-2.0/schemas/org.ukui.notification.gschema.xml
%{_datadir}/glib-2.0/schemas/org.ukui.log4qt.ukui-notification.gschema.xml
%{_datadir}/ukui-notification-daemon/ukui-notification-daemon_zh_CN.qm
%changelog
* Thu Apr 25 2024 houhongxun <houhongxun@kylinos.cn> - 3.3.1-6
- fix wrong assignment operator implementaion
* Fri Jul 21 2023 peijiankang <peijiankang@kylinos.cn> - 3.3.1-5
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:add Patch2: 0002-fix-ukui-notification-daemon-SIGSEGV.patch
* Tue Mar 14 2023 douyan <douyan@kylinos.cn> - 3.3.1-4
- add Provides: desktop-notification-daemon
* Tue Feb 07 2023 tanyulong <tanyulong@kylinos.cn> - 3.3.1-3
- Enable debuginfo for fix strip
* Fri Dec 30 2022 lvfei <lvfei@kylinos.cn> - 3.3.1-2
- add patch :0001-add-translations-file.patch
* Thu Nov 10 2022 douyan <douyan@kylinos.cn> - 3.3.1-1
- update to upstream version 3.3.1.0225.1