diff options
Diffstat (limited to 'source/xap/mozilla-firefox/mozilla-firefox.SlackBuild')
| -rwxr-xr-x | source/xap/mozilla-firefox/mozilla-firefox.SlackBuild | 59 |
1 files changed, 28 insertions, 31 deletions
diff --git a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild index 62181ad23..92d0f6e84 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, 2019, 2020, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2018, 2019, 2020, 2021, 2022, 2023, 2024 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -189,7 +189,8 @@ rm -rf firefox-$RELEASEVER rm -rf firefox-unpack mkdir firefox-unpack cd firefox-unpack -tar xvf $CWD/firefox-$VERSION.source.tar.?z || exit 1 +echo "Extracting $CWD/firefox-$VERSION.source.tar.?z..." +tar xf $CWD/firefox-$VERSION.source.tar.?z || exit 1 mv * .. cd .. rm -rf firefox-unpack @@ -208,6 +209,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 @@ -237,6 +241,7 @@ OPTIONS="\ --with-system-nss \ --with-system-nspr \ --with-unsigned-addon-scopes=app,system \ + --without-wasm-sandboxed-libraries \ --allow-addon-sideload \ --enable-alsa \ --enable-application=browser \ @@ -273,14 +278,19 @@ if [ ! -z $MOZLOCALIZE ]; then browser/installer/package-manifest.in || exit 1 fi +# They say to use the second line, not the first. +# But they're not the boss of me. export MACH_USE_SYSTEM_PYTHON="1" +#export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system export MOZILLA_OFFICIAL="1" export BUILD_OFFICIAL="1" export MOZ_PHOENIX="1" export MOZ_PACKAGE_JSSHELL="1" export CFLAGS="$SLKCFLAGS" -export CXXFLAGS="$SLKCFLAGS -fno-delete-null-pointer-checks" +export CXXFLAGS="$SLKCFLAGS -fno-delete-null-pointer-checks -Wno-error=c++11-narrowing-const-reference" export MOZ_MAKE_FLAGS="$NUMJOBS" +export MOZBUILD_STATE_PATH="$TMP/firefox-$RELEASEVER/.mozbuild" +export MOZ_APP_REMOTINGNAME="firefox" # Clear some variables that could break the build unset DBUS_SESSION_BUS_ADDRESS ORBIT_SOCKETDIR SESSION_MANAGER \ @@ -344,37 +354,24 @@ rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/firefox-devel-$RELEASEVER # Nor these: rm -rf $PKG/usr/include -( cd $PKG/usr/lib${LIBDIRSUFFIX}/firefox-$RELEASEVER - #mv defaults/profile/mimeTypes.rdf defaults/profile/mimeTypes.rdf.orig || exit 1 - if [ -d defaults/profile ]; then - zcat $CWD/mimeTypes.rdf > defaults/profile/mimeTypes.rdf || exit 1 - fi - # OK, this patch is useless on 7.x. We'll float without it and see what happens. - # Perhaps it won't make a difference or should be worked around elsewhere. - #zcat $CWD/firefox.moz_plugin_path.diff.gz \ - # | sed -e "s#usr/lib#usr/lib${LIBDIRSUFFIX}#g" \ - # | patch -p1 --verbose --backup --suffix=.orig || exit 1 - # Clean up if the above patch was successful: - #rm -f firefox.orig -) || exit +# 2022-12, COMMENTING OUT AS OBSOLETE +#( cd $PKG/usr/lib${LIBDIRSUFFIX}/firefox +# #mv defaults/profile/mimeTypes.rdf defaults/profile/mimeTypes.rdf.orig || exit 1 +# if [ -d defaults/profile ]; then +# zcat $CWD/mimeTypes.rdf > defaults/profile/mimeTypes.rdf || exit 1 +# fi +# # OK, this patch is useless on 7.x. We'll float without it and see what happens. +# # Perhaps it won't make a difference or should be worked around elsewhere. +# #zcat $CWD/firefox.moz_plugin_path.diff.gz \ +# # | sed -e "s#usr/lib#usr/lib${LIBDIRSUFFIX}#g" \ +# # | patch -p1 --verbose --backup --suffix=.orig || exit 1 +# # Clean up if the above patch was successful: +# #rm -f firefox.orig +#) || exit mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins mkdir -p $PKG/usr/share/applications -cat $CWD/mozilla-firefox.desktop > $PKG/usr/share/applications/mozilla-firefox.desktop - -# These files/directories are usually created if Firefox is run as root, -# which on many systems might (and possibly should) be never. Therefore, if we -# don't see them we'll put stubs in place to prevent startup errors. -( cd $PKG/usr/lib${LIBDIRSUFFIX}/firefox-$RELEASEVER - if [ -d extensions/talkback\@mozilla.org ]; then - if [ ! -r extensions/talkback\@mozilla.org/chrome.manifest ]; then - echo > extensions/talkback\@mozilla.org/chrome.manifest - fi - fi - if [ ! -d updates ]; then - mkdir -p updates/0 - fi -) +cat $CWD/firefox.desktop > $PKG/usr/share/applications/firefox.desktop # Need some default icons in the right place: for i in 16 22 24 32 48 256; do |