diff options
Diffstat (limited to 'patches')
-rw-r--r-- | patches/packages/mozilla-firefox-102.2.0esr-x86_64-1_slack15.0.txt (renamed from patches/packages/mozilla-firefox-91.13.0esr-x86_64-1_slack15.0.txt) | 0 | ||||
-rw-r--r-- | patches/packages/mozilla-thunderbird-102.2.1-x86_64-1_slack15.0.txt (renamed from patches/packages/mozilla-thunderbird-91.13.0-x86_64-1_slack15.0.txt) | 0 | ||||
-rw-r--r-- | patches/packages/vim-9.0.0396-x86_64-1_slack15.0.txt (renamed from patches/packages/vim-9.0.0334-x86_64-1_slack15.0.txt) | 0 | ||||
-rw-r--r-- | patches/packages/vim-gvim-9.0.0396-x86_64-1_slack15.0.txt (renamed from patches/packages/vim-gvim-9.0.0334-x86_64-1_slack15.0.txt) | 0 | ||||
-rwxr-xr-x | patches/source/mozilla-firefox/mozilla-firefox.SlackBuild | 2 | ||||
-rw-r--r-- | patches/source/mozilla-thunderbird/arc4random_buf.glibc-2.36.diff | 18 | ||||
-rwxr-xr-x | patches/source/mozilla-thunderbird/build-deps/nodejs/nodejs.build | 4 | ||||
-rw-r--r-- | patches/source/mozilla-thunderbird/double_t.x86.diff | 13 | ||||
-rwxr-xr-x | patches/source/mozilla-thunderbird/mozilla-thunderbird.SlackBuild | 14 |
9 files changed, 46 insertions, 5 deletions
diff --git a/patches/packages/mozilla-firefox-91.13.0esr-x86_64-1_slack15.0.txt b/patches/packages/mozilla-firefox-102.2.0esr-x86_64-1_slack15.0.txt index 9d8594319..9d8594319 100644 --- a/patches/packages/mozilla-firefox-91.13.0esr-x86_64-1_slack15.0.txt +++ b/patches/packages/mozilla-firefox-102.2.0esr-x86_64-1_slack15.0.txt diff --git a/patches/packages/mozilla-thunderbird-91.13.0-x86_64-1_slack15.0.txt b/patches/packages/mozilla-thunderbird-102.2.1-x86_64-1_slack15.0.txt index 5acb7b92e..5acb7b92e 100644 --- a/patches/packages/mozilla-thunderbird-91.13.0-x86_64-1_slack15.0.txt +++ b/patches/packages/mozilla-thunderbird-102.2.1-x86_64-1_slack15.0.txt diff --git a/patches/packages/vim-9.0.0334-x86_64-1_slack15.0.txt b/patches/packages/vim-9.0.0396-x86_64-1_slack15.0.txt index 4a843388d..4a843388d 100644 --- a/patches/packages/vim-9.0.0334-x86_64-1_slack15.0.txt +++ b/patches/packages/vim-9.0.0396-x86_64-1_slack15.0.txt diff --git a/patches/packages/vim-gvim-9.0.0334-x86_64-1_slack15.0.txt b/patches/packages/vim-gvim-9.0.0396-x86_64-1_slack15.0.txt index 3b81553b1..3b81553b1 100644 --- a/patches/packages/vim-gvim-9.0.0334-x86_64-1_slack15.0.txt +++ b/patches/packages/vim-gvim-9.0.0396-x86_64-1_slack15.0.txt diff --git a/patches/source/mozilla-firefox/mozilla-firefox.SlackBuild b/patches/source/mozilla-firefox/mozilla-firefox.SlackBuild index 3c83f3080..5cad8cc89 100755 --- a/patches/source/mozilla-firefox/mozilla-firefox.SlackBuild +++ b/patches/source/mozilla-firefox/mozilla-firefox.SlackBuild @@ -234,9 +234,9 @@ OPTIONS="\ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --with-system-zlib \ - --with-system-nss \ --with-system-nspr \ --with-unsigned-addon-scopes=app,system \ + --without-wasm-sandboxed-libraries \ --allow-addon-sideload \ --enable-alsa \ --enable-application=browser \ diff --git a/patches/source/mozilla-thunderbird/arc4random_buf.glibc-2.36.diff b/patches/source/mozilla-thunderbird/arc4random_buf.glibc-2.36.diff new file mode 100644 index 000000000..d4131c0a2 --- /dev/null +++ b/patches/source/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/patches/source/mozilla-thunderbird/build-deps/nodejs/nodejs.build b/patches/source/mozilla-thunderbird/build-deps/nodejs/nodejs.build index 136b05b26..e07f5a72e 100755 --- a/patches/source/mozilla-thunderbird/build-deps/nodejs/nodejs.build +++ b/patches/source/mozilla-thunderbird/build-deps/nodejs/nodejs.build @@ -76,9 +76,9 @@ find . \ # Fix paths for $LIBDIRSUFFIX (if needed): if [ ! -z $LIBDIRSUFFIX ]; then + sed -i "s|\"lib\"|\"lib${LIBDIRSUFFIX}\"|" deps/npm/lib/npm.js + sed -i "s/'lib'/'lib${LIBDIRSUFFIX}'/" lib/module.js sed -i "s|lib/|lib${LIBDIRSUFFIX}/|g" tools/install.py - sed -i "s|'lib'|'lib${LIBDIRSUFFIX}'|g" lib/module.js - sed -i "s|'lib'|'lib${LIBDIRSUFFIX}'|g" deps/npm/lib/npm.js fi # Use gcc as there have been linker failures with objects build with clang: diff --git a/patches/source/mozilla-thunderbird/double_t.x86.diff b/patches/source/mozilla-thunderbird/double_t.x86.diff new file mode 100644 index 000000000..12f04c378 --- /dev/null +++ b/patches/source/mozilla-thunderbird/double_t.x86.diff @@ -0,0 +1,13 @@ +--- ./modules/fdlibm/src/math_private.h.orig 2022-06-27 21:04:57.000000000 -0500 ++++ ./modules/fdlibm/src/math_private.h 2022-06-30 13:41:46.761170878 -0500 +@@ -30,8 +30,8 @@ + * Adapted from https://github.com/freebsd/freebsd-src/search?q=__double_t + */ + +-typedef double __double_t; +-typedef __double_t double_t; ++typedef long double __double_t; ++typedef long double double_t; + + /* + * The original fdlibm code used statements like: diff --git a/patches/source/mozilla-thunderbird/mozilla-thunderbird.SlackBuild b/patches/source/mozilla-thunderbird/mozilla-thunderbird.SlackBuild index 6fccba89a..4039ae9fc 100755 --- a/patches/source/mozilla-thunderbird/mozilla-thunderbird.SlackBuild +++ b/patches/source/mozilla-thunderbird/mozilla-thunderbird.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2011, 2012, 2014, 2016, 2017, 2018, 2019, 2020, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2011, 2012, 2014, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -172,6 +172,14 @@ zcat $CWD/tb.ui.scrollToClick.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 header mismatch on x86 with GCC: +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" @@ -202,9 +210,11 @@ OPTIONS="\ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --with-system-zlib \ - --with-system-nss \ --with-system-nspr \ --enable-alsa \ + --with-unsigned-addon-scopes=app,system \ + --without-wasm-sandboxed-libraries \ + --allow-addon-sideload \ --enable-application=comm/mail \ --enable-default-toolkit=cairo-gtk3-wayland \ --enable-linker=$LINKER \ |