Compare commits
No commits in common. "master" and "v107.0.1-1" have entirely different histories.
master
...
v107.0.1-1
3 changed files with 28 additions and 38 deletions
|
|
@ -5,31 +5,20 @@ 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)
|
||||||
android_platform,
|
target_multiarch_dir,
|
||||||
c_compiler,
|
android_platform,
|
||||||
developer_options,
|
c_compiler,
|
||||||
+ 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,
|
flags = list((linker and linker.LINKER_FLAG) or [])
|
||||||
+ host,
|
+ 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.
|
||||||
@deps
|
if sysroot.path and multiarch_dir and target.os != "WASI":
|
||||||
@@ -1721,8 +1723,11 @@
|
for d in ("lib", "usr/lib"):
|
||||||
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,11 +153,14 @@ 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 +171,9 @@ 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"
|
|
||||||
|
|
||||||
# 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 +207,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
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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:-'3.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
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue