Date: Saturday, February 8, 2020 @ 12:46:29 Author: tensor5 Revision: 564084
upgpkg: electron 8.0.0-1 Added: electron/trunk/fix-building-with-system-zlib.patch electron/trunk/fix-building-with-unbundled-libxml.patch electron/trunk/fix-shim-header-generation-when-unbundling-ICU.patch Modified: electron/trunk/PKGBUILD electron/trunk/default_app-icon.patch ------------------------------------------------------+ PKGBUILD | 38 ++--- default_app-icon.patch | 2 fix-building-with-system-zlib.patch | 32 ++++ fix-building-with-unbundled-libxml.patch | 127 +++++++++++++++++ fix-shim-header-generation-when-unbundling-ICU.patch | 50 ++++++ 5 files changed, 229 insertions(+), 20 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-02-08 12:45:18 UTC (rev 564083) +++ PKGBUILD 2020-02-08 12:46:29 UTC (rev 564084) @@ -1,9 +1,9 @@ # Maintainer: Nicola Squartini <[email protected]> pkgname=electron -pkgver=7.1.11 -_commit=d17dfabfcba7bd0bc994b8dac5f5d2000bef572c -_chromiumver=78.0.3904.130 +pkgver=8.0.0 +_commit=1af3a71fdbb3130fd581b12d8f5a7440e7a04fc6 +_chromiumver=80.0.3987.86 pkgrel=1 pkgdesc='Build cross platform desktop apps with web technologies' arch=('x86_64') @@ -24,19 +24,19 @@ 'default_app-icon.patch' 'use-system-libraries-in-node.patch' 'chromium-skia-harmony.patch' - 'icu65.patch' - 'chromium-system-icu.patch' - 'chromium-system-zlib.patch' + 'fix-building-with-system-zlib.patch' + 'fix-building-with-unbundled-libxml.patch' + 'fix-shim-header-generation-when-unbundling-ICU.patch' ) sha256sums=('SKIP' 'SKIP' '5270db01f3f8aaa5137dec275a02caa832b7f2e37942e068cba8d28b3a29df39' - '51d6e4239b51084a1e9df87ed4d94dcaa22f8d4f332e941eb56fe71b834e9a7a' + '63ba9cf70ce37c8503c65bd72c5a0e547474f089f52b5396aefd6abc5c136d7e' 'c7eadac877179e586d0cce7f898aa1462b4c207733e68ecc17de9754b691713a' '771292942c0901092a402cc60ee883877a99fb804cb54d568c8c6c94565a48e1' - '1de9bdbfed482295dda45c7d4e323cee55a34e42f66b892da1c1a778682b7a41' - 'e73cc2ee8d3ea35aab18c478d76fdfc68ca4463e1e10306fa1e738c03b3f26b5' - 'eb67eda4945a89c3b90473fa8dc20637511ca4dcb58879a8ed6bf403700ca9c8' + '18276e65c68a0c328601b12fefb7e8bfc632346f34b87e64944c9de8c95c5cfa' + 'e530d1b39504c2ab247e16f1602359c484e9e8be4ef6d4824d68b14d29a7f60b' + 'e477aa48a11ca4d53927f66a9593567fcd053325fb38af30ac3508465f1dd1f6' ) _system_libs=('ffmpeg' @@ -49,7 +49,7 @@ 'libevent' 'libjpeg' # 'libpng' -# 'libvpx' + 'libvpx' 'libwebp' 'libxml' 'libxslt' @@ -115,6 +115,14 @@ yarn install --frozen-lockfile cd .. + echo "Applying local patches..." + patch -Np0 -i ../chromium-skia-harmony.patch + patch -Np1 -i ../fix-building-with-system-zlib.patch + patch -Np1 -i ../fix-building-with-unbundled-libxml.patch + patch -Np1 -i ../fix-shim-header-generation-when-unbundling-ICU.patch + patch -Np1 -i ../use-system-libraries-in-node.patch + patch -Np1 -i ../default_app-icon.patch # Icon from .desktop file + echo "Patching Chromium for using system libraries..." sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \ tools/generate_shim_headers/generate_shim_headers.py @@ -133,14 +141,6 @@ python2 build/linux/unbundle/replace_gn_files.py \ --system-libraries \ "${_system_libs[@]}" - - echo "Applying local patches..." - patch -Np0 -i ../chromium-skia-harmony.patch - patch -Np1 -i ../icu65.patch - patch -Np1 -i ../chromium-system-icu.patch - patch -Np1 -i ../chromium-system-zlib.patch - patch -Np1 -i ../use-system-libraries-in-node.patch - patch -Np1 -i ../default_app-icon.patch # Icon from .desktop file } build() { Modified: default_app-icon.patch =================================================================== --- default_app-icon.patch 2020-02-08 12:45:18 UTC (rev 564083) +++ default_app-icon.patch 2020-02-08 12:46:29 UTC (rev 564084) @@ -1,6 +1,6 @@ --- a/electron/default_app/default_app.ts +++ b/electron/default_app/default_app.ts -@@ -60,7 +60,7 @@ +@@ -62,7 +62,7 @@ } if (process.platform === 'linux') { Added: fix-building-with-system-zlib.patch =================================================================== --- fix-building-with-system-zlib.patch (rev 0) +++ fix-building-with-system-zlib.patch 2020-02-08 12:46:29 UTC (rev 564084) @@ -0,0 +1,32 @@ +From cda86e34ddadba5f08dea764881bbb6c8ec01e8a Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann <[email protected]> +Date: Sat, 25 Jan 2020 02:00:43 +0000 +Subject: [PATCH] Fix building with system zlib + +Add zlib_config target because perfetto depends on it. + +Bug: 977964 +Change-Id: I2aac5c3704f1274f932a61264d1c26a05f2db55e +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2019035 +Reviewed-by: Thomas Anderson <[email protected]> +Commit-Queue: Thomas Anderson <[email protected]> +Cr-Commit-Position: refs/heads/master@{#735201} +--- + build/linux/unbundle/zlib.gn | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/build/linux/unbundle/zlib.gn b/build/linux/unbundle/zlib.gn +index 1fdd472f35e..97d6aebe6d5 100644 +--- a/build/linux/unbundle/zlib.gn ++++ b/build/linux/unbundle/zlib.gn +@@ -13,6 +13,10 @@ config("system_zlib") { + defines = [ "USE_SYSTEM_ZLIB=1" ] + } + ++config("zlib_config") { ++ configs = [ ":system_zlib" ] ++} ++ + source_set("zlib") { + deps = [ ":zlib_shim" ] + libs = [ "z" ] Added: fix-building-with-unbundled-libxml.patch =================================================================== --- fix-building-with-unbundled-libxml.patch (rev 0) +++ fix-building-with-unbundled-libxml.patch 2020-02-08 12:46:29 UTC (rev 564084) @@ -0,0 +1,127 @@ +From d3afade220ddb307e16a6dd4f2b0ec88b2af91e7 Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann <[email protected]> +Date: Tue, 28 Jan 2020 18:16:54 +0000 +Subject: [PATCH] Fix building with unbundled libxml + +Add new targets to libxml.gn that were added in + https://chromium-review.googlesource.com/c/chromium/src/+/1894877 +Adjust includes to use system libxml headers too + +Bug: 1043042 +Change-Id: I948c063e212e49b9e7f42fed2b8bf7f4af042ca7 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2007110 +Reviewed-by: Robert Sesek <[email protected]> +Reviewed-by: Daniel Cheng <[email protected]> +Reviewed-by: Nico Weber <[email protected]> +Commit-Queue: Robert Sesek <[email protected]> +Cr-Commit-Position: refs/heads/master@{#735957} +--- + build/linux/unbundle/libxml.gn | 41 ++++++++++++++++++++-- + third_party/libxml/chromium/libxml_utils.h | 4 +-- + third_party/libxml/chromium/xml_reader.cc | 3 +- + third_party/libxml/chromium/xml_writer.cc | 3 +- + 4 files changed, 45 insertions(+), 6 deletions(-) + +diff --git a/build/linux/unbundle/libxml.gn b/build/linux/unbundle/libxml.gn +index c481bd3547b..3587881eea8 100644 +--- a/build/linux/unbundle/libxml.gn ++++ b/build/linux/unbundle/libxml.gn +@@ -8,11 +8,48 @@ pkg_config("system_libxml") { + packages = [ "libxml-2.0" ] + } + +-static_library("libxml") { ++source_set("libxml") { ++ public_configs = [ ":system_libxml" ] ++} ++ ++static_library("libxml_utils") { ++ # Do not expand this visibility list without first consulting with the ++ # Security Team. ++ visibility = [ ++ ":xml_reader", ++ ":xml_writer", ++ "//base/test:test_support", ++ "//services/data_decoder:xml_parser_fuzzer", ++ ] + sources = [ + "chromium/libxml_utils.cc", + "chromium/libxml_utils.h", + ] +- + public_configs = [ ":system_libxml" ] + } ++ ++static_library("xml_reader") { ++ # Do not expand this visibility list without first consulting with the ++ # Security Team. ++ visibility = [ ++ "//base/test:test_support", ++ "//components/policy/core/common:unit_tests", ++ "//services/data_decoder:*", ++ "//tools/traffic_annotation/auditor:auditor_sources", ++ ] ++ sources = [ ++ "chromium/xml_reader.cc", ++ "chromium/xml_reader.h", ++ ] ++ deps = [ ":libxml_utils" ] ++} ++ ++static_library("xml_writer") { ++ # The XmlWriter is considered safe to use from any target. ++ visibility = [ "*" ] ++ sources = [ ++ "chromium/xml_writer.cc", ++ "chromium/xml_writer.h", ++ ] ++ deps = [ ":libxml_utils" ] ++} +diff --git a/third_party/libxml/chromium/libxml_utils.h b/third_party/libxml/chromium/libxml_utils.h +index ff969fab540..8b2383f9c8b 100644 +--- a/third_party/libxml/chromium/libxml_utils.h ++++ b/third_party/libxml/chromium/libxml_utils.h +@@ -5,9 +5,9 @@ + #ifndef THIRD_PARTY_LIBXML_CHROMIUM_LIBXML_UTILS_H_ + #define THIRD_PARTY_LIBXML_CHROMIUM_LIBXML_UTILS_H_ + +-#include <string> ++#include <libxml/xmlreader.h> + +-#include "third_party/libxml/src/include/libxml/xmlreader.h" ++#include <string> + + // libxml uses a global error function pointer for reporting errors. + // A ScopedXmlErrorFunc object lets you change the global error pointer +diff --git a/third_party/libxml/chromium/xml_reader.cc b/third_party/libxml/chromium/xml_reader.cc +index 92464f4cbcc..899ccefb7c8 100644 +--- a/third_party/libxml/chromium/xml_reader.cc ++++ b/third_party/libxml/chromium/xml_reader.cc +@@ -4,10 +4,11 @@ + + #include "third_party/libxml/chromium/xml_reader.h" + ++#include <libxml/xmlreader.h> ++ + #include <vector> + + #include "third_party/libxml/chromium/libxml_utils.h" +-#include "third_party/libxml/src/include/libxml/xmlreader.h" + + using internal::XmlStringToStdString; + +diff --git a/third_party/libxml/chromium/xml_writer.cc b/third_party/libxml/chromium/xml_writer.cc +index 51fce8ebeb1..7c58031fe2d 100644 +--- a/third_party/libxml/chromium/xml_writer.cc ++++ b/third_party/libxml/chromium/xml_writer.cc +@@ -4,8 +4,9 @@ + + #include "third_party/libxml/chromium/xml_writer.h" + ++#include <libxml/xmlwriter.h> ++ + #include "third_party/libxml/chromium/libxml_utils.h" +-#include "third_party/libxml/src/include/libxml/xmlwriter.h" + + XmlWriter::XmlWriter() : writer_(nullptr), buffer_(nullptr) {} + Added: fix-shim-header-generation-when-unbundling-ICU.patch =================================================================== --- fix-shim-header-generation-when-unbundling-ICU.patch (rev 0) +++ fix-shim-header-generation-when-unbundling-ICU.patch 2020-02-08 12:46:29 UTC (rev 564084) @@ -0,0 +1,50 @@ +From dcad5af090528018599277dc5d7e160fb6b2d68e Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann <[email protected]> +Date: Wed, 15 Jan 2020 20:26:40 +0000 +Subject: [PATCH] Fix shim header generation when unbundling ICU + +listformatter.h was moved from icuuc to icui18n + +Bug: 989153 +Change-Id: I9fcb56f6d5af7787f34ea99b737e2ed8fe741c84 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2000142 +Reviewed-by: Lei Zhang <[email protected]> +Commit-Queue: Lei Zhang <[email protected]> +Cr-Commit-Position: refs/heads/master@{#732114} +--- + AUTHORS | 1 + + build/linux/unbundle/icu.gn | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/AUTHORS b/AUTHORS +index 7523e483aae..1618fddc633 100644 +--- a/AUTHORS ++++ b/AUTHORS +@@ -891,6 +891,7 @@ Soren Dreijer <[email protected]> + Sreerenj Balachandran <[email protected]> + Srirama Chandra Sekhar Mogali <[email protected]> + Staphany Park <[email protected]> ++Stephan Hartmann <[email protected]> + Stephen Searles <[email protected]> + Steve Sanders <[email protected]> + Steven Pennington <[email protected]> +diff --git a/build/linux/unbundle/icu.gn b/build/linux/unbundle/icu.gn +index 923bd7f5ac3..e77bc43db87 100644 +--- a/build/linux/unbundle/icu.gn ++++ b/build/linux/unbundle/icu.gn +@@ -92,6 +92,7 @@ shim_headers("icui18n_shim") { + "unicode/fpositer.h", + "unicode/gender.h", + "unicode/gregocal.h", ++ "unicode/listformatter.h", + "unicode/measfmt.h", + "unicode/measunit.h", + "unicode/measure.h", +@@ -174,7 +175,6 @@ shim_headers("icuuc_shim") { + "unicode/icudataver.h", + "unicode/icuplug.h", + "unicode/idna.h", +- "unicode/listformatter.h", + "unicode/localpointer.h", + "unicode/locdspnm.h", + "unicode/locid.h",
