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

!33 [sync] PR-30: Synchronize upstream community version 3.0.2+2

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang
This commit is contained in:
openeuler-ci-bot 2023-05-25 00:27:04 +00:00 committed by Gitee
commit 4476d6fac6
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 48 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
0001-modify-ukui-themes-compile-error.patch
View File

@ -1,33 +1,19 @@
From 2c32b34e743ceb70b21dd8a79efa13f6096f4c87 Mon Sep 17 00:00:00 2001 From 962d4e1c6462e0be889379ff887d516657f20f5a Mon Sep 17 00:00:00 2001
From: pei-jiankang <peijiankang@kylinos.cn> From: peijiankang <peijiankang@kylinos.cn>
Date: Thu, 24 Feb 2022 14:45:01 +0800 Date: Wed, 11 Jan 2023 15:40:46 +0800
Subject: [PATCH] modify ukui-themes compile error Subject: [PATCH] modify ukui-themes compile error
--- ---
meson.build | 28 ++++++++++++---------------- meson.build | 19 ++++++++++---------
themes/meson.build | 10 +++++----- themes/meson.build | 10 +++++-----
2 files changed, 17 insertions(+), 21 deletions(-) 2 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/meson.build b/meson.build diff --git a/meson.build b/meson.build
index a408d40e..6ce08c46 100644 index 1c5681bc..b6838c94 100644
--- a/meson.build --- a/meson.build
+++ b/meson.build +++ b/meson.build
@@ -2,73 +2,69 @@ project( @@ -4,7 +4,7 @@ project(
'ukui-themes',
version: '1.4.1'
) )
-install_subdir(
- 'themes/ukui-dark/gtk-2.0',
- install_dir: '/usr/share/themes/ukui-black',
-)
install_subdir(
'themes',
- install_dir: '/usr/share',
+ install_dir: get_option('datadir'),
)
install_subdir( install_subdir(
'themes/ukui-dark/gtk-2.0', 'themes/ukui-dark/gtk-2.0',
- install_dir: '/usr/share/themes/ukui-black', - install_dir: '/usr/share/themes/ukui-black',
@ -35,6 +21,8 @@ index a408d40e..6ce08c46 100644
) )
@@ -16,39 +16,39 @@ install_subdir(
install_subdir( install_subdir(
'themes/ukui-dark/gtk-3.0', 'themes/ukui-dark/gtk-3.0',
- install_dir: '/usr/share/themes/ukui-black', - install_dir: '/usr/share/themes/ukui-black',
@ -70,36 +58,32 @@ index a408d40e..6ce08c46 100644
install_data( install_data(
'ukui-custom.xml', 'ukui-custom.xml',
- install_dir : '/usr/share/mime/packages/', - install_dir : '/usr/share/mime/packages/',
+ install_dir: join_paths(get_option('datadir'),'mime/packages/'), + install_dir: join_paths(get_option('datadir'),'mime/packages'),
) )
install_data( install_data(
'debian/25_ukui-themes.gschema.override', 'debian/25_ubuntukylin-theme.gschema.override',
- install_dir : '/usr/share/glib-2.0/schemas/', - install_dir : '/usr/share/glib-2.0/schemas/',
+ install_dir: join_paths(get_option('datadir'),'glib-2.0/schemas/'), + install_dir: join_paths(get_option('datadir'),'glib-2.0/schemas/'),
) )
install_subdir( install_subdir(
'icons', @@ -58,11 +58,12 @@ install_subdir(
- install_dir: '/usr/share',
+ install_dir: get_option('datadir'),
)
install_subdir( install_subdir(
'blue-crystal', 'blue-crystal',
- install_dir: '/usr/share/icons', - install_dir: '/usr/share/icons',
+ install_dir: join_paths(get_option('datadir'), 'icons'), + install_dir: join_paths(get_option('datadir'),'icons'),
) )
install_subdir( install_subdir(
'dark-sense', 'dark-sense',
- install_dir: '/usr/share/icons', install_dir: '/usr/share/icons',
+ install_dir: join_paths(get_option('datadir'), 'icons'), + install_dir: join_paths(get_option('datadir'),'icons'),
) )
subdir('themes')
subdir('themes')
diff --git a/themes/meson.build b/themes/meson.build diff --git a/themes/meson.build b/themes/meson.build
index 52c8322a..50cbaf67 100644 index 52c8322a..0d531f4b 100644
--- a/themes/meson.build --- a/themes/meson.build
+++ b/themes/meson.build +++ b/themes/meson.build
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
@ -126,13 +110,13 @@ index 52c8322a..50cbaf67 100644
'ukui-dark/index.theme.in', 'ukui-dark/index.theme.in',
rename : 'index.theme', rename : 'index.theme',
- install_dir : '/usr/share/themes/ukui-dark', - install_dir : '/usr/share/themes/ukui-dark',
+ install_dir: join_paths(get_option('datadir'),'themes/ukui-dark'), + install_dir: join_paths(get_option('datadir'),'themes/dark'),
) )
install_data( install_data(
'ukui-light/index.theme.in', 'ukui-light/index.theme.in',
rename : 'index.theme', rename : 'index.theme',
- install_dir : '/usr/share/themes/ukui-light', - install_dir : '/usr/share/themes/ukui-light',
+ install_dir: join_paths(get_option('datadir'), 'themes/ukui-light'), + install_dir: join_paths(get_option('datadir'),'themes/ukui-light'),
) )
-- --

BIN
ukui-themes-3.0.3.tar.gz → ukui-themes-3.0.2+2.tar.gz
View File

Binary file not shown.

45
ukui-themes.spec
View File

@ -1,25 +1,32 @@
%define debug_package %{nil} %define debug_package %{nil}
Name: ukui-themes Name: ukui-themes
Version: 3.0.3 Version: 3.0.2+2
Release: 6 Release: 1
Summary: Official themes for the UKUI desktop Summary: Official themes for the UKUI desktop
License: GPL-3 License: GPL-3
URL: http://www.ukui.org URL: http://www.ukui.org
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
Patch01: 0001-modify-ukui-themes-compile-error.patch Patch1: 0001-modify-ukui-themes-compile-error.patch
BuildRequires: libsass,sassc
BuildRequires: libsass
BuildRequires: meson BuildRequires: meson
BuildRequires: ninja-build BuildRequires: ninja-build
BuildRequires: xorg-x11-apps
Requires: gnome-icon-theme
Requires: hicolor-icon-theme
Requires: adwaita-icon-theme
Requires: plymouth
%description %description
This package contains the official desktop themes of the UKUI desktop This package contains the official desktop themes of the UKUI desktop
environment. environment.
%prep %prep
%setup -q %setup -q
%patch1 -p1 %patch1 -p1
%build %build
meson build --prefix=%{buildroot}/usr meson build --prefix=%{buildroot}/usr
ninja -C build ninja -C build
@ -31,16 +38,13 @@ ninja -C build install
rm -rf `find %{buildroot}/usr/share/icons/ukui -iname "fcitx.png"` rm -rf `find %{buildroot}/usr/share/icons/ukui -iname "fcitx.png"`
rm -rf `find %{buildroot}/usr/share/icons/ukui-classical -iname "fcitx.png"` rm -rf `find %{buildroot}/usr/share/icons/ukui-classical -iname "fcitx.png"`
rm -rf `find %{buildroot}/usr/share/icons/ukui-fashion -iname "fcitx.png"` rm -rf `find %{buildroot}/usr/share/icons/ukui-fashion -iname "fcitx.png"`
rm -rf `find %{buildroot}/usr/share/icons/ukui-classical -iname "document-properties-symbolic.png"`
cp %{buildroot}/usr/share/icons/ukui/scalable/actions/process-stop-symbolic.svg %{buildroot}/usr/share/icons/ukui/scalable/actions/process-stop.svg mkdir -p %{buildroot}/usr/share/initramfs-tools/hooks/
cp %{buildroot}/usr/share/icons/ukui/scalable/actions/view-refresh-symbolic.svg %{buildroot}/usr/share/icons/ukui/scalable/actions/view-refresh.svg cp %{_builddir}/%{name}-%{version}/debian/chinese %{buildroot}/usr/share/initramfs-tools/hooks/
cp %{buildroot}/usr/share/icons/ukui/scalable/actions/application-exit-symbolic.svg %{buildroot}/usr/share/icons/ukui/scalable/actions/application-exit.svg
cp %{buildroot}/usr/share/icons/ukui/scalable/actions/process-stop-symbolic.svg %{buildroot}/usr/share/icons/ukui-fashion/scalable/actions/process-stop.svg
cp %{buildroot}/usr/share/icons/ukui/scalable/actions/view-refresh-symbolic.svg %{buildroot}/usr/share/icons/ukui-fashion/scalable/actions/view-refresh.svg
cp %{buildroot}/usr/share/icons/ukui-fashion/scalable/actions/application-exit-symbolic.svg %{buildroot}/usr/share/icons/ukui-fashion/scalable/actions/application-exit.svg
mkdir -p %{buildroot}/etc/grub.d/
cp %{_builddir}/%{name}-%{version}/ubuntukylin-grub-theme/06_ubuntukylin_theme %{buildroot}/etc/grub.d/
\cp -r %{_builddir}/%{name}-%{version}/usr/share/* %{buildroot}/usr/share/
mkdir -p %{buildroot}/usr/share/doc/ukui-themes/ mkdir -p %{buildroot}/usr/share/doc/ukui-themes/
cp %{_builddir}/%{name}-%{version}/debian/copyright %{buildroot}/usr/share/doc/ukui-themes/ cp %{_builddir}/%{name}-%{version}/debian/copyright %{buildroot}/usr/share/doc/ukui-themes/
@ -52,7 +56,7 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%{_datadir}/doc/ukui-themes/ %{_datadir}/doc/ukui-themes/
%{_datadir}/mime/packages/ukui-custom.xml %{_datadir}/mime/packages/ukui-custom.xml
%{_datadir}/glib-2.0/schemas/25_ukui-themes.gschema.override %{_datadir}/glib-2.0/schemas/25_ubuntukylin-theme.gschema.override
%{_datadir}/icons/ukui %{_datadir}/icons/ukui
%{_datadir}/icons/ukui-classical %{_datadir}/icons/ukui-classical
%{_datadir}/icons/ukui-fashion %{_datadir}/icons/ukui-fashion
@ -64,9 +68,18 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/themes/ukui-dark %{_datadir}/themes/ukui-dark
%{_datadir}/themes/ukui-light %{_datadir}/themes/ukui-light
%{_datadir}/themes/meson.build %{_datadir}/themes/meson.build
%{_datadir}/themes/dark/index.theme
%{_datadir}/initramfs-tools/
%{_datadir}/plymouth/
%{_datadir}/fcitx-qimpanel/
%{_datadir}/grub
%{_sysconfdir}/grub.d/06_ubuntukylin_theme
%changelog %changelog
* Wed Jan 11 2023 peijiankang <peijiankang@kylinos.cn> - 3.0.2+2-1
- Synchronize upstream community version 3.0.2+2
* Wed Aug 17 2022 peijiankang <peijiankang@kylinos.cn> - 3.0.3-6 * Wed Aug 17 2022 peijiankang <peijiankang@kylinos.cn> - 3.0.3-6
- fix part button icon is not displayed - fix part button icon is not displayed