1 |
commit: 2b14a6fb9791ab9a4b7f872a722d3ecc9d6b088c |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Nov 4 14:52:51 2018 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 4 14:53:53 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b14a6fb |
7 |
|
8 |
www-client/firefox: unbreak with cbindgen 0.6.7 |
9 |
|
10 |
This commit will revert commit cf4b8d6c6a5b6e7e1b8b29a2f3045298a6ffc403 |
11 |
which is now possible due to an upstream patch which adds support for |
12 |
latest cbindgen to firefox-63.x. |
13 |
|
14 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
15 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
16 |
|
17 |
.../firefox-63.0.1-support-latest-cbindgen.patch | 29 ++++++++++++++++++++++ |
18 |
www-client/firefox/firefox-63.0.1.ebuild | 4 ++- |
19 |
2 files changed, 32 insertions(+), 1 deletion(-) |
20 |
|
21 |
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 |
22 |
new file mode 100644 |
23 |
index 00000000000..7b75e21cd5e |
24 |
--- /dev/null |
25 |
+++ b/www-client/firefox/files/firefox-63.0.1-support-latest-cbindgen.patch |
26 |
@@ -0,0 +1,29 @@ |
27 |
+https://bugzilla.mozilla.org/show_bug.cgi?id=1503401 |
28 |
+ |
29 |
+commit b85791110fe6 |
30 |
+Author: Emilio Cobos Álvarez <emilio@××××××.io> |
31 |
+Date: Tue Oct 30 22:21:52 2018 +0100 |
32 |
+ |
33 |
+ Keep mozilla-release building with newer cbindgen versions. |
34 |
+--- |
35 |
+ servo/components/style/cbindgen.toml | 6 ++++++ |
36 |
+ 1 file changed, 6 insertions(+) |
37 |
+ |
38 |
+diff --git servo/components/style/cbindgen.toml servo/components/style/cbindgen.toml |
39 |
+index 46162e43db5e..49872e88b7d9 100644 |
40 |
+--- a/servo/components/style/cbindgen.toml |
41 |
++++ b/servo/components/style/cbindgen.toml |
42 |
+@@ -28,6 +28,12 @@ include = [ |
43 |
+ "StyleDisplay", |
44 |
+ "StyleDisplayMode", |
45 |
+ "StyleFillRule", |
46 |
+- "StylePathCommand" |
47 |
++ "StylePathCommand", |
48 |
++ |
49 |
++ "Appearance", |
50 |
++ "Display", |
51 |
++ "DisplayMode", |
52 |
++ "FillRule", |
53 |
++ "PathCommand" |
54 |
+ ] |
55 |
+ item_types = ["enums", "structs", "typedefs"] |
56 |
|
57 |
diff --git a/www-client/firefox/firefox-63.0.1.ebuild b/www-client/firefox/firefox-63.0.1.ebuild |
58 |
index b2621cb3f5c..5f0eeffe545 100644 |
59 |
--- a/www-client/firefox/firefox-63.0.1.ebuild |
60 |
+++ b/www-client/firefox/firefox-63.0.1.ebuild |
61 |
@@ -104,7 +104,7 @@ RDEPEND="${CDEPEND} |
62 |
DEPEND="${CDEPEND} |
63 |
app-arch/zip |
64 |
app-arch/unzip |
65 |
- <dev-util/cbindgen-0.6.7 |
66 |
+ dev-util/cbindgen |
67 |
>=net-libs/nodejs-8.11.0 |
68 |
>=sys-devel/binutils-2.30 |
69 |
sys-apps/findutils |
70 |
@@ -180,6 +180,8 @@ src_unpack() { |
71 |
src_prepare() { |
72 |
eapply "${WORKDIR}/firefox" |
73 |
|
74 |
+ eapply "${FILESDIR}"/${P}-support-latest-cbindgen.patch |
75 |
+ |
76 |
# Allow user to apply any additional patches without modifing ebuild |
77 |
eapply_user |