From 4d66b87c7f1521cbfaad61488ba8699d2d6fc4b3 Mon Sep 17 00:00:00 2001 From: peijiankang Date: Wed, 20 Jul 2022 17:44:12 +0800 Subject: [PATCH] Fix the resolution donotsave button fails (cherry picked from commit aa0abef7947f5bc384ae1864bdf98e49e7e55362) --- ...he-resolution-donotsave-button-fails.patch | 35 +++++++++++++++++++ ukui-control-center.spec | 7 +++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 0009-Fix-the-resolution-donotsave-button-fails.patch diff --git a/0009-Fix-the-resolution-donotsave-button-fails.patch b/0009-Fix-the-resolution-donotsave-button-fails.patch new file mode 100644 index 0000000..b695e74 --- /dev/null +++ b/0009-Fix-the-resolution-donotsave-button-fails.patch @@ -0,0 +1,35 @@ +From 934fc1be1565d019b98373954551e81187096960 Mon Sep 17 00:00:00 2001 +From: peijiankang +Date: Wed, 20 Jul 2022 17:41:12 +0800 +Subject: [PATCH] Fix the resolution donotsave button fails + +--- + plugins/system/display/widget.cpp | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/plugins/system/display/widget.cpp b/plugins/system/display/widget.cpp +index 642114e..bb7fcf6 100644 +--- a/plugins/system/display/widget.cpp ++++ b/plugins/system/display/widget.cpp +@@ -1707,12 +1707,12 @@ void Widget::initConnection() + applyNightModeSlot(); + }); + +- QDBusConnection::sessionBus().connect(QString(), +- QString("/"), +- "org.ukui.ukcc.session.interface", +- "screenChanged", +- this, +- SLOT(kdsScreenchangeSlot(QString))); ++// QDBusConnection::sessionBus().connect(QString(), ++// QString("/"), ++// "org.ukui.ukcc.session.interface", ++// "screenChanged", ++// this, ++// SLOT(kdsScreenchangeSlot(QString))); + + + QDBusConnection::sessionBus().connect(QString(), +-- +2.33.0 + diff --git a/ukui-control-center.spec b/ukui-control-center.spec index fe39445..a7d8652 100644 --- a/ukui-control-center.spec +++ b/ukui-control-center.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: ukui-control-center Version: 3.0.4 -Release: 12 +Release: 13 Summary: utilities to configure the UKUI desktop License: GPL-2+ URL: http://www.ukui.org @@ -14,6 +14,7 @@ Patch05: 0005-Fix-the-problem-of-displaying-none-in-the-interface-version Patch06: 0006-fix-the-problem-that-the-new-user-in-the-control-panel-is-stuck.patch Patch07: 0007-modify-icon-theme-not-display.patch Patch08: 0008-Fix-preferred-language-default-errors.patch +Patch09: 0009-Fix-the-resolution-donotsave-button-fails.patch BuildRequires: qt5-qtsvg-devel BuildRequires: qt5-qtbase-devel @@ -119,6 +120,7 @@ Suggests: ukui-settings-daemon %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 %build qmake-qt5 @@ -167,6 +169,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jul 20 2022 peijiankang - 3.0.4-13 +- Fix the resolution donotsave button fails + * Mon Jul 18 2022 peijiankang - 3.0.4-12 - Fix preferred language default errors