Compare commits

...

16 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
ohfp
e5e62517e9 v107.0.1-1 CI, with cleaned up path stuff this time though 2022-12-03 22:26:23 +01:00
ohfp
155367a779 v107.0.1-1 CI 2022-12-03 22:21:55 +01:00
ohfp
8b0b13b8be v107.0; add jxl patch and enable it 2022-11-16 12:41:31 +01:00
ohfp
69e0b71cdf update patches and add aarch64 fix for 106.0.1 2022-10-24 13:03:11 +02:00
ohfp
b9c9521cda v103.0-3 2022-07-29 14:11:06 +02:00
ohfp
d48ad7c2b4 v102.0-2 2022-07-02 12:13:10 +02:00
ohfp
21f8b6a752 add new patch and add back kde patch 2022-06-10 14:08:45 +02:00
ohfp
5b0b89c8a5 actually comment out the broken patch 2022-06-03 10:34:25 +02:00
ohfp
8e7098bc0d v101.0 2022-06-02 16:16:44 +02:00
ohfp
354766fc0d Empty MOZ_REQUIRE_SIGNING for unsigned extensions
Allows using unsigned extensions (when `xpinstall.signatures.required`
is set to `false`). Should fix librewolf-community/browser/flatpak#21.
2022-05-21 11:42:46 +02:00
5 changed files with 70 additions and 37 deletions

View file

@ -5,16 +5,27 @@ 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,
developer_options,
+ host,
)
@deps
@@ -1721,8 +1723,11 @@
android_platform,
c_compiler,
developer_options,
+ host,
): ):
flags = list((linker and linker.LINKER_FLAG) or []) flags = list((linker and linker.LINKER_FLAG) or [])
+ if host.cpu == "arm": + if host.cpu == "arm":

View file

@ -0,0 +1,17 @@
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

View file

@ -63,6 +63,7 @@ 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
@ -88,6 +89,9 @@ 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:
@ -143,18 +147,17 @@ 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
# 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";
@ -165,12 +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"
# Remove Internal Plugin Certificates patch -Np1 -i "${_PATCHES_DIR}/unified-extensions-dont-show-recommendations.patch"
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
@ -186,15 +191,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,
@ -204,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
@ -228,15 +230,18 @@ 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

View file

@ -70,7 +70,7 @@ cd $srcdir;
rm -f mozconfig rm -f mozconfig
# install cbindgen # install cbindgen
cargo install --version 0.21.0 cbindgen cargo install --version 0.24.3 cbindgen
if [[ $CARCH == 'aarch64' ]]; then if [[ $CARCH == 'aarch64' ]]; then

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