Compare commits
No commits in common. "master" and "v100.0.1-1" have entirely different histories.
master
...
v100.0.1-1
5 changed files with 37 additions and 70 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"):
|
|
||||||
|
|
|
||||||
|
|
@ -1,17 +0,0 @@
|
||||||
Description: Remove an extra constant definition that is now being generated by newer versions of cbindgen (0.24),
|
|
||||||
and causing build failures because it is defined in several places.
|
|
||||||
Author: Olivier Tilloy <olivier.tilloy@canonical.com>
|
|
||||||
Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1773259
|
|
||||||
Forwarded: not-needed
|
|
||||||
|
|
||||||
--- a/gfx/webrender_bindings/webrender_ffi.h
|
|
||||||
+++ b/gfx/webrender_bindings/webrender_ffi.h
|
|
||||||
@@ -73,8 +73,6 @@ struct WrPipelineInfo;
|
|
||||||
struct WrPipelineIdAndEpoch;
|
|
||||||
using WrPipelineIdEpochs = nsTArray<WrPipelineIdAndEpoch>;
|
|
||||||
|
|
||||||
-const uint64_t ROOT_CLIP_CHAIN = ~0;
|
|
||||||
-
|
|
||||||
} // namespace wr
|
|
||||||
} // namespace mozilla
|
|
||||||
|
|
||||||
|
|
@ -63,7 +63,6 @@ ac_add_options --with-branding=browser/branding/librewolf
|
||||||
# ac_add_options --with-distribution-id=io.gitlab.librewolf-community
|
# ac_add_options --with-distribution-id=io.gitlab.librewolf-community
|
||||||
ac_add_options --with-unsigned-addon-scopes=app,system
|
ac_add_options --with-unsigned-addon-scopes=app,system
|
||||||
ac_add_options --allow-addon-sideload
|
ac_add_options --allow-addon-sideload
|
||||||
export MOZ_REQUIRE_SIGNING=
|
|
||||||
|
|
||||||
# System libraries
|
# System libraries
|
||||||
# ac_add_options --with-system-nspr
|
# ac_add_options --with-system-nspr
|
||||||
|
|
@ -89,9 +88,6 @@ 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:
|
||||||
|
|
@ -147,17 +143,18 @@ 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
|
||||||
|
|
||||||
# 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 +165,12 @@ 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"
|
# Remove Internal Plugin Certificates
|
||||||
|
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
|
||||||
|
|
@ -191,15 +186,15 @@ patch -Np1 -i ${_PATCHES_DIR}/mozilla_dirs.patch
|
||||||
# should not break things, buuuuuuuuuut we'll see.
|
# should not break things, buuuuuuuuuut we'll see.
|
||||||
patch -Np1 -i ${_PATCHES_DIR}/dbus_name.patch
|
patch -Np1 -i ${_PATCHES_DIR}/dbus_name.patch
|
||||||
|
|
||||||
|
# add v100 about dialog
|
||||||
|
patch -Np1 -i ${_PATCHES_DIR}/aboutLogos.patch
|
||||||
|
|
||||||
# allow uBlockOrigin to run in private mode by default, without user intervention.
|
# allow uBlockOrigin to run in private mode by default, without user intervention.
|
||||||
patch -Np1 -i ${_PATCHES_DIR}/allow-ubo-private-mode.patch
|
patch -Np1 -i ${_PATCHES_DIR}/allow-ubo-private-mode.patch
|
||||||
|
|
||||||
# add custom uBO assets (on first launch only)
|
# add custom uBO assets (on first launch only)
|
||||||
patch -Np1 -i ${_PATCHES_DIR}/custom-ubo-assets-bootstrap-location.patch
|
patch -Np1 -i ${_PATCHES_DIR}/custom-ubo-assets-bootstrap-location.patch
|
||||||
|
|
||||||
#
|
|
||||||
patch -Np1 -i ${_PATCHES_DIR}/faster-package-multi-locale.patch
|
|
||||||
|
|
||||||
# ui patches
|
# ui patches
|
||||||
|
|
||||||
# remove references to firefox from the settings UI, change text in some of the links,
|
# remove references to firefox from the settings UI, change text in some of the links,
|
||||||
|
|
@ -209,6 +204,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
|
||||||
|
|
||||||
|
|
@ -230,18 +228,15 @@ patch -Np1 -i ${_PATCHES_DIR}/ui-patches/remove-organization-policy-banner.patch
|
||||||
# hide "snippets" section from the home page settings, as it was already locked.
|
# hide "snippets" section from the home page settings, as it was already locked.
|
||||||
patch -Np1 -i ${_PATCHES_DIR}/ui-patches/remove-snippets-from-home.patch
|
patch -Np1 -i ${_PATCHES_DIR}/ui-patches/remove-snippets-from-home.patch
|
||||||
|
|
||||||
|
# add warning that sanitizing exceptions are bypassed by the options in History > Clear History when LibreWolf closes > Settings
|
||||||
|
patch -Np1 -i ${_PATCHES_DIR}/ui-patches/sanitizing-description.patch
|
||||||
|
|
||||||
# add patch to hide website appearance settings
|
# add patch to hide website appearance settings
|
||||||
patch -Np1 -i ${_PATCHES_DIR}/ui-patches/website-appearance-ui-rfp.patch
|
patch -Np1 -i ${_PATCHES_DIR}/ui-patches/website-appearance-ui-rfp.patch
|
||||||
|
|
||||||
# pref pane
|
# pref pane
|
||||||
patch -Np1 -i ${_PATCHES_DIR}/librewolf-pref-pane.patch
|
patch -Np1 -i ${_PATCHES_DIR}/librewolf-pref-pane.patch
|
||||||
|
|
||||||
# firefox view
|
|
||||||
patch -Np1 -i ${_PATCHES_DIR}/ui-patches/firefox-view.patch
|
|
||||||
|
|
||||||
# new prefs (view, ubo)
|
|
||||||
patch -Np1 -i ${_PATCHES_DIR}/librewolf-prefs.patch
|
|
||||||
|
|
||||||
# fix telemetry removal, see https://gitlab.com/librewolf-community/browser/linux/-/merge_requests/17, for example
|
# fix telemetry removal, see https://gitlab.com/librewolf-community/browser/linux/-/merge_requests/17, for example
|
||||||
patch -Np1 -i ${_PATCHES_DIR}/disable-data-reporting-at-compile-time.patch
|
patch -Np1 -i ${_PATCHES_DIR}/disable-data-reporting-at-compile-time.patch
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -70,7 +70,7 @@ cd $srcdir;
|
||||||
rm -f mozconfig
|
rm -f mozconfig
|
||||||
|
|
||||||
# install cbindgen
|
# install cbindgen
|
||||||
cargo install --version 0.24.3 cbindgen
|
cargo install --version 0.21.0 cbindgen
|
||||||
|
|
||||||
if [[ $CARCH == 'aarch64' ]]; then
|
if [[ $CARCH == 'aarch64' ]]; then
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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:-'6.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