diff options
Diffstat (limited to 'source')
23 files changed, 61 insertions, 25 deletions
diff --git a/source/a/aaa_libraries/aaa_libraries.SlackBuild b/source/a/aaa_libraries/aaa_libraries.SlackBuild index 3b593fbe..52584462 100755 --- a/source/a/aaa_libraries/aaa_libraries.SlackBuild +++ b/source/a/aaa_libraries/aaa_libraries.SlackBuild @@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=aaa_libraries VERSION=${VERSION:-15.1} -BUILD=${BUILD:-6} +BUILD=${BUILD:-7} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/aaa_libraries/symlinks-to-tracked-libs b/source/a/aaa_libraries/symlinks-to-tracked-libs index ce0485b1..8731ee59 100644 --- a/source/a/aaa_libraries/symlinks-to-tracked-libs +++ b/source/a/aaa_libraries/symlinks-to-tracked-libs @@ -39,8 +39,7 @@ /usr/lib/libcares.so.2 /usr/lib/libcurl.so.4 /usr/lib/libexpat.so.1 -/usr/lib/libffi.so.6 -/usr/lib/libffi.so.7 +/usr/lib/libffi.so.8 /usr/lib/libform.so.5 /usr/lib/libform.so.6 /usr/lib/libformw.so.5 diff --git a/source/a/aaa_libraries/symlinks-to-tracked-libs-tmp.d/icu4c b/source/a/aaa_libraries/symlinks-to-tracked-libs-tmp.d/icu4c deleted file mode 100644 index 7fff9cad..00000000 --- a/source/a/aaa_libraries/symlinks-to-tracked-libs-tmp.d/icu4c +++ /dev/null @@ -1,7 +0,0 @@ -# We'll keep these around for a little while... probably remove on 2022-05-10 or thereabouts -/usr/lib/libicudata.so.70 -/usr/lib/libicui18n.so.70 -/usr/lib/libicuio.so.70 -/usr/lib/libicutest.so.70 -/usr/lib/libicutu.so.70 -/usr/lib/libicuuc.so.70 diff --git a/source/a/aaa_libraries/symlinks-to-tracked-libs-tmp.d/libffi_so_7 b/source/a/aaa_libraries/symlinks-to-tracked-libs-tmp.d/libffi_so_7 new file mode 100644 index 00000000..ec1cefa5 --- /dev/null +++ b/source/a/aaa_libraries/symlinks-to-tracked-libs-tmp.d/libffi_so_7 @@ -0,0 +1,2 @@ +# We'll keep this around for a little while... probably remove on 2022-09-06 or thereabouts +/usr/lib/libffi.so.7 diff --git a/source/d/guile/guile.SlackBuild b/source/d/guile/guile.SlackBuild index 56767bf6..9c00b21f 100755 --- a/source/d/guile/guile.SlackBuild +++ b/source/d/guile/guile.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=guile VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/d/llvm/llvm.SlackBuild b/source/d/llvm/llvm.SlackBuild index f1964363..5996a100 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:-2} +BUILD=${BUILD:-3} # For the two options below, either set both to OFF or *only one* to ON: diff --git a/source/d/python2/python2.SlackBuild b/source/d/python2/python2.SlackBuild index 42c15d24..25a5d469 100755 --- a/source/d/python2/python2.SlackBuild +++ b/source/d/python2/python2.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=python2 SRCNAM=Python VERSION=$(echo $SRCNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev) BRANCH_VERSION=$(echo $VERSION | cut -f 1,2 -d . ) -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/d/python3/python3.SlackBuild b/source/d/python3/python3.SlackBuild index c437325c..b1090dd8 100755 --- a/source/d/python3/python3.SlackBuild +++ b/source/d/python3/python3.SlackBuild @@ -29,7 +29,7 @@ PKGNAM=python3 SRCNAM=Python VERSION=$(echo $SRCNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev) BRANCH_VERSION=$(echo $VERSION | cut -f 1,2 -d . ) -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/d/ruby/ruby.SlackBuild b/source/d/ruby/ruby.SlackBuild index d3c486f5..09237780 100755 --- a/source/d/ruby/ruby.SlackBuild +++ b/source/d/ruby/ruby.SlackBuild @@ -32,7 +32,7 @@ else VERSION=$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) fi -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/gjs/gjs.SlackBuild b/source/l/gjs/gjs.SlackBuild index 3786e79d..b5bea6bb 100755 --- a/source/l/gjs/gjs.SlackBuild +++ b/source/l/gjs/gjs.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gjs VERSION=${VERSION:-$(echo gjs-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/glib2/glib2.SlackBuild b/source/l/glib2/glib2.SlackBuild index f86924ff..3f04afb5 100755 --- a/source/l/glib2/glib2.SlackBuild +++ b/source/l/glib2/glib2.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=glib2 VERSION=${VERSION:-$(echo glib-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/l/gobject-introspection/gobject-introspection.SlackBuild b/source/l/gobject-introspection/gobject-introspection.SlackBuild index 9396474d..3856fce8 100755 --- a/source/l/gobject-introspection/gobject-introspection.SlackBuild +++ b/source/l/gobject-introspection/gobject-introspection.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gobject-introspection VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/libffi/libffi.SlackBuild b/source/l/libffi/libffi.SlackBuild index 0854f84b..d2f6fee2 100755 --- a/source/l/libffi/libffi.SlackBuild +++ b/source/l/libffi/libffi.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libffi 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/l/libffi/libffi.url b/source/l/libffi/libffi.url index 1fbd28a9..6f2684c7 100644 --- a/source/l/libffi/libffi.url +++ b/source/l/libffi/libffi.url @@ -1 +1 @@ -ftp://sourceware.org/pub/libffi +https://github.com/libffi/libffi diff --git a/source/l/pygobject/pygobject.SlackBuild b/source/l/pygobject/pygobject.SlackBuild index 6b9e40f3..0d2b697c 100755 --- a/source/l/pygobject/pygobject.SlackBuild +++ b/source/l/pygobject/pygobject.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=pygobject VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-8} +BUILD=${BUILD:-9} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/l/pygobject3/pygobject3.SlackBuild b/source/l/pygobject3/pygobject3.SlackBuild index e8108d3d..c97ac064 100755 --- a/source/l/pygobject3/pygobject3.SlackBuild +++ b/source/l/pygobject3/pygobject3.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=pygobject3 SRCNAM=pygobject VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/python-cffi/python-cffi.SlackBuild b/source/l/python-cffi/python-cffi.SlackBuild index 739675ca..8cb165ec 100755 --- a/source/l/python-cffi/python-cffi.SlackBuild +++ b/source/l/python-cffi/python-cffi.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-cffi SRCNAM=cffi VERSION=${VERSION:-$(echo ${SRCNAM}-*.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 diff --git a/source/n/p11-kit/p11-kit.SlackBuild b/source/n/p11-kit/p11-kit.SlackBuild index d0749941..cfd002ae 100755 --- a/source/n/p11-kit/p11-kit.SlackBuild +++ b/source/n/p11-kit/p11-kit.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=p11-kit VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/x/wayland/wayland.SlackBuild b/source/x/wayland/wayland.SlackBuild index 866f2d43..76f12c9e 100755 --- a/source/x/wayland/wayland.SlackBuild +++ b/source/x/wayland/wayland.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=wayland VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/xap/mozilla-firefox/arc4random_buf.glibc-2.36.diff b/source/xap/mozilla-firefox/arc4random_buf.glibc-2.36.diff new file mode 100644 index 00000000..d4131c0a --- /dev/null +++ b/source/xap/mozilla-firefox/arc4random_buf.glibc-2.36.diff @@ -0,0 +1,18 @@ +--- ./ipc/chromium/src/third_party/libevent/arc4random.c.orig 2022-08-04 14:57:57.000000000 -0500 ++++ ./ipc/chromium/src/third_party/libevent/arc4random.c 2022-08-06 14:40:21.569033657 -0500 +@@ -484,6 +484,7 @@ + } + #endif + ++#if 0 + ARC4RANDOM_EXPORT void + arc4random_buf(void *buf_, size_t n) + { +@@ -497,6 +498,7 @@ + } + ARC4_UNLOCK_(); + } ++#endif + + #ifndef ARC4RANDOM_NOUNIFORM + /* diff --git a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild index d827fec6..9ce487e2 100755 --- a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild +++ b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild @@ -208,6 +208,9 @@ zcat $CWD/ff.ui.scrollToClick.diff.gz | patch -p1 --verbose || exit 1 # Don't enable LTO for Rust unless the whole build uses it: zcat $CWD/0027-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch.gz | patch -p1 --verbose || exit 1 +# Don't define a function that's included starting in glibc-2.36: +zcat $CWD/arc4random_buf.glibc-2.36.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-thunderbird/arc4random_buf.glibc-2.36.diff b/source/xap/mozilla-thunderbird/arc4random_buf.glibc-2.36.diff new file mode 100644 index 00000000..d4131c0a --- /dev/null +++ b/source/xap/mozilla-thunderbird/arc4random_buf.glibc-2.36.diff @@ -0,0 +1,18 @@ +--- ./ipc/chromium/src/third_party/libevent/arc4random.c.orig 2022-08-04 14:57:57.000000000 -0500 ++++ ./ipc/chromium/src/third_party/libevent/arc4random.c 2022-08-06 14:40:21.569033657 -0500 +@@ -484,6 +484,7 @@ + } + #endif + ++#if 0 + ARC4RANDOM_EXPORT void + arc4random_buf(void *buf_, size_t n) + { +@@ -497,6 +498,7 @@ + } + ARC4_UNLOCK_(); + } ++#endif + + #ifndef ARC4RANDOM_NOUNIFORM + /* diff --git a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild index ca37b9e1..c5730f5d 100755 --- a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild +++ b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild @@ -177,6 +177,9 @@ if [ "$ARCH" = "i686" -a "$CC" = "gcc" ]; then zcat $CWD/double_t.x86.diff.gz | patch -p1 --verbose || exit 1 fi +# Don't define a function that's included starting in glibc-2.36: +zcat $CWD/arc4random_buf.glibc-2.36.diff.gz | patch -p1 --verbose || exit 1 + # Fetch localization, if requested: if [ ! -z $MOZLOCALIZE ]; then LOC_TAG="THUNDERBIRD_$( echo $VERSION | tr \. _ )_RELEASE" |