Fix wm-chooser error

This commit is contained in:
weidong 2021-09-23 21:36:35 +08:00
parent 1a3b733179
commit c9cde391ba
2 changed files with 36 additions and 2 deletions

View File

@ -0,0 +1,30 @@
From a71fcac57c7e3e4247ed433f67f6bd5e8ca09d6e Mon Sep 17 00:00:00 2001
From: weidong <weidong@uniontech.com>
Date: Thu, 23 Sep 2021 21:32:32 +0800
Subject: [PATCH] Fix wm-chooser error in openeuler
Signed-off-by: weidong <weidong@uniontech.com>
---
dde-wm-chooser/main.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dde-wm-chooser/main.cpp b/dde-wm-chooser/main.cpp
index c956566..01ea4d9 100644
--- a/dde-wm-chooser/main.cpp
+++ b/dde-wm-chooser/main.cpp
@@ -82,10 +82,10 @@ int main(int argc, char *argv[])
if (parser.isSet(config)) {
const DSysInfo::DeepinType DeepinType = DSysInfo::deepinType();
bool IsServerSystem = DSysInfo::DeepinServer == DeepinType;
- if (IsServerSystem) {
+ //if (IsServerSystem) {
selectNormalModel(parser.value(config));
return 0;
- }
+ //}
PropertyGroup *pg = new PropertyGroup();
--
2.20.1

View File

@ -1,10 +1,11 @@
Name: dde-session-ui
Version: 5.3.0.11
Release: 1
Release: 2
Summary: Deepin desktop-environment - Session UI module
License: GPLv3
URL: https://github.com/linuxdeepin/%{name}
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
Patch0: 0001-Fix-wm-chooser-error-in-openeuler.patch
BuildRequires: gcc-c++
BuildRequires: deepin-gettext-tools
@ -43,7 +44,7 @@ This project include those sub-project:
- dde-hotzone: User interface of setting hot zone.
%prep
%setup -q -n %{name}-%{version}
%autosetup -p1 -n %{name}-%{version}
sed -i 's|default_background.jpg|default.png|' widgets/fullscreenbackground.cpp
sed -i 's|lib|libexec|' \
misc/applications/deepin-toggle-desktop.desktop* \
@ -87,6 +88,9 @@ sed -i "s|#greeter-session.*|greeter-session=lightdm-deepin-greeter|g" /etc/ligh
%{_prefix}/share/glib-2.0/schemas/com.deepin.dde.dock.module.notifications.gschema.xml
%changelog
* Tue Sep 23 2021 weidong <weidong@uniontech.com> - 5.3.0.11-2
- Fix wm-chooser error in openeuler
* Tue Jul 20 2021 weidong <weidong@uniontech.com> - 5.3.0.11-1
- Update 5.3.0.11