icecat-38.8.0_gnu1-3: add harfbuzz patch

1 files changed, 15 insertions, 10 deletions

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index f0feee2d9..9a837aac4 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -15,12 +15,12 @@ _pgo=true
 pkgname=icecat
 _pkgver=38.8.0-gnu1
 pkgver=${_pkgver//-/_}
-pkgrel=2
+pkgrel=3
 
 pkgdesc="GNU IceCat, the standalone web browser based on Mozilla Firefox."
 arch=(i686 x86_64)
 license=(MPL GPL LGPL)
-depends=(alsa-lib dbus-glib gtk2 hicolor-icon-theme hunspell icu=57.1 libevent libvpx=1.5.0 libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification ttf-font)
+depends=(alsa-lib dbus-glib ffmpeg gtk2 hunspell icu=57.1 libevent libvpx=1.5.0 libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification ttf-font)
 makedepends=(diffutils gst-plugins-base-libs imake inetutils libpulse mesa python2 unzip yasm zip)
 options=(!emptydirs !makeflags debug)
 if $_pgo; then
@@ -28,8 +28,7 @@ if $_pgo; then
   options+=(!ccache)
 fi
 optdepends=('networkmanager: Location detection via available WiFi networks'
-            'gst-plugins-good: h.264 video'
-            'gst-libav: h.264 video')
+            'upower: Battery API')
 url="http://www.gnu.org/software/gnuzilla/"
 install=$pkgname.install
 source=(http://ftp.gnu.org/gnu/gnuzilla/${_pkgver%-*}/$pkgname-$_pkgver.tar.bz2{,.sig}
@@ -40,12 +39,11 @@ 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
+        firefox-gcc-6.0.patch gcc6-fix-compilation-for-IceCat.patch harfbuzz-1.1.3.patch mozilla-1228540-1.patch
         vendor.js
         $pkgname-fixed-loading-icon.png
         remove-google-play-services-support.patch
         disable-crypto-hardening-settings.patch)
-mksha256sums=('1f58676fc0bdf60dc37145b8c97f507f0acec9bc84582aeef703cf0ed9744ed3')
 sha256sums=('97f76e85cc6f98463f0e0b0e845826816032770f9b589db69ece6b1cff21936c'
             'SKIP'
             '19783b0cca336bca7c262f597acc176ca640756e7567ca6587a46b860f12ef91'
@@ -55,6 +53,7 @@ sha256sums=('97f76e85cc6f98463f0e0b0e845826816032770f9b589db69ece6b1cff21936c'
             '5bdab2de5520fb4d3dbc453d9f73d20e0e077bf652bc780fc17184ba6c718a47'
             '4d1e1ddabc9e975ed39f49e134559a29e01cd49439e358233f1ede43bf5a52bf'
             '329cf6753d29ae64a4336a8a76ee71f0d331a39132159401e4d11de65b708a07'
+            '8a17454d2be90e94694818a1d1a6bdb615eced4d3a7a75af42080c99ce942f2f'
             'd1ccbaf0973615c57f7893355e5cd3a89efb4e91071d0ec376e429b50cf6ed19'
             '977aa49b940f1da049cefa2878a63ac6669a78e63e9d55bb11db7b8f8fb64c33'
             '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213'
@@ -78,10 +77,13 @@ 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
+  # Compilation fix (FS#49243 and FS#49363), internet and Icedove package
+  patch -Np1 -i $srcdir/gcc6-fix-compilation-for-IceCat.patch
+  patch -Np1 -i $srcdir/firefox-gcc-6.0.patch
+
+  # Update to harfbuzz 1.1.3 (following Icedove in [libre])
+  patch -Np0 -i $srcdir/harfbuzz-1.1.3.patch
+  patch -Np1 -i $srcdir/mozilla-1228540-1.patch
 
   # Patch and remove anything that's left
   patch -Np1 -i "$srcdir/libre.patch"
@@ -121,6 +123,9 @@ build() {
   # _FORTIFY_SOURCE causes configure failures
   CPPFLAGS+=" -O2"
 
+  # Hardening
+  LDFLAGS+=" -Wl,-z,now"
+
   # 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"