4 files changed, 25 insertions, 14 deletions
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 5f0a03e70..6898105d8 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -16,10 +16,10 @@
 _pgo=false
 pkgname=icecat
 pkgver=17.0.1
-pkgrel=5
-pkgdesc='The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!'
+pkgrel=7
+pkgdesc='GNU IceCat, the standalone web browser based on Mozilla Firefox.'
 arch=(i686 x86_64 mips64el)
-license=(GPL2 MPL LGPL)
+license=(MPL GPL LGPL)
 depends=(
   alsa-lib
   dbus-glib
@@ -76,10 +76,10 @@ source=(
 )
 md5sums=(
   c88a29aa92fc41a07e777a0e63ac5f7e
-  f6ade03013a0bcb7f1585c51cb488e81
-  ac29b01c189f20abae2f3eef1618ffc0
+  2a35cf0054d0459993e3c3bae3d9841d
+  dfeb4ab2c96aae3356a4c347eee0b97b
   3009b176cc5f9b1e416b1bf7c45b064b
-  fcd2d895a0335c1b5fb652401e9da0d5
+  1dec37a964098fb3bc46bc767a5c0587
   b41f82994fa056ffa5f8e6d99570e27a
   b30ba2b5562558d510fdd09d626d0faa
   64826fcf48816b13090042eefddbaa58
@@ -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,8 +135,6 @@ 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 &
diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch
index 496c6b983..38b9fca01 100644
--- a/libre/icecat/libre.patch
+++ b/libre/icecat/libre.patch
@@ -59,12 +59,12 @@ diff -urN a/browser/locales/en-US/chrome/browser-region/region.properties b/brow
  gecko.handlerService.defaultHandlersVersion=3
 +
 +# The default set of protocol handlers for irc:
-+gecko.handlerService.schemes.irc.0.name=Freenode
-+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s
++gecko.handlerService.schemes.irc.0.name=Freenode Web IRC
++gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net
 +
 +# The default set of protocol handlers for ircs:
-+gecko.handlerService.schemes.ircs.0.name=Freenode
-+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s
++gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC
++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net
 diff -Nur a/dom/ipc/test.xul b/dom/ipc/test.xul
 --- a/dom/ipc/test.xul
 +++ b/dom/ipc/test.xul
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..30464c38c 100644
--- a/libre/icecat/mozconfig.pgo
+++ b/libre/icecat/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'