Add fix for Rust 1.39

3 files changed, 32 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0aa3f2600da..723e2fbe1d8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -63,6 +63,7 @@ pkgbase = waterfox-classic-kpe
 	source = pgo_fix_missing_kdejs.patch
 	source = restore_ua_overrides.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-classic-kpe/patches/restore_ua_overrides.patch
 	source = bmo1480003.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-classic-kpe/patches/bmo1480003.patch
+	source = rust_1.39.patch
 	sha256sums = SKIP
 	sha256sums = b0ec717b10494dad234a10c9ba9c2a89ed52fd0afbc3b98bb8c4f9c5dd4755a0
 	sha256sums = 0850a8a8dea9003c67a8ee1fa5eb19a6599eaad9f2ad09db753b74dc5048fdbc
@@ -75,6 +76,7 @@ pkgbase = waterfox-classic-kpe
 	sha256sums = bf6743660623b7c9a43b94edc8acbcade07aa222ff2102a2808809df333ebe8e
 	sha256sums = e179856821d463be8ceb75313fa8eb44be7d8580c81b4897e867fefc3e89a864
 	sha256sums = 56e5ed40df1cb84606e9d095b05e5e8d9a397198a1eb6491e208d5f888266ee7
+	sha256sums = e5a1cc8d651744252910f9b3090d0f284445d8a480a14ec649411c487083a3c7
 
 pkgname = waterfox-classic-kpe
 
diff --git a/PKGBUILD b/PKGBUILD
index 1efb6b3f8e4..a062999ece2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -36,7 +36,8 @@ source=("git+https://github.com/MrAlex94/Waterfox.git#commit=$_commit"
         "dont-statically-link-libstdc++.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-classic-kpe/patches/dont-statically-link-libstdc%2B%2B.patch"
         pgo_fix_missing_kdejs.patch
         "restore_ua_overrides.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-classic-kpe/patches/restore_ua_overrides.patch"
-        "bmo1480003.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-classic-kpe/patches/bmo1480003.patch")
+        "bmo1480003.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-classic-kpe/patches/bmo1480003.patch"
+        rust_1.39.patch)
 sha256sums=('SKIP'
             'b0ec717b10494dad234a10c9ba9c2a89ed52fd0afbc3b98bb8c4f9c5dd4755a0'
             '0850a8a8dea9003c67a8ee1fa5eb19a6599eaad9f2ad09db753b74dc5048fdbc'
@@ -48,7 +49,8 @@ sha256sums=('SKIP'
             '877bc1f0e768d96118bb739725e590467773dd897c31263099e52b8d7aaaa4c8'
             'bf6743660623b7c9a43b94edc8acbcade07aa222ff2102a2808809df333ebe8e'
             'e179856821d463be8ceb75313fa8eb44be7d8580c81b4897e867fefc3e89a864'
-            '56e5ed40df1cb84606e9d095b05e5e8d9a397198a1eb6491e208d5f888266ee7')
+            '56e5ed40df1cb84606e9d095b05e5e8d9a397198a1eb6491e208d5f888266ee7'
+            'e5a1cc8d651744252910f9b3090d0f284445d8a480a14ec649411c487083a3c7')
 
 prepare() {
   mkdir path
@@ -72,6 +74,8 @@ prepare() {
 
   patch -Np1 -i ../bmo1480003.patch
 
+  patch -Np1 -i ../rust_1.39.patch
+
   cat >.mozconfig <<END
 export CC=clang
 export CXX=clang++
diff --git a/rust_1.39.patch b/rust_1.39.patch
new file mode 100644
index 00000000000..b1998111eb1
--- /dev/null
+++ b/rust_1.39.patch
@@ -0,0 +1,24 @@
+From bd989e56d13b046b7a0fc0292b9ae2c4b788f519 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Mon, 11 Nov 2019 16:04:41 +0100
+Subject: [PATCH] nsstring: Fix build with rust-1.39
+
+rust-1.39 deprecated the "try!" call in favor of "?" which then breaks
+nsstring because it treats warnings as errors.
+---
+ xpcom/rust/nsstring/src/lib.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/xpcom/rust/nsstring/src/lib.rs b/xpcom/rust/nsstring/src/lib.rs
+index dddc8b81ca40..dd4f62538bcb 100644
+--- a/xpcom/rust/nsstring/src/lib.rs
++++ b/xpcom/rust/nsstring/src/lib.rs
+@@ -113,7 +113,7 @@
+ //! which invoke their member's destructors through C++ code.
+ 
+ #![allow(non_camel_case_types)]
+-#![deny(warnings)]
++//#![deny(warnings)]
+ 
+ #[macro_use]
+ extern crate bitflags;