Compare commits
9 commits
v106.0.1-1
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
50465aa304 | ||
|
|
8f8120a4cf | ||
|
|
365d39cc01 | ||
|
|
78be0f398f | ||
|
|
178c4062b8 | ||
|
|
61617ebcaf | ||
|
|
e5e62517e9 | ||
|
|
155367a779 | ||
|
|
8b0b13b8be |
3 changed files with 43 additions and 33 deletions
|
|
@ -5,20 +5,31 @@ 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
|
||||||
@@ -1631,12 +1631,15 @@ set_config("LINKER_KIND", select_linker.KIND)
|
@@ -1699,6 +1699,7 @@
|
||||||
target_multiarch_dir,
|
android_platform,
|
||||||
android_platform,
|
c_compiler,
|
||||||
c_compiler,
|
developer_options,
|
||||||
+ host,
|
+ host,
|
||||||
)
|
)
|
||||||
@imports("os")
|
else:
|
||||||
def linker_ldflags(
|
deps = depends_if(
|
||||||
- linker, target, sysroot, multiarch_dir, android_platform, c_compiler
|
@@ -1709,6 +1710,7 @@
|
||||||
+ linker, target, sysroot, multiarch_dir, android_platform, c_compiler, host
|
dependable(None),
|
||||||
):
|
host_c_compiler,
|
||||||
flags = list((linker and linker.LINKER_FLAG) or [])
|
developer_options,
|
||||||
+ if host.cpu == "arm":
|
+ host,
|
||||||
+ flags.append("-Wl,--no-keep-memory")
|
)
|
||||||
# rpath-link is irrelevant to wasm, see for more info https://github.com/emscripten-core/emscripten/issues/11076.
|
|
||||||
if sysroot.path and multiarch_dir and target.os != "WASI":
|
@deps
|
||||||
for d in ("lib", "usr/lib"):
|
@@ -1721,8 +1723,11 @@
|
||||||
|
android_platform,
|
||||||
|
c_compiler,
|
||||||
|
developer_options,
|
||||||
|
+ host,
|
||||||
|
):
|
||||||
|
flags = list((linker and linker.LINKER_FLAG) or [])
|
||||||
|
+ if host.cpu == "arm":
|
||||||
|
+ flags.append("-Wl,--no-keep-memory")
|
||||||
|
# rpath-link is irrelevant to wasm, see for more info https://github.com/emscripten-core/emscripten/issues/11076.
|
||||||
|
if sysroot.path and multiarch_dir and target.os != "WASI":
|
||||||
|
for d in ("lib", "usr/lib"):
|
||||||
|
|
|
||||||
|
|
@ -89,6 +89,9 @@ 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:
|
||||||
|
|
@ -116,9 +119,6 @@ END
|
||||||
|
|
||||||
export LDFLAGS+=" -Wl,--no-keep-memory -Wl"
|
export LDFLAGS+=" -Wl,--no-keep-memory -Wl"
|
||||||
|
|
||||||
# libav related aarch64 build failure
|
|
||||||
wget https://github.com/mozilla/gecko-dev/commit/60858bce4bb1b426c07ec0e9e7f627f59b8aca45.patch -O "${_PATCHES_DIR}/aarch64_libav.patch"
|
|
||||||
patch -Np1 -i "${_PATCHES_DIR}/aarch64_libav.patch"
|
|
||||||
else
|
else
|
||||||
cat >>${CI_PROJECT_DIR}/mozconfig <<END
|
cat >>${CI_PROJECT_DIR}/mozconfig <<END
|
||||||
# ubuntu seems to recommend this
|
# ubuntu seems to recommend this
|
||||||
|
|
@ -147,17 +147,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
|
|
||||||
|
|
||||||
# experimentally re-included
|
# KDE menu and unity menubar. patch order matters.
|
||||||
patch -Np1 -i ${_PATCHES_DIR}/unity-menubar.patch
|
patch -Np1 -i ${_PATCHES_DIR}/unity_kde/mozilla-kde.patch
|
||||||
patch -Np1 -i ${_PATCHES_DIR}/mozilla-kde_after_unity.patch
|
patch -Np1 -i ${_PATCHES_DIR}/unity_kde/firefox-kde.patch
|
||||||
|
patch -Np1 -i ${_PATCHES_DIR}/unity_kde/unity-menubar.patch
|
||||||
|
|
||||||
# Disabling Pocket
|
# Disabling Pocket
|
||||||
printf "\nDisabling Pocket\n";
|
printf "\nDisabling Pocket\n";
|
||||||
|
|
@ -168,12 +168,14 @@ patch -Np1 -i "${_PATCHES_DIR}/context-menu.patch"
|
||||||
|
|
||||||
patch -Np1 -i "${_PATCHES_DIR}/urlbarprovider-interventions.patch"
|
patch -Np1 -i "${_PATCHES_DIR}/urlbarprovider-interventions.patch"
|
||||||
|
|
||||||
# Remove Internal Plugin Certificates
|
patch -Np1 -i "${_PATCHES_DIR}/unified-extensions-dont-show-recommendations.patch"
|
||||||
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
|
||||||
|
|
@ -207,9 +209,6 @@ 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
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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.2-hotfix'}
|
_SETTINGS_TAG=${SETTINGS_TAG:-'7.4'}
|
||||||
_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
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue