commit 51b8f1efddf90a6fbeb1c5f0116b4d0c527a7300
Author: Jakub Bogusz <[email protected]>
Date: Sun Oct 6 21:56:04 2024 +0200
- updated to 0.18, uses meson now
hicolor-icon-theme-more-dirs.patch | 41 +++++++++++++++++++++++++------------
hicolor-icon-theme.spec | 42 +++++++++++++++++++++++---------------
2 files changed, 54 insertions(+), 29 deletions(-)
---
diff --git a/hicolor-icon-theme.spec b/hicolor-icon-theme.spec
index caae263..72e7539 100644
--- a/hicolor-icon-theme.spec
+++ b/hicolor-icon-theme.spec
@@ -1,16 +1,17 @@
Summary: Directory hierarchy for default icon theme
Summary(pl.UTF-8): Struktura katalogów dla domyślnego motywu ikon
Name: hicolor-icon-theme
-Version: 0.17
-Release: 3
-License: GPL v2
+Version: 0.18
+Release: 1
+License: GPL v2+
Group: Base
-Source0:
http://icon-theme.freedesktop.org/releases/%{name}-%{version}.tar.xz
-# Source0-md5: 84eec8d6f810240a069c731f1870b474
+Source0:
https://icon-theme.freedesktop.org/releases/%{name}-%{version}.tar.xz
+# Source0-md5: ef14f3af03bcde9ed134aad626bdbaad
Patch0: %{name}-more-dirs.patch
-URL: http://freedesktop.org/wiki/Software/icon-theme/
-BuildRequires: autoconf >= 2.50
-BuildRequires: automake >= 1:1.9
+URL: https://freedesktop.org/wiki/Software/icon-theme/
+BuildRequires: meson >= 0.60
+BuildRequires: ninja >= 1.5
+BuildRequires: pkgconfig
BuildRequires: tar >= 1:1.22
BuildRequires: xz
# Conflicts: gnome-icon-theme < 1.0.9
@@ -26,20 +27,28 @@ Struktura katalogów dla domyślnego motywu ikon.
%prep
%setup -q
+# additional sizes:
+# 8x8/apps genius grass postgis-gui spatialite_gui
+# 8x8/emblems ka5-kmail
+# 20x20/apps VirtualBox-gui kmymoney parcellite
+# 20x20/mimetypes VirtualBox-gui djvulibre
+# 40x40/apps parcellite
+# 42x42/apps grass postgis-gui spatialite_gui
+# 80x80/apps grass spatialite_gui ka5-kanagram-data
+# 160x160/apps wcm wf-shell
+# 1024x1024/apps kmymoney scribus ka5-kdevelop-data ka5-krita-data gingerblue
gnome-internet-radio-locator gtk-internet-radio-locator octave-gui supertuxkart
vcmi
+# 1024x1024/mimetypes kmymoney ka5-krita-data
%patch0 -p1
%build
-%{__aclocal}
-%{__autoconf}
-%{__automake}
-%configure
-%{__make}
+%meson build
+
+%ninja_build -C build
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT
+%ninja_install -C build
mkdir -p $RPM_BUILD_ROOT%{_iconsdir}/hicolor/symbolic/actions
@@ -51,9 +60,10 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc ChangeLog README
+%doc NEWS README.md
%dir %{_iconsdir}/hicolor
%{_iconsdir}/hicolor/*x*
%{_iconsdir}/hicolor/scalable
%{_iconsdir}/hicolor/symbolic
%ghost %{_iconsdir}/hicolor/icon-theme.cache
+%{_npkgconfigdir}/default-icon-theme.pc
diff --git a/hicolor-icon-theme-more-dirs.patch
b/hicolor-icon-theme-more-dirs.patch
index 198e272..57dd3b7 100644
--- a/hicolor-icon-theme-more-dirs.patch
+++ b/hicolor-icon-theme-more-dirs.patch
@@ -1,14 +1,29 @@
---- hicolor-icon-theme-0.15/Makefile.am.orig 2015-04-19 08:05:01.926315933
+0200
-+++ hicolor-icon-theme-0.15/Makefile.am 2015-04-19 08:05:04.579649210
+0200
-@@ -1,8 +1,8 @@
--ICON_SIZES = 16x16 22x22 24x24 32x32 36x36 48x48 64x64 72x72 96x96 \
-- 128x128 192x192 256x256 512x512 scalable
-+ICON_SIZES = 8x8 16x16 20x20 22x22 24x24 32x32 36x36 40x40 42x42 48x48 64x64
72x72 80x80 \
-+ 96x96 128x128 160x160 192x192 256x256 512x512 1024x1024 scalable
- ICON_CONTEXTS = actions animations apps categories devices emblems emotes \
- filesystems intl mimetypes places status stock
--STOCK_SUBS = chart code data form image io media navigation net object table
text
-+STOCK_SUBS = chart code data emoticons form image io media navigation net
object table text
+--- hicolor-icon-theme-0.18/meson.build.orig 2024-05-20 23:26:59.000000000
+0200
++++ hicolor-icon-theme-0.18/meson.build 2024-10-06 21:53:17.681373929
+0200
+@@ -6,19 +6,26 @@ project('hicolor-icon-theme',
+ pkgc = import('pkgconfig')
- themedir = $(datadir)/icons/hicolor
- dist_theme_DATA = index.theme
+ icon_sizes = [
++ '8x8',
+ '16x16',
++ '20x20',
+ '22x22',
+ '24x24',
+ '32x32',
+ '36x36',
++ '40x40',
++ '42x42',
+ '48x48',
+ '64x64',
+ '72x72',
++ '80x80',
+ '96x96',
+ '128x128',
++ '160x160',
+ '192x192',
+ '256x256',
+ '512x512',
++ '1024x1024',
+ '16x16@2',
+ '22x22@2',
+ '24x24@2',
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/hicolor-icon-theme.git/commitdiff/51b8f1efddf90a6fbeb1c5f0116b4d0c527a7300
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
