From e65bebc13b2231d7ff76fa839e7b87f02e0d56e33dcc8bbec15cae271c109d47 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 2 Dec 2017 18:10:39 +0000 Subject: [PATCH] Accepting request 546162 from GNOME:Next OBS-URL: https://build.opensuse.org/request/show/546162 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/adwaita-icon-theme?expand=0&rev=42 --- adwaita-icon-theme-3.26.0.tar.xz | 3 - adwaita-icon-theme-3.26.1.tar.xz | 3 + adwaita-icon-theme.changes | 12 + adwaita-icon-theme.spec | 14 +- adwaita-symbolic-audio-volume-fix.patch | 372 ------------------------ 5 files changed, 20 insertions(+), 384 deletions(-) delete mode 100644 adwaita-icon-theme-3.26.0.tar.xz create mode 100644 adwaita-icon-theme-3.26.1.tar.xz delete mode 100644 adwaita-symbolic-audio-volume-fix.patch diff --git a/adwaita-icon-theme-3.26.0.tar.xz b/adwaita-icon-theme-3.26.0.tar.xz deleted file mode 100644 index 35e0c4f..0000000 --- a/adwaita-icon-theme-3.26.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9cad85de19313f5885497aceab0acbb3f08c60fcd5fa5610aeafff37a1d12212 -size 20755152 diff --git a/adwaita-icon-theme-3.26.1.tar.xz b/adwaita-icon-theme-3.26.1.tar.xz new file mode 100644 index 0000000..b43b688 --- /dev/null +++ b/adwaita-icon-theme-3.26.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:28ba7392c7761996efd780779167ea6c940eedfb1bf37cfe9bccb7021f54d79d +size 20729696 diff --git a/adwaita-icon-theme.changes b/adwaita-icon-theme.changes index 000e40f..87e50f5 100644 --- a/adwaita-icon-theme.changes +++ b/adwaita-icon-theme.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Nov 27 21:09:58 UTC 2017 - luc14n0@linuxmail.org + +- Update to version 3.26.1: + + Fix scalability issues with 256/512 size (bgo#785574). + + Audio-volume-* pixel alignment. +- Point fdupes to the data directory instead of the build root, + which is a practice that must be avoided. +- Drop adwaita-symbolic-audio-volume-fix.patch: fixed upstream. +- Drop intltool BuildRequires once there is no translations to deal + with in the package. + ------------------------------------------------------------------- Sat Nov 18 19:40:53 UTC 2017 - zaitor@opensuse.org diff --git a/adwaita-icon-theme.spec b/adwaita-icon-theme.spec index 55f9a7c..7ea36b2 100644 --- a/adwaita-icon-theme.spec +++ b/adwaita-icon-theme.spec @@ -17,18 +17,15 @@ Name: adwaita-icon-theme -Version: 3.26.0 +Version: 3.26.1 Release: 0 Summary: GNOME Icon Theme License: LGPL-3.0+ or CC-BY-SA-3.0 Group: System/GUI/GNOME -URL: http://www.gnome.org/ +Url: https://www.gnome.org Source0: http://download.gnome.org/sources/adwaita-icon-theme/3.26/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM adwaita-symbolic-audio-volume-fix.patch bgo#709131 zaitor@opensuse.org -- symbolic: audio-volume-* - line up vertices to the pixel grid -Patch0: adwaita-symbolic-audio-volume-fix.patch BuildRequires: fdupes BuildRequires: gdk-pixbuf-loader-rsvg -BuildRequires: intltool BuildRequires: pkg-config # To make sure the icon theme cache gets generated Requires(post): gtk3-tools @@ -40,14 +37,13 @@ The default GNOME icon theme, Adwaita. %prep %setup -q -%patch0 -p1 %build %configure %make_build %install -%makeinstall +%make_install # Those folders disappeared in the upgrade from 2.28.0 -> 2.29.0 # FIXME: eventually no application should install any files there mkdir -p %{buildroot}%{_datadir}/icons/Adwaita/scalable/actions @@ -65,7 +61,7 @@ for folder in %{buildroot}%{_datadir}/icons/Adwaita/*x[0-9]*; do ln ${folder}/apps/web-browser.png ${folder}/apps/internet-web-browser.png || : done %icon_theme_cache_create_ghost Adwaita -%fdupes %{buildroot} +%fdupes %{buildroot}%{_datadir} %posttrans %icon_theme_cache_post Adwaita @@ -73,7 +69,7 @@ done # No need for %%icon_theme_cache_postun in %%postun since the theme won't exist anymore %files -%doc AUTHORS COPYING COPYING_LGPL COPYING_CCBYSA3 +%doc AUTHORS COPYING COPYING_LGPL COPYING_CCBYSA3 NEWS README %ghost %{_datadir}/icons/Adwaita/icon-theme.cache %{_datadir}/icons/Adwaita/ %{_datadir}/pkgconfig/adwaita-icon-theme.pc diff --git a/adwaita-symbolic-audio-volume-fix.patch b/adwaita-symbolic-audio-volume-fix.patch deleted file mode 100644 index c8c0d41..0000000 --- a/adwaita-symbolic-audio-volume-fix.patch +++ /dev/null @@ -1,372 +0,0 @@ -From 1f66b7d083112c9f0df617b5aa6220edc98b48b7 Mon Sep 17 00:00:00 2001 -From: Lapo Calamandrei -Date: Sat, 4 Nov 2017 15:00:40 +0100 -Subject: symbolic: audio-volume-* - line up vertices to the pixel grid - -https://bugzilla.gnome.org/show_bug.cgi?id=709131 ---- - .../scalable/status/audio-volume-high-symbolic.svg | 20 +++-- - .../scalable/status/audio-volume-low-symbolic.svg | 20 +++-- - .../status/audio-volume-medium-symbolic.svg | 20 +++-- - .../status/audio-volume-muted-symbolic.svg | 21 +++-- - src/symbolic/gnome-stencils.svg | 93 +++++++++++----------- - 5 files changed, 97 insertions(+), 77 deletions(-) - -diff --git a/Adwaita/scalable/status/audio-volume-high-symbolic.svg b/Adwaita/scalable/status/audio-volume-high-symbolic.svg -index 0ad15c4..0ef961d 100644 ---- a/Adwaita/scalable/status/audio-volume-high-symbolic.svg -+++ b/Adwaita/scalable/status/audio-volume-high-symbolic.svg -@@ -1,7 +1,7 @@ - - - -- -+ - - - -@@ -11,17 +11,21 @@ - - - -- -- -+ -+ - - Gnome Symbolic Icon Theme -- -+ -+ -+ -+ -+ - -- -+ - -- -- -- -+ -+ -+ - - - -diff --git a/Adwaita/scalable/status/audio-volume-low-symbolic.svg b/Adwaita/scalable/status/audio-volume-low-symbolic.svg -index d1b1293..a25bb30 100644 ---- a/Adwaita/scalable/status/audio-volume-low-symbolic.svg -+++ b/Adwaita/scalable/status/audio-volume-low-symbolic.svg -@@ -1,7 +1,7 @@ - - - -- -+ - - - -@@ -11,17 +11,21 @@ - - - -- -- -+ -+ - - Gnome Symbolic Icon Theme -- -+ -+ -+ -+ -+ - - -- -- -- -- -+ -+ -+ -+ - - - -diff --git a/Adwaita/scalable/status/audio-volume-medium-symbolic.svg b/Adwaita/scalable/status/audio-volume-medium-symbolic.svg -index 16aebed..f6de84c 100644 ---- a/Adwaita/scalable/status/audio-volume-medium-symbolic.svg -+++ b/Adwaita/scalable/status/audio-volume-medium-symbolic.svg -@@ -1,7 +1,7 @@ - - - -- -+ - - - -@@ -11,17 +11,21 @@ - - - -- -- -+ -+ - - Gnome Symbolic Icon Theme -- -+ -+ -+ -+ -+ - - -- -- -- -- -+ -+ -+ -+ - - - -diff --git a/Adwaita/scalable/status/audio-volume-muted-symbolic.svg b/Adwaita/scalable/status/audio-volume-muted-symbolic.svg -index a234216..dfa3497 100644 ---- a/Adwaita/scalable/status/audio-volume-muted-symbolic.svg -+++ b/Adwaita/scalable/status/audio-volume-muted-symbolic.svg -@@ -1,7 +1,7 @@ - - - -- -+ - - - -@@ -11,17 +11,22 @@ - - - -- -- -+ -+ - - Gnome Symbolic Icon Theme -- -+ -+ -+ -+ -+ - -- - -- -- -- -+ -+ -+ -+ -+ - - - -diff --git a/src/symbolic/gnome-stencils.svg b/src/symbolic/gnome-stencils.svg -index 3fef0b3..740122f 100644 ---- a/src/symbolic/gnome-stencils.svg -+++ b/src/symbolic/gnome-stencils.svg -@@ -46,13 +46,13 @@ - inkscape:window-height="1016" - id="namedview88" - showgrid="false" -- inkscape:zoom="1" -- inkscape:cx="-251.99999" -- inkscape:cy="-12" -+ inkscape:zoom="5.6568542" -+ inkscape:cx="-81.48198" -+ inkscape:cy="48.972604" - inkscape:window-x="0" - inkscape:window-y="27" - inkscape:window-maximized="1" -- inkscape:current-layer="layer10" -+ inkscape:current-layer="g6192" - showborder="false" - inkscape:snap-nodes="true" - inkscape:snap-bbox="true" -@@ -488,31 +488,31 @@ - id="rect8104" - style="color:#bebebe;display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:none;stroke:none;stroke-width:1;marker:none" /> - -- - - -+ sodipodi:nodetypes="zccccz" /> -+ - - - - - -+ sodipodi:nodetypes="zccccz" /> - - -- - - -- - -+ -+ -+ -+ clip-path="none" -+ d="m 110.00019,205.0002 c 0,-1.25733 -0.31165,-2.21571 -1,-3 h -1 v 6 h 1 c 0.67206,-0.8369 1,-1.74267 1,-3 z" -+ id="path6297-6-0" -+ inkscape:connector-curvature="0" -+ sodipodi:nodetypes="zccccz" /> - - - -+ sodipodi:nodetypes="zccccz" /> - -