summaryrefslogtreecommitdiffstats
path: root/source/xap/mozilla-firefox
diff options
context:
space:
mode:
Diffstat (limited to 'source/xap/mozilla-firefox')
-rwxr-xr-xsource/xap/mozilla-firefox/build-deps.sh41
-rw-r--r--source/xap/mozilla-firefox/build-deps/autoconf/autoconf-2.13-consolidated_fixes-1.patch (renamed from source/xap/mozilla-firefox/autoconf/autoconf-2.13-consolidated_fixes-1.patch)0
-rwxr-xr-xsource/xap/mozilla-firefox/build-deps/autoconf/autoconf.build (renamed from source/xap/mozilla-firefox/autoconf/autoconf.build)16
-rwxr-xr-xsource/xap/mozilla-firefox/build-deps/cbindgen/cbindgen.build54
-rwxr-xr-xsource/xap/mozilla-firefox/build-deps/nodejs/nodejs.build91
-rw-r--r--source/xap/mozilla-firefox/build-deps/nodejs/nodejs.url2
-rw-r--r--source/xap/mozilla-firefox/ff.ui.scrollToClick.diff12
-rwxr-xr-xsource/xap/mozilla-firefox/mozilla-firefox.SlackBuild17
-rw-r--r--source/xap/mozilla-firefox/unbreakdocs.diff23
9 files changed, 218 insertions, 38 deletions
diff --git a/source/xap/mozilla-firefox/build-deps.sh b/source/xap/mozilla-firefox/build-deps.sh
new file mode 100755
index 000000000..af9d440e2
--- /dev/null
+++ b/source/xap/mozilla-firefox/build-deps.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+# 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.
+
+# Clear out any existing build deps:
+rm -rf $TMP/mozilla-firefox-build-deps
+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
+ ( 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/autoconf/autoconf-2.13-consolidated_fixes-1.patch b/source/xap/mozilla-firefox/build-deps/autoconf/autoconf-2.13-consolidated_fixes-1.patch
index 5e7b23113..5e7b23113 100644
--- a/source/xap/mozilla-firefox/autoconf/autoconf-2.13-consolidated_fixes-1.patch
+++ b/source/xap/mozilla-firefox/build-deps/autoconf/autoconf-2.13-consolidated_fixes-1.patch
diff --git a/source/xap/mozilla-firefox/autoconf/autoconf.build b/source/xap/mozilla-firefox/build-deps/autoconf/autoconf.build
index 7dae1bad1..b9ae59749 100755
--- a/source/xap/mozilla-firefox/autoconf/autoconf.build
+++ b/source/xap/mozilla-firefox/build-deps/autoconf/autoconf.build
@@ -30,7 +30,7 @@ NUMJOBS=${NUMJOBS:-" -j7 "}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) export ARCH=i486 ;;
+ 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 ) ;;
@@ -61,19 +61,13 @@ find . \
# Build a temporary copy of autoconf-2.13 only to be used to compile
# Firefox, since it somewhat inexplicably requires this ancient version:
-rm -rf $TMP/autoconf-tmp
-mkdir -p $TMP/autoconf-tmp
-# This will be at the beginning of the $PATH, so protect against nonsense
-# happening in /tmp:
-chmod 700 $TMP/autoconf-tmp
-rm -rf $TMP/autoconf-tmp/*
-mkdir -p $TMP/autoconf-tmp/usr
+mkdir -p $TMP/mozilla-firefox-build-deps/usr
./configure \
- --prefix=$TMP/autoconf-tmp/usr \
+ --prefix=$TMP/mozilla-firefox-build-deps/usr \
--program-suffix=-2.13 \
- --infodir=$TMP/autoconf-tmp/usr/info \
- --mandir=$TMP/autoconf-tmp/usr/man \
+ --infodir=$TMP/mozilla-firefox-build-deps/usr/info \
+ --mandir=$TMP/mozilla-firefox-build-deps/usr/man \
--build=$ARCH-slackware-linux || exit 1
make $NUMJOBS || make || exit 1
diff --git a/source/xap/mozilla-firefox/build-deps/cbindgen/cbindgen.build b/source/xap/mozilla-firefox/build-deps/cbindgen/cbindgen.build
new file mode 100755
index 000000000..06116e435
--- /dev/null
+++ b/source/xap/mozilla-firefox/build-deps/cbindgen/cbindgen.build
@@ -0,0 +1,54 @@
+#!/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 install --force cbindgen
diff --git a/source/xap/mozilla-firefox/build-deps/nodejs/nodejs.build b/source/xap/mozilla-firefox/build-deps/nodejs/nodejs.build
new file mode 100755
index 000000000..d0813df0e
--- /dev/null
+++ b/source/xap/mozilla-firefox/build-deps/nodejs/nodejs.build
@@ -0,0 +1,91 @@
+#!/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
+
+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
new file mode 100644
index 000000000..75f7f4d38
--- /dev/null
+++ b/source/xap/mozilla-firefox/build-deps/nodejs/nodejs.url
@@ -0,0 +1,2 @@
+https://nodejs.org/dist/v10.16.0/node-v10.16.0.tar.gz
+#https://github.com/nodejs/node
diff --git a/source/xap/mozilla-firefox/ff.ui.scrollToClick.diff b/source/xap/mozilla-firefox/ff.ui.scrollToClick.diff
index 6bb7ea67a..f5cca210f 100644
--- a/source/xap/mozilla-firefox/ff.ui.scrollToClick.diff
+++ b/source/xap/mozilla-firefox/ff.ui.scrollToClick.diff
@@ -1,12 +1,12 @@
---- ./modules/libpref/init/all.js.orig 2017-04-10 21:13:21.000000000 -0500
-+++ ./modules/libpref/init/all.js 2017-05-21 15:29:42.803757223 -0500
-@@ -235,6 +235,9 @@
+--- ./modules/libpref/init/all.js.orig 2019-07-08 13:28:45.106153934 -0500
++++ ./modules/libpref/init/all.js 2019-07-08 13:41:02.035201116 -0500
+@@ -258,6 +258,9 @@
// If true, all popups won't hide automatically on blur
pref("ui.popup.disable_autohide", false);
+// Default to GTK+ v2 type scrolling:
+pref("ui.scrollToClick", 0);
+
- pref("browser.display.use_document_fonts", 1); // 0 = never, 1 = quick, 2 = always
- // 0 = default: always, except in high contrast mode
- // 1 = always
+ #ifdef XP_MACOSX
+ pref("ui.touchbar.layout", "Back,Forward,Reload,OpenLocation,NewTab,Share");
+ #endif
diff --git a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
index 3649ce8ef..363e2cf7d 100755
--- a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
+++ b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2018, 2019 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -75,8 +75,8 @@ if [ "$(uname -m)" = "x86_64" -a "$(file -L /usr/bin/gcc | grep 80386 | grep 32-
fi
# Choose a compiler (gcc/g++ or clang/clang++):
-export CC=${CC:-gcc}
-export CXX=${CXX:-g++}
+export CC=${CC:-clang}
+export CXX=${CXX:-clang++}
# Keep memory usage as low as possible when linking:
SLKLDFLAGS=" -Wl,--as-needed -Wl,--no-keep-memory -Wl,--stats"
@@ -160,9 +160,8 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
rm -rf $PKG
mkdir -p $TMP $PKG/usr/lib${LIBDIRSUFFIX}
-# We need to use the incredibly ancient autoconf-2.13 for this :/
-( cd $CWD/autoconf ; ./autoconf.build )
-PATH=$TMP/autoconf-tmp/usr/bin:$PATH
+# Build or unpack build-time dependencies:
+. build-deps.sh
cd $TMP
rm -rf firefox-$RELEASEVER
@@ -176,6 +175,9 @@ cd ..
rm -rf firefox-unpack
cd firefox-$RELEASEVER || exit 1
+# Delete object directory if it was mistakenly included in the tarball:
+rm -rf obj-x86_64-pc-linux-gnu
+
# Prevent failures building gkrust by suppressing useless warnings:
sed -i.allow-warnings -e '/#!\[deny(warnings)\]/a #![allow(unused_imports)]' \
servo/components/style/lib.rs
@@ -303,6 +305,9 @@ fi
./mach buildsymbols || exit 1
DESTDIR=$PKG ./mach install || exit 1
+# Clean up the build time dependencies:
+rm -rf $TMP/mozilla-firefox-build-deps
+
# We don't need these (just symlinks anyway):
rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/firefox-devel-$RELEASEVER
diff --git a/source/xap/mozilla-firefox/unbreakdocs.diff b/source/xap/mozilla-firefox/unbreakdocs.diff
index b76dc71d7..03d8e6b42 100644
--- a/source/xap/mozilla-firefox/unbreakdocs.diff
+++ b/source/xap/mozilla-firefox/unbreakdocs.diff
@@ -1,11 +1,5 @@
-
-https://lists.freebsd.org/pipermail/freebsd-gecko/2019-March/009206.html
-https://github.com/grahamperrin/Waterfox/pull/7/files
-
-
-diff -urN firefox-60.6.0_orig/servo/components/style/lib.rs firefox-60.6.0/servo/components/style/lib.rs
---- firefox-60.6.0_orig/servo/components/style/lib.rs 2019-03-13 21:33:48.000000000 +0000
-+++ firefox-60.6.0/servo/components/style/lib.rs 2019-03-20 13:06:18.611024453 +0000
+--- ./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
@@ -15,7 +9,7 @@ diff -urN firefox-60.6.0_orig/servo/components/style/lib.rs firefox-60.6.0/servo
extern crate app_units;
extern crate arrayvec;
-@@ -148,7 +148,7 @@
+@@ -196,7 +196,7 @@
/// Generated from the properties.mako.rs template by build.rs
#[macro_use]
#[allow(unsafe_code)]
@@ -24,15 +18,14 @@ diff -urN firefox-60.6.0_orig/servo/components/style/lib.rs firefox-60.6.0/servo
pub mod properties {
include!(concat!(env!("OUT_DIR"), "/properties.rs"));
}
-diff -urN firefox-60.6.0_orig/servo/components/style_traits/lib.rs firefox-60.6.0/servo/components/style_traits/lib.rs
---- firefox-60.6.0_orig/servo/components/style_traits/lib.rs 2019-03-13 21:33:48.000000000 +0000
-+++ firefox-60.6.0/servo/components/style_traits/lib.rs 2019-03-20 13:06:47.137024070 +0000
-@@ -9,7 +9,7 @@
+--- ./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] extern crate bitflags;
+ #[macro_use]