From e9d582ff83574971c68a3d1b2742ea57cdc673a2 Mon Sep 17 00:00:00 2001 From: layman Date: Sat, 21 Dec 2019 02:41:40 -0800 Subject: [PATCH] Fix electron:7 build --- dev-util/electron/electron-7.0.1.ebuild | 1 + dev-util/electron/electron-7.1.1.ebuild | 3 ++- .../files/chromium-78-missing-semicolon.patch | 12 ++++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 dev-util/electron/files/chromium-78-missing-semicolon.patch diff --git a/dev-util/electron/electron-7.0.1.ebuild b/dev-util/electron/electron-7.0.1.ebuild index e32db1e..15ec1a0 100644 --- a/dev-util/electron/electron-7.0.1.ebuild +++ b/dev-util/electron/electron-7.0.1.ebuild @@ -163,6 +163,7 @@ CHROMIUM_PATCHES=( "${FILESDIR}/chromium-78-xlib-name-clash.patch" "${FILESDIR}/chromium-78-blink-includes.patch" "${FILESDIR}/chromium-78-use-system-libraries-in-official-build.patch" + "${FILESDIR}/chromium-78-missing-semicolon.patch" ) PATCHES=( "${FILESDIR}/electron-7.0.1-fix-chromium-viz-osr-patch.patch" diff --git a/dev-util/electron/electron-7.1.1.ebuild b/dev-util/electron/electron-7.1.1.ebuild index 80c7255..476bc11 100644 --- a/dev-util/electron/electron-7.1.1.ebuild +++ b/dev-util/electron/electron-7.1.1.ebuild @@ -146,7 +146,7 @@ NODE_VERSION="12.8.1" NODE_P="node-${NODE_VERSION}" NODE_S="${S}/vendor/node" -NODEMODULES_P="electron-node-modules-7.1.1" +NODEMODULES_P="electron-node-modules-${PV}" NODEMODULES_S="${S}/node_modules" #deps included with chromium @@ -163,6 +163,7 @@ CHROMIUM_PATCHES=( "${FILESDIR}/chromium-78-xlib-name-clash.patch" "${FILESDIR}/chromium-78-blink-includes.patch" "${FILESDIR}/chromium-78-use-system-libraries-in-official-build.patch" + "${FILESDIR}/chromium-78-missing-semicolon.patch" ) PATCHES=( "${FILESDIR}/electron-7.0.1-fix-chromium-viz-osr-patch.patch" diff --git a/dev-util/electron/files/chromium-78-missing-semicolon.patch b/dev-util/electron/files/chromium-78-missing-semicolon.patch new file mode 100644 index 0000000..e22ac23 --- /dev/null +++ b/dev-util/electron/files/chromium-78-missing-semicolon.patch @@ -0,0 +1,12 @@ +diff -Naur a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc +--- a/third_party/blink/renderer/core/dom/document.cc 2019-12-21 01:02:56.696356861 -0800 ++++ b/third_party/blink/renderer/core/dom/document.cc 2019-12-21 01:03:18.879355215 -0800 +@@ -6216,7 +6216,7 @@ + + for (unsigned i = 0; i < length;) { + UChar32 c; +- U16_NEXT(characters, i, length, c) ++ U16_NEXT(characters, i, length, c); + if (c == ':') { + if (saw_colon) + return ParseQualifiedNameResult(kQNMultipleColons);