1
0

Accepting request 341232 from GNOME:Factory

Drop patch, it was never applied upstream, and is now found to be causing issues.

OBS-URL: https://build.opensuse.org/request/show/341232
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hicolor-icon-theme?expand=0&rev=29
This commit is contained in:
2015-10-30 15:35:34 +00:00
committed by Git OBS Bridge
3 changed files with 9 additions and 226 deletions

View File

@@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Oct 26 00:08:46 UTC 2015 - zaitor@opensuse.org
- Drop hicolor-scalable-sizes.patch: It breaks builder icons, and
default icons on desktops like MATE. It has never been taken
upstream, nor is any other distro using it, so lets align with
everyone else.
-------------------------------------------------------------------
Tue Mar 24 21:52:20 UTC 2015 - zaitor@opensuse.org

View File

@@ -26,8 +26,6 @@ Url: http://icon-theme.freedesktop.org/wiki/HicolorTheme
Source: http://icon-theme.freedesktop.org/releases/%{name}-%{version}.tar.xz
Source1: macros.hicolor
Source99: %{name}-rpmlintrc
# PATCH-FIX-UPSTREAM hicolor-scalable-sizes.patch fdo25449 vuntz@opensuse.org -- Add some MinSize for scalable, since the icons won't look that good at small sizes
Patch1: hicolor-scalable-sizes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@@ -37,7 +35,6 @@ theme specification.
%prep
%setup -q
%patch1 -p1
%build
%configure
@@ -53,7 +50,7 @@ install -D -m644 %{S:1} %{buildroot}%{_sysconfdir}/rpm/macros.hicolor
%clean
rm -rf %{buildroot}
# No %post/%postun: there are actually no icons in this package. It's just the
# No %%post/%%postun: there are actually no icons in this package. It's just the
# directory structure.
%files

View File

@@ -1,222 +0,0 @@
Index: hicolor-icon-theme-0.13/index.theme
===================================================================
--- hicolor-icon-theme-0.13.orig/index.theme
+++ hicolor-icon-theme-0.13/index.theme
@@ -1661,169 +1661,169 @@ Context=Stock
Type=Scalable
[scalable/actions]
-MinSize=1
-Size=128
+MinSize=32
+Size=48
MaxSize=256
Context=Actions
Type=Scalable
[scalable/animations]
-MinSize=1
-Size=128
+MinSize=32
+Size=48
MaxSize=256
Context=Animations
Type=Scalable
[scalable/apps]
-MinSize=1
-Size=128
+MinSize=32
+Size=48
MaxSize=256
Context=Applications
Type=Scalable
[scalable/categories]
-MinSize=1
-Size=128
+MinSize=32
+Size=48
MaxSize=256
Context=Categories
Type=Scalable
[scalable/devices]
-MinSize=1
-Size=128
+MinSize=32
+Size=48
MaxSize=512
Context=Devices
Type=Scalable
[scalable/emblems]
-MinSize=1
-Size=128
+MinSize=32
+Size=48
MaxSize=256
Context=Emblems
Type=Scalable
[scalable/emotes]
-MinSize=1
-Size=128
+MinSize=32
+Size=48
MaxSize=512
Context=Emotes
Type=Scalable
[scalable/filesystems]
-MinSize=1
-Size=128
+MinSize=32
+Size=48
MaxSize=256
Context=FileSystems
Type=Scalable
[scalable/intl]
-MinSize=1
-Size=128
+MinSize=32
+Size=48
MaxSize=512
Context=International
Type=Scalable
[scalable/mimetypes]
-MinSize=1
-Size=128
+MinSize=32
+Size=48
MaxSize=256
Context=MimeTypes
Type=Scalable
[scalable/places]
-MinSize=1
-Size=128
+MinSize=32
+Size=48
MaxSize=512
Context=Places
Type=Scalable
[scalable/status]
-MinSize=1
-Size=128
+MinSize=32
+Size=48
MaxSize=256
Context=Status
Type=Scalable
[scalable/stock/chart]
-MinSize=1
-Size=128
+MinSize=32
+Size=48
MaxSize=512
Context=Stock
Type=Scalable
[scalable/stock/code]
-MinSize=1
-Size=128
+MinSize=32
+Size=48
MaxSize=256
Context=Stock
Type=Scalable
[scalable/stock/data]
-MinSize=1
-Size=128
+MinSize=32
+Size=48
MaxSize=512
Context=Stock
Type=Scalable
[scalable/stock/form]
-MinSize=1
-Size=128
+MinSize=32
+Size=48
MaxSize=256
Context=Stock
Type=Scalable
[scalable/stock/image]
-MinSize=1
-Size=128
+MinSize=32
+Size=48
MaxSize=512
Context=Stock
Type=Scalable
[scalable/stock/io]
-MinSize=1
-Size=128
+MinSize=32
+Size=48
MaxSize=256
Context=Stock
Type=Scalable
[scalable/stock/media]
-MinSize=1
-Size=128
+MinSize=32
+Size=48
MaxSize=512
Context=Stock
Type=Scalable
[scalable/stock/navigation]
-MinSize=1
-Size=128
+MinSize=32
+Size=48
MaxSize=256
Context=Stock
Type=Scalable
[scalable/stock/net]
-MinSize=1
-Size=128
+MinSize=32
+Size=48
MaxSize=512
Context=Stock
Type=Scalable
[scalable/stock/object]
-MinSize=1
-Size=128
+MinSize=32
+Size=48
MaxSize=256
Context=Stock
Type=Scalable
[scalable/stock/table]
-MinSize=1
-Size=128
+MinSize=32
+Size=48
MaxSize=512
Context=Stock
Type=Scalable
[scalable/stock/text]
-MinSize=1
-Size=128
+MinSize=32
+Size=48
MaxSize=256
Context=Stock
Type=Scalable