1 files changed, 19 insertions, 33 deletions

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index d8e223aef..15a9e60f5 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -16,20 +16,21 @@ _pgo=true
 
 # We're getting this from Debian Experimental
 _debname=iceweasel
-_debver=41.0.2
+_debver=42.0
 _debrel=deb1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
+_pkgname=firefox
 pkgname=iceweasel
 epoch=1
 pkgver=$_debver.$_debrel
-pkgrel=3
+pkgrel=1
 
 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox."
 arch=(i686 x86_64)
 license=(MPL GPL LGPL)
-depends=(alsa-lib dbus-glib desktop-file-utils gtk2 hicolor-icon-theme hunspell icu=55.1 libevent libvpx=1.4.0 libxt mime-types mozilla-common nss sqlite startup-notification ttf-font)
+depends=(alsa-lib dbus-glib desktop-file-utils gtk2 hicolor-icon-theme hunspell icu=56.1 libevent libvpx=1.4.0 libxt mime-types mozilla-common nss sqlite startup-notification ttf-font)
 makedepends=(autoconf2.13 diffutils gconf gst-plugins-base-libs imagemagick imake inetutils libidl2 libpulse librsvg libxslt mesa mozilla-searchplugins pkg-config python2 quilt unzip yasm zip)
 options=(!emptydirs !makeflags debug)
 if $_pgo; then
@@ -39,10 +40,10 @@ fi
 optdepends=('networkmanager: Location detection via available WiFi networks'
             'gst-plugins-good: h.264 video'
             'gst-libav: h.264 video')
-url="http://packages.debian.org/experimental/${pkgname}"
+url="http://packages.debian.org/experimental/$pkgname"
 install=$pkgname.install
-replaces=("${pkgname}-libre" 'firefox')
-conflicts=("${pkgname}-libre")
+replaces=("$pkgname-libre" "$_pkgname")
+conflicts=("$pkgname-libre")
 source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.xz"
         "$_debrepo/`debfile $_debname`_$_debver-${_debrel#deb}.debian.tar.xz"
         mozconfig
@@ -53,10 +54,10 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.xz"
         $pkgname-install-dir.patch
         vendor.js
         $pkgname-fixed-loading-icon.png)
-sha256sums=('707d44ac9a73868c5f2fe1832945ae66b297a8b7eaee3d45a43ab767fe9447cc'
-            '5d451c032fab037b86b628c34c8efaac69016ee793c1b33a4884ab8c56f53378'
+sha256sums=('355e688b16330d8a86f01a2abaaa483971ba1eab9c7aca37fc064a7601645cc2'
+            'd25335678825e23a5dd0c669d3f8fcfc666bf21944139b16e4fc46d203a8cfd8'
             '8e0b2aa899f9c71dfabf61e8e3427bda9a6ef76330bda4428d1badddcfc331a5'
-            '49566ee824f0b40d4eb90c20bc23dc2a4caca47ceee4554936d020575dda0598'
+            'a28bd21522f0c7d93e9669f1fcc35309c9841d9b2332aa16b0b746ad18fc878c'
             '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd'
             '56eba484179c7f498076f8dc603d8795e99dce8c6ea1da9736318c59d666bff6'
             '2257dc69886bd0b72c48675a27c3a88b9cf6b598252c9e9f1c99763180684fc3'
@@ -65,15 +66,13 @@ sha256sums=('707d44ac9a73868c5f2fe1832945ae66b297a8b7eaee3d45a43ab767fe9447cc'
             '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213')
 
 prepare() {
-  export DEBIAN_BUILD="mozilla-release"
+  cd "$srcdir/$_pkgname-$_debver"
+  mv "$srcdir/debian" .
 
   export QUILT_PATCHES=debian/patches
   export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
   export QUILT_DIFF_ARGS='--no-timestamps'
 
-  mv debian "$srcdir/$DEBIAN_BUILD"
-  cd "$srcdir/$DEBIAN_BUILD"
-
   quilt push -av
 
   # Put gnu_headshadow.png and drm-free.png in the source code
@@ -93,9 +92,6 @@ prepare() {
           \|["]displayName["][:] ["]QuickTime["]| s|QuickTime|MOV Player|
           \|installLinux| s|true|false|
          ' browser/base/content/browser-plugins.js
-  rm -v browser/base/content/abouthome/snippet*.png || true
-  sed -i '\|abouthome/snippet|d
-         ' browser/base/jar.mn
 
   # Load our build config, disable SafeSearch
   cp "$srcdir/mozconfig" .mozconfig
@@ -120,9 +116,7 @@ prepare() {
 }
 
 build() {
-  export DEBIAN_BUILD="mozilla-release"
-
-  cd "$srcdir/$DEBIAN_BUILD"
+  cd "$srcdir/$_pkgname-$_debver"
 
   export PATH="$srcdir/path:$PATH"
   export PYTHON="/usr/bin/python2"
@@ -137,9 +131,7 @@ build() {
 }
 
 package() {
-  export DEBIAN_BUILD="mozilla-release"
-
-  cd "$srcdir/$DEBIAN_BUILD"
+  cd "$srcdir/$_pkgname-$_debver"
   make -f client.mk DESTDIR="$pkgdir" INSTALL_SDK= install
 
   install -Dm644 ../vendor.js "$pkgdir/usr/lib/$pkgname/browser/defaults/preferences/vendor.js"
@@ -147,23 +139,17 @@ package() {
   _brandingdir=debian/branding
   brandingdir=moz-objdir/$_brandingdir
   icondir="$pkgdir/usr/share/icons/hicolor"
-  for i in 16 32 48 64; do
+  for i in 16 22 24 32 48 64 128 192 256 384; do
+    convert -background none "$_brandingdir/${pkgname}_icon.svg" \
+      -resize ${i}x${i}^ -gravity center -extent ${i}x${i} \
+      "$brandingdir/default$i.png"
     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
-  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"