From 2a3d0389493b0c2ca18839ef1238510b6eae1e6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@parabola.nu>
Date: Thu, 4 Dec 2014 14:51:30 -0200
Subject: iceweasel-1:34.0.deb1-1: updating version

* try without rpath
* don't need to specify the PGO script anymore
* avoid openh264 being downloaded and disable it if it is already there -> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=769716
---
 libre/iceweasel/PKGBUILD | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

(limited to 'libre/iceweasel/PKGBUILD')

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index ea23f656e..6ed6d74aa 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -16,7 +16,7 @@ _pgo=true
 
 # We're getting this from Debian Experimental
 _debname=iceweasel
-_debver=33.1
+_debver=34.0
 _debrel=deb1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -24,7 +24,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 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 mips64el)
@@ -46,8 +46,6 @@ conflicts=("${pkgname}-libre")
 source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
         "$_debrepo/`debfile $_debname`_$_debver-${_debrel#deb}.debian.tar.xz"
         mozconfig
-        mozconfig.pgo
-        non-openh264.patch
         libre.patch
         gnu_headshadow.png
         $pkgname.desktop
@@ -55,12 +53,10 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
         vendor.js
         rhbz-966424.patch
         $pkgname-fixed-loading-icon.png)
-md5sums=('8f866d57af8649152fb814a3a697d5c2'
-         'c646686c03f1fe350fa8ca1151ac61d5'
+md5sums=('67c5ab2f4551c2743e70a3bcb041bf66'
+         '5d72813950fdcf47a38b2f0eb7ebe33d'
          '5eca2c1dbdd9c043b24de39cd05d6e8f'
-         'df08eaa1ac3bc6c2356be4fbf8ec8932'
-         'dea78e67cbda6811905e6c7b1e72df88'
-         '615e983df37cdee26095df4d645cd2ab'
+         '747e2db5987302777e9bf7be58dd4c72'
          'b03a979a78484503ba8dddad4f2c96d1'
          'fd8f61f2ae44e5b0e0b2c7b433695980'
          '1c42509891cf6843660a5f3c69896e80'
@@ -87,10 +83,6 @@ prepare() {
   install -m644 "$srcdir/gnu_headshadow.png" \
     browser/base/content/abouthome
 
-  # Remove nonfree OpenH264 references
-  rm -v toolkit/mozapps/extensions/{test/{browser/browser_openH264.js,xpcshell/test_openh264.js},content/{OpenH264-license.txt,openH264Prefs.xul},internal/OpenH264Provider.jsm}
-  patch -Np1 -i "$srcdir/non-openh264.patch"
-
   # Install to /usr/lib/$pkgname
   patch -Np1 -i "$srcdir/$pkgname-install-dir.patch"
 
@@ -123,10 +115,6 @@ prepare() {
   # Load our build config, disable SafeSearch
   cp "$srcdir/mozconfig" .mozconfig
 
-  if $_pgo; then
-    cat "$srcdir/mozconfig.pgo" >> .mozconfig
-  fi
-
   # From js on abslibre-mips64el.git
   if [ "$CARCH" = "mips64el" ]; then
       msg "Force disabling JIT."
@@ -181,7 +169,6 @@ build() {
   cd "$srcdir/$DEBIAN_BUILD"
 
   export PATH="$srcdir/path:$PATH"
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgname"
   export PYTHON="/usr/bin/python2"
 
   if $_pgo; then
-- 
cgit v1.2.3-2-g168b