diff options
Diffstat (limited to 'source/xap')
12 files changed, 15 insertions, 322 deletions
diff --git a/source/xap/mozilla-firefox/build-deps.sh b/source/xap/mozilla-firefox/build-deps.sh index e70ed7b9d..8c22c29ba 100755 --- a/source/xap/mozilla-firefox/build-deps.sh +++ b/source/xap/mozilla-firefox/build-deps.sh @@ -26,16 +26,10 @@ mkdir -p $TMP/mozilla-firefox-build-deps # This will be at the beginning of the $PATH, so protect against nonsense # happening in /tmp: chmod 700 $TMP/mozilla-firefox-build-deps -PATH=$TMP/mozilla-firefox-build-deps/usr/bin:$HOME/.cargo/bin:$PATH -# cbindgen is a build-time dependency: -( cd $CWD/build-deps/cbindgen ; ./cbindgen.build ) || exit 1 - -if /bin/ls build-deps*.txz 1> /dev/null 2> /dev/null ; then # use prebuilt autoconf/nodejs +if /bin/ls build-deps*.txz 1> /dev/null 2> /dev/null ; then # use prebuilt ( cd $TMP/mozilla-firefox-build-deps ; tar xf $CWD/build-deps*.txz ) else # We need to use the incredibly ancient autoconf-2.13 for this :/ ( cd $CWD/build-deps/autoconf ; ./autoconf.build ) || exit 1 - ## And node.js... WHY - #( cd $CWD/build-deps/nodejs ; ./nodejs.build ) || exit 1 fi diff --git a/source/xap/mozilla-firefox/build-deps/cbindgen/cbindgen.build b/source/xap/mozilla-firefox/build-deps/cbindgen/cbindgen.build deleted file mode 100755 index a4659df29..000000000 --- a/source/xap/mozilla-firefox/build-deps/cbindgen/cbindgen.build +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh - -# Copyright 2019 Patrick J. Volkerding, Sebeka, Minnesota, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -PKGNAM=cbindgen -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i586 ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp} - -mkdir -p $TMP - -cd $TMP -rm -rf cbindgen-$VERSION -tar xvf $CWD/cbindgen-$VERSION.tar.?z || exit 1 -cd cbindgen-$VERSION - -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -cargo build --release -rm /root/.cargo/bin 2> /dev/null -mkdir -p /root/.cargo/bin -install -Dm755 target/release/cbindgen /root/.cargo/bin diff --git a/source/xap/mozilla-firefox/build-deps/cbindgen/cbindgen.url b/source/xap/mozilla-firefox/build-deps/cbindgen/cbindgen.url deleted file mode 100644 index f9f55c57d..000000000 --- a/source/xap/mozilla-firefox/build-deps/cbindgen/cbindgen.url +++ /dev/null @@ -1 +0,0 @@ -https://github.com/eqrion/cbindgen diff --git a/source/xap/mozilla-firefox/build-deps/nodejs/nodejs.build b/source/xap/mozilla-firefox/build-deps/nodejs/nodejs.build deleted file mode 100755 index aa09beaba..000000000 --- a/source/xap/mozilla-firefox/build-deps/nodejs/nodejs.build +++ /dev/null @@ -1,94 +0,0 @@ -#!/bin/sh - -# Copyright 2019 Patrick J. Volkerding, Sebeka, Minnesota, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -PKGNAM=node -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i586 ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; - esac -fi - -NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp} - -mkdir -p $TMP -mkdir -p $TMP/mozilla-firefox-build-deps/usr - -cd $TMP -rm -rf node-$VERSION -tar xvf $CWD/node-$VERSION.tar.?z || exit 1 -cd node-$VERSION - -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# 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 -fi - -# Use gcc as there have been linker failures with objects build with clang: -CC="gcc" \ -CXX="g++" \ -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=$TMP/mozilla-firefox-build-deps/usr \ - --shared-zlib \ - --without-ssl - make $NUMJOBS || make || exit 1 - make install DESTDIR=$PKG || exit 1 diff --git a/source/xap/mozilla-firefox/build-deps/nodejs/nodejs.url b/source/xap/mozilla-firefox/build-deps/nodejs/nodejs.url deleted file mode 100644 index 75f7f4d38..000000000 --- a/source/xap/mozilla-firefox/build-deps/nodejs/nodejs.url +++ /dev/null @@ -1,2 +0,0 @@ -https://nodejs.org/dist/v10.16.0/node-v10.16.0.tar.gz -#https://github.com/nodejs/node diff --git a/source/xap/mozilla-thunderbird/build-deps.sh b/source/xap/mozilla-thunderbird/build-deps.sh index c1ad0491b..090876bdd 100755 --- a/source/xap/mozilla-thunderbird/build-deps.sh +++ b/source/xap/mozilla-thunderbird/build-deps.sh @@ -26,16 +26,10 @@ mkdir -p $TMP/mozilla-thunderbird-build-deps # This will be at the beginning of the $PATH, so protect against nonsense # happening in /tmp: chmod 700 $TMP/mozilla-thunderbird-build-deps -PATH=$TMP/mozilla-thunderbird-build-deps/usr/bin:$HOME/.cargo/bin:$PATH -# cbindgen is a build-time dependency: -( cd $CWD/build-deps/cbindgen ; ./cbindgen.build ) || exit 1 - -if /bin/ls build-deps*.txz 1> /dev/null 2> /dev/null ; then # use prebuilt autoconf/nodejs +if /bin/ls build-deps*.txz 1> /dev/null 2> /dev/null ; then # use prebuilt ( cd $TMP/mozilla-thunderbird-build-deps ; tar xf $CWD/build-deps*.txz ) else # We need to use the incredibly ancient autoconf-2.13 for this :/ ( cd $CWD/build-deps/autoconf ; ./autoconf.build ) || exit 1 - ## And node.js... WHY - #( cd $CWD/build-deps/nodejs ; ./nodejs.build ) || exit 1 fi diff --git a/source/xap/mozilla-thunderbird/build-deps/cbindgen/cbindgen.build b/source/xap/mozilla-thunderbird/build-deps/cbindgen/cbindgen.build deleted file mode 100755 index a4659df29..000000000 --- a/source/xap/mozilla-thunderbird/build-deps/cbindgen/cbindgen.build +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh - -# Copyright 2019 Patrick J. Volkerding, Sebeka, Minnesota, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -PKGNAM=cbindgen -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i586 ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp} - -mkdir -p $TMP - -cd $TMP -rm -rf cbindgen-$VERSION -tar xvf $CWD/cbindgen-$VERSION.tar.?z || exit 1 -cd cbindgen-$VERSION - -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -cargo build --release -rm /root/.cargo/bin 2> /dev/null -mkdir -p /root/.cargo/bin -install -Dm755 target/release/cbindgen /root/.cargo/bin diff --git a/source/xap/mozilla-thunderbird/build-deps/cbindgen/cbindgen.url b/source/xap/mozilla-thunderbird/build-deps/cbindgen/cbindgen.url deleted file mode 100644 index f9f55c57d..000000000 --- a/source/xap/mozilla-thunderbird/build-deps/cbindgen/cbindgen.url +++ /dev/null @@ -1 +0,0 @@ -https://github.com/eqrion/cbindgen diff --git a/source/xap/mozilla-thunderbird/build-deps/nodejs/nodejs.build b/source/xap/mozilla-thunderbird/build-deps/nodejs/nodejs.build deleted file mode 100755 index e07f5a72e..000000000 --- a/source/xap/mozilla-thunderbird/build-deps/nodejs/nodejs.build +++ /dev/null @@ -1,94 +0,0 @@ -#!/bin/sh - -# Copyright 2019 Patrick J. Volkerding, Sebeka, Minnesota, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -PKGNAM=node -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i586 ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; - esac -fi - -NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp} - -mkdir -p $TMP -mkdir -p $TMP/mozilla-thunderbird-build-deps/usr - -cd $TMP -rm -rf node-$VERSION -tar xvf $CWD/node-$VERSION.tar.?z || exit 1 -cd node-$VERSION - -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# 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 -fi - -# Use gcc as there have been linker failures with objects build with clang: -CC="gcc" \ -CXX="g++" \ -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=$TMP/mozilla-thunderbird-build-deps/usr \ - --shared-zlib \ - --without-ssl - make $NUMJOBS || make || exit 1 - make install DESTDIR=$PKG || exit 1 diff --git a/source/xap/mozilla-thunderbird/build-deps/nodejs/nodejs.url b/source/xap/mozilla-thunderbird/build-deps/nodejs/nodejs.url deleted file mode 100644 index 75f7f4d38..000000000 --- a/source/xap/mozilla-thunderbird/build-deps/nodejs/nodejs.url +++ /dev/null @@ -1,2 +0,0 @@ -https://nodejs.org/dist/v10.16.0/node-v10.16.0.tar.gz -#https://github.com/nodejs/node diff --git a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild index c5730f5d6..1ad24f533 100755 --- a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild +++ b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild @@ -180,6 +180,9 @@ 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 +# Fix building with newer cbindgen: +zcat $CWD/thunderbird.cbindgen-0.24.3.diff.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/thunderbird.cbindgen-0.24.3.diff b/source/xap/mozilla-thunderbird/thunderbird.cbindgen-0.24.3.diff new file mode 100644 index 000000000..cd05437d2 --- /dev/null +++ b/source/xap/mozilla-thunderbird/thunderbird.cbindgen-0.24.3.diff @@ -0,0 +1,10 @@ +--- ./gfx/webrender_bindings/webrender_ffi.h.orig 2022-11-29 09:56:59.000000000 -0600 ++++ ./gfx/webrender_bindings/webrender_ffi.h 2022-12-07 13:03:07.952026999 -0600 +@@ -73,7 +73,6 @@ + struct WrPipelineIdAndEpoch; + using WrPipelineIdEpochs = nsTArray<WrPipelineIdAndEpoch>; + +-const uint64_t ROOT_CLIP_CHAIN = ~0; + + } // namespace wr + } // namespace mozilla |