From 9a14f41d92f2c2b89607537fa3bb2676c854bfce Mon Sep 17 00:00:00 2001 From: peijiankang Date: Tue, 2 Aug 2022 00:22:11 +0800 Subject: [PATCH] remove 0001-add-check-pulseaudio-process.patch --- 0001-add-check-pulseaudio-process.patch | 54 ------------- 0002-add-pulseaudio-process-log-message.patch | 78 ------------------- ukui-media.spec | 9 +-- 3 files changed, 4 insertions(+), 137 deletions(-) delete mode 100644 0001-add-check-pulseaudio-process.patch delete mode 100644 0002-add-pulseaudio-process-log-message.patch diff --git a/0001-add-check-pulseaudio-process.patch b/0001-add-check-pulseaudio-process.patch deleted file mode 100644 index 65a4355..0000000 --- a/0001-add-check-pulseaudio-process.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 31e5dcfd540bb5f63647b7fd6828b26774fb4424 Mon Sep 17 00:00:00 2001 -From: peijiankang -Date: Fri, 24 Jun 2022 17:20:22 +0800 -Subject: [PATCH] add check pulseaudio process - ---- - ukui-volume-control-applet-qt/main.cpp | 24 ++++++++++++++++++++++++ - 1 file changed, 24 insertions(+) - -diff --git a/ukui-volume-control-applet-qt/main.cpp b/ukui-volume-control-applet-qt/main.cpp -index f1f69de..47a1fb1 100644 ---- a/ukui-volume-control-applet-qt/main.cpp -+++ b/ukui-volume-control-applet-qt/main.cpp -@@ -34,6 +34,25 @@ - #include - #include - -+ -+bool checkProc(){ -+ bool bIsExist = false; // 进程是否存在 -+ QProcess process; -+ process.start("ps -C pulseaudio"); -+ if (process.waitForFinished()) -+ { -+ QByteArray result = process.readAll(); -+ QString exe = QString(result); -+ if (exe.contains("pulseaudio")) -+ { -+ bIsExist = true; -+ } -+ } -+ -+ return bIsExist; -+} -+ -+ - int main(int argc, char *argv[]) - { - Display *display = XOpenDisplay(NULL); -@@ -74,6 +93,11 @@ int main(int argc, char *argv[]) - qss.open(QFile::ReadOnly); - - qss.close(); -+ -+ while(!checkProc()) -+ { -+ sleep(5); -+ } - DeviceSwitchWidget w; - KWindowEffects::enableBlurBehind(w.winId(),true); - w.raise(); --- -2.33.0 - diff --git a/0002-add-pulseaudio-process-log-message.patch b/0002-add-pulseaudio-process-log-message.patch deleted file mode 100644 index 7edafef..0000000 --- a/0002-add-pulseaudio-process-log-message.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 57d08339e7705ff1e588fddd0781d8306de9b5a8 Mon Sep 17 00:00:00 2001 -From: peijiankang -Date: Mon, 27 Jun 2022 10:57:01 +0800 -Subject: [PATCH] add pulseaudio process log message - ---- - ukui-volume-control-applet-qt/main.cpp | 35 +++++++++++++++++--------- - 1 file changed, 23 insertions(+), 12 deletions(-) - -diff --git a/ukui-volume-control-applet-qt/main.cpp b/ukui-volume-control-applet-qt/main.cpp -index 47a1fb1..c861578 100644 ---- a/ukui-volume-control-applet-qt/main.cpp -+++ b/ukui-volume-control-applet-qt/main.cpp -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - - - bool checkProc(){ -@@ -41,20 +42,34 @@ bool checkProc(){ - process.start("ps -C pulseaudio"); - if (process.waitForFinished()) - { -- QByteArray result = process.readAll(); -- QString exe = QString(result); -- if (exe.contains("pulseaudio")) -- { -- bIsExist = true; -- } -+ QByteArray result = process.readAll(); -+ QString exe = QString(result); -+ if (exe.contains("pulseaudio")) -+ { -+ syslog(LOG_INFO, "ukui-meida: pulseaudio is running!"); -+ bIsExist = true; -+ } - } -- -+ - return bIsExist; - } - -- - int main(int argc, char *argv[]) - { -+ int cnt = 0; -+ -+ while(!checkProc()) -+ { -+ syslog(LOG_INFO, "ukui-meida: pulseaudio is not running, please wait ......! cnt:%d", cnt+1); -+ if(++cnt > 12) -+ { -+ syslog(LOG_INFO, "ukui-meida:pulseaudio is not startup, please check pulseaudio!"); -+ return -1; -+ } -+ sleep(5); -+ } -+ sleep(2); -+ - Display *display = XOpenDisplay(NULL); - Screen *scrn = DefaultScreenOfDisplay(display); - if(scrn == nullptr) { -@@ -94,10 +109,6 @@ int main(int argc, char *argv[]) - - qss.close(); - -- while(!checkProc()) -- { -- sleep(5); -- } - DeviceSwitchWidget w; - KWindowEffects::enableBlurBehind(w.winId(),true); - w.raise(); --- -2.33.0 - diff --git a/ukui-media.spec b/ukui-media.spec index 5b4f9db..d601508 100644 --- a/ukui-media.spec +++ b/ukui-media.spec @@ -1,12 +1,10 @@ Name: ukui-media Version: 3.0.4 -Release: 6 +Release: 7 Summary: UKUI media utilities License: GPL-2+ GPL-3+ LGPL-2+ BSD-3-Clause URL: http://www.ukui.org Source0: %{name}-%{version}.tar.gz -Patch1: 0001-add-check-pulseaudio-process.patch -Patch2: 0002-add-pulseaudio-process-log-message.patch Autoreq : yes @@ -53,8 +51,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %prep %setup -q -%patch1 -p1 -%patch2 -p1 %build ./autogen.sh --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib64 @@ -141,6 +137,9 @@ glib-compile-schemas /usr/share/glib-2.0/schemas/ &> /dev/null ||: %{_datadir}/glib-2.0/schemas/org.ukui.media.gschema.xml %changelog +* Tue Aug 2 2022 peijiankang - 3.0.4-7 +- remove 0001-add-check-pulseaudio-process.patch + * Mon Jun 27 2022 peijiankang - 3.0.4-6 - add pulseaudio process log message