8 files changed, 50 insertions, 23 deletions
diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index 39c40f9ea..125a8b3d6 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -6,7 +6,7 @@
 
 _pkgname=calibre
 pkgname=calibre-libre
-pkgver=0.9.19
+pkgver=0.9.20
 pkgrel=1
 pkgdesc="Ebook management application (unar support included instead of libunrar and without nonfree fonts)"
 arch=('i686' 'x86_64') 
@@ -27,7 +27,7 @@ install=calibre.install
 source=("http://calibre-ebook.googlecode.com/files/${_pkgname}-${pkgver}.tar.xz"
         'desktop_integration.patch'
         'calibre-mount-helper')
-md5sums=('1977c75613209b8fcade35e9185a8ee0'
+md5sums=('860b4b28029ae40e5ea59ec4f50b1144'
          '42c07b43d575b5e7e7524bd7b9528f0e'
          '675cd87d41342119827ef706055491e7')
 
diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD
index 01bc6558e..b84a30e72 100644
--- a/libre/iceape-libre/PKGBUILD
+++ b/libre/iceape-libre/PKGBUILD
@@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 _pkgname=${_debname}
 pkgname=${_debname}-libre
 pkgver=${_debver}.${_debrel}
-pkgrel=2
+pkgrel=3
 pkgdesc="A libre version of Debian Iceape, the internet suite based on SeaMonkey."
 arch=('i686' 'x86_64' 'mips64el')
 license=('MPL' 'GPL' 'LGPL')
@@ -38,14 +38,17 @@ md5sums=('1ee82aa6ec73c13e2099b4cb6f16a908'
          '3e0a275b57e5ccfeb7573e716693441a')
 
 build() {
+  export LDFLAGS="${LDFLAGS} -Wl,--as-needed,-rpath,/usr/lib/${_pkgname}"
+  export MOZ_MAKE_FLAGS="$MAKEFLAGS"
+  unset MAKEFLAGS
+
   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,--as-needed,-rpath,/usr/lib/${_pkgname}"
-  export PYTHON="/usr/bin/python2"
   export DEBIAN_BUILD="comm-release"
   export DEBIAN_BRANDING_DIR="debian/branding" 
   export ICEAPE_ICONS_BRANDING="suite/branding/nightly"
+
   mv comm-esr10 "${DEBIAN_BUILD}"
   mv debian "${srcdir}/${DEBIAN_BUILD}"
   cd "${srcdir}/${DEBIAN_BUILD}"
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 4f2a5b4ef..c5a35a16c 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -76,8 +76,8 @@ source=(
 )
 md5sums=(
   c88a29aa92fc41a07e777a0e63ac5f7e
-  f6ade03013a0bcb7f1585c51cb488e81
-  ac29b01c189f20abae2f3eef1618ffc0
+  2a35cf0054d0459993e3c3bae3d9841d
+  383e8e2a97a8b13fe56d153adb6878b6
   3009b176cc5f9b1e416b1bf7c45b064b
   fcd2d895a0335c1b5fb652401e9da0d5
   b41f82994fa056ffa5f8e6d99570e27a
@@ -88,10 +88,22 @@ md5sums=(
 )
 
 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"
+
+  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgname"
+  export PYTHON="/usr/bin/python2"
+  export MOZ_MAKE_FLAGS="$MAKEFLAGS"
+  unset MAKEFLAGS
+
   mv $pkgname-$pkgver $srcdir/gnuzilla-build
   cd $srcdir/gnuzilla-build
 
   cp $srcdir/mozconfig .mozconfig # Load our build config, disable SafeSearch
+
   if $_pgo; then
     cat $srcdir/mozconfig.pgo >> .mozconfig
   fi
@@ -108,7 +120,7 @@ build() {
   sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
     browser/base/Makefile.in
 
-  # This is a bug, we should fix it.
+  # This is a bug, we should fix it
   if [ $CARCH = mips64el ]; then
       # Fix MIPS N32 support.
       sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \
@@ -123,16 +135,22 @@ build() {
   fi
 
   chmod +x build/unix/run-icecat.sh # fix bug for bad file permition
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgname"
-  export PYTHON=/usr/bin/python2
 
   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
-    kill $! || true
+    export MOZ_PGO=1
+    export DISPLAY=:99
+    Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
+    _fail=0
+
+    make -f client.mk build || _fail=1
   else
-    LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS=$MAKEFLAGS
+    _fail=0
+
+    make -f client.mk build || _fail=1
   fi
+
+  kill $! || true
+  return $_fail
 }
 
 package() {
diff --git a/libre/icecat/mozconfig b/libre/icecat/mozconfig
index e54cdb54c..7b27e3c6a 100644
--- a/libre/icecat/mozconfig
+++ b/libre/icecat/mozconfig
@@ -3,7 +3,7 @@
 ac_add_options --prefix=/usr
 ac_add_options --libdir=/usr/lib
 
-# Icecat
+# IceCat
 export MOZ_PHOENIX=1
 mk_add_options MOZ_PHOENIX=1
 
diff --git a/libre/icecat/mozconfig.pgo b/libre/icecat/mozconfig.pgo
index b0c249ebf..2f4ebe32b 100644
--- a/libre/icecat/mozconfig.pgo
+++ b/libre/icecat/mozconfig.pgo
@@ -1,4 +1,3 @@
+
 # PGO
-ac_add_options --enable-profile-guided-optimization
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
-mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo'
+mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py 10'
diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD
index 1bf14850d..406853a9b 100644
--- a/libre/icedove-libre/PKGBUILD
+++ b/libre/icedove-libre/PKGBUILD
@@ -44,15 +44,19 @@ md5sums=('3f7679bb98ae99be5adf73fd0025b00e'
          'ea5f7a06967f561d47d7e5c35b23de6f')
 
 build() {
+  export LDFLAGS="${LDFLAGS} -Wl,--as-needed,-rpath,/usr/lib/${_pkgname}"
+  export PYTHON="/usr/bin/python2"
+
   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,--as-needed,-rpath,/usr/lib/${_pkgname}"
-  export PYTHON="/usr/bin/python2"
   export DEBIAN_BUILD="comm-release"
+
   mv debian "${srcdir}/${DEBIAN_BUILD}"
   cd "${srcdir}/${DEBIAN_BUILD}"
+
   mv debian/${_pkgname}-branding "${srcdir}/${DEBIAN_BUILD}/mail/branding/${_pkgname}"
+
   cp -a debian/app-icons/${_pkgname}big.svg debian/app-icons/${_pkgname}_icon.svg
   for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
       install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${_pkgname}/mailicon${i/x*/}.png"
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 0a3225605..065835d99 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -52,7 +52,7 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
 md5sums=('b4c109e987f869f94220188a901d4425'
          'e1d6920cb49c9de88b8e00eb14b1b0e7'
          'f90c6a70d0a6d0a9e7f9a0eed6aeffd3'
-         'ac29b01c189f20abae2f3eef1618ffc0'
+         'dfeb4ab2c96aae3356a4c347eee0b97b'
          'acb402fa414bed916fb0e09dfc1485c4'
          '7b9e5996dd9fe0b186a43a297db1c6b5'
          'abf5ecb74caa857abb42bcfbb3442d9c'
@@ -73,12 +73,14 @@ build() {
   ln -s /usr/bin/python2 "$srcdir/python2-path/python"
   export PATH="$srcdir/python2-path:$PATH"
 
+  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname"
+  export PYTHON="/usr/bin/python2"
+
   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"
 
diff --git a/libre/iceweasel-libre/mozconfig.pgo b/libre/iceweasel-libre/mozconfig.pgo
index b0c249ebf..30464c38c 100644
--- a/libre/iceweasel-libre/mozconfig.pgo
+++ b/libre/iceweasel-libre/mozconfig.pgo
@@ -1,3 +1,4 @@
+
 # PGO
 ac_add_options --enable-profile-guided-optimization
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'