From 58c28f62226cff0c897ed608fb74134e4ebd1602 Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Mon, 4 Jul 2022 11:15:48 -0400 Subject: lw 102.0 rc1 --- ...Add-a-2-minutes-timeout-on-xpcshell-tests.patch | 2 +- ...-sessionstore-data-to-keep-windows-out-of.patch | 6 +-- ...illa-Location-Service-key-when-the-Google.patch | 4 +- ...-build-failure-with-newer-cbindgen.-bz-17.patch | 43 ++++++++++++++++++++++ 4 files changed, 49 insertions(+), 6 deletions(-) create mode 100644 librewolf/debian/patches/debian-hacks/Work-around-build-failure-with-newer-cbindgen.-bz-17.patch (limited to 'librewolf/debian/patches/debian-hacks') diff --git a/librewolf/debian/patches/debian-hacks/Add-a-2-minutes-timeout-on-xpcshell-tests.patch b/librewolf/debian/patches/debian-hacks/Add-a-2-minutes-timeout-on-xpcshell-tests.patch index 631fca9..ba877d0 100644 --- a/librewolf/debian/patches/debian-hacks/Add-a-2-minutes-timeout-on-xpcshell-tests.patch +++ b/librewolf/debian/patches/debian-hacks/Add-a-2-minutes-timeout-on-xpcshell-tests.patch @@ -7,7 +7,7 @@ Subject: Add a 2 minutes timeout on xpcshell tests 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/testing/xpcshell/runxpcshelltests.py b/testing/xpcshell/runxpcshelltests.py -index c6aea1a..a43f380 100755 +index 212bfeb..6761334 100755 --- a/testing/xpcshell/runxpcshelltests.py +++ b/testing/xpcshell/runxpcshelltests.py @@ -13,6 +13,7 @@ import os diff --git a/librewolf/debian/patches/debian-hacks/Avoid-wrong-sessionstore-data-to-keep-windows-out-of.patch b/librewolf/debian/patches/debian-hacks/Avoid-wrong-sessionstore-data-to-keep-windows-out-of.patch index 7465dda..e6fbcd9 100644 --- a/librewolf/debian/patches/debian-hacks/Avoid-wrong-sessionstore-data-to-keep-windows-out-of.patch +++ b/librewolf/debian/patches/debian-hacks/Avoid-wrong-sessionstore-data-to-keep-windows-out-of.patch @@ -12,10 +12,10 @@ Closes: #552426, #553453 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/browser/components/sessionstore/SessionStore.jsm b/browser/components/sessionstore/SessionStore.jsm -index b8e2ac8..d7860ba 100644 +index 4611737..1d92679 100644 --- a/browser/components/sessionstore/SessionStore.jsm +++ b/browser/components/sessionstore/SessionStore.jsm -@@ -5026,7 +5026,7 @@ var SessionStoreInternal = { +@@ -5033,7 +5033,7 @@ var SessionStoreInternal = { // _getWindowDimension. let desktopToCssScale = aWindow.desktopToDeviceScale / aWindow.devicePixelRatio; @@ -24,7 +24,7 @@ index b8e2ac8..d7860ba 100644 } if ( aWidth && -@@ -5055,9 +5055,8 @@ var SessionStoreInternal = { +@@ -5062,9 +5062,8 @@ var SessionStoreInternal = { case "minimized": if (aSizeModeBeforeMinimized == "maximized") { aWindow.maximize(); diff --git a/librewolf/debian/patches/debian-hacks/Use-the-Mozilla-Location-Service-key-when-the-Google.patch b/librewolf/debian/patches/debian-hacks/Use-the-Mozilla-Location-Service-key-when-the-Google.patch index 3f8814a..480b434 100644 --- a/librewolf/debian/patches/debian-hacks/Use-the-Mozilla-Location-Service-key-when-the-Google.patch +++ b/librewolf/debian/patches/debian-hacks/Use-the-Mozilla-Location-Service-key-when-the-Google.patch @@ -7,10 +7,10 @@ Subject: Use the Mozilla Location Service key when the Google Key is not there 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js -index 9db483d..b74cb4d 100644 +index db545cd..71fb01f 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js -@@ -3690,7 +3690,7 @@ pref("network.psl.onUpdate_notify", false); +@@ -3555,7 +3555,7 @@ pref("network.psl.onUpdate_notify", false); // All the Geolocation preferences are here. // diff --git a/librewolf/debian/patches/debian-hacks/Work-around-build-failure-with-newer-cbindgen.-bz-17.patch b/librewolf/debian/patches/debian-hacks/Work-around-build-failure-with-newer-cbindgen.-bz-17.patch new file mode 100644 index 0000000..75d20d6 --- /dev/null +++ b/librewolf/debian/patches/debian-hacks/Work-around-build-failure-with-newer-cbindgen.-bz-17.patch @@ -0,0 +1,43 @@ +From: Mike Hommey +Date: Wed, 29 Jun 2022 07:30:11 +0900 +Subject: Work around build failure with newer cbindgen. bz#1773259 + +--- + build/moz.configure/bindgen.configure | 9 +++++++++ + gfx/webrender_bindings/webrender_ffi.h | 2 ++ + 2 files changed, 11 insertions(+) + +diff --git a/build/moz.configure/bindgen.configure b/build/moz.configure/bindgen.configure +index 193e1ad..660090a 100644 +--- a/build/moz.configure/bindgen.configure ++++ b/build/moz.configure/bindgen.configure +@@ -91,6 +91,15 @@ def cbindgen(cbindgen_override, bootstrap_search_path, rust_search_path): + + set_config("CBINDGEN", cbindgen) + ++set_define( ++ "CBINDGEN_0_24", ++ True, ++ when=depends(cbindgen)( ++ lambda c: Version(check_cmd_output(c, "--version").strip().split(" ")[1]) ++ >= "0.24.0" ++ ), ++) ++ + # Bindgen can use rustfmt to format Rust file, but it's not required. + option(env="RUSTFMT", nargs=1, help="Path to the rustfmt program") + +diff --git a/gfx/webrender_bindings/webrender_ffi.h b/gfx/webrender_bindings/webrender_ffi.h +index b1d67b1..ab3cfef 100644 +--- a/gfx/webrender_bindings/webrender_ffi.h ++++ b/gfx/webrender_bindings/webrender_ffi.h +@@ -73,7 +73,9 @@ struct WrPipelineInfo; + struct WrPipelineIdAndEpoch; + using WrPipelineIdEpochs = nsTArray; + ++#ifndef CBINDGEN_0_24 + const uint64_t ROOT_CLIP_CHAIN = ~0; ++#endif + + } // namespace wr + } // namespace mozilla -- cgit