From owner-svn-ports-head@freebsd.org Mon Dec 9 13:48:18 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A37951D734B; Mon, 9 Dec 2019 13:48:18 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47Wkzk3rJjz4dCW; Mon, 9 Dec 2019 13:48:18 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7EBFB1B747; Mon, 9 Dec 2019 13:48:18 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xB9DmIkl025037; Mon, 9 Dec 2019 13:48:18 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xB9DmIRi025036; Mon, 9 Dec 2019 13:48:18 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201912091348.xB9DmIRi025036@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 9 Dec 2019 13:48:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r519609 - head/www/firefox/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/www/firefox/files X-SVN-Commit-Revision: 519609 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Dec 2019 13:48:18 -0000 Author: jbeich Date: Mon Dec 9 13:48:18 2019 New Revision: 519609 URL: https://svnweb.freebsd.org/changeset/ports/519609 Log: www/firefox: unbreak after r519576 [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) { ^ Added: head/www/firefox/files/patch-bug1602358 (contents, props changed) Added: head/www/firefox/files/patch-bug1602358 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/firefox/files/patch-bug1602358 Mon Dec 9 13:48:18 2019 (r519609) @@ -0,0 +1,45 @@ +commit 9ca396abb28b +Author: Emilio Cobos Álvarez +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( ++ (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(this->bits ^ other.bits)}; +- } +- StyleWritingMode& operator^=(const StyleWritingMode& other) { +- *this = (*this ^ other); +- return *this; +- } +-"""