1 files changed, 18 insertions, 2 deletions
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 74a5ccf66..f0feee2d9 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -15,7 +15,7 @@ _pgo=true
 pkgname=icecat
 _pkgver=38.8.0-gnu1
 pkgver=${_pkgver//-/_}
-pkgrel=1
+pkgrel=2
 
 pkgdesc="GNU IceCat, the standalone web browser based on Mozilla Firefox."
 arch=(i686 x86_64)
@@ -40,6 +40,7 @@ source=(http://ftp.gnu.org/gnu/gnuzilla/${_pkgver%-*}/$pkgname-$_pkgver.tar.bz2{
         gnu_headshadow.png
         $pkgname.desktop
         $pkgname-install-dir.patch
+        firefox-gcc-6.0.patch gcc6-fix-compilation-for-IceCat.patch mozilla-1228540-1.patch
         vendor.js
         $pkgname-fixed-loading-icon.png
         remove-google-play-services-support.patch
@@ -47,11 +48,14 @@ source=(http://ftp.gnu.org/gnu/gnuzilla/${_pkgver%-*}/$pkgname-$_pkgver.tar.bz2{
 mksha256sums=('1f58676fc0bdf60dc37145b8c97f507f0acec9bc84582aeef703cf0ed9744ed3')
 sha256sums=('97f76e85cc6f98463f0e0b0e845826816032770f9b589db69ece6b1cff21936c'
             'SKIP'
-            '33a8cf07373c63a0bea70ec2c3983d2cca990752c0f946cb5dbd91f1e2b6410f'
+            '19783b0cca336bca7c262f597acc176ca640756e7567ca6587a46b860f12ef91'
             'dd173c9283babb8a04bf55274de05e823161f7d13adb8c5e21dd5a9c0dc549a2'
             '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd'
             '52df9ffeb52166ed4abd9a132ee4a9017b9c4980f0725ba383610ccfb06d4745'
             '5bdab2de5520fb4d3dbc453d9f73d20e0e077bf652bc780fc17184ba6c718a47'
+            '4d1e1ddabc9e975ed39f49e134559a29e01cd49439e358233f1ede43bf5a52bf'
+            '329cf6753d29ae64a4336a8a76ee71f0d331a39132159401e4d11de65b708a07'
+            'd1ccbaf0973615c57f7893355e5cd3a89efb4e91071d0ec376e429b50cf6ed19'
             '977aa49b940f1da049cefa2878a63ac6669a78e63e9d55bb11db7b8f8fb64c33'
             '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213'
             '9e651b0f7e7d9d663e8b24077d52bad15f011871747743aff60d6e2d7a45ae5b'
@@ -74,6 +78,11 @@ prepare() {
   # Install to /usr/lib/$pkgname
   patch -Np1 -i "$srcdir/$pkgname-install-dir.patch"
 
+  # GCC 6
+  patch -Np1 -i ../firefox-gcc-6.0.patch
+  patch -Np1 -i ../gcc6-fix-compilation-for-IceCat.patch
+  patch -Np1 -i ../mozilla-1228540-1.patch
+
   # Patch and remove anything that's left
   patch -Np1 -i "$srcdir/libre.patch"
   patch -Np1 -i "$srcdir/remove-google-play-services-support.patch"
@@ -109,6 +118,13 @@ build() {
 
   cd "$srcdir/$GNU_BUILD"
 
+  # _FORTIFY_SOURCE causes configure failures
+  CPPFLAGS+=" -O2"
+
+  # GCC 6
+  CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
+  CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
+
   export PATH="$srcdir/path:$PATH"
   export PYTHON="/usr/bin/python2"