Thu Feb 18 20:47:35 UTC 202120210218204735

xap/mozilla-firefox-78.7.1esr-x86_64-1.txz:  Upgraded.
  It looks like rebuilding Firefox with Rust 1.50.0 causes it to crash on
  HTML5 streams, so let's drop back to this build. 78.8.0 is coming soon
  and hopefully it'll fix this.

4 files changed, 63 insertions, 36 deletions

diff --git a/source/xap/mozilla-thunderbird/0041-bmo-1684261-Fix-build-with-rust-1.50.0.patch b/source/xap/mozilla-thunderbird/0041-bmo-1684261-Fix-build-with-rust-1.50.0.patch
new file mode 100644
index 000000000..73dec34cc
--- /dev/null
+++ b/source/xap/mozilla-thunderbird/0041-bmo-1684261-Fix-build-with-rust-1.50.0.patch
@@ -0,0 +1,58 @@
+From eb88f36f108a201d531f82789a86a4281f37b3b0 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@gentoo.org>
+Date: Sun, 14 Feb 2021 14:57:47 +0100
+Subject: [PATCH 41/41] bmo#1684261: Fix build with rust 1.50.0
+
+Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
+---
+ .cargo/config.in | 2 +-
+ Cargo.lock       | 2 +-
+ Cargo.toml       | 4 ++--
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/.cargo/config.in b/.cargo/config.in
+index 0ee86efe40..1accd1ef72 100644
+--- a/.cargo/config.in
++++ b/.cargo/config.in
+@@ -3,9 +3,9 @@
+ # Please do not edit.
+ 
+ [source."https://github.com/shravanrn/nix/"]
+-branch = "r0.13.1"
+ git = "https://github.com/shravanrn/nix/"
+ replace-with = "vendored-sources"
++rev = "4af6c367603869a30fddb5ffb0aba2b9477ba92e"
+ 
+ [source."https://github.com/mozilla/rkv"]
+ git = "https://github.com/mozilla/rkv"
+diff --git a/Cargo.lock b/Cargo.lock
+index d6dffc0133..e7b0247088 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -3200,7 +3200,7 @@ dependencies = [
+ [[package]]
+ name = "nix"
+ version = "0.13.1"
+-source = "git+https://github.com/shravanrn/nix/?branch=r0.13.1#4af6c367603869a30fddb5ffb0aba2b9477ba92e"
++source = "git+https://github.com/shravanrn/nix/?rev=4af6c367603869a30fddb5ffb0aba2b9477ba92e#4af6c367603869a30fddb5ffb0aba2b9477ba92e"
+ dependencies = [
+  "bitflags",
+  "cc",
+diff --git a/Cargo.toml b/Cargo.toml
+index 2c162e6567..3173ef840c 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -68,8 +68,8 @@ panic = "abort"
+ libudev-sys = { path = "dom/webauthn/libudev-sys" }
+ packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="0917fe780032a6bbb23d71be545f9c1834128d75" }
+ rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="d510da5999a744c563b0acd18056069d1698273f" }
+-nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
+-spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3", rev = "20191ad2f370afd6d247edcb9ff9da32d3bedb9c" }
++nix = { git = "https://github.com/shravanrn/nix/", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
++spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3" }
+ # failure's backtrace feature might break our builds, see bug 1608157.
+ failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
+ failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
+-- 
+2.30.1
+
diff --git a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
index 4a529a483..0e760a4b4 100755
--- a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
+++ b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
@@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=mozilla-thunderbird
 VERSION=$(basename $(ls thunderbird-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev) .source)
 RELEASEVER=$(echo $VERSION | cut -f 1 -d e | cut -f 1 -d b)
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Specify this variable for a localized build.
 # For example, to build a version of Thunderbird with Italian support, run
@@ -169,12 +169,12 @@ rm -rf obj-x86_64-pc-linux-gnu
 # Retain GTK+ v2 scrolling behavior:
 zcat $CWD/tb.ui.scrollToClick.diff.gz | patch -p1 --verbose || exit 1
 
-# Fix building with latest Rust:
-zcat $CWD/unbreakdocs.diff.gz | patch -p1 --verbose || exit 1
-
 # Bypass a test that fails the build:
 zcat $CWD/gkrust.a.no.networking.check.diff.gz | patch -p1 --verbose || exit 1
 
+# Fix building with rust-1.50.0:
+zcat $CWD/0041-bmo-1684261-Fix-build-with-rust-1.50.0.patch.gz | patch -p1 --verbose || exit 1
+
 # Fetch localization, if requested:
 if [ ! -z $MOZLOCALIZE ]; then
   LOC_TAG="THUNDERBIRD_$( echo $VERSION | tr \. _ )_RELEASE"
diff --git a/source/xap/mozilla-thunderbird/unbreakdocs.diff b/source/xap/mozilla-thunderbird/unbreakdocs.diff
deleted file mode 100644
index 03d8e6b42..000000000
--- a/source/xap/mozilla-thunderbird/unbreakdocs.diff
+++ /dev/null
@@ -1,31 +0,0 @@
---- ./servo/components/style/lib.rs.orig	2019-07-05 20:44:35.000000000 -0500
-+++ ./servo/components/style/lib.rs	2019-07-08 13:51:55.460242952 -0500
-@@ -23,7 +23,7 @@
- //! [cssparser]: ../cssparser/index.html
- //! [selectors]: ../selectors/index.html
- 
--#![deny(missing_docs)]
-+// #![deny(missing_docs)]
- 
- extern crate app_units;
- extern crate arrayvec;
-@@ -196,7 +196,7 @@
- /// Generated from the properties.mako.rs template by build.rs
- #[macro_use]
- #[allow(unsafe_code)]
--#[deny(missing_docs)]
-+// #[deny(missing_docs)]
- pub mod properties {
-     include!(concat!(env!("OUT_DIR"), "/properties.rs"));
- }
---- ./servo/components/style_traits/lib.rs.orig	2019-07-08 13:51:55.462242953 -0500
-+++ ./servo/components/style_traits/lib.rs	2019-07-08 13:53:44.853249956 -0500
-@@ -8,7 +8,7 @@
- 
- #![crate_name = "style_traits"]
- #![crate_type = "rlib"]
--#![deny(unsafe_code, missing_docs)]
-+#![deny(unsafe_code)]
- 
- extern crate app_units;
- #[macro_use]
diff --git a/source/xap/seamonkey/seamonkey.SlackBuild b/source/xap/seamonkey/seamonkey.SlackBuild
index a8afd8a44..28b8b14d4 100755
--- a/source/xap/seamonkey/seamonkey.SlackBuild
+++ b/source/xap/seamonkey/seamonkey.SlackBuild
@@ -26,7 +26,7 @@ PKGNAM=seamonkey
 TARBALLVER=${VERSION:-$(basename $(ls seamonkey-*.tar.* | cut -d - -f 2 | rev | cut -f 3- -d . | rev) .source)}
 # Strip the end from beta versions:
 VERSION=$(echo $TARBALLVER | cut -f 1 -d b)
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then