From b387d4842a79b801215cfe18ab5d2b4ff22ee425 Mon Sep 17 00:00:00 2001 From: xiewenhao Date: Wed, 30 Mar 2022 18:36:47 +0800 Subject: [PATCH] fix two problems and recompile systemd post scripts for pulseaudio --- ...that-the-muted-function-in-mate-volu.patch | 25 ++++++++++++++++++ ...ume-control-status-icon-doesn-t-work.patch | 24 +++++++++++++++++ pulseaudio.spec | 26 ++++++++++++++++--- 3 files changed, 72 insertions(+), 3 deletions(-) create mode 100644 0002-Fix-the-problem-that-the-muted-function-in-mate-volu.patch create mode 100644 0002-fix-mate-volume-control-status-icon-doesn-t-work.patch diff --git a/0002-Fix-the-problem-that-the-muted-function-in-mate-volu.patch b/0002-Fix-the-problem-that-the-muted-function-in-mate-volu.patch new file mode 100644 index 0000000..e84b741 --- /dev/null +++ b/0002-Fix-the-problem-that-the-muted-function-in-mate-volu.patch @@ -0,0 +1,25 @@ +From 5f945b8da1bf6834ad619c2a9920f3b589ab1fe4 Mon Sep 17 00:00:00 2001 +From: xiewenhao +Date: Wed, 30 Mar 2022 18:21:46 +0800 +Subject: [PATCH 2/2] Fix-the-problem-that-the-muted-function-in-mate-volu + +--- + src/daemon/systemd/user/pulseaudio.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/daemon/systemd/user/pulseaudio.service.in b/src/daemon/systemd/user/pulseaudio.service.in +index bf0f481..a84a978 100644 +--- a/src/daemon/systemd/user/pulseaudio.service.in ++++ b/src/daemon/systemd/user/pulseaudio.service.in +@@ -14,7 +14,7 @@ Description=Sound Service + # After=pulseaudio.socket is not needed, as it is already implicit in the + # socket-service relationship, see systemd.socket(5). + Requires=pulseaudio.socket +-ConditionUser=!root ++#ConditionUser=!root + + [Service] + ExecStart=@PA_BINARY@ --daemonize=no --log-target=journal +-- +2.33.0 + diff --git a/0002-fix-mate-volume-control-status-icon-doesn-t-work.patch b/0002-fix-mate-volume-control-status-icon-doesn-t-work.patch new file mode 100644 index 0000000..5030415 --- /dev/null +++ b/0002-fix-mate-volume-control-status-icon-doesn-t-work.patch @@ -0,0 +1,24 @@ +From 02f3bde2031dfb6c8a6bb4458282f93ad563035a Mon Sep 17 00:00:00 2001 +From: xiewenhao +Date: Wed, 30 Mar 2022 18:25:36 +0800 +Subject: [PATCH 2/2] fix-mate-volume-control-status-icon-doesn-t-work + +--- + src/daemon/systemd/user/pulseaudio.socket | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/daemon/systemd/user/pulseaudio.socket b/src/daemon/systemd/user/pulseaudio.socket +index 98c1002..95247c1 100644 +--- a/src/daemon/systemd/user/pulseaudio.socket ++++ b/src/daemon/systemd/user/pulseaudio.socket +@@ -1,6 +1,6 @@ + [Unit] + Description=Sound System +-ConditionUser=!root ++#ConditionUser=!root + + [Socket] + Priority=6 +-- +2.33.0 + diff --git a/pulseaudio.spec b/pulseaudio.spec index a3e3c31..84c319b 100644 --- a/pulseaudio.spec +++ b/pulseaudio.spec @@ -6,7 +6,7 @@ Name: pulseaudio Summary: Improved Linux Sound Server Version: 15.0 -Release: 4 +Release: 5 License: LGPLv2+ URL: https://www.freedesktop.org/wiki/Software/PulseAudio Source0: https://freedesktop.org/software/pulseaudio/releases/pulseaudio-%{version}.tar.xz @@ -14,7 +14,10 @@ Source1: https://freedesktop.org/software/pulseaudio/releases/pulseaudio- Source5: default.pa-for-gdm Patch201: pulseaudio-autostart.patch - +#kylin +Patch202: 0002-fix-mate-volume-control-status-icon-doesn-t-work.patch +Patch203: 0002-Fix-the-problem-that-the-muted-function-in-mate-volu.patch +#end kylin BuildRequires: meson BuildRequires: automake libtool gcc-c++ bash-completion BuildRequires: m4 libtool-ltdl-devel intltool pkgconfig doxygen xmltoman libsndfile-devel @@ -81,7 +84,11 @@ Requires: %{name}-libs-glib2 = %{version}-%{release} Headers and libraries for developing applications that can communicate with a PulseAudio sound server. -%package_help +%package help +Summary: Documents for pulseaudio +BuildArch: noarch +%description help +Man pages and other related documents for pulseaudio. %prep %autosetup -n %{name}-%{version} -p1 @@ -153,6 +160,14 @@ exit 0 %ldconfig_scriptlets +%post +%systemd_user_post pulseaudio.service +%systemd_user_post pulseaudio.socket + +%preun +%systemd_user_preun pulseaudio.service +%systemd_user_preun pulseaudio.socket + %files %defattr(-,root,root) %license LICENSE GPL LGPL @@ -233,6 +248,11 @@ exit 0 %{_datadir}/glib-2.0/schemas/org.freedesktop.pulseaudio.gschema.xml %changelog +* Wed Mar 30 2022 xiewenhao - 15.0-5 +- Fix mate-volume-control-status-icon doesn't work in KY3.4-4-2106-282040 +- Fix the problem that the muted function in mate-volume-control-status-icon doesn't work when the system is boot +- Recompile systemd post scripts for pulseaudio + * Thu Feb 24 2022 tanyulong - 15.0-4 - fix Mplayer/mpv error -- Gitee