Compare commits
10 Commits
9fe1f7a761
...
07e12fc4e5
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
07e12fc4e5 | ||
|
|
d4955f572e | ||
|
|
2fdbfa520c | ||
|
|
40673559c9 | ||
|
|
15939fff2a | ||
|
|
c961cf7fc2 | ||
|
|
64a9c8ebee | ||
|
|
d0168f4c36 | ||
|
|
137a62a67c | ||
|
|
e0da85f87b |
BIN
0001-add-translations-file.patch
Normal file
BIN
0001-add-translations-file.patch
Normal file
Binary file not shown.
43
0001-fix-wrong-assignment-operator-implementation.patch
Normal file
43
0001-fix-wrong-assignment-operator-implementation.patch
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
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 ¬ify) :
|
||||||
|
|
||||||
|
notifyReceiveInfo ¬ifyReceiveInfo::operator=(const notifyReceiveInfo ¬ify)
|
||||||
|
{
|
||||||
|
- 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
|
||||||
|
|
||||||
28
0002-fix-ukui-notification-daemon-SIGSEGV.patch
Normal file
28
0002-fix-ukui-notification-daemon-SIGSEGV.patch
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
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
|
||||||
|
|
||||||
@ -1,12 +1,13 @@
|
|||||||
%define debug_package %{nil}
|
|
||||||
|
|
||||||
Name: ukui-notification-daemon
|
Name: ukui-notification-daemon
|
||||||
Version: 3.3.1
|
Version: 3.3.1
|
||||||
Release: 1
|
Release: 6
|
||||||
Summary: daemon to display passive popup notifications
|
Summary: daemon to display passive popup notifications
|
||||||
License: GPL-3+
|
License: GPL-3+
|
||||||
URL: https://github.com/ukui/ukui-notification-daemon
|
URL: https://github.com/ukui/ukui-notification-daemon
|
||||||
Source0: %{name}-%{version}.tar.gz
|
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-qtbase-devel
|
||||||
BuildRequires: qt5-qtsvg-devel
|
BuildRequires: qt5-qtsvg-devel
|
||||||
@ -22,6 +23,8 @@ Requires: gsettings-qt
|
|||||||
Requires: libX11
|
Requires: libX11
|
||||||
Requires: dconf
|
Requires: dconf
|
||||||
|
|
||||||
|
Provides: desktop-notification-daemon
|
||||||
|
|
||||||
%description
|
%description
|
||||||
daemon to display passive popup notifications
|
daemon to display passive popup notifications
|
||||||
ukui-notification-daemon displays passive popup notifications, as per
|
ukui-notification-daemon displays passive popup notifications, as per
|
||||||
@ -36,6 +39,9 @@ Desktop Notifications spec.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch -p1 1
|
||||||
|
%patch -p1 2
|
||||||
|
%patch -p1 3
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export PATH=%{_qt5_bindir}:$PATH
|
export PATH=%{_qt5_bindir}:$PATH
|
||||||
@ -48,7 +54,7 @@ popd
|
|||||||
%install
|
%install
|
||||||
pushd qmake-build
|
pushd qmake-build
|
||||||
%{make_install} INSTALL_ROOT=%{buildroot}
|
%{make_install} INSTALL_ROOT=%{buildroot}
|
||||||
popd
|
popd
|
||||||
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
@ -58,8 +64,27 @@ popd
|
|||||||
%{_datadir}/dbus-1/services/org.ukui.freedesktop.Notification.service
|
%{_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.notification.gschema.xml
|
||||||
%{_datadir}/glib-2.0/schemas/org.ukui.log4qt.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
|
%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
|
* Thu Nov 10 2022 douyan <douyan@kylinos.cn> - 3.3.1-1
|
||||||
- update to upstream version 3.3.1.0225.1
|
- update to upstream version 3.3.1.0225.1
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user