cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

www/firefox: unbreak after r519576

Browse Source 
[style 0.0.1] ../.build/dist/include/mozilla/ServoStyleConsts.h:10840:20: error: class member cannot be redeclared
[style 0.0.1] ../.build/dist/include/mozilla/ServoStyleConsts.h:10827:20: note: previous definition is here
[style 0.0.1] ../.build/dist/include/mozilla/ServoStyleConsts.h:10843:21: error: class member cannot be redeclared
[style 0.0.1] ../.build/dist/include/mozilla/ServoStyleConsts.h:10830:21: note: previous definition is here
[...]
In file included from Unified_cpp_xpcom_base2.cpp:11:
In file included from xpcom/base/nsMemoryInfoDumper.cpp:14:
In file included from ../.build/dist/include/mozilla/dom/ContentParent.h:10:
In file included from ../.build/ipc/ipdl/_ipdlheaders/mozilla/dom/PContentParent.h:9:
In file included from ../.build/ipc/ipdl/_ipdlheaders/mozilla/dom/PContent.h:11:
In file included from ../.build/dist/include/ipc/IPCMessageUtils.h:36:
In file included from ../.build/dist/include/nsIWidget.h:21:
In file included from ../.build/dist/include/nsStyleConsts.h:17:
../.build/dist/include/mozilla/ServoStyleConsts.h:10840:20: error: class member cannot be redeclared
  StyleWritingMode operator^(const StyleWritingMode& other) const {
                   ^
../.build/dist/include/mozilla/ServoStyleConsts.h:10827:20: note: previous definition is here
  StyleWritingMode operator^(const StyleWritingMode& other) const {
                   ^
../.build/dist/include/mozilla/ServoStyleConsts.h:10843:21: error: class member cannot be redeclared
  StyleWritingMode& operator^=(const StyleWritingMode& other) {
                    ^
../.build/dist/include/mozilla/ServoStyleConsts.h:10830:21: note: previous definition is here
  StyleWritingMode& operator^=(const StyleWritingMode& other) {
                    ^
This commit is contained in:
Jan Beich 2019-12-09 13:48:18 +00:00
parent a3c18d23d1
commit 74ff41feb6
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=519609
1 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
www/firefox/files/patch-bug1602358 Normal file
View File

@ -0,0 +1,45 @@
commit 9ca396abb28b
Author: Emilio Cobos Álvarez <emilio@crisal.io>
Date: Mon Dec 9 12:47:00 2019 +0000
Bug 1602358 - Fix older builds with newer cbindgen. r=heycam
This should be fine to uplift so that downstream doesn't need multiple cbindgen
versions.
---
layout/generic/WritingModes.h | 3 ++-
servo/ports/geckolib/cbindgen.toml | 10 ----------
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git layout/generic/WritingModes.h layout/generic/WritingModes.h
index 1a8d08b191bbb..0671388902f0f 100644
--- layout/generic/WritingModes.h
+++ 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 servo/ports/geckolib/cbindgen.toml servo/ports/geckolib/cbindgen.toml
index bed86498ea125..8a7a9cd7998f1 100644
--- servo/ports/geckolib/cbindgen.toml
+++ servo/ports/geckolib/cbindgen.toml
@@ -616,13 +616,3 @@ renaming_overrides_prefixing = true
// Get the layout rect, replacing auto right / bottom values for aAutoSize.
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;
- }
-"""