pkgver: 52.8.0

4 files changed, 45 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2c5360aede93..48ea3610bad9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu Mar 29 12:57:26 UTC 2018
+# Wed May  9 21:44:59 UTC 2018
 pkgbase = firefox-esr-gtk2
 	pkgdesc = Standalone web browser from mozilla.org, Extended Support Release
-	pkgver = 52.7.3
+	pkgver = 52.8.0
 	pkgrel = 1
 	url = https://www.mozilla.org/en-US/firefox/organizations/
 	arch = i686
@@ -10,7 +10,6 @@ pkgbase = firefox-esr-gtk2
 	license = MPL
 	license = GPL
 	license = LGPL
-	makedepends = gcc6
 	makedepends = unzip
 	makedepends = zip
 	makedepends = diffutils
@@ -42,12 +41,12 @@ pkgbase = firefox-esr-gtk2
 	optdepends = networkmanager: Location detection via available WiFi networks
 	optdepends = libnotify: Notification integration
 	optdepends = speech-dispatcher: Text-to-Speech
-	provides = firefox=52.7.3
+	provides = firefox=52.8.0
 	conflicts = firefox
 	replaces = firefox-gtk2
 	options = !emptydirs
 	options = !makeflags
-	source = https://ftp.mozilla.org/pub/firefox/releases/52.7.3esr/source/firefox-52.7.3esr.source.tar.xz
+	source = https://ftp.mozilla.org/pub/firefox/releases/52.8.0esr/source/firefox-52.8.0esr.source.tar.xz
 	source = firefox.desktop
 	source = firefox-symbolic.svg
 	source = 0001-Bug-54395-remove-hardcoded-flag-lcrmf.patch
@@ -55,9 +54,9 @@ pkgbase = firefox-esr-gtk2
 	source = fix-wifi-scanner.diff
 	source = rust-i686.patch
 	source = make_SystemResourceMonitor.stop_more_resilient_to_errors.patch
-	source = nvidia-GLSL-version.patch
+	source = use_noexcept_in_mozalloc.patch
 	source = firefox-52-disable-pocket-leftovers.patch
-	sha256sums = 5cc68c1a7486cfbbf02aec0e9da9f87b55e7bfc68c7d5139bc1e578441aaf19f
+	sha256sums = babed4fe0ae95783e39358aedf7111b20fd9442f73b3b41b025fa4951fe76287
 	sha256sums = ada313750e6fb14558b37c764409a17c1672a351a46c73b350aa1fe4ea9220ef
 	sha256sums = a2474b32b9b2d7e0fb53a4c89715507ad1c194bef77713d798fa39d507def9e9
 	sha256sums = 93c495526c1a1227f76dda5f3a43b433bc7cf217aaf74bd06b8fc187d285f593
@@ -65,7 +64,7 @@ pkgbase = firefox-esr-gtk2
 	sha256sums = 9765bca5d63fb5525bbd0520b7ab1d27cabaed697e2fc7791400abc3fa4f13b8
 	sha256sums = f61ea706ce6905f568b9bdafd1b044b58f20737426f0aa5019ddb9b64031a269
 	sha256sums = 7760ebe71f4057cbd2f52b715abaf0d944c14c39e2bb2a5322114ad8451e12d9
-	sha256sums = d8c5c30589c0e176d260a5814f3cb99e94267b3185ab40ff01bf33a58f375d6a
+	sha256sums = 32eae55bf9151df5f77ee98585e6cef4cc7ee2e5f2ca44c1a42f87d132eb22d8
 	sha256sums = d6760634e4926ce5ad0df501d06139a5e693d7058e671a195c9e0b54197c1d96
 
 pkgname = firefox-esr-gtk2
diff --git a/PKGBUILD b/PKGBUILD
index be2ac054d89c..3ba839162412 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=firefox-esr-gtk2
 _pkgname=firefox-esr
-pkgver=52.7.3
+pkgver=52.8.0
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org, Extended Support Release"
 arch=(i686 x86_64)
@@ -15,7 +15,7 @@ license=(MPL GPL LGPL)
 url="https://www.mozilla.org/en-US/firefox/organizations/"
 depends=(gtk2 mozilla-common libxt startup-notification mime-types dbus-glib alsa-lib ffmpeg
          libvpx libevent nss hunspell sqlite ttf-font icu)
-makedepends=(gcc6 unzip zip diffutils python2 yasm mesa imake gconf libpulse inetutils xorg-server-xvfb
+makedepends=(unzip zip diffutils python2 yasm mesa imake gconf libpulse inetutils xorg-server-xvfb
              autoconf2.13 rust)
 optdepends=('networkmanager: Location detection via available WiFi networks'
             'libnotify: Notification integration'
@@ -30,9 +30,9 @@ source=(https://ftp.mozilla.org/pub/firefox/releases/${pkgver}esr/source/firefox
         firefox-install-dir.patch fix-wifi-scanner.diff
         rust-i686.patch
         make_SystemResourceMonitor.stop_more_resilient_to_errors.patch
-        nvidia-GLSL-version.patch
+        use_noexcept_in_mozalloc.patch
         firefox-52-disable-pocket-leftovers.patch)
-sha256sums=('5cc68c1a7486cfbbf02aec0e9da9f87b55e7bfc68c7d5139bc1e578441aaf19f'
+sha256sums=('babed4fe0ae95783e39358aedf7111b20fd9442f73b3b41b025fa4951fe76287'
             'ada313750e6fb14558b37c764409a17c1672a351a46c73b350aa1fe4ea9220ef'
             'a2474b32b9b2d7e0fb53a4c89715507ad1c194bef77713d798fa39d507def9e9'
             '93c495526c1a1227f76dda5f3a43b433bc7cf217aaf74bd06b8fc187d285f593'
@@ -40,7 +40,7 @@ sha256sums=('5cc68c1a7486cfbbf02aec0e9da9f87b55e7bfc68c7d5139bc1e578441aaf19f'
             '9765bca5d63fb5525bbd0520b7ab1d27cabaed697e2fc7791400abc3fa4f13b8'
             'f61ea706ce6905f568b9bdafd1b044b58f20737426f0aa5019ddb9b64031a269'
             '7760ebe71f4057cbd2f52b715abaf0d944c14c39e2bb2a5322114ad8451e12d9'
-            'd8c5c30589c0e176d260a5814f3cb99e94267b3185ab40ff01bf33a58f375d6a'
+            '32eae55bf9151df5f77ee98585e6cef4cc7ee2e5f2ca44c1a42f87d132eb22d8'
             'd6760634e4926ce5ad0df501d06139a5e693d7058e671a195c9e0b54197c1d96')
 validpgpkeys=('2B90598A745E992F315E22C58AB132963A06537A')
 
@@ -82,15 +82,13 @@ prepare() {
   # Remove pocket source directory
   rm -fr browser/extensions/pocket
 
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1382358
-  # https://hg.mozilla.org/integration/mozilla-inbound/rev/4a5185552a07
-#  patch -Np1 -i ../nvidia-GLSL-version.patch
+  # https://hg.mozilla.org/mozilla-central/rev/ae7e3082d862
+  patch -Np1 -i ../use_noexcept_in_mozalloc.patch
 
   echo -n "$_google_api_key" >google-api-key
   echo -n "$_mozilla_api_key" >mozilla-api-key
 
   cat >.mozconfig <<END
-CC=gcc-6
 ac_add_options --enable-application=browser
 
 ac_add_options --prefix=/usr
diff --git a/nvidia-GLSL-version.patch b/nvidia-GLSL-version.patch
deleted file mode 100644
index dbea559aa5ab..000000000000
--- a/nvidia-GLSL-version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/dom/canvas/WebGLShaderValidator.cpp	2017-04-11 04:13:14.000000000 +0200
-+++ b/dom/canvas/WebGLShaderValidator.cpp	2017-10-18 21:37:05.383873927 +0200
-@@ -114,7 +114,7 @@
-         case 440: return SH_GLSL_440_CORE_OUTPUT;
-         case 450: return SH_GLSL_450_CORE_OUTPUT;
-         default:
--            MOZ_CRASH("GFX: Unexpected GLSL version.");
-+            MOZ_ASSERT(false, "GFX: Unexpected GLSL version.");
-         }
-     }
- 
diff --git a/use_noexcept_in_mozalloc.patch b/use_noexcept_in_mozalloc.patch
new file mode 100644
index 000000000000..e374621b54f1
--- /dev/null
+++ b/use_noexcept_in_mozalloc.patch
@@ -0,0 +1,31 @@
+
+diff --git a/memory/mozalloc/mozalloc.h b/memory/mozalloc/mozalloc.h
+--- a/memory/mozalloc/mozalloc.h
++++ b/memory/mozalloc/mozalloc.h
+@@ -170,16 +170,22 @@ MFBT_API void* moz_xvalloc(size_t size)
+ #define MOZALLOC_THROW_IF_HAS_EXCEPTIONS throw()
+ #define MOZALLOC_THROW_BAD_ALLOC_IF_HAS_EXCEPTIONS
+ #elif defined(_MSC_VER)
+ /*
+  * Suppress build warning spam (bug 578546).
+  */
+ #define MOZALLOC_THROW_IF_HAS_EXCEPTIONS
+ #define MOZALLOC_THROW_BAD_ALLOC_IF_HAS_EXCEPTIONS
++#elif __cplusplus >= 201103
++/*
++ * C++11 has deprecated exception-specifications in favour of |noexcept|.
++ */
++#define MOZALLOC_THROW_IF_HAS_EXCEPTIONS noexcept(true)
++#define MOZALLOC_THROW_BAD_ALLOC_IF_HAS_EXCEPTIONS noexcept(false)
+ #else
+ #define MOZALLOC_THROW_IF_HAS_EXCEPTIONS throw()
+ #define MOZALLOC_THROW_BAD_ALLOC_IF_HAS_EXCEPTIONS throw(std::bad_alloc)
+ #endif
+ 
+ #define MOZALLOC_THROW_BAD_ALLOC MOZALLOC_THROW_BAD_ALLOC_IF_HAS_EXCEPTIONS
+ 
+ MOZALLOC_EXPORT_NEW
+
+
+
+