update to upstream version 3.0.3
This commit is contained in:
pei-jiankang
parent
c5ff104190
commit
c416a38a24
140
0001-modify-ukui-themes-compile-error.patch
Normal file
140
0001-modify-ukui-themes-compile-error.patch
Normal file
@ -0,0 +1,140 @@
|
||||
From 2c32b34e743ceb70b21dd8a79efa13f6096f4c87 Mon Sep 17 00:00:00 2001
|
||||
From: pei-jiankang <peijiankang@kylinos.cn>
|
||||
Date: Thu, 24 Feb 2022 14:45:01 +0800
|
||||
Subject: [PATCH] modify ukui-themes compile error
|
||||
|
||||
---
|
||||
meson.build | 28 ++++++++++++----------------
|
||||
themes/meson.build | 10 +++++-----
|
||||
2 files changed, 17 insertions(+), 21 deletions(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index a408d40e..6ce08c46 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -2,73 +2,69 @@ 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(
|
||||
'themes/ukui-dark/gtk-2.0',
|
||||
- install_dir: '/usr/share/themes/ukui-black',
|
||||
+ install_dir: join_paths(get_option('datadir'),'themes/ukui-black'),
|
||||
|
||||
)
|
||||
|
||||
install_subdir(
|
||||
'themes/ukui-dark/gtk-3.0',
|
||||
- install_dir: '/usr/share/themes/ukui-black',
|
||||
+ install_dir: join_paths(get_option('datadir'),'themes/ukui-black'),
|
||||
|
||||
)
|
||||
|
||||
install_subdir(
|
||||
'themes/ukui-light/gtk-2.0',
|
||||
- install_dir: '/usr/share/themes/ukui',
|
||||
+ install_dir: join_paths(get_option('datadir'),'themes/ukui'),
|
||||
|
||||
)
|
||||
install_subdir(
|
||||
'themes/ukui-light/gtk-3.0',
|
||||
- install_dir: '/usr/share/themes/ukui',
|
||||
+ install_dir: join_paths(get_option('datadir'),'themes/ukui'),
|
||||
|
||||
)
|
||||
install_subdir(
|
||||
'themes/ukui-light/gtk-2.0',
|
||||
- install_dir: '/usr/share/themes/ukui-white',
|
||||
+ install_dir: join_paths(get_option('datadir'),'themes/ukui-white'),
|
||||
|
||||
)
|
||||
install_subdir(
|
||||
'themes/ukui-light/gtk-3.0',
|
||||
- install_dir: '/usr/share/themes/ukui-white',
|
||||
+ install_dir: join_paths(get_option('datadir'),'themes/ukui-white'),
|
||||
|
||||
)
|
||||
|
||||
install_data(
|
||||
'ukui-custom.xml',
|
||||
- install_dir : '/usr/share/mime/packages/',
|
||||
+ install_dir: join_paths(get_option('datadir'),'mime/packages/'),
|
||||
)
|
||||
|
||||
install_data(
|
||||
'debian/25_ukui-themes.gschema.override',
|
||||
- install_dir : '/usr/share/glib-2.0/schemas/',
|
||||
+ install_dir: join_paths(get_option('datadir'),'glib-2.0/schemas/'),
|
||||
)
|
||||
|
||||
install_subdir(
|
||||
'icons',
|
||||
- install_dir: '/usr/share',
|
||||
+ install_dir: get_option('datadir'),
|
||||
)
|
||||
|
||||
install_subdir(
|
||||
'blue-crystal',
|
||||
- install_dir: '/usr/share/icons',
|
||||
+ install_dir: join_paths(get_option('datadir'), 'icons'),
|
||||
)
|
||||
|
||||
install_subdir(
|
||||
'dark-sense',
|
||||
- install_dir: '/usr/share/icons',
|
||||
+ install_dir: join_paths(get_option('datadir'), 'icons'),
|
||||
)
|
||||
|
||||
subdir('themes')
|
||||
diff --git a/themes/meson.build b/themes/meson.build
|
||||
index 52c8322a..50cbaf67 100644
|
||||
--- a/themes/meson.build
|
||||
+++ b/themes/meson.build
|
||||
@@ -1,27 +1,27 @@
|
||||
install_data(
|
||||
'ukui/index.theme.in',
|
||||
rename : 'index.theme',
|
||||
- install_dir : '/usr/share/themes/ukui',
|
||||
+ install_dir: join_paths(get_option('datadir'),'themes/ukui'),
|
||||
)
|
||||
install_data(
|
||||
'ukui-black/index.theme.in',
|
||||
rename : 'index.theme',
|
||||
- install_dir : '/usr/share/themes/ukui-black',
|
||||
+ install_dir: join_paths(get_option('datadir'),'themes/ukui-black'),
|
||||
)
|
||||
|
||||
install_data(
|
||||
'ukui-white/index.theme.in',
|
||||
rename : 'index.theme',
|
||||
- install_dir : '/usr/share/themes/ukui-white',
|
||||
+ install_dir: join_paths(get_option('datadir'),'themes/ukui-white'),
|
||||
)
|
||||
install_data(
|
||||
'ukui-dark/index.theme.in',
|
||||
rename : 'index.theme',
|
||||
- install_dir : '/usr/share/themes/ukui-dark',
|
||||
+ install_dir: join_paths(get_option('datadir'),'themes/ukui-dark'),
|
||||
)
|
||||
install_data(
|
||||
'ukui-light/index.theme.in',
|
||||
rename : 'index.theme',
|
||||
- install_dir : '/usr/share/themes/ukui-light',
|
||||
+ install_dir: join_paths(get_option('datadir'), 'themes/ukui-light'),
|
||||
)
|
||||
|
||||
--
|
||||
2.33.0
|
||||
|
||||
Binary file not shown.
BIN
ukui-themes-3.0.3.tar.gz
Normal file
BIN
ukui-themes-3.0.3.tar.gz
Normal file
Binary file not shown.
@ -1,12 +1,12 @@
|
||||
%define debug_package %{nil}
|
||||
Name: ukui-themes
|
||||
Version: 3.0.1
|
||||
Version: 3.0.3
|
||||
Release: 1
|
||||
Summary: Official themes for the UKUI desktop
|
||||
License: GPL-3
|
||||
URL: http://www.ukui.org
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
|
||||
Patch01: 0001-modify-ukui-themes-compile-error.patch
|
||||
BuildRequires: libsass,sassc
|
||||
BuildRequires: meson
|
||||
BuildRequires: ninja-build
|
||||
@ -17,6 +17,7 @@ BuildRequires: ninja-build
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1
|
||||
echo $RPM_BUILD_ROOT
|
||||
echo %{buildroot}
|
||||
|
||||
@ -64,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_datadir}/themes/ukui-light
|
||||
|
||||
%changelog
|
||||
* Thu Feb 24 2022 pei-jiankang <peijiankang@kylinos.cn> - 3.0.3-1
|
||||
- update to upstream version 3.0.3
|
||||
|
||||
* Wed Feb 16 2022 pei-jiankang <peijiankang@kylinos.cn> - 3.0.1-1
|
||||
- update to upstream version 3.0.1
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user