v109.0-1
This commit is contained in:
parent
78be0f398f
commit
365d39cc01
3 changed files with 33 additions and 28 deletions
|
|
@ -5,23 +5,31 @@ Author: Olivier Tilloy <olivier.tilloy@canonical.com>
|
|||
|
||||
--- a/build/moz.configure/toolchain.configure
|
||||
+++ b/build/moz.configure/toolchain.configure
|
||||
@@ -1674,6 +1674,7 @@
|
||||
android_platform,
|
||||
c_compiler,
|
||||
developer_options,
|
||||
+ host,
|
||||
)
|
||||
@imports("os")
|
||||
def linker_ldflags(
|
||||
@@ -1684,8 +1685,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"):
|
||||
@@ -1699,6 +1699,7 @@
|
||||
android_platform,
|
||||
c_compiler,
|
||||
developer_options,
|
||||
+ host,
|
||||
)
|
||||
else:
|
||||
deps = depends_if(
|
||||
@@ -1709,6 +1710,7 @@
|
||||
dependable(None),
|
||||
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 [])
|
||||
+ 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"):
|
||||
|
|
|
|||
|
|
@ -153,14 +153,11 @@ patch -Np1 -i ${_PATCHES_DIR}/allow-JXL-in-non-nightly-browser.patch
|
|||
# Remove some pre-installed addons that might be questionable
|
||||
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
|
||||
patch -Np1 -i ${_PATCHES_DIR}/unity-menubar.patch
|
||||
patch -Np1 -i ${_PATCHES_DIR}/mozilla-kde_after_unity.patch
|
||||
# KDE menu and unity menubar. patch order matters.
|
||||
patch -Np1 -i ${_PATCHES_DIR}/unity_kde/mozilla-kde.patch
|
||||
patch -Np1 -i ${_PATCHES_DIR}/unity_kde/firefox-kde.patch
|
||||
patch -Np1 -i ${_PATCHES_DIR}/unity_kde/unity-menubar.patch
|
||||
|
||||
# Disabling Pocket
|
||||
printf "\nDisabling Pocket\n";
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ LAUNCHER_SCRIPT=$3;
|
|||
CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../)}
|
||||
_SCRIPT_FOLDER=$(realpath $(dirname $0));
|
||||
_EXTRACTED_TARBALL_FOLDER=$_SCRIPT_FOLDER/librewolf;
|
||||
_SETTINGS_TAG=${SETTINGS_TAG:-'3.7'}
|
||||
_SETTINGS_TAG=${SETTINGS_TAG:-'7.4'}
|
||||
_SETTINGS_REPO='https://gitlab.com/librewolf-community/settings.git';
|
||||
|
||||
# Extracts the binary tarball
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue