bump iceweasel-libre to pkgrel=2, fix multiple issues

 * Missing makedepends: imagemagick, libxslt, xorg-server xvfb
 * References to $pkgname instead of $_pkgname

1 files changed, 19 insertions, 14 deletions

diff --git a/mozilla-testing/iceweasel-libre/PKGBUILD b/mozilla-testing/iceweasel-libre/PKGBUILD
index d81800ab5..50970fae8 100644
--- a/mozilla-testing/iceweasel-libre/PKGBUILD
+++ b/mozilla-testing/iceweasel-libre/PKGBUILD
@@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 _pkgname=iceweasel
 pkgname=iceweasel-libre
 pkgver=${_debver}.${_debrel}
-pkgrel=1
+pkgrel=2
 
 pkgdesc="A libre version of Debian Iceweasel, the browser based on Mozilla Firefox."
 arch=('i586' 'i686' 'x86_64' 'mips64el')
@@ -37,14 +37,17 @@ depends=(
 makedepends=(
   'autoconf2.13'
   'diffutils'
+  'imagemagick'
   'libidl2'
   'librsvg'
+  'libxslt'
   'mesa'
   'p7zip-libre'
   'pkg-config'
   'python2'
   'quilt'
   'wireless_tools'
+  'xorg-server-xvfb'
   'yasm'
   'zip'
 )
@@ -60,6 +63,7 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
         region.properties
         vendor.js)
 
+if [ -z "$_pkgname" ]; then _pkgname=$pkgname; fi
 if [ "$_pkgname" != "$pkgname" ]; then
   provides+=("$_pkgname")
   conflicts+=("$_pkgname")
@@ -91,7 +95,7 @@ build() {
   cd "$srcdir/$_pkgname-$pkgver"
   
   cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch
-  patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$pkgname
+  patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname
   patch -Np1 -i "$srcdir/xulrunner-copy-stub.patch" # small fix
   patch -Np1 -i "$srcdir/libre.patch"
   cp -f ${srcdir}/region.properties ./browser/locales/en-US/chrome/browser-region/
@@ -100,9 +104,9 @@ build() {
   sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
     browser/base/Makefile.in
 
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgname"
+  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname"
   export PYTHON="/usr/bin/python2"
-  
+
   LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 &
   LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="$MAKEFLAGS"
   kill $! || true
@@ -112,29 +116,30 @@ package() {
   cd "$srcdir/$_pkgname-$pkgver"
   make -j1 -f client.mk DESTDIR="$pkgdir" install
 
-  install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$pkgname/defaults/pref"
+  install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/pref"
 
   brandingdir="debian/branding"
-  for i in 16x16 32x32 64x64; do
-    install -Dm644 "$brandingdir/default${i/x*/}.png" "$pkgdir/usr/share/icons/hicolor/$i/apps/$pkgname.png"
+  for i in 16x16 32x32 48x48 64x64; do
+    install -Dm644 "$brandingdir/default${i/x*/}.png" "$pkgdir/usr/share/icons/hicolor/$i/apps/$_pkgname.png"
   done
+  install -Dm644 "$brandingdir/mozicon128.png" "$pkgdir/usr/share/icons/hicolor/128x128/apps/$_pkgname.png"
   install -Dm644 "$brandingdir/iceweasel_icon.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/iceweasel.svg"
 
   install -d                                  "$pkgdir/usr/share/applications"
   install -m644 debian/iceweasel.desktop      "$pkgdir/usr/share/applications"
   #install -m644 debian/iceweasel-safe.desktop "$pkgdir/usr/share/applications"
 
-  rm -rf "$pkgdir/usr/lib/$pkgname/"{dictionaries,hyphenation,searchplugins,plugins}
-  ln -sf /usr/share/hunspell            "$pkgdir/usr/lib/$pkgname/dictionaries"
-  ln -sf /usr/share/hyphen              "$pkgdir/usr/lib/$pkgname/hyphenation"
-  ln -sf /usr/lib/mozilla/plugins       "$pkgdir/usr/lib/$pkgname/plugins"
-  ln -sf /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$pkgname/searchplugins"
+  rm -rf "$pkgdir/usr/lib/$_pkgname/"{dictionaries,hyphenation,searchplugins,plugins}
+  ln -sf /usr/share/hunspell            "$pkgdir/usr/lib/$_pkgname/dictionaries"
+  ln -sf /usr/share/hyphen              "$pkgdir/usr/lib/$_pkgname/hyphenation"
+  ln -sf /usr/lib/mozilla/plugins       "$pkgdir/usr/lib/$_pkgname/plugins"
+  ln -sf /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$_pkgname/searchplugins"
 
   # We don't want the development stuff
-  rm -rf "$pkgdir"/usr/{include,lib/$pkgname-devel,share/idl}
+  rm -rf "$pkgdir"/usr/{include,lib/$_pkgname-devel,share/idl}
 
   # Workaround for now: https://bugzilla.mozilla.org/show_bug.cgi?id=658850
-  ln -sf $pkgname "$pkgdir/usr/lib/$pkgname/$pkgname-bin"
+  ln -sf $_pkgname "$_pkgdir/usr/lib/$_pkgname/$_pkgname-bin"
 }
 
 md5sums=('bd656a24d0ba3d4ca7b68aca8081a07d'