Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

1 files changed, 60 insertions, 53 deletions

diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index e34ed131e..03dd71fba 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -10,11 +10,11 @@
 # Contributor: evr <evanroman at gmail>
 # Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> 
 
-_pgo=false
+_pgo=true
 
 # We're getting this from Debian Experimental
 _debname=iceweasel
-_debver=18.0
+_debver=20.0.1
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -22,27 +22,25 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 _pkgname=iceweasel
 pkgname=iceweasel-libre
 pkgver=$_debver.$_debrel
-pkgrel=6
+pkgrel=1
 
-if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi
-if $_pgo; then
-  pkgname+='-pgo'
-fi
-
-pkgdesc="A libre version of Debian Iceweasel, the Browser based on Mozilla Firefox."
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL2' 'MPL' 'LGPL')
-depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss>=3.14.1' 'sqlite3' 'startup-notification')
-makedepends=( 'autoconf2.13' 'diffutils' 'imagemagick' 'libidl2' 'librsvg' 'libxslt' 'mesa' 'pkg-config' 'python2' 'quilt' 'unzip' 'zip')
+pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox."
+arch=(i686 x86_64 mips64el)
+license=(MPL GPL LGPL)
+depends=(alsa-lib dbus-glib desktop-file-utils gtk2 hicolor-icon-theme hunspell libevent libnotify libvpx libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification)
+makedepends=(autoconf2.13 diffutils imagemagick libidl2 librsvg libxslt mesa pkg-config python2 quilt unzip zip)
 [ "$CARCH" != "mips64el" ] && makedepends+=('yasm')
+options=(!emptydirs)
 if $_pgo; then
-  makedepends+=('xorg-server-xvfb')
-  options=(!ccache)
+  makedepends+=(xorg-server-xvfb)
+  options+=(!ccache)
 fi
-
 optdepends=('networkmanager: Location detection via available WiFi networks')
-url="http://www.geticeweasel.org/"
+url="http://packages.debian.org/experimental/${_pkgname}"
 install=iceweasel.install
+replaces=('firefox')
+conflicts=('firefox')
+provides=('firefox')
 source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
         "$_debrepo/`debfile $_debname`_$_debver-$_debrel.debian.tar.gz"
         mozconfig
@@ -52,40 +50,27 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
         iceweasel-install-dir.patch
         vendor.js
         shared-libs.patch
-        bug677092.patch
         replace-urls.txt
         Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
-md5sums=('366e1e4847d7e00eba77ee5a4be0d3db'
-         '6a571d3a3b355c331f67d57702f4fccf'
-         '619e8f7c8596838a7daf2b7ce2e54cd3'
-         'ac29b01c189f20abae2f3eef1618ffc0'
-         '1ee2d4bcacee73d671b9ffa17a02abaa'
+md5sums=('22daa24b6490c654f131550cbf20fad3'
+         '0c70ab52f35701558081df3d360361a2'
+         'f90c6a70d0a6d0a9e7f9a0eed6aeffd3'
+         '383e8e2a97a8b13fe56d153adb6878b6'
+         '5addd418bf32b673fdfe80c8fefbea1a'
          '7b9e5996dd9fe0b186a43a297db1c6b5'
          'abf5ecb74caa857abb42bcfbb3442d9c'
          '6dd547c72bb875a3101135a1c32d4783'
          '52e52f840a49eb1d14be1c0065b03a93'
-         '23520aca140fb0dd3e1b6f21b21f591f'
          'a8fc4658d45b6bf9350023e5c3f34e56'
-         '65f68090d2a69b467bd2707d0c4ea3bd')
-
-if [ "$_pkgname" != "$pkgname" ]; then
-  provides+=("$_pkgname=$pkgver")
-  conflicts+=("$_pkgname")
-fi
+         'd0e1f2625cd9f7234abdeb55aee00529')
 
-build() {
-  # WebRTC build tries to execute "python" and expects Python 2
-  # Workaround taken from chromium PKGBUILD on Archlinux
-  mkdir "$srcdir/python2-path"
-  ln -s /usr/bin/python2 "$srcdir/python2-path/python"
-  export PATH="$srcdir/python2-path:$PATH"
+prepare() {
+  export DEBIAN_BUILD="mozilla-release"
 
   export QUILT_PATCHES=debian/patches
   export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
   export QUILT_DIFF_ARGS='--no-timestamps'
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname"
-  export PYTHON="/usr/bin/python2"
-  export DEBIAN_BUILD="mozilla-release"
+
   mv debian "$srcdir/$DEBIAN_BUILD"
   cd "$srcdir/$DEBIAN_BUILD"
 
@@ -100,11 +85,7 @@ build() {
   patch -Np1 -i "$srcdir/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch" # Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
   patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname
   patch -Np1 -i "$srcdir/shared-libs.patch"
-  
-  # Back out https://bugzilla.mozilla.org/show_bug.cgi?id=677092
-  # in order to fix https://bugzilla.mozilla.org/show_bug.cgi?id=818468
-  patch -Rp1 -i ../bug677092.patch
-  
+
   # Replace common URLs
   sed '/^#/d' ../replace-urls.txt | while read -r moz_url gnu_url; do
     if [[ -n $moz_url ]]; then
@@ -115,12 +96,12 @@ build() {
         | xargs -d '\n' --no-run-if-empty sed -ri "s<${moz_url}<${gnu_url}<g"
     fi
   done
-  
+
   # Patch anything that's left
   patch -Np1 -i "$srcdir/libre.patch"
 
   cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch
-  
+
   if $_pgo; then
     cat "$srcdir/mozconfig.pgo" >> .mozconfig
   fi
@@ -136,10 +117,6 @@ build() {
       echo "ac_add_options --disable-tracejit" >> .mozconfig
   fi
 
-  # Fix PRE_RELEASE_SUFFIX
-  sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
-    browser/base/Makefile.in
-
   # This is a bug, we should fix it
   if [ "$CARCH" = "mips64el" ]; then
       # Fix MIPS N32 support.
@@ -154,12 +131,42 @@ build() {
       echo 'ac_add_options --disable-jemalloc' >> .mozconfig
   fi
 
+  # Fix PRE_RELEASE_SUFFIX
+  sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
+    browser/base/Makefile.in
+
+  mkdir "$srcdir/path"
+
+  # 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
+  # https://bugs.archlinux.org/task/34644
+  # TODO: re-enable when we're building with GCC >= 4.8 again
+  #sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure
+}
+
+build() {
+  cd "$srcdir/$DEBIAN_BUILD"
+
+  export PATH="$srcdir/path:$PATH"
+  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname"
+  export PYTHON="/usr/bin/python2"
+  export MOZ_MAKE_FLAGS="$MAKEFLAGS"
+  unset MAKEFLAGS
+
   if $_pgo; then
-    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"
+    # Enable PGO
+    export DISPLAY=:99
+    Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
+    _fail=0
+
+    make -f client.mk build MOZ_PGO=1 || _fail=1
+
     kill $! || true
+    return $_fail
   else
-    LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
+    make -f client.mk build
   fi
 }