summaryrefslogtreecommitdiffstats
path: root/debian/patches/debian-hacks/Allow-to-build-oxilangtag-ffi-with-rustc-1.65.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-07 19:34:35 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-07 19:34:35 +0000
commit63de81373e18709bf3cf805a9aea810d7105be62 (patch)
tree381c798425ec7b9d4634609f0ac776a4b3e7e309 /debian/patches/debian-hacks/Allow-to-build-oxilangtag-ffi-with-rustc-1.65.patch
parentAdding upstream version 115.7.0esr. (diff)
downloadfirefox-esr-63de81373e18709bf3cf805a9aea810d7105be62.tar.xz
firefox-esr-63de81373e18709bf3cf805a9aea810d7105be62.zip
Adding debian version 115.7.0esr-1~deb12u1.debian/115.7.0esr-1_deb12u1debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/debian-hacks/Allow-to-build-oxilangtag-ffi-with-rustc-1.65.patch')
-rw-r--r--debian/patches/debian-hacks/Allow-to-build-oxilangtag-ffi-with-rustc-1.65.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/debian/patches/debian-hacks/Allow-to-build-oxilangtag-ffi-with-rustc-1.65.patch b/debian/patches/debian-hacks/Allow-to-build-oxilangtag-ffi-with-rustc-1.65.patch
new file mode 100644
index 0000000000..5dd42994b1
--- /dev/null
+++ b/debian/patches/debian-hacks/Allow-to-build-oxilangtag-ffi-with-rustc-1.65.patch
@@ -0,0 +1,34 @@
+From: Mike Hommey <mh@glandium.org>
+Date: Wed, 20 Dec 2023 08:47:32 +0900
+Subject: Allow to build oxilangtag-ffi with rustc < 1.65
+
+---
+ intl/locale/rust/oxilangtag-ffi/src/lib.rs | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/intl/locale/rust/oxilangtag-ffi/src/lib.rs b/intl/locale/rust/oxilangtag-ffi/src/lib.rs
+index 5a30e9b..e647fb0 100644
+--- a/intl/locale/rust/oxilangtag-ffi/src/lib.rs
++++ b/intl/locale/rust/oxilangtag-ffi/src/lib.rs
+@@ -85,7 +85,9 @@ pub extern "C" fn lang_tag_matches(attribute: *const LangTag, selector: &nsACStr
+ loop {
+ // 4. When the language range's list has no more subtags, the match
+ // succeeds.
+- let Some(range_subtag_str) = range_subtag else {
++ let range_subtag_str = if let Some(range_subtag_str) = range_subtag {
++ range_subtag_str
++ } else {
+ return true;
+ };
+
+@@ -99,7 +101,9 @@ pub extern "C" fn lang_tag_matches(attribute: *const LangTag, selector: &nsACStr
+
+ // B. Else, if there are no more subtags in the language tag's
+ // list, the match fails.
+- let Some(lang_subtag_str) = lang_subtag else {
++ let lang_subtag_str = if let Some(lang_subtag_str) = lang_subtag {
++ lang_subtag_str
++ } else {
+ return false;
+ };
+