bonsai/repo
4
0
Fork 0
forked from kiss-community/repo
Code Issues 28 Pull Requests 2 Projects Releases Activity

firefox: fix builds on newer cbindgen.

Browse Source
This commit is contained in:
Dylan Araps 2019-12-17 13:16:43 +00:00
parent 01a6635fab
commit 4f7862ca71
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
4 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
extra/firefox/checksums
View File

@ -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

31
extra/firefox/patches/firefox-fix-cbindgen.patch Normal file
View File

@ -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<uint8_t>(
+ (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<decltype(bits)>(this->bits ^ other.bits)};
- }
- StyleWritingMode& operator^=(const StyleWritingMode& other) {
- *this = (*this ^ other);
- return *this;
- }
-"""

1
extra/firefox/sources
View File

@ -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

2
extra/firefox/version
View File

@ -1 +1 @@
71.0 1
71.0 2