pkgver: 52.4.1

3 files changed, 28 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 52fb46589835..5aa26d52d42f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri Oct 20 03:47:02 UTC 2017
+# Fri Oct 20 04:02:00 UTC 2017
 pkgbase = firefox-esr-gtk2
 	pkgdesc = Standalone web browser from mozilla.org, Extended Support Release
-	pkgver = 52.4.0
+	pkgver = 52.4.1
 	pkgrel = 1
 	url = https://www.mozilla.org/en-US/firefox/organizations/
 	arch = i686
@@ -42,12 +42,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.4.0
+	provides = firefox=52.4.1
 	conflicts = firefox
 	replaces = firefox-gtk2
 	options = !emptydirs
 	options = !makeflags
-	source = https://ftp.mozilla.org/pub/firefox/releases/52.4.0esr/source/firefox-52.4.0esr.source.tar.xz
+	source = https://ftp.mozilla.org/pub/firefox/releases/52.4.1esr/source/firefox-52.4.1esr.source.tar.xz
 	source = firefox.desktop
 	source = firefox-symbolic.svg
 	source = 0001-Bug-54395-remove-hardcoded-flag-lcrmf.patch
@@ -56,7 +56,8 @@ pkgbase = firefox-esr-gtk2
 	source = glibc-2.26-fix.diff
 	source = rust-i686.patch
 	source = make_SystemResourceMonitor.stop_more_resilient_to_errors.patch
-	sha256sums = 58ae7cb6c2fb81d22762ab3c60e46cadbe7c5b687f24c2823d9533ec998a21ee
+	source = nvidia-GLSL-version.patch
+	sha256sums = 96fab11b7e5bd016f80718161ee8dd8afdf989a2cd03106a148b15def2569457
 	sha256sums = ada313750e6fb14558b37c764409a17c1672a351a46c73b350aa1fe4ea9220ef
 	sha256sums = a2474b32b9b2d7e0fb53a4c89715507ad1c194bef77713d798fa39d507def9e9
 	sha256sums = 93c495526c1a1227f76dda5f3a43b433bc7cf217aaf74bd06b8fc187d285f593
@@ -65,6 +66,7 @@ pkgbase = firefox-esr-gtk2
 	sha256sums = cd7ff441da66a287f8712e60cdc9e216c30355d521051e2eaae28a66d81915e8
 	sha256sums = f61ea706ce6905f568b9bdafd1b044b58f20737426f0aa5019ddb9b64031a269
 	sha256sums = 7760ebe71f4057cbd2f52b715abaf0d944c14c39e2bb2a5322114ad8451e12d9
+	sha256sums = d8c5c30589c0e176d260a5814f3cb99e94267b3185ab40ff01bf33a58f375d6a
 
 pkgname = firefox-esr-gtk2
 
diff --git a/PKGBUILD b/PKGBUILD
index 7b2cd5d692e2..d33e421c27a0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=firefox-esr-gtk2
 _pkgname=firefox-esr
-pkgver=52.4.0
+pkgver=52.4.1
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org, Extended Support Release"
 arch=(i686 x86_64)
@@ -30,8 +30,9 @@ source=(https://ftp.mozilla.org/pub/firefox/releases/${pkgver}esr/source/firefox
         firefox-install-dir.patch fix-wifi-scanner.diff
         glibc-2.26-fix.diff
         rust-i686.patch
-        make_SystemResourceMonitor.stop_more_resilient_to_errors.patch)
-sha256sums=('58ae7cb6c2fb81d22762ab3c60e46cadbe7c5b687f24c2823d9533ec998a21ee'
+        make_SystemResourceMonitor.stop_more_resilient_to_errors.patch
+        nvidia-GLSL-version.patch)
+sha256sums=('96fab11b7e5bd016f80718161ee8dd8afdf989a2cd03106a148b15def2569457'
             'ada313750e6fb14558b37c764409a17c1672a351a46c73b350aa1fe4ea9220ef'
             'a2474b32b9b2d7e0fb53a4c89715507ad1c194bef77713d798fa39d507def9e9'
             '93c495526c1a1227f76dda5f3a43b433bc7cf217aaf74bd06b8fc187d285f593'
@@ -39,7 +40,8 @@ sha256sums=('58ae7cb6c2fb81d22762ab3c60e46cadbe7c5b687f24c2823d9533ec998a21ee'
             '9765bca5d63fb5525bbd0520b7ab1d27cabaed697e2fc7791400abc3fa4f13b8'
             'cd7ff441da66a287f8712e60cdc9e216c30355d521051e2eaae28a66d81915e8'
             'f61ea706ce6905f568b9bdafd1b044b58f20737426f0aa5019ddb9b64031a269'
-            '7760ebe71f4057cbd2f52b715abaf0d944c14c39e2bb2a5322114ad8451e12d9')
+            '7760ebe71f4057cbd2f52b715abaf0d944c14c39e2bb2a5322114ad8451e12d9'
+            'd8c5c30589c0e176d260a5814f3cb99e94267b3185ab40ff01bf33a58f375d6a')
 validpgpkeys=('2B90598A745E992F315E22C58AB132963A06537A')
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@@ -78,6 +80,10 @@ prepare() {
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1384062
   patch -Np1 -i ../make_SystemResourceMonitor.stop_more_resilient_to_errors.patch
 
+  # 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
+
   echo -n "$_google_api_key" >google-api-key
   echo -n "$_mozilla_api_key" >mozilla-api-key
 
diff --git a/nvidia-GLSL-version.patch b/nvidia-GLSL-version.patch
new file mode 100644
index 000000000000..dbea559aa5ab
--- /dev/null
+++ b/nvidia-GLSL-version.patch
@@ -0,0 +1,11 @@
+--- 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.");
+         }
+     }
+