Compare commits
10 Commits
e2e533fb4f
...
2d4efc50b1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2d4efc50b1 | ||
|
|
45b8a18fe4 | ||
|
|
5ac56082c3 | ||
|
|
0ce93c1298 | ||
|
|
4476d6fac6 | ||
|
|
7aa1554af6 | ||
|
|
1908b14b13 | ||
|
|
6b75fff0be | ||
|
|
5763d5b8ab | ||
|
|
704c8d36ad |
@ -1,33 +1,19 @@
|
||||
From 2c32b34e743ceb70b21dd8a79efa13f6096f4c87 Mon Sep 17 00:00:00 2001
|
||||
From: pei-jiankang <peijiankang@kylinos.cn>
|
||||
Date: Thu, 24 Feb 2022 14:45:01 +0800
|
||||
From 962d4e1c6462e0be889379ff887d516657f20f5a Mon Sep 17 00:00:00 2001
|
||||
From: peijiankang <peijiankang@kylinos.cn>
|
||||
Date: Wed, 11 Jan 2023 15:40:46 +0800
|
||||
Subject: [PATCH] modify ukui-themes compile error
|
||||
|
||||
---
|
||||
meson.build | 28 ++++++++++++----------------
|
||||
meson.build | 19 ++++++++++---------
|
||||
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
|
||||
index a408d40e..6ce08c46 100644
|
||||
index 1c5681bc..b6838c94 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -2,73 +2,69 @@ project(
|
||||
'ukui-themes',
|
||||
version: '1.4.1'
|
||||
@@ -4,7 +4,7 @@ project(
|
||||
)
|
||||
-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',
|
||||
@ -35,6 +21,8 @@ index a408d40e..6ce08c46 100644
|
||||
|
||||
)
|
||||
|
||||
@@ -16,39 +16,39 @@ install_subdir(
|
||||
|
||||
install_subdir(
|
||||
'themes/ukui-dark/gtk-3.0',
|
||||
- install_dir: '/usr/share/themes/ukui-black',
|
||||
@ -70,36 +58,32 @@ index a408d40e..6ce08c46 100644
|
||||
install_data(
|
||||
'ukui-custom.xml',
|
||||
- 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(
|
||||
'debian/25_ukui-themes.gschema.override',
|
||||
'debian/25_ubuntukylin-theme.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'),
|
||||
)
|
||||
@@ -58,11 +58,12 @@ install_subdir(
|
||||
|
||||
install_subdir(
|
||||
'blue-crystal',
|
||||
- install_dir: '/usr/share/icons',
|
||||
+ install_dir: join_paths(get_option('datadir'), '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'),
|
||||
install_dir: '/usr/share/icons',
|
||||
+ install_dir: join_paths(get_option('datadir'),'icons'),
|
||||
)
|
||||
|
||||
subdir('themes')
|
||||
subdir('themes')
|
||||
diff --git a/themes/meson.build b/themes/meson.build
|
||||
index 52c8322a..50cbaf67 100644
|
||||
index 52c8322a..0d531f4b 100644
|
||||
--- a/themes/meson.build
|
||||
+++ b/themes/meson.build
|
||||
@@ -1,27 +1,27 @@
|
||||
@ -126,13 +110,13 @@ index 52c8322a..50cbaf67 100644
|
||||
'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_dir: join_paths(get_option('datadir'),'themes/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'),
|
||||
+ install_dir: join_paths(get_option('datadir'),'themes/ukui-light'),
|
||||
)
|
||||
|
||||
--
|
||||
|
||||
Binary file not shown.
@ -1,26 +1,32 @@
|
||||
%define debug_package %{nil}
|
||||
Name: ukui-themes
|
||||
Version: 3.0.3
|
||||
Release: 4
|
||||
Version: 3.0.2
|
||||
Release: 2
|
||||
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
|
||||
Patch1: 0001-modify-ukui-themes-compile-error.patch
|
||||
|
||||
|
||||
BuildRequires: libsass
|
||||
BuildRequires: meson
|
||||
BuildRequires: ninja-build
|
||||
BuildRequires: xorg-x11-apps
|
||||
|
||||
Requires: gnome-icon-theme
|
||||
Requires: hicolor-icon-theme
|
||||
Requires: adwaita-icon-theme
|
||||
Requires: plymouth
|
||||
|
||||
|
||||
%description
|
||||
This package contains the official desktop themes of the UKUI desktop
|
||||
environment.
|
||||
This package contains the official desktop themes of the UKUI desktop
|
||||
environment.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1
|
||||
echo $RPM_BUILD_ROOT
|
||||
echo %{buildroot}
|
||||
|
||||
%build
|
||||
meson build --prefix=%{buildroot}/usr
|
||||
ninja -C build
|
||||
@ -41,18 +47,41 @@ gzip %{_builddir}/%{name}-%{version}/debian/changelog > %{buildroot}/usr/share/d
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%files
|
||||
%{_datadir}/*
|
||||
%{_datadir}/doc/ukui-themes/
|
||||
%{_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-classical
|
||||
%{_datadir}/icons/ukui-fashion
|
||||
%{_datadir}/icons/blue-crystal
|
||||
%{_datadir}/icons/dark-sense
|
||||
%{_datadir}/themes/ukui
|
||||
%{_datadir}/themes/ukui-black
|
||||
%{_datadir}/themes/ukui-white
|
||||
%{_datadir}/themes/ukui-dark
|
||||
%{_datadir}/themes/ukui-light
|
||||
%{_datadir}/themes/meson.build
|
||||
%{_datadir}/themes/dark/index.theme
|
||||
|
||||
%changelog
|
||||
* Fri Jun 09 2023 peijiankang <peijiankang@kylinos.cn> - 3.0.2-2
|
||||
- Type:update
|
||||
- ID:NA
|
||||
- SUG :NA
|
||||
- DESC:remove Delete unnecessary files
|
||||
|
||||
* Fri May 26 2023 peijiankang <peijiankang@kylinos.cn> - 3.0.2-1
|
||||
- Synchronize upstream community version 3.0.2 add kylin-connectivity
|
||||
|
||||
* 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
|
||||
- fix part button icon is not displayed
|
||||
|
||||
* Tue Aug 16 2022 peijiankang <peijiankang@kylinos.cn> - 3.0.3-5
|
||||
- fix ukui-search icon under classic-themes no display
|
||||
|
||||
* Wed Apr 06 2022 pei-jiankang <peijiankang@kylinos.cn> - 3.0.3-4
|
||||
- modify classical-icon theme fcitx png no change
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user