diff --git a/extra/firefox/checksums b/extra/firefox/checksums index 78f2320a..778faf01 100644 --- a/extra/firefox/checksums +++ b/extra/firefox/checksums @@ -13,3 +13,4 @@ e24f71a6a0d8d4637b2081780c66b01be4eeb4dd496031270d0ae0b898be94d2 fix-tools.patc 1d4a8f110d34da478f5597727eda9acacebd443dd86cce5bb64f898c01feabce mallinfo.patch 49b1c589bc3248fa6389c8b9ff9316c5c5f10cb7868436c9c47cab888bdc8df6 firefox-71-no-dbus.patch b050ee807c000f26d09ff0c3e79f0149f195d802efa92b8740a75e7f07267064 firefox-71-no-accessibility.patch +5cb9b094229ea1b8e9d7361bbeeb26d43bc6247c7b2915aab490e46a3667e57b firefox-fix-cbindgen.patch diff --git a/extra/firefox/patches/firefox-fix-cbindgen.patch b/extra/firefox/patches/firefox-fix-cbindgen.patch new file mode 100644 index 00000000..5b2c3532 --- /dev/null +++ b/extra/firefox/patches/firefox-fix-cbindgen.patch @@ -0,0 +1,31 @@ +diff --git a/layout/generic/WritingModes.h b/layout/generic/WritingModes.h +index 1a8d08b191..0671388902 100644 +--- a/layout/generic/WritingModes.h ++++ b/layout/generic/WritingModes.h +@@ -518,7 +518,8 @@ class WritingMode { + */ + void SetDirectionFromBidiLevel(uint8_t level) { + if (IS_LEVEL_RTL(level) == IsBidiLTR()) { +- mWritingMode ^= StyleWritingMode_RTL | StyleWritingMode_INLINE_REVERSED; ++ mWritingMode.bits ^= static_cast( ++ (StyleWritingMode_RTL | StyleWritingMode_INLINE_REVERSED).bits); + } + } + +diff --git a/servo/ports/geckolib/cbindgen.toml b/servo/ports/geckolib/cbindgen.toml +index bed86498ea..d675ba393d 100644 +--- a/servo/ports/geckolib/cbindgen.toml ++++ b/servo/ports/geckolib/cbindgen.toml +@@ -617,12 +617,3 @@ renaming_overrides_prefixing = true + inline nsRect ToLayoutRect(nscoord aAutoSize = NS_MAXSIZE) const; + """ + +-"WritingMode" = """ +- StyleWritingMode operator^(const StyleWritingMode& other) const { +- return {static_cast(this->bits ^ other.bits)}; +- } +- StyleWritingMode& operator^=(const StyleWritingMode& other) { +- *this = (*this ^ other); +- return *this; +- } +-""" diff --git a/extra/firefox/sources b/extra/firefox/sources index f5c8cbab..585bcdd3 100644 --- a/extra/firefox/sources +++ b/extra/firefox/sources @@ -13,3 +13,4 @@ patches/fix-webrtc-glibcisms.patch patches/mallinfo.patch patches/firefox-71-no-dbus.patch patches/firefox-71-no-accessibility.patch +patches/firefox-fix-cbindgen.patch diff --git a/extra/firefox/version b/extra/firefox/version index 4f95e8e6..1d01a36c 100644 --- a/extra/firefox/version +++ b/extra/firefox/version @@ -1 +1 @@ -71.0 1 +71.0 2