Fixed build with rust 1.48

4 files changed, 8 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5bb901e427ba..df70cf00d3f4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = firefox-esr
 	pkgdesc = Standalone web browser from mozilla.org, Extended Support Release
 	pkgver = 78.5.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.mozilla.org/en-US/firefox/organizations/
 	arch = x86_64
 	license = MPL
@@ -50,14 +50,14 @@ pkgbase = firefox-esr
 	source = firefox-esr.desktop
 	source = 0001-Use-remoting-name-for-GDK-application-names.patch
 	source = upload-symbol-archive
-	source = bug-1663715.patch.gz
+	source = rust_1.48.patch.gz
 	validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
 	sha256sums = 51f54ff608aa09de07b304307581ae89112781597322b8999b3099cfabf48290
 	sha256sums = SKIP
 	sha256sums = d86fe1636346ff003744b65e73cd3a7182618faedf3ee57023bb942e325cc726
 	sha256sums = 3bb7463471fb43b2163a705a79a13a3003d70fff4bbe44f467807ca056de9a75
 	sha256sums = eb9b9c058d1505e5b82526a8cad63f98e04fc17c4715f6b4cfc778e10fcfaf27
-	sha256sums = 6ce4eeddc1d73110721d9db6817634bbc453971c578a950e1386dc3819b85b1f
+	sha256sums = d32c87c4526e897d64453914da43f99366d1d0b7d71e43b4027a6cb5aa274040
 
 pkgname = firefox-esr
 
diff --git a/PKGBUILD b/PKGBUILD
index bfb0d34b86f4..212092dfc28a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=firefox-esr
 pkgver=78.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Standalone web browser from mozilla.org, Extended Support Release"
 arch=(x86_64)
 license=(MPL GPL LGPL)
@@ -23,13 +23,13 @@ conflicts=(firefox)
 options=(!emptydirs !makeflags !strip)
 source=(https://archive.mozilla.org/pub/firefox/releases/${pkgver}esr/source/firefox-${pkgver}esr.source.tar.xz{,.asc}
         ${pkgname}.desktop 0001-Use-remoting-name-for-GDK-application-names.patch upload-symbol-archive
-        bug-1663715.patch.gz)
+        rust_1.48.patch.gz)
 sha256sums=('51f54ff608aa09de07b304307581ae89112781597322b8999b3099cfabf48290'
             'SKIP'
             'd86fe1636346ff003744b65e73cd3a7182618faedf3ee57023bb942e325cc726'
             '3bb7463471fb43b2163a705a79a13a3003d70fff4bbe44f467807ca056de9a75'
             'eb9b9c058d1505e5b82526a8cad63f98e04fc17c4715f6b4cfc778e10fcfaf27'
-            '6ce4eeddc1d73110721d9db6817634bbc453971c578a950e1386dc3819b85b1f')
+            'd32c87c4526e897d64453914da43f99366d1d0b7d71e43b4027a6cb5aa274040')
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release@mozilla.com>
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@@ -51,8 +51,8 @@ prepare() {
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052
   patch -Np1 -i ../0001-Use-remoting-name-for-GDK-application-names.patch
 
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1663715
-  patch -Np1 -i ../bug-1663715.patch || true
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1667736
+  patch -Np1 -i ../rust_1.48.patch
 
   echo -n "$_google_api_key" >google-api-key
   echo -n "$_mozilla_api_key" >mozilla-api-key
diff --git a/bug-1663715.patch.gz b/bug-1663715.patch.gz
deleted file mode 100644
index c9d8b67ff4cd..000000000000
--- a/bug-1663715.patch.gz
+++ /dev/null
diff --git a/rust_1.48.patch.gz b/rust_1.48.patch.gz
new file mode 100644
index 000000000000..a384764c65c0
--- /dev/null
+++ b/rust_1.48.patch.gz