diff options
Diffstat (limited to 'source')
-rwxr-xr-x | source/ap/sudo/sudo.SlackBuild | 2 | ||||
-rwxr-xr-x | source/d/rust/rust.SlackBuild | 12 | ||||
-rw-r--r-- | source/d/rust/rust.url | 8 | ||||
-rwxr-xr-x | source/l/libcap/libcap.SlackBuild | 2 | ||||
-rwxr-xr-x | source/l/python-urllib3/python-urllib3.SlackBuild | 2 | ||||
-rwxr-xr-x | source/l/qt5/qt5.SlackBuild | 4 | ||||
-rw-r--r-- | source/xap/mozilla-firefox/build-deps/nodejs/nodejs.url | 2 | ||||
-rw-r--r-- | source/xap/mozilla-firefox/gkrust.a.no.networking.check.diff | 31 | ||||
-rwxr-xr-x | source/xap/mozilla-firefox/mozilla-firefox.SlackBuild | 5 | ||||
-rw-r--r-- | source/xap/mozilla-firefox/unbreakdocs.diff | 31 |
10 files changed, 48 insertions, 51 deletions
diff --git a/source/ap/sudo/sudo.SlackBuild b/source/ap/sudo/sudo.SlackBuild index 5bbe1f48..a1d65af6 100755 --- a/source/ap/sudo/sudo.SlackBuild +++ b/source/ap/sudo/sudo.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=sudo VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/d/rust/rust.SlackBuild b/source/d/rust/rust.SlackBuild index 8d768eaa..5ab97ac9 100755 --- a/source/d/rust/rust.SlackBuild +++ b/source/d/rust/rust.SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 2017 Andrew Clemons, Wellington, New Zealand -# Copyright 2017, 2018, 2019, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2017, 2018, 2019, 2020, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA # Copyright 2017 Stuart Winter # All rights reserved. # @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=rust SRCNAM="${PKGNAM}c" -VERSION=${VERSION:-1.49.0} +VERSION=${VERSION:-1.50.0} BUILD=${BUILD:-1} # Set this to YES to build with the system LLVM, or NO to use the bundled LLVM. @@ -34,9 +34,9 @@ BUILD=${BUILD:-1} SYSTEM_LLVM=${SYSTEM_LLVM:-YES} # Bootstrap variables (might not be kept updated for latest Rust): -RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.48.0} -RSTAGE0_DIR=${RSTAGE0_DIR:-2020-11-19} -CSTAGE0_VERSION=${CSTAGE0_VERSION:-1.48.0} +RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.49.0} +RSTAGE0_DIR=${RSTAGE0_DIR:-2020-12-31} +CSTAGE0_VERSION=${CSTAGE0_VERSION:-1.49.0} CSTAGE0_DIR=${CSTAGE0_DIR:-$RSTAGE0_DIR} # Automatically determine the architecture we're building on: @@ -115,7 +115,7 @@ OUTPUT=${OUTPUT:-/tmp} PKG=$TMP/package-$PKGNAM # Not needed, as the build will automatically use as many jobs as there are -# cores. +# threads. #NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then diff --git a/source/d/rust/rust.url b/source/d/rust/rust.url index 17927fa1..23878e04 100644 --- a/source/d/rust/rust.url +++ b/source/d/rust/rust.url @@ -1,5 +1,5 @@ # Source code (repacked to .tar.lz): -VERSION=1.49.0 +VERSION=1.50.0 rm -f rustc-${VERSION}-src.tar.* lftpget https://static.rust-lang.org/dist/rustc-${VERSION}-src.tar.gz lftpget https://static.rust-lang.org/dist/rustc-${VERSION}-src.tar.gz.asc @@ -20,9 +20,9 @@ fi # update the settings below, look at src/stage0.txt in the Rust sources. exit 0 -BOOTSTRAP_DATE=2020-11-19 -BOOTSTRAP_CARGO=1.48.0 -BOOTSTRAP_VERSION=1.48.0 +BOOTSTRAP_DATE=2020-12-31 +BOOTSTRAP_CARGO=1.49.0 +BOOTSTRAP_VERSION=1.49.0 # i686 bootstrap: lftpget https://static.rust-lang.org/dist/${BOOTSTRAP_DATE}/cargo-${BOOTSTRAP_CARGO}-i686-unknown-linux-gnu.tar.gz diff --git a/source/l/libcap/libcap.SlackBuild b/source/l/libcap/libcap.SlackBuild index aaf168f3..d67f5e57 100755 --- a/source/l/libcap/libcap.SlackBuild +++ b/source/l/libcap/libcap.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libcap VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Building Go support is currently disabled until something actually needs it: GOSUPPORT=${GOSUPPORT:-no} diff --git a/source/l/python-urllib3/python-urllib3.SlackBuild b/source/l/python-urllib3/python-urllib3.SlackBuild index c1673bd8..52d33872 100755 --- a/source/l/python-urllib3/python-urllib3.SlackBuild +++ b/source/l/python-urllib3/python-urllib3.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-urllib3 VERSION=${VERSION:-$(echo urllib3-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} SRCNAM=urllib3 diff --git a/source/l/qt5/qt5.SlackBuild b/source/l/qt5/qt5.SlackBuild index 400b8f12..28a8204a 100755 --- a/source/l/qt5/qt5.SlackBuild +++ b/source/l/qt5/qt5.SlackBuild @@ -31,11 +31,11 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=qt5 VERSION=$(ls qt-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -BUILD=${BUILD:-5} +BUILD=${BUILD:-6} PKGSRC=$(echo $VERSION | cut -d - -f 1) PKGVER=$(echo $VERSION | tr - _) -USE_CODECS=${USE_CODECS:-NO} +USE_CODECS=${USE_CODECS:-YES} SYSTEM_FFMPEG=${SYSTEM_FFMPEG:-YES} # Automatically determine the architecture we're building on: 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] |