Compare commits

..

No commits in common. "master" and "v104.0-1" have entirely different histories.

3 changed files with 30 additions and 49 deletions

View file

@ -5,27 +5,16 @@ Author: Olivier Tilloy <olivier.tilloy@canonical.com>
--- a/build/moz.configure/toolchain.configure --- a/build/moz.configure/toolchain.configure
+++ b/build/moz.configure/toolchain.configure +++ b/build/moz.configure/toolchain.configure
@@ -1699,6 +1699,7 @@ @@ -1631,12 +1631,15 @@ set_config("LINKER_KIND", select_linker.KIND)
target_multiarch_dir,
android_platform, android_platform,
c_compiler, c_compiler,
developer_options,
+ host, + host,
) )
else: @imports("os")
deps = depends_if( def linker_ldflags(
@@ -1709,6 +1710,7 @@ - linker, target, sysroot, multiarch_dir, android_platform, c_compiler
dependable(None), + linker, target, sysroot, multiarch_dir, android_platform, c_compiler, host
host_c_compiler,
developer_options,
+ host,
)
@deps
@@ -1721,8 +1723,11 @@
android_platform,
c_compiler,
developer_options,
+ host,
): ):
flags = list((linker and linker.LINKER_FLAG) or []) flags = list((linker and linker.LINKER_FLAG) or [])
+ if host.cpu == "arm": + if host.cpu == "arm":

View file

@ -89,9 +89,6 @@ mk_add_options MOZ_TELEMETRY_REPORTING=0
# required for 95.0 for now, it seems # required for 95.0 for now, it seems
ac_add_options --without-wasm-sandboxed-libraries ac_add_options --without-wasm-sandboxed-libraries
# experimental JXL support
ac_add_options --enable-jxl
END END
# allow setting limited resource usage via ENV / CI: # allow setting limited resource usage via ENV / CI:
@ -147,17 +144,17 @@ patch -Np1 -i "${CI_PROJECT_DIR}/deb_patches/use-system-icupkg.patch"
# might make the build just a tiny bit cleaner, not really required though # might make the build just a tiny bit cleaner, not really required though
patch -Np1 -i "${CI_PROJECT_DIR}/deb_patches/fix-wayland-build.patch" patch -Np1 -i "${CI_PROJECT_DIR}/deb_patches/fix-wayland-build.patch"
# allow enabling JPEG XL in non-nightly browser
patch -Np1 -i ${_PATCHES_DIR}/allow-JXL-in-non-nightly-browser.patch
# Remove some pre-installed addons that might be questionable # Remove some pre-installed addons that might be questionable
patch -Np1 -i ${_PATCHES_DIR}/remove_addons.patch patch -Np1 -i ${_PATCHES_DIR}/remove_addons.patch
# Debian patch to enable global menubar
# if [[ ! -z "${GLOBAL_MENUBAR}" ]];then
# patch -Np1 -i ${_PATCHES_DIR}/unity-menubar.patch
# fi
# KDE menu and unity menubar. patch order matters. # experimentally re-included
patch -Np1 -i ${_PATCHES_DIR}/unity_kde/mozilla-kde.patch patch -Np1 -i ${_PATCHES_DIR}/unity-menubar.patch
patch -Np1 -i ${_PATCHES_DIR}/unity_kde/firefox-kde.patch patch -Np1 -i ${_PATCHES_DIR}/mozilla-kde_after_unity.patch
patch -Np1 -i ${_PATCHES_DIR}/unity_kde/unity-menubar.patch
# Disabling Pocket # Disabling Pocket
printf "\nDisabling Pocket\n"; printf "\nDisabling Pocket\n";
@ -168,14 +165,12 @@ patch -Np1 -i "${_PATCHES_DIR}/context-menu.patch"
patch -Np1 -i "${_PATCHES_DIR}/urlbarprovider-interventions.patch" patch -Np1 -i "${_PATCHES_DIR}/urlbarprovider-interventions.patch"
patch -Np1 -i "${_PATCHES_DIR}/unified-extensions-dont-show-recommendations.patch" # Remove Internal Plugin Certificates
patch -Np1 -i "${_PATCHES_DIR}/sed-patches/remove-internal-plugin-certs.patch"
# allow SearchEngines option in non-ESR builds # allow SearchEngines option in non-ESR builds
patch -Np1 -i "${_PATCHES_DIR}/sed-patches/allow-searchengines-non-esr.patch" patch -Np1 -i "${_PATCHES_DIR}/sed-patches/allow-searchengines-non-esr.patch"
# fix broken(?)/unintended handling of autoconf file loading in flatpak/snap environments
patch -Np1 -i "${_PATCHES_DIR}/flatpak_autoconf.patch"
# remove search extensions (experimental) # remove search extensions (experimental)
# patch -Np1 -i "${_PATCHES_DIR}/search-config.patch" # patch -Np1 -i "${_PATCHES_DIR}/search-config.patch"
cp "${_SOURCE_REPO_DIR}/assets/search-config.json" services/settings/dumps/main/search-config.json cp "${_SOURCE_REPO_DIR}/assets/search-config.json" services/settings/dumps/main/search-config.json
@ -209,6 +204,9 @@ patch -Np1 -i ${_PATCHES_DIR}/ui-patches/pref-naming.patch
# #
patch -Np1 -i ${_PATCHES_DIR}/ui-patches/handlers.patch patch -Np1 -i ${_PATCHES_DIR}/ui-patches/handlers.patch
#
patch -Np1 -i ${_PATCHES_DIR}/ui-patches/remap-links.patch
# #
patch -Np1 -i ${_PATCHES_DIR}/ui-patches/hide-default-browser.patch patch -Np1 -i ${_PATCHES_DIR}/ui-patches/hide-default-browser.patch
@ -236,12 +234,6 @@ patch -Np1 -i ${_PATCHES_DIR}/ui-patches/website-appearance-ui-rfp.patch
# pref pane # pref pane
patch -Np1 -i ${_PATCHES_DIR}/librewolf-pref-pane.patch patch -Np1 -i ${_PATCHES_DIR}/librewolf-pref-pane.patch
# firefox view
patch -Np1 -i ${_PATCHES_DIR}/ui-patches/firefox-view.patch
# new prefs (view, ubo)
patch -Np1 -i ${_PATCHES_DIR}/librewolf-prefs.patch
# fix telemetry removal, see https://gitlab.com/librewolf-community/browser/linux/-/merge_requests/17, for example # fix telemetry removal, see https://gitlab.com/librewolf-community/browser/linux/-/merge_requests/17, for example
patch -Np1 -i ${_PATCHES_DIR}/disable-data-reporting-at-compile-time.patch patch -Np1 -i ${_PATCHES_DIR}/disable-data-reporting-at-compile-time.patch

View file

@ -11,7 +11,7 @@ LAUNCHER_SCRIPT=$3;
CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../)} CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../)}
_SCRIPT_FOLDER=$(realpath $(dirname $0)); _SCRIPT_FOLDER=$(realpath $(dirname $0));
_EXTRACTED_TARBALL_FOLDER=$_SCRIPT_FOLDER/librewolf; _EXTRACTED_TARBALL_FOLDER=$_SCRIPT_FOLDER/librewolf;
_SETTINGS_TAG=${SETTINGS_TAG:-'7.4'} _SETTINGS_TAG=${SETTINGS_TAG:-'6.7'}
_SETTINGS_REPO='https://gitlab.com/librewolf-community/settings.git'; _SETTINGS_REPO='https://gitlab.com/librewolf-community/settings.git';
# Extracts the binary tarball # Extracts the binary tarball