1 files changed, 35 insertions, 36 deletions

diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 30449be72..6b36c19ce 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -14,8 +14,8 @@ _pgo=true
 
 # We're getting this from Debian Sid
 _debname=iceweasel
-_debver=30.0
-_debrel=deb2
+_debver=31.0
+_debrel=deb1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
@@ -38,8 +38,7 @@ if $_pgo; then
 fi
 optdepends=('networkmanager: Location detection via available WiFi networks'
             'gst-plugins-good: h.264 video'
-            'gst-libav: h.264 video'
-            'libpulse: PulseAudio audio driver')
+            'gst-libav: h.264 video')
 url="http://packages.debian.org/sid/${_pkgname}"
 install=iceweasel.install
 replaces=('firefox')
@@ -55,11 +54,11 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
         iceweasel-install-dir.patch
         vendor.js
         iceweasel-20.0.1-fixed-loading-icon.png)
-md5sums=('3a603dbbfc9c7e56a8e58cede90a9b0b'
-         'a459c3970169f1f68269cf8c5b4af513'
+md5sums=('52fc839ddc92223023d98c600075cd9e'
+         '9d2b0386dcdf8e9e70deca149bc26ed8'
          '2f5cb3df42b09fbfeaee5e72e5433ab9'
          'df08eaa1ac3bc6c2356be4fbf8ec8932'
-         '21d3ffb77ea84ce897016bc713b52ef4'
+         '96aec3a725ad9f438ae9d54c0f8b37d0'
          'b03a979a78484503ba8dddad4f2c96d1'
          '7b9e5996dd9fe0b186a43a297db1c6b5'
          '1c42509891cf6843660a5f3c69896e80'
@@ -80,10 +79,13 @@ prepare() {
   rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true
 
   quilt push -av
+ 
+  # Put gnu_headshadow.png on the source code
+  install -m644 "$srcdir/gnu_headshadow.png" \
+    browser/base/content/abouthome
 
-  install -m644 "$srcdir/gnu_headshadow.png" browser/base/content/abouthome # Put gnu_headshadow.png on the source code
-
-  patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname
+  # Install to /usr/lib/iceweasel
+  patch -Np1 -i "$srcdir/iceweasel-install-dir.patch"
 
   # Patch and remove anything that's left
   patch -Np1 -i "$srcdir/libre.patch"
@@ -100,7 +102,8 @@ prepare() {
          ' browser/app/profile/firefox.js \
            browser/metro/profile/metro.js
   rm -v browser/base/content/abouthome/snippet*.png || true
-  sed -i "\|abouthome/snippet|d" browser/base/jar.mn
+  sed -i '\|abouthome/snippet|d
+         ' browser/base/jar.mn
 
   # Replace common URLs
   sed -i '\|extensions[.]getAddons[.]get[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|https://trisquel.info/en/browser");|g;
@@ -111,7 +114,8 @@ prepare() {
           \|plugins[.]update[.]url| s|https://www[.]mozilla[.]org/[%]LOCALE[%]/plugincheck/["][)][;]|https://trisquel.info/en/browser");|g;
          ' browser/app/profile/firefox.js
 
-  cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch
+  # Load our build config, disable SafeSearch
+  cp "$srcdir/mozconfig" .mozconfig
 
   if $_pgo; then
     cat "$srcdir/mozconfig.pgo" >> .mozconfig
@@ -156,6 +160,8 @@ prepare() {
 
   # Fix tab loading icon (flickers with libpng 1.6)
   # https://bugzilla.mozilla.org/show_bug.cgi?id=841734
+  # TODO: Remove this; Iceweasel 32 will use CSS animations for the loading icon
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=759252
   cp "$srcdir/iceweasel-20.0.1-fixed-loading-icon.png" \
     browser/themes/linux/tabbrowser/loading.png
 
@@ -172,22 +178,10 @@ build() {
   export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname"
   export PYTHON="/usr/bin/python2"
 
-  if [[ $CARCH == i686 ]]; then
-    # Work around memory address space exhaustion during linking on i686
-    LDFLAGS+=' -Wl,--no-keep-memory'
-  fi
-
   if $_pgo; then
-    # Set up PGO
-    export DISPLAY=:99
-    Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
-
-    if ! make -f client.mk build MOZ_PGO=1; then
-      kill $!
-      return 1
-    fi
-
-    kill $! || true
+    # Do PGO
+    xvfb-run -a -s "-extension GLX -screen 0 1280x1024x24" \
+      make -f client.mk build MOZ_PGO=1
   else
     make -f client.mk build
   fi
@@ -208,20 +202,25 @@ package() {
   for i in 16x16 32x32 48x48 64x64; do
     install -Dm644 "$brandingdir/default${i/x*/}.png" "$icondir/$i/apps/$_pkgname.png"
   done
-  install -Dm644 "$brandingdir/mozicon128.png"      "$icondir/128x128/apps/$_pkgname.png"
-  install -Dm644 "$_brandingdir/iceweasel_icon.svg" "$icondir/scalable/apps/$_pkgname.svg"
-
-  install -d                                        "$pkgdir/usr/share/applications"
-  install -m644  "$srcdir/iceweasel.desktop"        "$pkgdir/usr/share/applications"
-
+  install -Dm644 "$brandingdir/mozicon128.png" \
+    "$icondir/128x128/apps/$_pkgname.png"
+  install -Dm644 "$_brandingdir/iceweasel_icon.svg" \
+    "$icondir/scalable/apps/$_pkgname.svg"
+ 
+  install -d "$pkgdir/usr/share/applications"
+  install -m644  "$srcdir/iceweasel.desktop" \
+    "$pkgdir/usr/share/applications"
+
+  # Use system-provided dictionaries
   rm -rf "$pkgdir/usr/lib/$_pkgname/"{dictionaries,hyphenation}
-  ln -sf /usr/share/hunspell            "$pkgdir/usr/lib/$_pkgname/dictionaries"
-  ln -sf /usr/share/hyphen              "$pkgdir/usr/lib/$_pkgname/hyphenation"
+  ln -s /usr/share/hunspell "$pkgdir/usr/lib/$_pkgname/dictionaries"
+  ln -s /usr/share/hyphen "$pkgdir/usr/lib/$_pkgname/hyphenation"
 
   rm -rf "$pkgdir/usr/lib/$_pkgname/browser/"{searchplugins,plugins}
   ln -sf /usr/lib/mozilla/plugins       "$pkgdir/usr/lib/$_pkgname/browser/plugins"
   ln -sf /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$_pkgname/browser/searchplugins"
 
-  # Workaround for now: https://bugzilla.mozilla.org/show_bug.cgi?id=658850
+  # Workaround for now:
+  #https://bugzilla.mozilla.org/show_bug.cgi?id=658850
   ln -sf $_pkgname "$pkgdir/usr/lib/$_pkgname/$_pkgname-bin"
 }