diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-17 09:04:06 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-17 09:04:06 +0000 |
| commit | c034765db3ea0b2c909f567d5ac9cce2a567a796 (patch) | |
| tree | 20c7f2ecdec991cb64f09e1a5b1842d3e59c63c2 /debian/patches | |
| parent | Merging upstream version 115.12.0esr. (diff) | |
| download | firefox-esr-c034765db3ea0b2c909f567d5ac9cce2a567a796.tar.xz firefox-esr-c034765db3ea0b2c909f567d5ac9cce2a567a796.zip | |
Merging debian version 115.12.0esr-1~deb12u1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/debian-hacks/Relax-minimum-supporter-rust-version-to-1.63.patch | 2 | ||||
| -rw-r--r-- | debian/patches/debian-hacks/Use-the-Mozilla-Location-Service-key-when-the-Google.patch | 4 |
2 files changed, 3 insertions, 3 deletions
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 e97ac3174a..486bc417b0 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 aba3978..cdc047a 100644 +index 8f0a879..5a907c3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1040,9 +1040,9 @@ dependencies = [ 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 f0cf6976c0..c12759c95d 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 7ad409c..d143a0c 100644 +index 3f860aa..e461e56 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js -@@ -3246,7 +3246,7 @@ pref("network.psl.onUpdate_notify", false); +@@ -3247,7 +3247,7 @@ pref("network.psl.onUpdate_notify", false); // All the Geolocation preferences are here. // |