From 25c1feac9bacb55e3b25b107248d3cc89e75ee99 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 21 Apr 2024 20:35:45 +0200 Subject: Merging debian version 115.10.0esr-1~deb12u1. Signed-off-by: Daniel Baumann --- .../Avoid-wrong-sessionstore-data-to-keep-windows-out-of.patch | 6 +++--- .../debian-hacks/Relax-minimum-supporter-rust-version-to-1.63.patch | 2 +- debian/patches/debian-hacks/Set-DPI-to-system-settings.patch | 2 +- .../Use-the-Mozilla-Location-Service-key-when-the-Google.patch | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'debian/patches') diff --git a/debian/patches/debian-hacks/Avoid-wrong-sessionstore-data-to-keep-windows-out-of.patch b/debian/patches/debian-hacks/Avoid-wrong-sessionstore-data-to-keep-windows-out-of.patch index 18e45daba2..d93faaca41 100644 --- a/debian/patches/debian-hacks/Avoid-wrong-sessionstore-data-to-keep-windows-out-of.patch +++ b/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.sys.mjs b/browser/components/sessionstore/SessionStore.sys.mjs -index 602986e..99cf002 100644 +index 2c50de6..ff340aa 100644 --- a/browser/components/sessionstore/SessionStore.sys.mjs +++ b/browser/components/sessionstore/SessionStore.sys.mjs -@@ -5220,7 +5220,7 @@ var SessionStoreInternal = { +@@ -5229,7 +5229,7 @@ var SessionStoreInternal = { // _getWindowDimension. let desktopToCssScale = aWindow.desktopToDeviceScale / aWindow.devicePixelRatio; @@ -24,7 +24,7 @@ index 602986e..99cf002 100644 } if ( aWidth && -@@ -5248,9 +5248,8 @@ var SessionStoreInternal = { +@@ -5257,9 +5257,8 @@ var SessionStoreInternal = { case "minimized": if (aSizeModeBeforeMinimized == "maximized") { aWindow.maximize(); diff --git a/debian/patches/debian-hacks/Relax-minimum-supporter-rust-version-to-1.63.patch b/debian/patches/debian-hacks/Relax-minimum-supporter-rust-version-to-1.63.patch index 337d004fff..e97ac3174a 100644 --- a/debian/patches/debian-hacks/Relax-minimum-supporter-rust-version-to-1.63.patch +++ b/debian/patches/debian-hacks/Relax-minimum-supporter-rust-version-to-1.63.patch @@ -22,7 +22,7 @@ This reverts: 13 files changed, 36 insertions(+), 48 deletions(-) diff --git a/Cargo.lock b/Cargo.lock -index 1cb46da..9e5f122 100644 +index aba3978..cdc047a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1040,9 +1040,9 @@ dependencies = [ diff --git a/debian/patches/debian-hacks/Set-DPI-to-system-settings.patch b/debian/patches/debian-hacks/Set-DPI-to-system-settings.patch index ca1feb9543..387421ef6c 100644 --- a/debian/patches/debian-hacks/Set-DPI-to-system-settings.patch +++ b/debian/patches/debian-hacks/Set-DPI-to-system-settings.patch @@ -7,7 +7,7 @@ Subject: Set DPI to system settings 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml -index f32cab1..700dcb4 100644 +index 12ed7cf..6f4cb05 100644 --- a/modules/libpref/init/StaticPrefList.yaml +++ b/modules/libpref/init/StaticPrefList.yaml @@ -8256,7 +8256,7 @@ diff --git a/debian/patches/debian-hacks/Use-the-Mozilla-Location-Service-key-when-the-Google.patch b/debian/patches/debian-hacks/Use-the-Mozilla-Location-Service-key-when-the-Google.patch index 35108a05b4..f0cf6976c0 100644 --- a/debian/patches/debian-hacks/Use-the-Mozilla-Location-Service-key-when-the-Google.patch +++ b/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 c7c6f0c..a772bd8 100644 +index 7ad409c..d143a0c 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js -@@ -3249,7 +3249,7 @@ pref("network.psl.onUpdate_notify", false); +@@ -3246,7 +3246,7 @@ pref("network.psl.onUpdate_notify", false); // All the Geolocation preferences are here. // -- cgit v1.2.3