summaryrefslogtreecommitdiff
path: root/source/xap
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2021-03-15 19:37:28 +0000
committerEric Hameleers <alien@slackware.com>2021-03-16 08:59:42 +0100
commitd2f4c4e59baa55effed93d23ddb49d1345b0eecb (patch)
tree8f63fdce6984fae5fc75e757b09d6b68a1ada6dd /source/xap
parent50778dacdfb06dc06f0441c6559cc1d213f8c50f (diff)
downloadcurrent-d2f4c4e59baa55effed93d23ddb49d1345b0eecb.tar.gz
Mon Mar 15 19:37:28 UTC 202120210315193728
a/kernel-firmware-20210315_3568f96-noarch-1.txz: Upgraded. ap/sudo-1.9.6-x86_64-1.txz: Upgraded. d/cmake-3.19.7-x86_64-1.txz: Upgraded. d/python-setuptools-54.1.2-x86_64-1.txz: Upgraded. d/rust-1.50.0-x86_64-1.txz: Upgraded. l/libcap-2.49-x86_64-1.txz: Upgraded. l/python-urllib3-1.26.4-x86_64-1.txz: Upgraded. l/qt5-5.15.2-x86_64-6.txz: Rebuilt. Rebuilt with -proprietary-codecs and -webengine-proprietary-codecs. When combined with -webengine-ffmpeg (use system ffmpeg), this doesn't actually build any proprietary codecs, but allows them to be used if they happen to be built into the system ffmpeg. Thanks to alienBOB. xap/mozilla-firefox-86.0.1-x86_64-1.txz: Upgraded. When we first moved Slackware to the Firefox ESR channel, the motivation was to keep Firefox secure while delaying a requirement for Rust at build time. Of course, eventually that ESR version reached EOL and we had to introduce Rust into Slackware 14.2 in order to continue providing updates. Eventually that also ran into roadblocks as Firefox required first newer C/C++ compilers, and then finally a newer libstdc++. To continue, we'd have had to bump GCC to a much newer version, making other maintenance difficult or impossible. At this point, the latest Firefox has no additional dependencies beyond those of the ESR version, and it's unlikely that it will be any more difficult to keep it maintained. I think we all want the Slackware 15.0 release to be as good as possible, and most users will be better served if we resume following the latest desktop releases. Thanks to LuckyCyborg who can always be counted on to give me a friendly kick in the rear end. :-) Thanks also to ponce for the updated gkrust patch.
Diffstat (limited to 'source/xap')
-rw-r--r--source/xap/mozilla-firefox/build-deps/nodejs/nodejs.url2
-rw-r--r--source/xap/mozilla-firefox/gkrust.a.no.networking.check.diff31
-rwxr-xr-xsource/xap/mozilla-firefox/mozilla-firefox.SlackBuild5
-rw-r--r--source/xap/mozilla-firefox/unbreakdocs.diff31
4 files changed, 33 insertions, 36 deletions
diff --git a/source/xap/mozilla-firefox/build-deps/nodejs/nodejs.url b/source/xap/mozilla-firefox/build-deps/nodejs/nodejs.url
index f46786d1..9a5a0960 100644
--- a/source/xap/mozilla-firefox/build-deps/nodejs/nodejs.url
+++ b/source/xap/mozilla-firefox/build-deps/nodejs/nodejs.url
@@ -1,2 +1,2 @@
-https://nodejs.org/dist/v10.21.0/node-v10.21.0.tar.xz
+https://nodejs.org/dist/latest-v10.x/node-v10.24.0.tar.xz
#https://github.com/nodejs/node
diff --git a/source/xap/mozilla-firefox/gkrust.a.no.networking.check.diff b/source/xap/mozilla-firefox/gkrust.a.no.networking.check.diff
new file mode 100644
index 00000000..115ba0e7
--- /dev/null
+++ b/source/xap/mozilla-firefox/gkrust.a.no.networking.check.diff
@@ -0,0 +1,31 @@
+--- ./config/makefiles/rust.mk.orig 2021-03-15 12:42:08.219987929 -0500
++++ ./config/makefiles/rust.mk 2021-03-15 12:43:15.996984180 -0500
+@@ -332,17 +332,17 @@
+ # the chance of proxy bypasses originating from rust code.
+ # The check only works when rust code is built with -Clto but without MOZ_LTO_RUST_CROSS.
+ # Sanitizers and sancov also fail because compiler-rt hooks network functions.
+-ifndef MOZ_PROFILE_GENERATE
+-ifeq ($(OS_ARCH), Linux)
+-ifeq (,$(rustflags_sancov)$(MOZ_ASAN)$(MOZ_TSAN)$(MOZ_UBSAN))
+-ifndef MOZ_LTO_RUST_CROSS
+-ifneq (,$(filter -Clto,$(cargo_rustc_flags)))
+- $(call py_action,check_binary,--target --networking $@)
+-endif
+-endif
+-endif
+-endif
+-endif
++#ifndef MOZ_PROFILE_GENERATE
++#ifeq ($(OS_ARCH), Linux)
++#ifeq (,$(rustflags_sancov)$(MOZ_ASAN)$(MOZ_TSAN)$(MOZ_UBSAN))
++#ifndef MOZ_LTO_RUST_CROSS
++#ifneq (,$(filter -Clto,$(cargo_rustc_flags)))
++# $(call py_action,check_binary,--target --networking $@)
++#endif
++#endif
++#endif
++#endif
++#endif
+
+ force-cargo-library-check:
+ $(call CARGO_CHECK) --lib $(cargo_target_flag) $(rust_features_flag)
diff --git a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
index 51fe64ea..d95b38ba 100755
--- a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
+++ b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=mozilla-firefox
VERSION=$(basename $(ls firefox-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev) .source)
RELEASEVER=$(echo $VERSION | cut -f 1 -d r | cut -f 1 -d b | cut -f 1 -d e)
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-1}
# Specify this variable for a localized build.
# For example, to build a version of Firefox with Italian support, run
@@ -198,9 +198,6 @@ sed -i.allow-warnings -e '/#!\[deny(warnings)\]/a #![allow(unused_imports)]' \
# Retain GTK+ v2 scrolling behavior:
zcat $CWD/ff.ui.scrollToClick.diff.gz | patch -p1 --verbose || exit 1
-# Fix building with latest Rust:
-zcat $CWD/unbreakdocs.diff.gz | patch -p1 --verbose || exit 1
-
# Fetch localization, if requested
# https://bugzilla.mozilla.org/show_bug.cgi?id=1256955
if [ ! -z $MOZLOCALIZE ]; then
diff --git a/source/xap/mozilla-firefox/unbreakdocs.diff b/source/xap/mozilla-firefox/unbreakdocs.diff
deleted file mode 100644
index 03d8e6b4..00000000
--- a/source/xap/mozilla-firefox/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]