packages/ukui-desktop-environment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!30 use ukui-kwin instead of ukwm

Browse Source 
From: @dou33 
Reviewed-by: @pei-jiankang 
Signed-off-by: @pei-jiankang
This commit is contained in:
openeuler-ci-bot 2022-03-02 09:39:46 +00:00 committed by Gitee
commit b25f891d04
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 148 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
0001-Add-ukui-themes-as-alternative-and-drop-eom-et.patch Normal file
View File

@ -0,0 +1,50 @@
From 8844a814ec08a2006dcaf5fc56b6bb0e82dc74d9 Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
Date: Thu, 28 Oct 2021 14:09:41 +0800
Subject: [PATCH] Add ukui-themes as alternative and drop eom et
---
debian/control | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/debian/control b/debian/control
index d239dc3..49462a7 100755
--- a/debian/control
+++ b/debian/control
@@ -27,7 +27,7 @@ Depends: peony,
ukui-polkit,
ukui-settings-daemon,
mate-terminal,
- ubuntukylin-theme (>= 1.6.2),
+ ubuntukylin-theme (>= 1.6.2) | ukui-themes,
${misc:Depends},
Description: UKUI Desktop Environment (essential components, metapackage)
The UKUI Desktop Environment is the continuation of MATE. It provides an
@@ -51,14 +51,11 @@ Recommends: atril,
desktop-base,
ubuntukylin-wallpapers,
engrampa,
- eom,
ffmpegthumbnailer,
- mate-calc,
ukui-media,
ukui-notification-daemon,
ukui-power-manager,
ukui-screensaver,
- mate-utils,
pluma,
qt5-ukui-platformtheme,
Suggests: mail-reader | thunderbird,
@@ -81,8 +78,7 @@ Architecture: all
Provides: ukui-extras,
Depends: ukui-desktop-environment (= ${binary:Version}),
${misc:Depends},
-Recommends: blueman,
- dconf-editor,
+Recommends: dconf-editor,
gnome-keyring,
yelp,
Description: UKUI Desktop Environment (extra components, metapackage)
--
2.30.0

82
0001-add-components-list-in-README.patch Normal file
View File

@ -0,0 +1,82 @@
From 6cc8e1c350d484a5a86191e22ab6356e106976eb Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
Date: Thu, 28 Oct 2021 09:42:00 +0800
Subject: [PATCH] add components list in README
---
README.md | 36 ++++++++++++++++++++++++++++++++++++
debian/control | 4 ++--
2 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index f19bc22..2153e55 100755
--- a/README.md
+++ b/README.md
@@ -7,6 +7,42 @@ UKUI is a desktop environment for Linux distributions and other UNIX-like operat
## Homepage
[UKUI Homepage](https://www.ukui.org)
+## Components
+### Core
+* peony
+* peony-extensions
+* ukui-menu
+* ukui-panel
+* ukui-sidebar
+* ukui-media
+* ukui-greeter
+* ukui-screensaver
+* ukui-session-manager
+* ukui-control-center
+* ukui-settings-deamon
+* ukui-power-manager
+* kylin-nm
+* ukui-biometric-auth
+* ukui-kwin
+* ukwm (Used when ukui-kwin is not available, and the side effect is no Gaussian blur)
+* ukui-window-switch
+* qt5-ukui-platformtheme
+* ukui-themes (Or ubuntukylin-theme)
+* ukui-wallpapers (Or ubuntukylin-wallpapers)
+
+### Optional
+* kylin-display-switch
+* ukui-notification-daemon
+* ukui-biometric-manager
+* ukui-system-monitor
+* libinput-touch-translator
+* biometric-authentication
+
+### Deprecated
+* ukui-menus
+* ukui-indicators
+
+
## Install
### Ubuntu
diff --git a/debian/control b/debian/control
index e5ef3a6..d239dc3 100755
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Depends: peony,
ukui-kwin | ukwm,
ukui-panel,
mate-desktop,
- mate-notification-daemon,
+ ukui-notification-daemon,
ukui-polkit,
ukui-settings-daemon,
mate-terminal,
@@ -55,7 +55,7 @@ Recommends: atril,
ffmpegthumbnailer,
mate-calc,
ukui-media,
- mate-notification-daemon,
+ ukui-notification-daemon,
ukui-power-manager,
ukui-screensaver,
mate-utils,
--
2.30.0

19
ukui-desktop-environment.spec
View File

@ -1,7 +1,7 @@
%define debug_package %{nil}
Name: ukui-desktop-environment
Version: 2.0.2
Release: 9
Release: 12
Summary: ukui-desktop-environment
License: GPL-2+
URL: http://www.ukui.org
@ -9,6 +9,8 @@ Source0: ukui-desktop-environment-2.0.2.tar.gz
BuildArch: noarch
patch1: 0001-change-default-gtk-theme-and-icon-theme.patch
patch2: 0001-add-components-list-in-README.patch
patch3: 0001-Add-ukui-themes-as-alternative-and-drop-eom-et.patch
Requires: ukui-greeter ukui-control-center qt5-ukui-platformtheme ukui-menu ukui-panel ukui-polkit ukui-power-manager ukui-screensaver ukui-session-manager ukui-settings-daemon ukui-sidebar ukui-themes ukui-wallpapers ukui-system-monitor ukui-window-switch peony peony-extensions kylin-nm qt5-ukui-platformtheme ukui-media qt5-qtquickcontrols qt5-qtgraphicaleffects ubuntukylin-default-settings engrampa shotwell atril ukwm
@ -26,7 +28,7 @@ Requires: ukui-greeter ukui-control-center qt5-ukui-platformtheme ukui-menu ukui
%package -n ukui
Summary: ukui-desktop-environment
Requires: ukui-greeter ukui-control-center qt5-ukui-platformtheme ukui-menu ukui-panel ukui-polkit ukui-power-manager ukui-screensaver ukui-session-manager ukui-settings-daemon ukui-sidebar ukui-themes ukui-wallpapers ukui-system-monitor ukui-window-switch peony peony-extensions kylin-nm qt5-ukui-platformtheme ukui-media qt5-qtquickcontrols qt5-qtgraphicaleffects ubuntukylin-default-settings engrampa shotwell atril ukwm
Requires: ukui-greeter ukui-control-center qt5-ukui-platformtheme ukui-menu ukui-panel ukui-polkit ukui-power-manager ukui-screensaver ukui-session-manager ukui-settings-daemon ukui-sidebar ukui-themes ukui-wallpapers ukui-system-monitor ukui-window-switch peony peony-extensions kylin-nm qt5-ukui-platformtheme ukui-media qt5-qtquickcontrols qt5-qtgraphicaleffects ubuntukylin-default-settings engrampa shotwell atril ukui-kwin
Requires: google-noto-sans-cjk-ttc-fonts
Recommends: firefox
@ -59,7 +61,7 @@ The UKUI Desktop Environment is the continuation of MATE. It provides an
%package core
Summary: UKUI Desktop Environment (essential components, metapackage)
Requires: ukui-greeter ukui-control-center qt5-ukui-platformtheme ukui-menu ukui-panel ukui-polkit ukui-power-manager ukui-screensaver ukui-session-manager ukui-settings-daemon ukui-sidebar ukui-themes ukui-wallpapers ukui-system-monitor ukui-window-switch peony peony-extensions kylin-nm qt5-ukui-platformtheme ukui-media qt5-qtquickcontrols qt5-qtgraphicaleffects ubuntukylin-default-settings engrampa ukwm
Requires: ukui-greeter ukui-control-center qt5-ukui-platformtheme ukui-menu ukui-panel ukui-polkit ukui-power-manager ukui-screensaver ukui-session-manager ukui-settings-daemon ukui-sidebar ukui-themes ukui-wallpapers ukui-system-monitor ukui-window-switch peony peony-extensions kylin-nm qt5-ukui-platformtheme ukui-media qt5-qtquickcontrols qt5-qtgraphicaleffects ubuntukylin-default-settings engrampa ukui-kwin
BuildArch: noarch
%description core
@ -78,6 +80,8 @@ The UKUI Desktop Environment is the continuation of MATE. It provides an
%prep
%setup -q
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
@ -101,6 +105,15 @@ rm -rf $RPM_BUILD_ROOT
%doc debian/changelog
%changelog
* Wed Mar 2 2022 douyan <douyan@kylinos.cn> - 2.0.10-12
- use ukui-kwin instead of ukwm
* Thu Oct 28 2021 tanyulong <tanyulong@kylinos.cn> - 2.0.2-11
- Add ukui themes as alternative and drop eom et
* Thu Oct 28 2021 tanyulong <tanyulong@kylinos.cn> - 2.0.2-10
- add components list-in README
* Tue Sep 14 2021 douyan <douyan@kylinos.cn> - 2.0.2-9
- add Recommends: kylin-music system-config-printer