52.0.2

1 files changed, 16 insertions, 23 deletions

diff --git a/PKGBUILD b/PKGBUILD
index d9ae43c930b2..da11d075d0f0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 # Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> 
 
 pkgname=icecat
-pkgver=45.7.0
+pkgver=52.0.2
 _pkgver=${pkgver}-gnu1
 _pkgverbase=${pkgver%%.*}
 pkgrel=1
@@ -14,33 +14,28 @@ pkgdesc="GNU version of the Firefox browser."
 arch=(i686 x86_64)
 url="http://www.gnu.org/software/gnuzilla/"
 license=('GPL' 'MPL' 'LGPL')
-depends=('gtk2' 'mozilla-common' 'libxt' 'startup-notification' 'mime-types'
-         'dbus-glib' 'alsa-lib' 'ffmpeg'
+depends=('gtk3' 'gtk2' 'mozilla-common' 'libxt' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'ffmpeg'
          'libvpx' 'icu' 'libevent' 'nss' 'hunspell' 'sqlite' 'ttf-font')
 makedepends=('unzip' 'zip' 'diffutils' 'python2' 'yasm' 'mesa' 'imake' 'gconf'
              'libpulse' 'gst-plugins-base-libs' 'inetutils' 'cargo')
 optdepends=('networkmanager: Location detection via available WiFi networks'
-            'upower: Battery API')
-options=('!emptydirs' '!makeflags')
+            'libnotify: Notification integration'
+            'speech-dispatcher: Text-to-Speech')
 source=(http://ftpmirror.gnu.org/gnuzilla/${pkgver}/${pkgname}-${_pkgver}.tar.bz2{,.sig}
 #source=(https://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${_pkgver}.tar.bz2{,.sig}      ## Main upstream download site
 #source=(https://mirrors.kernel.org/gnu/gnuzilla/${pkgver}/${pkgname}-${_pkgver}.tar.bz2      ## Good mirror
 #source=(http://jenkins.trisquel.info/icecat/${pkgname}-${_pkgver}.tar.bz2      ## Official developer (Ruben Rodriguez) site. Probably only has developer releases.
-        mozconfig
-        icecat.desktop
-        icecat-safe.desktop
-        vendor.js
-        gcc6-fix-compilation-for-IceCat.patch
-        firefox-gcc-6.0.patch)
-
-sha256sums=('635b2d458b22221dcaff4463ce3ed2983e6fc4981c09170899fd63ea231dc7d6'
+        mozconfig icecat.desktop icecat-safe.desktop vendor.js
+        rust-i686.patch fix-wifi-scanner.diff)
+
+sha256sums=('8901a4ab7f2b87d5516c77cbdec6d276cdde64421725d4ed613c1b4f805a4a2b'
             'SKIP'
-            '0f9c8f4e7795ded4f661af9ff73a5b091fda4eebc969a76e00e48d005feebe7d'
+            '1fe0c64404ec088ad3900bf482ab9cdd317b2f57c8fcc3b38e9f3321fb237b60'
             'c44eab35f71dd3028a74632463710d674b2e8a0682e5e887535e3233a3b7bbb3'
             '190577ad917bccfc89a9bcafbc331521f551b6f54e190bb6216eada48dcb1303'
             '4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4'
-            '329cf6753d29ae64a4336a8a76ee71f0d331a39132159401e4d11de65b708a07'
-            '4d1e1ddabc9e975ed39f49e134559a29e01cd49439e358233f1ede43bf5a52bf')
+            'f61ea706ce6905f568b9bdafd1b044b58f20737426f0aa5019ddb9b64031a269'
+            '9765bca5d63fb5525bbd0520b7ab1d27cabaed697e2fc7791400abc3fa4f13b8')
 
 validpgpkeys=(A57369A8BABC2542B5A0368C3C76EED7D7E04784) # Ruben Rodriguez (GNU IceCat releases key) <ruben@gnu.org>
 
@@ -52,10 +47,12 @@ prepare() {
   sed -e 's;$(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION);$(libdir)/$(MOZ_APP_NAME);g' -i config/baseconfig.mk
   sed -e 's;$(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION);$(libdir)/$(MOZ_APP_NAME)-devel;g' -i config/baseconfig.mk
 
-  # Compilation fix (FS#49243 and FS#49363), internet and Thunderbird package
-  patch -Np1 -i $srcdir/gcc6-fix-compilation-for-IceCat.patch
-  patch -Np1 -i $srcdir/firefox-gcc-6.0.patch
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1314968
+  patch -Np1 -i ../fix-wifi-scanner.diff
 
+  # Build with the rust targets we actually ship
+  patch -Np1 -i ../rust-i686.patch
+  
   msg2 "Starting build..."
 
   cp -v ${srcdir}/mozconfig .mozconfig
@@ -76,10 +73,6 @@ build() {
   # 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"
-
   export PATH="$srcdir/path:$PATH"
 
   make -f client.mk build