From a579ba2079213591cbe5864a3b53ef81d6c61ad9 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 21 May 2024 07:22:13 +0200 Subject: Merging debian version 115.11.0esr-1~deb12u1. Signed-off-by: Daniel Baumann --- .../Avoid-wrong-sessionstore-data-to-keep-windows-out-of.patch | 6 +++--- debian/patches/debian-hacks/Set-DPI-to-system-settings.patch | 2 +- 2 files changed, 4 insertions(+), 4 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 d93faaca41..76c7c50f7f 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 2c50de6..ff340aa 100644 +index 6506b21..6dc53f7 100644 --- a/browser/components/sessionstore/SessionStore.sys.mjs +++ b/browser/components/sessionstore/SessionStore.sys.mjs -@@ -5229,7 +5229,7 @@ var SessionStoreInternal = { +@@ -4992,7 +4992,7 @@ var SessionStoreInternal = { // _getWindowDimension. let desktopToCssScale = aWindow.desktopToDeviceScale / aWindow.devicePixelRatio; @@ -24,7 +24,7 @@ index 2c50de6..ff340aa 100644 } if ( aWidth && -@@ -5257,9 +5257,8 @@ var SessionStoreInternal = { +@@ -5020,9 +5020,8 @@ var SessionStoreInternal = { case "minimized": if (aSizeModeBeforeMinimized == "maximized") { aWindow.maximize(); 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 387421ef6c..1625064613 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 12ed7cf..6f4cb05 100644 +index d2e9414..2a6b5e6 100644 --- a/modules/libpref/init/StaticPrefList.yaml +++ b/modules/libpref/init/StaticPrefList.yaml @@ -8256,7 +8256,7 @@ -- cgit v1.2.3