!24 [sync] PR-23: modify compile error
From: @openeuler-sync-bot Reviewed-by: @peijiankang Signed-off-by: @peijiankang
This commit is contained in:
commit
c56f9aad9d
28
0001-modify-compile-error.patch
Normal file
28
0001-modify-compile-error.patch
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
From be6fb589406d3b1777d9a07c8d2ee8e9a59e0a82 Mon Sep 17 00:00:00 2001
|
||||||
|
From: pei-jiankang <peijiankang@kylinos.cn>
|
||||||
|
Date: Wed, 11 May 2022 13:54:44 +0800
|
||||||
|
Subject: [PATCH] modify compile error
|
||||||
|
|
||||||
|
---
|
||||||
|
plugins/xrandr/xrandr-output.cpp | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/plugins/xrandr/xrandr-output.cpp b/plugins/xrandr/xrandr-output.cpp
|
||||||
|
index 4162547..624db24 100644
|
||||||
|
--- a/plugins/xrandr/xrandr-output.cpp
|
||||||
|
+++ b/plugins/xrandr/xrandr-output.cpp
|
||||||
|
@@ -363,9 +363,9 @@ void xrandrOutput::readInOutputs(KScreen::ConfigPtr config, const QVariantList &
|
||||||
|
auto replicationSource = nullptr;//control.getReplicationSource(output);
|
||||||
|
if (replicationSource) {
|
||||||
|
//output->setPos(replicationSource->pos());
|
||||||
|
- //output->setLogicalSize(replicationSource->logicalSize());
|
||||||
|
+ //output->setExplicitLogicalSize(replicationSource->logicalSize());
|
||||||
|
} else {
|
||||||
|
- output->setLogicalSize(QSizeF());
|
||||||
|
+ output->setExplicitLogicalSize(QSizeF());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
--
|
||||||
|
2.33.0
|
||||||
|
|
||||||
@ -1,11 +1,12 @@
|
|||||||
%define debug_package %{nil}
|
%define debug_package %{nil}
|
||||||
Name: ukui-settings-daemon
|
Name: ukui-settings-daemon
|
||||||
Version: 3.0.1
|
Version: 3.0.1
|
||||||
Release: 4
|
Release: 5
|
||||||
Summary: daemon handling the UKUI session settings
|
Summary: daemon handling the UKUI session settings
|
||||||
License: GPL-2.0, GPL-2+, GPL-2.1, LGPL-2.1+, GPL-3+, LGPL-2+, MIT~OldStyleWithDisclaimer+RedHat, MIT~OldStyle+RedHat
|
License: GPL-2.0, GPL-2+, GPL-2.1, LGPL-2.1+, GPL-3+, LGPL-2+, MIT~OldStyleWithDisclaimer+RedHat, MIT~OldStyle+RedHat
|
||||||
URL: http://www.ukui.org
|
URL: http://www.ukui.org
|
||||||
Source0: %{name}-%{version}.tar.gz
|
Source0: %{name}-%{version}.tar.gz
|
||||||
|
Patch1: 0001-modify-compile-error.patch
|
||||||
|
|
||||||
BuildRequires: intltool
|
BuildRequires: intltool
|
||||||
BuildRequires: libcanberra-devel
|
BuildRequires: libcanberra-devel
|
||||||
@ -112,6 +113,7 @@ Requires: intltool libcanberra-devel dbus-glib-devel dconf-devel fontconfig-deve
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch1 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
qmake-qt5
|
qmake-qt5
|
||||||
@ -158,6 +160,9 @@ glib-compile-schemas /usr/share/glib-2.0/schemas/ &> /dev/null || :
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed May 11 2022 peijiankang <peijiankang@kylinos.cn> - 3.0.1-5
|
||||||
|
- modify compile error
|
||||||
|
|
||||||
* Tue Apr 19 2022 douyan <douyan@kylimos.cn> - 3.0.1-4
|
* Tue Apr 19 2022 douyan <douyan@kylimos.cn> - 3.0.1-4
|
||||||
- fix first install post script issue
|
- fix first install post script issue
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user