From: Thomas Deutschmann <whissi@gentoo.org>
Date: Sun, 4 Nov 2018 14:52:51 +0000 (+0100)
Subject: www-client/firefox: unbreak with cbindgen 0.6.7
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=2b14a6fb9791ab9a4b7f872a722d3ecc9d6b088c;p=gentoo.git

www-client/firefox: unbreak with cbindgen 0.6.7

This commit will revert commit cf4b8d6c6a5b6e7e1b8b29a2f3045298a6ffc403
which is now possible due to an upstream patch which adds support for
latest cbindgen to firefox-63.x.

Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
---

diff --git a/www-client/firefox/files/firefox-63.0.1-support-latest-cbindgen.patch b/www-client/firefox/files/firefox-63.0.1-support-latest-cbindgen.patch
new file mode 100644
index 000000000000..7b75e21cd5ee
--- /dev/null
+++ b/www-client/firefox/files/firefox-63.0.1-support-latest-cbindgen.patch
@@ -0,0 +1,29 @@
+https://bugzilla.mozilla.org/show_bug.cgi?id=1503401
+
+commit b85791110fe6
+Author: Emilio Cobos Álvarez <emilio@crisal.io>
+Date:   Tue Oct 30 22:21:52 2018 +0100
+
+    Keep mozilla-release building with newer cbindgen versions.
+---
+ servo/components/style/cbindgen.toml | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git servo/components/style/cbindgen.toml servo/components/style/cbindgen.toml
+index 46162e43db5e..49872e88b7d9 100644
+--- a/servo/components/style/cbindgen.toml
++++ b/servo/components/style/cbindgen.toml
+@@ -28,6 +28,12 @@ include = [
+   "StyleDisplay",
+   "StyleDisplayMode",
+   "StyleFillRule",
+-  "StylePathCommand"
++  "StylePathCommand",
++
++  "Appearance",
++  "Display",
++  "DisplayMode",
++  "FillRule",
++  "PathCommand"
+ ]
+ item_types = ["enums", "structs", "typedefs"]
diff --git a/www-client/firefox/firefox-63.0.1.ebuild b/www-client/firefox/firefox-63.0.1.ebuild
index b2621cb3f5ce..5f0eeffe545d 100644
--- a/www-client/firefox/firefox-63.0.1.ebuild
+++ b/www-client/firefox/firefox-63.0.1.ebuild
@@ -104,7 +104,7 @@ RDEPEND="${CDEPEND}
 DEPEND="${CDEPEND}
 	app-arch/zip
 	app-arch/unzip
-	<dev-util/cbindgen-0.6.7
+	dev-util/cbindgen
 	>=net-libs/nodejs-8.11.0
 	>=sys-devel/binutils-2.30
 	sys-apps/findutils
@@ -180,6 +180,8 @@ src_unpack() {
 src_prepare() {
 	eapply "${WORKDIR}/firefox"
 
+	eapply "${FILESDIR}"/${P}-support-latest-cbindgen.patch
+
 	# Allow user to apply any additional patches without modifing ebuild
 	eapply_user