diff options
Diffstat (limited to 'source')
30 files changed, 120 insertions, 92 deletions
diff --git a/source/a/lrzip/lrzip.SlackBuild b/source/a/lrzip/lrzip.SlackBuild index 25ea484e3..b0b5ac536 100755 --- a/source/a/lrzip/lrzip.SlackBuild +++ b/source/a/lrzip/lrzip.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=lrzip VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/pkgtools/pkgtools.SlackBuild b/source/a/pkgtools/pkgtools.SlackBuild index 6bcffc571..cca59234c 100755 --- a/source/a/pkgtools/pkgtools.SlackBuild +++ b/source/a/pkgtools/pkgtools.SlackBuild @@ -30,7 +30,7 @@ PKGNAM=pkgtools # *** UPDATE THESE WITH EACH BUILD: VERSION=15.0 ARCH=${ARCH:-noarch} -BUILD=${BUILD:-36} +BUILD=${BUILD:-37} # If the variable PRINT_PACKAGE_NAME is set, then this script will report what # the name of the created package would be, and then exit. This information diff --git a/source/a/pkgtools/scripts/installpkg b/source/a/pkgtools/scripts/installpkg index ddd8e693b..3bebe7ce2 100644..100755 --- a/source/a/pkgtools/scripts/installpkg +++ b/source/a/pkgtools/scripts/installpkg @@ -584,7 +584,7 @@ EOF fi elif [ "$MODE" = "terse" ]; then # emit a single description line ( flock 9 || exit 11 - printf "%-$(expr $TERSELENGTH - 7)s %-6s\n" "$(echo $shortname: $(echo $(cat $DESCRIPTION | grep "^$packagebase:" | sed "s/^$packagebase: //g" | head -n 1 | tr -d '()' | sed "s/^$packagebase //g" ) $(echo " $(printf '.%.0s' {1..256})")) | cut -b1-$(expr $TERSELENGTH - 7))" "$(printf "[%4s]" $UNCOMPRESSED)" | cut -b 1-${TERSELENGTH} + printf "%-$(expr $TERSELENGTH - 8)s %-6s\n" "$(echo $shortname: $(echo $(cat $DESCRIPTION | grep "^$packagebase:" | sed "s/^$packagebase: //g" | head -n 1 | tr -d '()' | sed "s/^$packagebase //g" ) $(echo " $(printf '.%.0s' {1..256})")) | cut -b1-$(expr $TERSELENGTH - 8))" "$(printf "[%5s]" $UNCOMPRESSED)" | cut -b 1-${TERSELENGTH} ) 9> $INSTLOCKDIR/dialog.lock elif [ "$MODE" = "infobox" ]; then # install infobox package ( flock 9 || exit 11 diff --git a/source/ap/mariadb/mariadb.SlackBuild b/source/ap/mariadb/mariadb.SlackBuild index 904f2ae8b..2291bb573 100755 --- a/source/ap/mariadb/mariadb.SlackBuild +++ b/source/ap/mariadb/mariadb.SlackBuild @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mariadb VERSION=${VERSION:-$(echo ${PKGNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # To reduce the package size, the embedded server may be omitted. Currently # only amarok uses this. To build without embedded support, set this to NO. diff --git a/source/d/llvm/llvm.SlackBuild b/source/d/llvm/llvm.SlackBuild index 8554eb530..826a47927 100755 --- a/source/d/llvm/llvm.SlackBuild +++ b/source/d/llvm/llvm.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=llvm VERSION=${VERSION:-$(echo llvm-*.tar.xz | rev | cut -f 4- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/d/llvm/llvm.url b/source/d/llvm/llvm.url index 62c0ad415..c18b45b10 100644 --- a/source/d/llvm/llvm.url +++ b/source/d/llvm/llvm.url @@ -1,23 +1,23 @@ -https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.1/llvm-11.0.1.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.1/clang-11.0.1.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.1/clang-tools-extra-11.0.1.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.1/compiler-rt-11.0.1.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.1/flang-11.0.1.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.1/lldb-11.0.1.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.1/openmp-11.0.1.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.1/polly-11.0.1.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.1/libcxx-11.0.1.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.1/libcxxabi-11.0.1.src.tar.xz -https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.1/lld-11.0.1.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-11.1.0/llvm-11.1.0.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-11.1.0/clang-11.1.0.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-11.1.0/clang-tools-extra-11.1.0.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-11.1.0/compiler-rt-11.1.0.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-11.1.0/flang-11.1.0.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-11.1.0/lldb-11.1.0.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-11.1.0/openmp-11.1.0.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-11.1.0/polly-11.1.0.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-11.1.0/libcxx-11.1.0.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-11.1.0/libcxxabi-11.1.0.src.tar.xz +https://github.com/llvm/llvm-project/releases/download/llvmorg-11.1.0/lld-11.1.0.src.tar.xz -#http://llvm.org/releases/11.0.1/llvm-11.0.1.src.tar.xz -#http://llvm.org/releases/11.0.1/clang-11.0.1.src.tar.xz -#http://llvm.org/releases/11.0.1/clang-tools-extra-11.0.1.src.tar.xz -#http://llvm.org/releases/11.0.1/compiler-rt-11.0.1.src.tar.xz -#http://llvm.org/releases/11.0.1/flang-11.0.1.src.tar.xz -#http://llvm.org/releases/11.0.1/lldb-11.0.1.src.tar.xz -#http://llvm.org/releases/11.0.1/openmp-11.0.1.src.tar.xz -#http://llvm.org/releases/11.0.1/polly-11.0.1.src.tar.xz -#http://llvm.org/releases/11.0.1/libcxx-11.0.1.src.tar.xz -#http://llvm.org/releases/11.0.1/libcxxabi-11.0.1.src.tar.xz -#http://llvm.org/releases/11.0.1/lld-11.0.1.src.tar.xz +#http://llvm.org/releases/11.1.0/llvm-11.1.0.src.tar.xz +#http://llvm.org/releases/11.1.0/clang-11.1.0.src.tar.xz +#http://llvm.org/releases/11.1.0/clang-tools-extra-11.1.0.src.tar.xz +#http://llvm.org/releases/11.1.0/compiler-rt-11.1.0.src.tar.xz +#http://llvm.org/releases/11.1.0/flang-11.1.0.src.tar.xz +#http://llvm.org/releases/11.1.0/lldb-11.1.0.src.tar.xz +#http://llvm.org/releases/11.1.0/openmp-11.1.0.src.tar.xz +#http://llvm.org/releases/11.1.0/polly-11.1.0.src.tar.xz +#http://llvm.org/releases/11.1.0/libcxx-11.1.0.src.tar.xz +#http://llvm.org/releases/11.1.0/libcxxabi-11.1.0.src.tar.xz +#http://llvm.org/releases/11.1.0/lld-11.1.0.src.tar.xz diff --git a/source/d/rust/rust.SlackBuild b/source/d/rust/rust.SlackBuild index 8d768eaa7..5ab97ac97 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 17927fa19..23878e045 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/d/strace/strace.SlackBuild b/source/d/strace/strace.SlackBuild index 3dc35a812..0e6690ad8 100755 --- a/source/d/strace/strace.SlackBuild +++ b/source/d/strace/strace.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=strace 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/k/kernel-configs/config-generic-5.10.16 b/source/k/kernel-configs/config-generic-5.10.17 index 812cca1bd..7ed5b9ee0 100644 --- a/source/k/kernel-configs/config-generic-5.10.16 +++ b/source/k/kernel-configs/config-generic-5.10.17 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.10.16 Kernel Configuration +# Linux/x86 5.10.17 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-generic-5.10.16.x64 b/source/k/kernel-configs/config-generic-5.10.17.x64 index 42e27ed41..566434cc8 100644 --- a/source/k/kernel-configs/config-generic-5.10.16.x64 +++ b/source/k/kernel-configs/config-generic-5.10.17.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.10.16 Kernel Configuration +# Linux/x86 5.10.17 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-generic-smp-5.10.16-smp b/source/k/kernel-configs/config-generic-smp-5.10.17-smp index cd38898d6..2bb945cf8 100644 --- a/source/k/kernel-configs/config-generic-smp-5.10.16-smp +++ b/source/k/kernel-configs/config-generic-smp-5.10.17-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.10.16 Kernel Configuration +# Linux/x86 5.10.17 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-huge-5.10.16 b/source/k/kernel-configs/config-huge-5.10.17 index c8e44fecf..49c82e123 100644 --- a/source/k/kernel-configs/config-huge-5.10.16 +++ b/source/k/kernel-configs/config-huge-5.10.17 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.10.16 Kernel Configuration +# Linux/x86 5.10.17 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-huge-5.10.16.x64 b/source/k/kernel-configs/config-huge-5.10.17.x64 index 745c8ffac..6e259ff99 100644 --- a/source/k/kernel-configs/config-huge-5.10.16.x64 +++ b/source/k/kernel-configs/config-huge-5.10.17.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.10.16 Kernel Configuration +# Linux/x86 5.10.17 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-huge-smp-5.10.16-smp b/source/k/kernel-configs/config-huge-smp-5.10.17-smp index 05d46e7f5..de4f48e9e 100644 --- a/source/k/kernel-configs/config-huge-smp-5.10.16-smp +++ b/source/k/kernel-configs/config-huge-smp-5.10.17-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.10.16 Kernel Configuration +# Linux/x86 5.10.17 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0" CONFIG_CC_IS_GCC=y diff --git a/source/kde/kde/build/kdevelop b/source/kde/kde/build/kdevelop index 0cfbf0888..00750edc0 100644 --- a/source/kde/kde/build/kdevelop +++ b/source/kde/kde/build/kdevelop @@ -1 +1 @@ -2 +3 diff --git a/source/l/libedit/libedit.SlackBuild b/source/l/libedit/libedit.SlackBuild index 4fc10150d..42c57c319 100755 --- a/source/l/libedit/libedit.SlackBuild +++ b/source/l/libedit/libedit.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libedit VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1-2 -d - | rev)} PKGVER=$(echo $VERSION | tr - _) -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/l/libiodbc/libiodbc.SlackBuild b/source/l/libiodbc/libiodbc.SlackBuild index 59fe0a2e8..b03543ce4 100755 --- a/source/l/libiodbc/libiodbc.SlackBuild +++ b/source/l/libiodbc/libiodbc.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libiodbc VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: diff --git a/source/l/pipewire/pipewire.SlackBuild b/source/l/pipewire/pipewire.SlackBuild index 51ce5f32d..d3210a726 100755 --- a/source/l/pipewire/pipewire.SlackBuild +++ b/source/l/pipewire/pipewire.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=pipewire VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/qt5/qt5.SlackBuild b/source/l/qt5/qt5.SlackBuild index a626f42f2..400b8f125 100755 --- a/source/l/qt5/qt5.SlackBuild +++ b/source/l/qt5/qt5.SlackBuild @@ -31,7 +31,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=qt5 VERSION=$(ls qt-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} PKGSRC=$(echo $VERSION | cut -d - -f 1) PKGVER=$(echo $VERSION | tr - _) diff --git a/source/l/vte/vte.SlackBuild b/source/l/vte/vte.SlackBuild index 6bc7618c9..a8ca327e2 100755 --- a/source/l/vte/vte.SlackBuild +++ b/source/l/vte/vte.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=vte VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/n/bind/bind.SlackBuild b/source/n/bind/bind.SlackBuild index 783ef548a..1b7af8957 100755 --- a/source/n/bind/bind.SlackBuild +++ b/source/n/bind/bind.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=bind VERSION=${VERSION:-$(echo ${PKGNAM}-[0-9]*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/libgcrypt/libgcrypt.SlackBuild b/source/n/libgcrypt/libgcrypt.SlackBuild index 2929ba0a0..afe39d3ab 100755 --- a/source/n/libgcrypt/libgcrypt.SlackBuild +++ b/source/n/libgcrypt/libgcrypt.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libgcrypt VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/nettle/nettle.SlackBuild b/source/n/nettle/nettle.SlackBuild index e61e2ce08..7ce2d95d4 100755 --- a/source/n/nettle/nettle.SlackBuild +++ b/source/n/nettle/nettle.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=nettle VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/n/s-nail/s-nail.SlackBuild b/source/n/s-nail/s-nail.SlackBuild index c3a470040..07f673ccd 100755 --- a/source/n/s-nail/s-nail.SlackBuild +++ b/source/n/s-nail/s-nail.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=s-nail VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -84,7 +84,8 @@ make $NUMJOBS \ VAL_MANDIR=/usr/man \ VAL_MAIL=/var/spool/mail \ VAL_MTA=/usr/sbin/sendmail \ - OPT_AUTOCC=0 \ + OPT_AUTOCC=no \ + OPT_DOTLOCK=no \ VAL_SID= \ VAL_MAILX=mailx \ VAL_SYSCONFRC=nail.rc \ diff --git a/source/x/mesa/mesa.SlackBuild b/source/x/mesa/mesa.SlackBuild index f41ca6bd2..82cb083a5 100755 --- a/source/x/mesa/mesa.SlackBuild +++ b/source/x/mesa/mesa.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mesa VERSION=${VERSION:-$(echo $PKGNAM-[0-9]*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} DEMOVERS=${DEMOVERS:-8.4.0} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} BUILD_DEMOS=${BUILD_DEMOS:-YES} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} 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 |