Compare commits

..

6 commits

Author SHA1 Message Date
ohfp
50465aa304 v110.0-3 2023-03-18 12:27:41 +01:00
ohfp
8f8120a4cf add some missing patches 2023-02-19 11:53:33 +01:00
ohfp
365d39cc01 v109.0-1 2023-01-17 17:04:00 +01:00
ohfp
78be0f398f use source-repo-patch for autoconf issue 2022-12-30 16:13:32 +01:00
ohfp
178c4062b8 potential flatpak issue fix: patch autoconf handling to non-flatpakified default 2022-12-30 13:42:34 +01:00
ohfp
61617ebcaf update patches for 108.0 2022-12-15 14:07:15 +01:00
3 changed files with 38 additions and 28 deletions

View file

@ -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"):

View file

@ -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 # 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";
@ -171,9 +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"
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
@ -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

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:-'3.7'} _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