diff --git a/0003-fix-coredump-of-ukui-volume-control-applet-qt.patch b/0003-fix-coredump-of-ukui-volume-control-applet-qt.patch index 7e48169..881ba6f 100644 --- a/0003-fix-coredump-of-ukui-volume-control-applet-qt.patch +++ b/0003-fix-coredump-of-ukui-volume-control-applet-qt.patch @@ -1,14 +1,15 @@ -From 702a5c8d1353f53577163818d6e567831e357b85 Mon Sep 17 00:00:00 2001 +From 31d9527ddb1f1e1c009378c867e862cb7aaa68c0 Mon Sep 17 00:00:00 2001 From: peijiankang -Date: Fri, 10 Feb 2023 14:44:16 +0800 +Date: Wed, 15 Feb 2023 16:26:38 +0800 Subject: [PATCH] fix coredump of ukui-volume-control-applet-qt --- - ukui-volume-control-applet-qt/ukmedia_volume_control.cpp | 4 ++++ - 1 file changed, 4 insertions(+) + .../ukmedia_volume_control.cpp | 16 ++++++++++++++++ + .../ukmedia_volume_control.h | 2 +- + 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ukui-volume-control-applet-qt/ukmedia_volume_control.cpp b/ukui-volume-control-applet-qt/ukmedia_volume_control.cpp -index b07294d..34465e3 100644 +index b07294d..8edc83f 100644 --- a/ukui-volume-control-applet-qt/ukmedia_volume_control.cpp +++ b/ukui-volume-control-applet-qt/ukmedia_volume_control.cpp @@ -103,6 +103,10 @@ void UkmediaVolumeControl::setSinkMute(bool status) @@ -22,6 +23,52 @@ index b07294d..34465e3 100644 pa_cvolume v = m_pDefaultSink->volume; v.channels = channel; for (int i=0;ivolume; + v.channels = inputChannel; + for (int i=0;ivolume; + + v.channels = channel; +@@ -267,6 +279,10 @@ void UkmediaVolumeControl::setSinkInputMuted(int index, bool status) + */ + void UkmediaVolumeControl::setSourceOutputVolume(int index, int value) + { ++ if(m_pDefaultSink == nullptr){ ++ return; ++ } ++ + pa_cvolume v = m_pDefaultSink->volume; + v.channels = sourceOutputChannel; + for (int i=0;i clientNames; + SinkInputType showSinkInputType; -- 2.33.0 diff --git a/ukui-media.spec b/ukui-media.spec index ccb60bf..5a80d6e 100644 --- a/ukui-media.spec +++ b/ukui-media.spec @@ -52,21 +52,18 @@ Requires: %{name}%{?_isa} = %{version}-%{release} This package contains the common files. %prep -%setup -q -%patch01 -p1 -%patch02 -p1 -%patch03 -p1 +%autosetup -n %{name}-%{version} -p1 %build mkdir build && pushd build -qmake-qt5 .. -make -j4 +%{qmake_qt5} .. +%{make_build} popd %install rm -rf $RPM_BUILD_ROOT pushd build -make INSTALL_ROOT=$RPM_BUILD_ROOT install +%{make_install} INSTALL_ROOT=$RPM_BUILD_ROOT popd