iceweasel-1:41.0.2.deb1-2: add missing icons -> https://labs.parabola.nu/issues/833

1 files changed, 15 insertions, 5 deletions

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index e744919a2..ad28c4bfe 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -24,7 +24,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 pkgname=iceweasel
 epoch=1
 pkgver=$_debver.$_debrel
-pkgrel=1
+pkgrel=2
 
 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox."
 arch=(i686 x86_64)
@@ -114,7 +114,7 @@ prepare() {
   # WebRTC build tries to execute "python" and expects Python 2
   ln -s /usr/bin/python2 "$srcdir/path/python"
 
-  # configure script misdetects the preprocessor without an optimization level
+  # Configure script misdetects the preprocessor without an optimization level
   # https://bugs.archlinux.org/task/34644
   sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure
 
@@ -156,14 +156,24 @@ package() {
   _brandingdir=debian/branding
   brandingdir=moz-objdir/$_brandingdir
   icondir="$pkgdir/usr/share/icons/hicolor"
-  for i in 16x16 32x32 48x48 64x64; do
-    install -Dm644 "$brandingdir/default${i/x*/}.png" "$icondir/$i/apps/$pkgname.png"
+  for i in 16 32 48 64; do
+    install -Dm644 "$brandingdir/default$i.png" \
+      "$icondir/${i}x${i}/apps/$pkgname.png"
   done
   install -Dm644 "$brandingdir/mozicon128.png" \
     "$icondir/128x128/apps/$pkgname.png"
   install -Dm644 "$_brandingdir/${pkgname}_icon.svg" \
     "$icondir/scalable/apps/$pkgname.svg"
  
+  # Add missing icons
+  # https://labs.parabola.nu/issues/833
+  for i in 22 24 192 256 384; do
+    rsvg-convert -w $i -h $i -o "$brandingdir/default$i.png" \
+      "$_brandingdir/${pkgname}_icon.svg" \
+    install -Dm644 "$brandingdir/default$i.png" \
+      "$icondir/${i}x${i}/apps/$pkgname.png"
+  done
+
   install -d "$pkgdir/usr/share/applications"
   install -m644  "$srcdir/$pkgname.desktop" \
     "$pkgdir/usr/share/applications"
@@ -174,6 +184,6 @@ package() {
   ln -s /usr/share/hyphen   "$pkgdir/usr/lib/$pkgname/hyphenation"
 
   # Workaround for now:
-  #https://bugzilla.mozilla.org/show_bug.cgi?id=658850
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=658850
   ln -sf $pkgname "$pkgdir/usr/lib/$pkgname/$pkgname-bin"
 }