From ce10fa11df0676e8bcb8d9cb1bef5362dced9745 Mon Sep 17 00:00:00 2001 From: Nirupam Bhowmick <48842933+heydryft@users.noreply.github.com> Date: Sun, 21 Dec 2025 23:34:14 +0000 Subject: [PATCH] fix: update moz.build patches for Firefox 146 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - geolocation-spoofing: Update line 58→81, fix hunk header to include elif context - audio-context-spoofing: Update line 417→419 - font-hijacker: Update line 351→379, replace CONFIGURE_SUBST_FILES with CbindgenHeader context --- patches/audio-context-spoofing.patch | 2 +- patches/font-hijacker.patch | 8 +++++--- patches/geolocation-spoofing.patch | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/patches/audio-context-spoofing.patch b/patches/audio-context-spoofing.patch index 7857c6d0..d004fa9e 100644 --- a/patches/audio-context-spoofing.patch +++ b/patches/audio-context-spoofing.patch @@ -23,7 +23,7 @@ diff --git a/dom/media/moz.build b/dom/media/moz.build index 21063575d7..9e7c9f3e84 100644 --- a/dom/media/moz.build +++ b/dom/media/moz.build -@@ -417,3 +417,5 @@ if CONFIG["CC_TYPE"] in ("clang", "gcc"): +@@ -419,3 +419,5 @@ if CONFIG["CC_TYPE"] in ("clang", "gcc"): CXXFLAGS += ["-Werror=switch"] FINAL_LIBRARY = "xul" diff --git a/patches/font-hijacker.patch b/patches/font-hijacker.patch index 08fd76ce..89103000 100644 --- a/patches/font-hijacker.patch +++ b/patches/font-hijacker.patch @@ -149,9 +149,11 @@ diff --git a/layout/style/moz.build b/layout/style/moz.build index a14ab6a7ac..6e6a727abf 100644 --- a/layout/style/moz.build +++ b/layout/style/moz.build -@@ -351,3 +351,6 @@ if CONFIG["COMPILE_ENVIRONMENT"]: - CONFIGURE_SUBST_FILES += [ - "extra-bindgen-flags", +@@ -379,3 +379,6 @@ if CONFIG["COMPILE_ENVIRONMENT"]: + CbindgenHeader( + "ServoStyleConsts.h", + inputs=["/servo/ports/geckolib", "/servo/components/style"], + ) ] + +# DOM Mask diff --git a/patches/geolocation-spoofing.patch b/patches/geolocation-spoofing.patch index 9606c644..f4b03a79 100644 --- a/patches/geolocation-spoofing.patch +++ b/patches/geolocation-spoofing.patch @@ -73,7 +73,7 @@ diff --git a/dom/geolocation/moz.build b/dom/geolocation/moz.build index 2d6b6b5fab..0c7ed74c6d 100644 --- a/dom/geolocation/moz.build +++ b/dom/geolocation/moz.build -@@ -58,3 +58,6 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": +@@ -81,5 +81,8 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": if CONFIG["MOZ_ENABLE_DBUS"]: LOCAL_INCLUDES += ["/dom/system/linux"] CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]