diff --git a/deb_patches/armhf-reduce-linker-memory-use.patch b/deb_patches/armhf-reduce-linker-memory-use.patch index 3baaecb..dbe74cf 100644 --- a/deb_patches/armhf-reduce-linker-memory-use.patch +++ b/deb_patches/armhf-reduce-linker-memory-use.patch @@ -5,24 +5,23 @@ Author: Olivier Tilloy --- a/build/moz.configure/toolchain.configure +++ b/build/moz.configure/toolchain.configure -@@ -2418,8 +2418,8 @@ +@@ -2349,15 +2349,17 @@ set_config("LINKER_KIND", select_linker.KIND) --@depends_if(select_linker, macos_sdk, sysroot_path, multiarch_dir) --def linker_ldflags(linker, macos_sdk, sysroot_path, multiarch_dir): -+@depends_if(select_linker, macos_sdk, sysroot_path, multiarch_dir, host) -+def linker_ldflags(linker, macos_sdk, sysroot_path, multiarch_dir, host): +-@depends_if(select_linker, target, macos_sdk, sysroot_path, multiarch_dir) ++@depends_if(select_linker, target, macos_sdk, sysroot_path, multiarch_dir, host) + @imports("os") +-def linker_ldflags(linker, target, macos_sdk, sysroot_path, multiarch_dir): ++def linker_ldflags(linker, target, macos_sdk, sysroot_path, multiarch_dir, host): flags = list((linker and linker.LINKER_FLAG) or []) - if macos_sdk: + if target.kernel == "Darwin": if linker and linker.KIND == "ld64": -@@ -2427,6 +2427,9 @@ + flags.append("-Wl,-syslibroot,%s" % macos_sdk) else: flags.append("-Wl,--sysroot=%s" % macos_sdk) - + if host.cpu == "arm": + flags.append("-Wl,--no-keep-memory") -+ + if sysroot_path and multiarch_dir: - # Non-Debian-patched binutils linkers (both BFD and gold) don't lookup - # in multi-arch directories. + for d in ("lib", "usr/lib"): diff --git a/deb_patches/relax-cargo-dep.patch b/deb_patches/relax-cargo-dep.patch index f83558c..ecc6c02 100644 --- a/deb_patches/relax-cargo-dep.patch +++ b/deb_patches/relax-cargo-dep.patch @@ -1,9 +1,9 @@ --- a/build/moz.configure/rust.configure +++ b/build/moz.configure/rust.configure @@ -168,7 +168,7 @@ - rustc_min_version = Version("1.47.0") - else: - rustc_min_version = Version(MINIMUM_RUST_VERSION) + ) + ) + rustc_min_version = Version(MINIMUM_RUST_VERSION) - cargo_min_version = rustc_min_version + cargo_min_version = Version("1.46.0") diff --git a/scripts/3_Configure_Source_Code.sh b/scripts/3_Configure_Source_Code.sh index ab82db1..3d8b2cd 100755 --- a/scripts/3_Configure_Source_Code.sh +++ b/scripts/3_Configure_Source_Code.sh @@ -7,7 +7,7 @@ set -e srcdir=$1; CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../)} _COMMON_REPO='https://gitlab.com/librewolf-community/browser/common.git'; -_COMMON_COMMIT='5bce5285fa7046e6987ec3e5a8931ac17ca6c7c0' +_COMMON_TAG='v89.0-1' _COMMON_DIR="${CI_PROJECT_DIR}"/common _PATCHES_DIR="${_COMMON_DIR}"/patches _MOZBUILD=$srcdir/../mozbuild @@ -18,7 +18,7 @@ mkdir -p ${_MOZBUILD} printf "\nCopying branding and source code changes to firefox source code\n"; git clone $_COMMON_REPO ${_COMMON_DIR} cd ${_COMMON_DIR} -git checkout ${_COMMON_COMMIT} +git checkout ${_COMMON_TAG} cd .. cp -r ${_COMMON_DIR}/source_files/* $srcdir/; @@ -169,6 +169,9 @@ patch -Np1 -i "${_PATCHES_DIR}/sed-patches/remove-internal-plugin-certs.patch" # sed -i 's#"enterprise_only": true,#"enterprise_only": false,#g' browser/components/enterprisepolicies/schemas/policies-schema.json patch -Np1 -i "${_PATCHES_DIR}/sed-patches/allow-searchengines-non-esr.patch" +# remove search extensions (experimental) +patch -Np1 -i "${_PATCHES_DIR}/search-config.patch" + # stop some undesired requests (https://gitlab.com/librewolf-community/browser/common/-/issues/10) # _settings_services_sed='s#firefox.settings.services.mozilla.com#f.s.s.m.c.qjz9zk#g' # sed "$_settings_services_sed" -i browser/components/newtab/data/content/activity-stream.bundle.js diff --git a/scripts/5_Configure_Binary_Tarball.sh b/scripts/5_Configure_Binary_Tarball.sh index e1db7bd..64f2b12 100755 --- a/scripts/5_Configure_Binary_Tarball.sh +++ b/scripts/5_Configure_Binary_Tarball.sh @@ -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_COMMIT='c78c50fbefe2fcf830611e21dcc0fe79180d1e01' +_SETTINGS_TAG='1.0' _SETTINGS_REPO='https://gitlab.com/librewolf-community/settings.git'; # Extracts the binary tarball @@ -24,7 +24,7 @@ printf "\nCopying librewolf settings to extracted binary tarball\n"; git clone $_SETTINGS_REPO $_EXTRACTED_TARBALL_FOLDER/settings; cd $_EXTRACTED_TARBALL_FOLDER/settings -git checkout $_SETTINGS_COMMIT +git checkout $_SETTINGS_TAG cd - # no need to keep that in there: rm -rf "${_EXTRACTED_TARBALL_FOLDER}/settings/.git";