From c6825f0d93046ec5d39e81970088b92886c360b3 Mon Sep 17 00:00:00 2001 From: peijiankang Date: Fri, 17 Jun 2022 11:35:13 +0800 Subject: [PATCH] remove 0001-modify-ukui-volume-control-applet-satrtup.patch (cherry picked from commit cf51659c0f41dcedff62a85513bab044916cc510) --- ...y-ukui-volume-control-applet-satrtup.patch | 40 ------------------- ukui-session-manager.spec | 9 +++-- 2 files changed, 5 insertions(+), 44 deletions(-) delete mode 100644 0001-modify-ukui-volume-control-applet-satrtup.patch diff --git a/0001-modify-ukui-volume-control-applet-satrtup.patch b/0001-modify-ukui-volume-control-applet-satrtup.patch deleted file mode 100644 index 282c370..0000000 --- a/0001-modify-ukui-volume-control-applet-satrtup.patch +++ /dev/null @@ -1,40 +0,0 @@ -From cca81f9a8bd6631f8dca31af41d9e28f72ab5d4b Mon Sep 17 00:00:00 2001 -From: peijiankang -Date: Thu, 16 Jun 2022 09:22:55 +0800 -Subject: [PATCH] modify ukui-volume-control-applet satrtup - ---- - ukui-session/modulemanager.cpp | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/ukui-session/modulemanager.cpp b/ukui-session/modulemanager.cpp -index fc718db..1224086 100644 ---- a/ukui-session/modulemanager.cpp -+++ b/ukui-session/modulemanager.cpp -@@ -477,9 +477,23 @@ void ModuleManager::timerUpdate(){ - qDebug() << "the sogouImeService exist so the fcitx-ui-qimpanel will not start"; - continue; - } -+ if(i->fileName()=="/etc/xdg/autostart/ukui-volume-control-applet.desktop" && file_sogou.exists()){ -+ qDebug() << "wait pulseaudio to start"; -+ continue; -+ } - startProcess(*i, false); - } - -+ for (XdgDesktopFileList::const_iterator i = mApplication.constBegin(); i != mApplication.constEnd(); ++i) { -+ qDebug() << i->fileName(); -+ if(i->fileName()=="/etc/xdg/autostart/ukui-volume-control-applet.desktop" && file_sogou.exists()){ -+ qDebug() << "ukui-volume-control-applet to start"; -+ startProcess(*i, false); -+ break; -+ } -+ continue; -+ } -+ - qDebug() << "Start force application: "; - const QString ws = "ukui-window-switch"; - XdgDesktopFile ukui_ws= XdgDesktopFile(XdgDesktopFile::ApplicationType,"ukui-window-switch", ws); --- -2.33.0 - diff --git a/ukui-session-manager.spec b/ukui-session-manager.spec index a8f514b..71a53a0 100644 --- a/ukui-session-manager.spec +++ b/ukui-session-manager.spec @@ -2,12 +2,11 @@ Name: ukui-session-manager Version: 3.0.6 -Release: 3 +Release: 4 Summary: Session manager of the UKUI desktop environment -License: LGPL-2.1+ GPL-3+ +License: LGPL-2.0-or-later and GPL-2.0-or-later URL: http://www.ukui.org Source0: %{name}-%{version}.tar.gz -Patch01: 0001-modify-ukui-volume-control-applet-satrtup.patch BuildRequires: cmake,libXtst-devel,libX11-devel,xdg-user-dirs,kf5-kidletime-devel,qt5-qtx11extras-devel,qt5-qtbase-devel,systemd-devel,qt5-qttools-devel,qt5-qtmultimedia-devel,gsettings-qt-devel,pkgconf Requires: ukui-themes @@ -31,7 +30,6 @@ Provides: x-session-manager %prep %setup -q -%patch01 -p1 %build mkdir cmake-build @@ -65,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT #%%{_datadir}/man/man1/ukui-session-tools.1.gz %changelog +* Fri Jun 17 2022 peijiankang - 3.0.6-4 +- remove 0001-modify-ukui-volume-control-applet-satrtup.patch + * Thu Jun 16 2022 peijiankang - 3.0.6-3 - modify ukui-volume-control-applet satrtup