Date: Tuesday, July 14, 2020 @ 21:57:34 Author: foutrelis Revision: 663810
archrelease: copy trunk to community-x86_64 Added: electron7/repos/community-x86_64/PKGBUILD (from rev 663809, electron7/trunk/PKGBUILD) electron7/repos/community-x86_64/angle-gcc10.patch (from rev 663809, electron7/trunk/angle-gcc10.patch) electron7/repos/community-x86_64/chromium-ffmpeg-4.3.patch (from rev 663809, electron7/trunk/chromium-ffmpeg-4.3.patch) electron7/repos/community-x86_64/chromium-gcc10.patch (from rev 663809, electron7/trunk/chromium-gcc10.patch) electron7/repos/community-x86_64/chromium-skia-harmony.patch (from rev 663809, electron7/trunk/chromium-skia-harmony.patch) electron7/repos/community-x86_64/chromium-system-icu.patch (from rev 663809, electron7/trunk/chromium-system-icu.patch) electron7/repos/community-x86_64/chromium-system-zlib.patch (from rev 663809, electron7/trunk/chromium-system-zlib.patch) electron7/repos/community-x86_64/default_app-icon.patch (from rev 663809, electron7/trunk/default_app-icon.patch) electron7/repos/community-x86_64/electron7.desktop (from rev 663809, electron7/trunk/electron7.desktop) electron7/repos/community-x86_64/glslang-remove-setAllocator.patch (from rev 663809, electron7/trunk/glslang-remove-setAllocator.patch) electron7/repos/community-x86_64/icu65.patch (from rev 663809, electron7/trunk/icu65.patch) electron7/repos/community-x86_64/icu67.patch (from rev 663809, electron7/trunk/icu67.patch) electron7/repos/community-x86_64/perfetto-gcc10.patch (from rev 663809, electron7/trunk/perfetto-gcc10.patch) electron7/repos/community-x86_64/use-system-libraries-in-node.patch (from rev 663809, electron7/trunk/use-system-libraries-in-node.patch) electron7/repos/community-x86_64/webrtc-gcc10.patch (from rev 663809, electron7/trunk/webrtc-gcc10.patch) Deleted: electron7/repos/community-x86_64/PKGBUILD electron7/repos/community-x86_64/angle-gcc10.patch electron7/repos/community-x86_64/chromium-gcc10.patch electron7/repos/community-x86_64/chromium-skia-harmony.patch electron7/repos/community-x86_64/chromium-system-icu.patch electron7/repos/community-x86_64/chromium-system-zlib.patch electron7/repos/community-x86_64/default_app-icon.patch electron7/repos/community-x86_64/electron7.desktop electron7/repos/community-x86_64/glslang-remove-setAllocator.patch electron7/repos/community-x86_64/icu65.patch electron7/repos/community-x86_64/icu67.patch electron7/repos/community-x86_64/perfetto-gcc10.patch electron7/repos/community-x86_64/use-system-libraries-in-node.patch electron7/repos/community-x86_64/webrtc-gcc10.patch ------------------------------------+ PKGBUILD | 437 +++++++++++++++++------------------ angle-gcc10.patch | 52 ++-- chromium-ffmpeg-4.3.patch | 21 + chromium-gcc10.patch | 68 ++--- chromium-skia-harmony.patch | 28 +- chromium-system-icu.patch | 40 +-- chromium-system-zlib.patch | 26 +- default_app-icon.patch | 42 +-- electron7.desktop | 14 - glslang-remove-setAllocator.patch | 48 +-- icu65.patch | 128 +++++----- icu67.patch | 338 +++++++++++++-------------- perfetto-gcc10.patch | 56 ++-- use-system-libraries-in-node.patch | 112 ++++---- webrtc-gcc10.patch | 146 +++++------ 15 files changed, 790 insertions(+), 766 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-07-14 21:57:20 UTC (rev 663809) +++ PKGBUILD 2020-07-14 21:57:34 UTC (rev 663810) @@ -1,217 +0,0 @@ -# Maintainer: Filipe Laíns (FFY00) <la...@archlinux.org> -# Contributor: Nicola Squartini <tens...@gmail.com> - -pkgname=electron7 -pkgver=7.1.14 -_commit=0f082ecd5c378a36b5b9bd6d150a00d5dc34da6c -_chromiumver=78.0.3904.130 -pkgrel=6 -pkgdesc='Build cross platform desktop apps with web technologies' -arch=('x86_64') -url='https://electronjs.org/' -license=('MIT' 'custom') -depends=('c-ares' 'ffmpeg' 'gtk3' 'http-parser' 'libevent' 'libnghttp2' - 'libxslt' 'libxss' 'minizip' 'nss' 're2' 'snappy') -makedepends=('clang' 'git' 'gn' 'gperf' 'harfbuzz-icu' 'java-runtime-headless' - 'jsoncpp' 'libnotify' 'lld' 'llvm' 'ninja' 'npm' 'pciutils' 'yarn' - 'python2' 'wget' 'yasm') -optdepends=('kde-cli-tools: file deletion support (kioclient5)' - 'libappindicator-gtk3: StatusNotifierItem support' - 'trash-cli: file deletion support (trash-put)' - "xdg-utils: open URLs with desktop's default (xdg-email, xdg-open)") -source=('git+https://github.com/electron/electron.git' - 'git+https://chromium.googlesource.com/chromium/tools/depot_tools.git' - "$pkgname.desktop" - 'default_app-icon.patch' - 'use-system-libraries-in-node.patch' - 'icu65.patch' - 'icu67.patch' - 'chromium-gcc10.patch' - 'angle-gcc10.patch' - 'perfetto-gcc10.patch' - 'webrtc-gcc10.patch' - 'glslang-remove-setAllocator.patch' - 'chromium-skia-harmony.patch' - 'chromium-system-icu.patch' - 'chromium-system-zlib.patch') -sha512sums=('SKIP' - 'SKIP' - 'c8a3c849117c8d1b4037076563ed39b441e68178c541603dab4203d889903f2e3aa26fc93fc958dc96e720446d082a79e1169ea87801a15ae3f22b527aed00c4' - '8c7fb91a3e5f0ba9e031d4011c5167b872e54751a64f78816f66376a5ac8af81e59e3fb6301140056f61ced44903acb3acbd106ad5d5f6503e7566bc6b7ee5b9' - '147563fe422108598af26c617edf78d146d4e70223e3093216d5f63a1ab051eff95abd0c8f8c0b6f8a504ae26557d65cd0ffd90c542d6534176b72b99ea44a5e' - 'd109937c4a5fba96e82d6fbc7b804943010d5723eef91af4f79355c8b84214da3978fc784dd0fcc3ed228c4684d0d06cf8cd21fa32fc5ec80c00d1bb4e3b9c90' - '9b80bdda769a63f8550e4adfaa3b17cda6d3de45b2aa08adcbcf079256058a46537ed40d54e56c64595e608da8d8537e0d2cb5ece44a34636a1aadb47fb5e1ef' - '682cbc25a332ea30e2475fc39fa8e6ce395f65b974520121ccf7be90b7744b0f9b98313e2d9ac0e56a0e41fd444e8dec80a7e8565b7e91508bfe8234e4105f6b' - 'fd8e523b657205ed1cb64581bd9e5597183c1575f0d0523dcc708e3b67e4ff2dcb962b41254b7ad7b180a317161ab47b7e262d2321ac1b21718c3b1bccc54c3e' - '047606dacc67dc689bac9d30540331c4f4a56f5ff664115c779b13376918a0279fa0466099aa5e36a6541faa7479ae567ac50a4d4b482cdc34c95ae04aceb51d' - 'a4340a6b338768d51600853d101f7b4e06c7b733bda71f1e193c457edac3bb07887f7c307e60e26edf2fda47986788df8c4645b6ce26dae0d1e0b091f4520e91' - 'e34562b4b6cf4f0afa3f23afe7336fed4614201b39bfb73871899081161f5927d273c1da14b3ab7edeeb803300ba6e07c1ddf7261e8be12555cbfc4fe0a0d23c' - '6fa7c5f737b3f86274b1f768aadf863dd7542fca9c8885d5c3804590bd04c288394c54b2003234be37d961f48b5470ce15254ba64b2716f8aceb181e1fd3c7c0' - '7413e0cca7102008dd5bee443dcde90be69ef1d0973fee576f70544f0d0a66aa8bc7099e619c89160915d6cd6186384be46ffab4a1d747000133dda9a84e15e5' - '89d62431e11cf8f3b48afdf9a133a8532916d445676de12acb48b0aaca3aa45106e25de399e7ee37a6220b0766c0ea65f10da219d4bb9a7a02275b4364e493ad') - -_system_libs=('ffmpeg' - 'flac' - 'fontconfig' - 'freetype' - 'harfbuzz-ng' - 'icu' - 'libdrm' - 'libevent' - 'libjpeg' -# 'libpng' -# 'libvpx' - 'libwebp' - 'libxml' - 'libxslt' -# 'openh264' - 'opus' - 're2' - 'snappy' - 'yasm' - 'zlib') - -prepare() { - mkdir -p "$srcdir"/python2-path - ln -sf /usr/bin/python2 "$srcdir"/python2-path/python - export PATH="$srcdir/python2-path:$PATH:$srcdir/depot_tools" - - echo 'Fetching chromium...' - git clone --branch=$_chromiumver --depth=1 https://chromium.googlesource.com/chromium/src.git - - echo "solutions = [ - { - \"name\": \"src/electron\", - \"url\": \"file://$srcdir/electron@$_commit\", - \"deps_file\": \"DEPS\", - \"managed\": False, - \"custom_deps\": { - \"src\": None, - }, - \"custom_vars\": {}, - }, -]" > .gclient - - python2 "$srcdir"/depot_tools/gclient.py sync \ - --with_branch_heads \ - --with_tags \ - --nohooks - - sed -e "s/'am'/'apply'/" -i src/electron/script/lib/git.py - - echo 'Running hooks...' - # python2 "$srcdir"/depot_tools/gclient.py runhooks - python2 src/build/landmines.py - python2 src/build/util/lastchange.py -o src/build/util/LASTCHANGE - python2 src/build/util/lastchange.py -m GPU_LISTS_VERSION \ - --revision-id-only --header src/gpu/config/gpu_lists_version.h - python2 src/build/util/lastchange.py -m SKIA_COMMIT_HASH \ - -s src/third_party/skia --header src/skia/ext/skia_commit_hash.h - # Create sysmlink to system Node.js - mkdir -p src/third_party/node/linux/node-linux-x64/bin - ln -sf /usr/bin/node src/third_party/node/linux/node-linux-x64/bin - python2 src/third_party/depot_tools/download_from_google_storage.py \ - --no_resume --extract --no_auth --bucket chromium-nodejs \ - -s src/third_party/node/node_modules.tar.gz.sha1 - vpython src/tools/download_cros_provided_profile.py \ - --newest_state=src/chrome/android/profiles/newest.txt \ - --local_state=src/chrome/android/profiles/local.txt \ - --output_name=src/chrome/android/profiles/afdo.prof \ - --gs_url_base=chromeos-prebuilt/afdo-job/llvm - python2 src/electron/script/apply_all_patches.py \ - src/electron/patches/config.json - cd src/electron - yarn install --frozen-lockfile - cd .. - - echo 'Patching Chromium for using system libraries...' - sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \ - tools/generate_shim_headers/generate_shim_headers.py - for lib in "${_system_libs[@]}" libjpeg_turbo; do - third_party_dir=third_party/"$lib" - if [ ! -d "$third_party_dir" ]; then - third_party_dir=base/"$third_party_dir" - fi - find "$third_party_dir" -type f \ - \! -path "$third_party_dir/chromium/*" \ - \! -path "$third_party_dir/google/*" \ - \! -path 'third_party/yasm/run_yasm.py' \ - \! -regex '.*\.\(gn\|gni\|isolate\)' \ - -delete - done - 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 -Np3 -d v8 <../icu67.patch - patch -Np1 -i ../chromium-gcc10.patch - patch -Np1 -d third_party/angle <../angle-gcc10.patch - patch -Np1 -d third_party/perfetto <../perfetto-gcc10.patch - patch -Np1 -d third_party/webrtc <../webrtc-gcc10.patch - patch -Np1 -d third_party/glslang/src <../glslang-remove-setAllocator.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() { - export CC=clang - export CXX=clang++ - export AR=ar - export NM=nm - - # Do not warn about unknown warning options - CFLAGS+=' -Wno-unknown-warning-option' - CXXFLAGS+=' -Wno-unknown-warning-option' - - cd src - export CHROMIUM_BUILDTOOLS_PATH="$PWD"/buildtools - GN_EXTRA_ARGS=' - blink_symbol_level = 0 - clang_use_chrome_plugins = false - custom_toolchain = "//build/toolchain/linux/unbundle:default" - host_toolchain = "//build/toolchain/linux/unbundle:default" - icu_use_data_file = false - is_component_ffmpeg = false - link_pulseaudio = true - linux_use_bundled_binutils = false - treat_warnings_as_errors = false - use_custom_libcxx = false - use_gnome_keyring = false - use_sysroot = false - ' - gn gen out/Release \ - --args="import(\"//electron/build/args/release.gn\") $GN_EXTRA_ARGS" - ninja -C out/Release electron - # Strip before zip to avoid - # zipfile.LargeZipFile: Filesize would require ZIP64 extensions - strip -s out/Release/electron - ninja -C out/Release electron_dist_zip - # ninja -C out/Release third_party/electron_node:headers -} - -package() { - install -dm755 "$pkgdir"/usr/lib/$pkgname - bsdtar -xf src/out/Release/dist.zip -C "$pkgdir"/usr/lib/$pkgname - - chmod u+s "$pkgdir"/usr/lib/$pkgname/chrome-sandbox - - install -dm755 "$pkgdir"/usr/share/licenses/$pkgname - for l in "$pkgdir"/usr/lib/$pkgname/{LICENSE,LICENSES.chromium.html}; do - ln -s \ - $(realpath --relative-to="$pkgdir"/usr/share/licenses/$pkgname $l) \ - "$pkgdir"/usr/share/licenses/$pkgname - done - - install -dm755 "$pkgdir"/usr/bin - ln -s ../lib/$pkgname/electron "$pkgdir"/usr/bin/$pkgname - - # Install .desktop and icon file (see default_app-icon.patch) - install -Dm644 -t "$pkgdir"/usr/share/applications $pkgname.desktop - install -Dm644 src/electron/default_app/icon.png \ - "$pkgdir"/usr/share/pixmaps/$pkgname.png # hicolor has no 1024x1024 -} Copied: electron7/repos/community-x86_64/PKGBUILD (from rev 663809, electron7/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-07-14 21:57:34 UTC (rev 663810) @@ -0,0 +1,220 @@ +# Maintainer: Filipe Laíns (FFY00) <la...@archlinux.org> +# Contributor: Nicola Squartini <tens...@gmail.com> + +pkgname=electron7 +pkgver=7.1.14 +_commit=0f082ecd5c378a36b5b9bd6d150a00d5dc34da6c +_chromiumver=78.0.3904.130 +pkgrel=7 +pkgdesc='Build cross platform desktop apps with web technologies' +arch=('x86_64') +url='https://electronjs.org/' +license=('MIT' 'custom') +depends=('c-ares' 'ffmpeg' 'gtk3' 'http-parser' 'libevent' 'libnghttp2' + 'libxslt' 'libxss' 'minizip' 'nss' 're2' 'snappy') +makedepends=('clang' 'git' 'gn' 'gperf' 'harfbuzz-icu' 'java-runtime-headless' + 'jsoncpp' 'libnotify' 'lld' 'llvm' 'ninja' 'npm' 'pciutils' 'yarn' + 'python2' 'wget' 'yasm') +optdepends=('kde-cli-tools: file deletion support (kioclient5)' + 'libappindicator-gtk3: StatusNotifierItem support' + 'trash-cli: file deletion support (trash-put)' + "xdg-utils: open URLs with desktop's default (xdg-email, xdg-open)") +source=('git+https://github.com/electron/electron.git' + 'git+https://chromium.googlesource.com/chromium/tools/depot_tools.git' + "$pkgname.desktop" + 'default_app-icon.patch' + 'use-system-libraries-in-node.patch' + 'icu65.patch' + 'icu67.patch' + 'chromium-gcc10.patch' + 'angle-gcc10.patch' + 'perfetto-gcc10.patch' + 'webrtc-gcc10.patch' + 'glslang-remove-setAllocator.patch' + 'chromium-ffmpeg-4.3.patch' + 'chromium-skia-harmony.patch' + 'chromium-system-icu.patch' + 'chromium-system-zlib.patch') +sha512sums=('SKIP' + 'SKIP' + 'c8a3c849117c8d1b4037076563ed39b441e68178c541603dab4203d889903f2e3aa26fc93fc958dc96e720446d082a79e1169ea87801a15ae3f22b527aed00c4' + '8c7fb91a3e5f0ba9e031d4011c5167b872e54751a64f78816f66376a5ac8af81e59e3fb6301140056f61ced44903acb3acbd106ad5d5f6503e7566bc6b7ee5b9' + '147563fe422108598af26c617edf78d146d4e70223e3093216d5f63a1ab051eff95abd0c8f8c0b6f8a504ae26557d65cd0ffd90c542d6534176b72b99ea44a5e' + 'd109937c4a5fba96e82d6fbc7b804943010d5723eef91af4f79355c8b84214da3978fc784dd0fcc3ed228c4684d0d06cf8cd21fa32fc5ec80c00d1bb4e3b9c90' + '9b80bdda769a63f8550e4adfaa3b17cda6d3de45b2aa08adcbcf079256058a46537ed40d54e56c64595e608da8d8537e0d2cb5ece44a34636a1aadb47fb5e1ef' + '682cbc25a332ea30e2475fc39fa8e6ce395f65b974520121ccf7be90b7744b0f9b98313e2d9ac0e56a0e41fd444e8dec80a7e8565b7e91508bfe8234e4105f6b' + 'fd8e523b657205ed1cb64581bd9e5597183c1575f0d0523dcc708e3b67e4ff2dcb962b41254b7ad7b180a317161ab47b7e262d2321ac1b21718c3b1bccc54c3e' + '047606dacc67dc689bac9d30540331c4f4a56f5ff664115c779b13376918a0279fa0466099aa5e36a6541faa7479ae567ac50a4d4b482cdc34c95ae04aceb51d' + 'a4340a6b338768d51600853d101f7b4e06c7b733bda71f1e193c457edac3bb07887f7c307e60e26edf2fda47986788df8c4645b6ce26dae0d1e0b091f4520e91' + 'e34562b4b6cf4f0afa3f23afe7336fed4614201b39bfb73871899081161f5927d273c1da14b3ab7edeeb803300ba6e07c1ddf7261e8be12555cbfc4fe0a0d23c' + '70c30709a9bb6abc7a61a17cdc90cb2c4bad907f13f3bdd595906d87f7ad9a45100f237885e08d3dd4373a19a0716e8a4fa72a3950b7f779c8755cf0349f63d2' + '6fa7c5f737b3f86274b1f768aadf863dd7542fca9c8885d5c3804590bd04c288394c54b2003234be37d961f48b5470ce15254ba64b2716f8aceb181e1fd3c7c0' + '7413e0cca7102008dd5bee443dcde90be69ef1d0973fee576f70544f0d0a66aa8bc7099e619c89160915d6cd6186384be46ffab4a1d747000133dda9a84e15e5' + '89d62431e11cf8f3b48afdf9a133a8532916d445676de12acb48b0aaca3aa45106e25de399e7ee37a6220b0766c0ea65f10da219d4bb9a7a02275b4364e493ad') + +_system_libs=('ffmpeg' + 'flac' + 'fontconfig' + 'freetype' + 'harfbuzz-ng' + 'icu' + 'libdrm' + 'libevent' + 'libjpeg' +# 'libpng' +# 'libvpx' + 'libwebp' + 'libxml' + 'libxslt' +# 'openh264' + 'opus' + 're2' + 'snappy' + 'yasm' + 'zlib') + +prepare() { + mkdir -p "$srcdir"/python2-path + ln -sf /usr/bin/python2 "$srcdir"/python2-path/python + export PATH="$srcdir/python2-path:$PATH:$srcdir/depot_tools" + + echo 'Fetching chromium...' + git clone --branch=$_chromiumver --depth=1 https://chromium.googlesource.com/chromium/src.git + + echo "solutions = [ + { + \"name\": \"src/electron\", + \"url\": \"file://$srcdir/electron@$_commit\", + \"deps_file\": \"DEPS\", + \"managed\": False, + \"custom_deps\": { + \"src\": None, + }, + \"custom_vars\": {}, + }, +]" > .gclient + + python2 "$srcdir"/depot_tools/gclient.py sync \ + --with_branch_heads \ + --with_tags \ + --nohooks + + sed -e "s/'am'/'apply'/" -i src/electron/script/lib/git.py + + echo 'Running hooks...' + # python2 "$srcdir"/depot_tools/gclient.py runhooks + python2 src/build/landmines.py + python2 src/build/util/lastchange.py -o src/build/util/LASTCHANGE + python2 src/build/util/lastchange.py -m GPU_LISTS_VERSION \ + --revision-id-only --header src/gpu/config/gpu_lists_version.h + python2 src/build/util/lastchange.py -m SKIA_COMMIT_HASH \ + -s src/third_party/skia --header src/skia/ext/skia_commit_hash.h + # Create sysmlink to system Node.js + mkdir -p src/third_party/node/linux/node-linux-x64/bin + ln -sf /usr/bin/node src/third_party/node/linux/node-linux-x64/bin + python2 src/third_party/depot_tools/download_from_google_storage.py \ + --no_resume --extract --no_auth --bucket chromium-nodejs \ + -s src/third_party/node/node_modules.tar.gz.sha1 + vpython src/tools/download_cros_provided_profile.py \ + --newest_state=src/chrome/android/profiles/newest.txt \ + --local_state=src/chrome/android/profiles/local.txt \ + --output_name=src/chrome/android/profiles/afdo.prof \ + --gs_url_base=chromeos-prebuilt/afdo-job/llvm + python2 src/electron/script/apply_all_patches.py \ + src/electron/patches/config.json + cd src/electron + yarn install --frozen-lockfile + cd .. + + echo 'Patching Chromium for using system libraries...' + sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \ + tools/generate_shim_headers/generate_shim_headers.py + for lib in "${_system_libs[@]}" libjpeg_turbo; do + third_party_dir=third_party/"$lib" + if [ ! -d "$third_party_dir" ]; then + third_party_dir=base/"$third_party_dir" + fi + find "$third_party_dir" -type f \ + \! -path "$third_party_dir/chromium/*" \ + \! -path "$third_party_dir/google/*" \ + \! -path 'third_party/yasm/run_yasm.py' \ + \! -regex '.*\.\(gn\|gni\|isolate\)' \ + -delete + done + python2 build/linux/unbundle/replace_gn_files.py \ + --system-libraries \ + "${_system_libs[@]}" + + echo 'Applying local patches...' + patch -Np1 -i ../chromium-ffmpeg-4.3.patch + patch -Np0 -i ../chromium-skia-harmony.patch + patch -Np1 -i ../icu65.patch + patch -Np3 -d v8 <../icu67.patch + patch -Np1 -i ../chromium-gcc10.patch + patch -Np1 -d third_party/angle <../angle-gcc10.patch + patch -Np1 -d third_party/perfetto <../perfetto-gcc10.patch + patch -Np1 -d third_party/webrtc <../webrtc-gcc10.patch + patch -Np1 -d third_party/glslang/src <../glslang-remove-setAllocator.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() { + export CC=clang + export CXX=clang++ + export AR=ar + export NM=nm + + # Do not warn about unknown warning options + CFLAGS+=' -Wno-unknown-warning-option' + CXXFLAGS+=' -Wno-unknown-warning-option' + + cd src + export CHROMIUM_BUILDTOOLS_PATH="$PWD"/buildtools + GN_EXTRA_ARGS=' + blink_symbol_level = 0 + clang_use_chrome_plugins = false + custom_toolchain = "//build/toolchain/linux/unbundle:default" + host_toolchain = "//build/toolchain/linux/unbundle:default" + icu_use_data_file = false + is_component_ffmpeg = false + link_pulseaudio = true + linux_use_bundled_binutils = false + treat_warnings_as_errors = false + use_custom_libcxx = false + use_gnome_keyring = false + use_sysroot = false + ' + gn gen out/Release \ + --args="import(\"//electron/build/args/release.gn\") $GN_EXTRA_ARGS" + ninja -C out/Release electron + # Strip before zip to avoid + # zipfile.LargeZipFile: Filesize would require ZIP64 extensions + strip -s out/Release/electron + ninja -C out/Release electron_dist_zip + # ninja -C out/Release third_party/electron_node:headers +} + +package() { + install -dm755 "$pkgdir"/usr/lib/$pkgname + bsdtar -xf src/out/Release/dist.zip -C "$pkgdir"/usr/lib/$pkgname + + chmod u+s "$pkgdir"/usr/lib/$pkgname/chrome-sandbox + + install -dm755 "$pkgdir"/usr/share/licenses/$pkgname + for l in "$pkgdir"/usr/lib/$pkgname/{LICENSE,LICENSES.chromium.html}; do + ln -s \ + $(realpath --relative-to="$pkgdir"/usr/share/licenses/$pkgname $l) \ + "$pkgdir"/usr/share/licenses/$pkgname + done + + install -dm755 "$pkgdir"/usr/bin + ln -s ../lib/$pkgname/electron "$pkgdir"/usr/bin/$pkgname + + # Install .desktop and icon file (see default_app-icon.patch) + install -Dm644 -t "$pkgdir"/usr/share/applications $pkgname.desktop + install -Dm644 src/electron/default_app/icon.png \ + "$pkgdir"/usr/share/pixmaps/$pkgname.png # hicolor has no 1024x1024 +} Deleted: angle-gcc10.patch =================================================================== --- angle-gcc10.patch 2020-07-14 21:57:20 UTC (rev 663809) +++ angle-gcc10.patch 2020-07-14 21:57:34 UTC (rev 663810) @@ -1,26 +0,0 @@ -From 9a481b6ec835cfd0d4014c0b11f03c27a209f305 Mon Sep 17 00:00:00 2001 -From: Pierre-Marc Berube <pmber...@google.com> -Date: Tue, 18 Feb 2020 19:21:34 -0500 -Subject: [PATCH] Add missing #include to fix build with GCC 10. - -Bug: angleproject:4389 -Change-Id: I4a2f04a12a059924871f5d54f137c67670747ebd -Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2063042 -Reviewed-by: Jamie Madill <jmad...@chromium.org> -Commit-Queue: Jamie Madill <jmad...@chromium.org> ---- - include/platform/Platform.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/platform/Platform.h b/include/platform/Platform.h -index b603ff9ba..131674008 100644 ---- a/include/platform/Platform.h -+++ b/include/platform/Platform.h -@@ -10,6 +10,7 @@ - #define ANGLE_PLATFORM_H - - #include <stdint.h> -+#include <stdlib.h> - #include <array> - - #define EGL_PLATFORM_ANGLE_PLATFORM_METHODS_ANGLEX 0x3482 Copied: electron7/repos/community-x86_64/angle-gcc10.patch (from rev 663809, electron7/trunk/angle-gcc10.patch) =================================================================== --- angle-gcc10.patch (rev 0) +++ angle-gcc10.patch 2020-07-14 21:57:34 UTC (rev 663810) @@ -0,0 +1,26 @@ +From 9a481b6ec835cfd0d4014c0b11f03c27a209f305 Mon Sep 17 00:00:00 2001 +From: Pierre-Marc Berube <pmber...@google.com> +Date: Tue, 18 Feb 2020 19:21:34 -0500 +Subject: [PATCH] Add missing #include to fix build with GCC 10. + +Bug: angleproject:4389 +Change-Id: I4a2f04a12a059924871f5d54f137c67670747ebd +Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2063042 +Reviewed-by: Jamie Madill <jmad...@chromium.org> +Commit-Queue: Jamie Madill <jmad...@chromium.org> +--- + include/platform/Platform.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/platform/Platform.h b/include/platform/Platform.h +index b603ff9ba..131674008 100644 +--- a/include/platform/Platform.h ++++ b/include/platform/Platform.h +@@ -10,6 +10,7 @@ + #define ANGLE_PLATFORM_H + + #include <stdint.h> ++#include <stdlib.h> + #include <array> + + #define EGL_PLATFORM_ANGLE_PLATFORM_METHODS_ANGLEX 0x3482 Copied: electron7/repos/community-x86_64/chromium-ffmpeg-4.3.patch (from rev 663809, electron7/trunk/chromium-ffmpeg-4.3.patch) =================================================================== --- chromium-ffmpeg-4.3.patch (rev 0) +++ chromium-ffmpeg-4.3.patch 2020-07-14 21:57:34 UTC (rev 663810) @@ -0,0 +1,21 @@ +diff --git a/media/base/media.cc b/media/base/media.cc +index c282ee49a03..a298b40c79b 100644 +--- a/media/base/media.cc ++++ b/media/base/media.cc +@@ -14,6 +14,7 @@ + #include "third_party/libyuv/include/libyuv.h" + + #if BUILDFLAG(ENABLE_FFMPEG) ++#include <limits> + #include "third_party/ffmpeg/ffmpeg_features.h" // nogncheck + extern "C" { + #include <libavutil/cpu.h> +@@ -41,7 +42,7 @@ class MediaInitializer { + + #if BUILDFLAG(USE_ALLOCATOR_SHIM) + // Remove allocation limit from ffmpeg, so calls go down to shim layer. +- av_max_alloc(0); ++ av_max_alloc(std::numeric_limits<size_t>::max()); + #endif // BUILDFLAG(USE_ALLOCATOR_SHIM) + + #endif // BUILDFLAG(ENABLE_FFMPEG) Deleted: chromium-gcc10.patch =================================================================== --- chromium-gcc10.patch 2020-07-14 21:57:20 UTC (rev 663809) +++ chromium-gcc10.patch 2020-07-14 21:57:34 UTC (rev 663810) @@ -1,34 +0,0 @@ -From 17902f2263622eb21bd8adddf078355dbe7654a5 Mon Sep 17 00:00:00 2001 -From: Chisoon Jeong <chisoon.je...@lge.com> -Date: Tue, 31 Mar 2020 18:02:12 +0000 -Subject: [PATCH] Add #include <stddef.h> for clarity and supporting gcc - compilation - -Depending on compilation environments of gcc, supported_cdm_versions.h|cc -is not compiled. To fix this issue add '#include <stddef.h>' in -supported_cdm_versions.h - -Change-Id: I0f56cb4f69e1fb3867a1c168a28431661341784b -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2117912 -Reviewed-by: Nico Weber <tha...@chromium.org> -Reviewed-by: Scott Violet <s...@chromium.org> -Reviewed-by: John Rummell <jrumm...@chromium.org> -Commit-Queue: Nico Weber <tha...@chromium.org> -Cr-Commit-Position: refs/heads/master@{#755016} ---- - media/cdm/supported_cdm_versions.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/media/cdm/supported_cdm_versions.h b/media/cdm/supported_cdm_versions.h -index dbe59ba5ea7..25bb6ed3f33 100644 ---- a/media/cdm/supported_cdm_versions.h -+++ b/media/cdm/supported_cdm_versions.h -@@ -5,6 +5,8 @@ - #ifndef MEDIA_CDM_SUPPORTED_CDM_VERSIONS_H_ - #define MEDIA_CDM_SUPPORTED_CDM_VERSIONS_H_ - -+#include <stddef.h> -+ - #include <array> - - #include "media/base/media_export.h" Copied: electron7/repos/community-x86_64/chromium-gcc10.patch (from rev 663809, electron7/trunk/chromium-gcc10.patch) =================================================================== --- chromium-gcc10.patch (rev 0) +++ chromium-gcc10.patch 2020-07-14 21:57:34 UTC (rev 663810) @@ -0,0 +1,34 @@ +From 17902f2263622eb21bd8adddf078355dbe7654a5 Mon Sep 17 00:00:00 2001 +From: Chisoon Jeong <chisoon.je...@lge.com> +Date: Tue, 31 Mar 2020 18:02:12 +0000 +Subject: [PATCH] Add #include <stddef.h> for clarity and supporting gcc + compilation + +Depending on compilation environments of gcc, supported_cdm_versions.h|cc +is not compiled. To fix this issue add '#include <stddef.h>' in +supported_cdm_versions.h + +Change-Id: I0f56cb4f69e1fb3867a1c168a28431661341784b +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2117912 +Reviewed-by: Nico Weber <tha...@chromium.org> +Reviewed-by: Scott Violet <s...@chromium.org> +Reviewed-by: John Rummell <jrumm...@chromium.org> +Commit-Queue: Nico Weber <tha...@chromium.org> +Cr-Commit-Position: refs/heads/master@{#755016} +--- + media/cdm/supported_cdm_versions.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/media/cdm/supported_cdm_versions.h b/media/cdm/supported_cdm_versions.h +index dbe59ba5ea7..25bb6ed3f33 100644 +--- a/media/cdm/supported_cdm_versions.h ++++ b/media/cdm/supported_cdm_versions.h +@@ -5,6 +5,8 @@ + #ifndef MEDIA_CDM_SUPPORTED_CDM_VERSIONS_H_ + #define MEDIA_CDM_SUPPORTED_CDM_VERSIONS_H_ + ++#include <stddef.h> ++ + #include <array> + + #include "media/base/media_export.h" Deleted: chromium-skia-harmony.patch =================================================================== --- chromium-skia-harmony.patch 2020-07-14 21:57:20 UTC (rev 663809) +++ chromium-skia-harmony.patch 2020-07-14 21:57:34 UTC (rev 663810) @@ -1,14 +0,0 @@ ---- third_party/skia/src/ports/SkFontHost_FreeType.cpp.orig 2019-07-19 11:08:34.770972665 +0000 -+++ third_party/skia/src/ports/SkFontHost_FreeType.cpp 2019-07-19 11:08:44.274442065 +0000 -@@ -128,9 +128,9 @@ public: - : fGetVarDesignCoordinates(nullptr) - , fGetVarAxisFlags(nullptr) - , fLibrary(nullptr) -- , fIsLCDSupported(false) -+ , fIsLCDSupported(true) - , fLightHintingIsYOnly(false) -- , fLCDExtra(0) -+ , fLCDExtra(2) - { - if (FT_New_Library(&gFTMemory, &fLibrary)) { - return; Copied: electron7/repos/community-x86_64/chromium-skia-harmony.patch (from rev 663809, electron7/trunk/chromium-skia-harmony.patch) =================================================================== --- chromium-skia-harmony.patch (rev 0) +++ chromium-skia-harmony.patch 2020-07-14 21:57:34 UTC (rev 663810) @@ -0,0 +1,14 @@ +--- third_party/skia/src/ports/SkFontHost_FreeType.cpp.orig 2019-07-19 11:08:34.770972665 +0000 ++++ third_party/skia/src/ports/SkFontHost_FreeType.cpp 2019-07-19 11:08:44.274442065 +0000 +@@ -128,9 +128,9 @@ public: + : fGetVarDesignCoordinates(nullptr) + , fGetVarAxisFlags(nullptr) + , fLibrary(nullptr) +- , fIsLCDSupported(false) ++ , fIsLCDSupported(true) + , fLightHintingIsYOnly(false) +- , fLCDExtra(0) ++ , fLCDExtra(2) + { + if (FT_New_Library(&gFTMemory, &fLibrary)) { + return; Deleted: chromium-system-icu.patch =================================================================== --- chromium-system-icu.patch 2020-07-14 21:57:20 UTC (rev 663809) +++ chromium-system-icu.patch 2020-07-14 21:57:34 UTC (rev 663810) @@ -1,20 +0,0 @@ -diff --git a/build/linux/unbundle/icu.gn b/build/linux/unbundle/icu.gn -index 4450e40..9ca36dd 100644 ---- a/build/linux/unbundle/icu.gn -+++ b/build/linux/unbundle/icu.gn -@@ -96,6 +96,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", -@@ -178,7 +179,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", Copied: electron7/repos/community-x86_64/chromium-system-icu.patch (from rev 663809, electron7/trunk/chromium-system-icu.patch) =================================================================== --- chromium-system-icu.patch (rev 0) +++ chromium-system-icu.patch 2020-07-14 21:57:34 UTC (rev 663810) @@ -0,0 +1,20 @@ +diff --git a/build/linux/unbundle/icu.gn b/build/linux/unbundle/icu.gn +index 4450e40..9ca36dd 100644 +--- a/build/linux/unbundle/icu.gn ++++ b/build/linux/unbundle/icu.gn +@@ -96,6 +96,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", +@@ -178,7 +179,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", Deleted: chromium-system-zlib.patch =================================================================== --- chromium-system-zlib.patch 2020-07-14 21:57:20 UTC (rev 663809) +++ chromium-system-zlib.patch 2020-07-14 21:57:34 UTC (rev 663810) @@ -1,13 +0,0 @@ -diff --git a/third_party/perfetto/gn/BUILD.gn b/third_party/perfetto/gn/BUILD.gn -index 3bc618a..e0ddf6d 100644 ---- a/third_party/perfetto/gn/BUILD.gn -+++ b/third_party/perfetto/gn/BUILD.gn -@@ -244,7 +244,7 @@ if (enable_perfetto_trace_processor || perfetto_build_standalone || - "//buildtools:zlib", - ] - } else { -- public_configs = [ "//third_party/zlib:zlib_config" ] -+ public_configs = [ "//third_party/zlib:system_zlib" ] - public_deps = [ - "//third_party/zlib", - ] Copied: electron7/repos/community-x86_64/chromium-system-zlib.patch (from rev 663809, electron7/trunk/chromium-system-zlib.patch) =================================================================== --- chromium-system-zlib.patch (rev 0) +++ chromium-system-zlib.patch 2020-07-14 21:57:34 UTC (rev 663810) @@ -0,0 +1,13 @@ +diff --git a/third_party/perfetto/gn/BUILD.gn b/third_party/perfetto/gn/BUILD.gn +index 3bc618a..e0ddf6d 100644 +--- a/third_party/perfetto/gn/BUILD.gn ++++ b/third_party/perfetto/gn/BUILD.gn +@@ -244,7 +244,7 @@ if (enable_perfetto_trace_processor || perfetto_build_standalone || + "//buildtools:zlib", + ] + } else { +- public_configs = [ "//third_party/zlib:zlib_config" ] ++ public_configs = [ "//third_party/zlib:system_zlib" ] + public_deps = [ + "//third_party/zlib", + ] Deleted: default_app-icon.patch =================================================================== --- default_app-icon.patch 2020-07-14 21:57:20 UTC (rev 663809) +++ default_app-icon.patch 2020-07-14 21:57:34 UTC (rev 663810) @@ -1,21 +0,0 @@ -/electron/default_app/default_app.ts -+++ b/electron/default_app/default_app.ts -@@ -60,7 +60,7 @@ - } - - if (process.platform === 'linux') { -- options.icon = path.join(__dirname, 'icon.png') -+ options.icon = '/usr/share/pixmaps/electron.png' - } - - mainWindow = new BrowserWindow(options) ---- a/electron/filenames.gni -+++ b/electron/filenames.gni -@@ -6,7 +6,6 @@ - ] - - default_app_static_sources = [ -- "default_app/icon.png", - "default_app/index.html", - "default_app/package.json", - "default_app/styles.css", Copied: electron7/repos/community-x86_64/default_app-icon.patch (from rev 663809, electron7/trunk/default_app-icon.patch) =================================================================== --- default_app-icon.patch (rev 0) +++ default_app-icon.patch 2020-07-14 21:57:34 UTC (rev 663810) @@ -0,0 +1,21 @@ +/electron/default_app/default_app.ts ++++ b/electron/default_app/default_app.ts +@@ -60,7 +60,7 @@ + } + + if (process.platform === 'linux') { +- options.icon = path.join(__dirname, 'icon.png') ++ options.icon = '/usr/share/pixmaps/electron.png' + } + + mainWindow = new BrowserWindow(options) +--- a/electron/filenames.gni ++++ b/electron/filenames.gni +@@ -6,7 +6,6 @@ + ] + + default_app_static_sources = [ +- "default_app/icon.png", + "default_app/index.html", + "default_app/package.json", + "default_app/styles.css", Deleted: electron7.desktop =================================================================== --- electron7.desktop 2020-07-14 21:57:20 UTC (rev 663809) +++ electron7.desktop 2020-07-14 21:57:34 UTC (rev 663810) @@ -1,7 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Electron -Icon=electron7 -Exec=electron7 %u -Categories=Development;GTK; -StartupNotify=true Copied: electron7/repos/community-x86_64/electron7.desktop (from rev 663809, electron7/trunk/electron7.desktop) =================================================================== --- electron7.desktop (rev 0) +++ electron7.desktop 2020-07-14 21:57:34 UTC (rev 663810) @@ -0,0 +1,7 @@ +[Desktop Entry] +Type=Application +Name=Electron +Icon=electron7 +Exec=electron7 %u +Categories=Development;GTK; +StartupNotify=true Deleted: glslang-remove-setAllocator.patch =================================================================== --- glslang-remove-setAllocator.patch 2020-07-14 21:57:20 UTC (rev 663809) +++ glslang-remove-setAllocator.patch 2020-07-14 21:57:34 UTC (rev 663810) @@ -1,24 +0,0 @@ -From 24b3e8384e93f3e73b6aa14ea00a30574112f9ba Mon Sep 17 00:00:00 2001 -From: Reid Kleckner <r...@google.com> -Date: Wed, 4 Dec 2019 14:09:03 -0800 -Subject: [PATCH] Remove glslang::pool_allocator::setAllocator - -TPoolAllocator is not copy assignable, so this setter could never have -been used. After a recent change (878a24ee2), new versions of Clang -reject this code outright. ---- - glslang/Include/PoolAlloc.h | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/glslang/Include/PoolAlloc.h b/glslang/Include/PoolAlloc.h -index 0e237a6a2..b8eccb883 100644 ---- a/glslang/Include/PoolAlloc.h -+++ b/glslang/Include/PoolAlloc.h -@@ -304,7 +304,6 @@ class pool_allocator { - size_type max_size() const { return static_cast<size_type>(-1) / sizeof(T); } - size_type max_size(int size) const { return static_cast<size_type>(-1) / size; } - -- void setAllocator(TPoolAllocator* a) { allocator = *a; } - TPoolAllocator& getAllocator() const { return allocator; } - - protected: Copied: electron7/repos/community-x86_64/glslang-remove-setAllocator.patch (from rev 663809, electron7/trunk/glslang-remove-setAllocator.patch) =================================================================== --- glslang-remove-setAllocator.patch (rev 0) +++ glslang-remove-setAllocator.patch 2020-07-14 21:57:34 UTC (rev 663810) @@ -0,0 +1,24 @@ +From 24b3e8384e93f3e73b6aa14ea00a30574112f9ba Mon Sep 17 00:00:00 2001 +From: Reid Kleckner <r...@google.com> +Date: Wed, 4 Dec 2019 14:09:03 -0800 +Subject: [PATCH] Remove glslang::pool_allocator::setAllocator + +TPoolAllocator is not copy assignable, so this setter could never have +been used. After a recent change (878a24ee2), new versions of Clang +reject this code outright. +--- + glslang/Include/PoolAlloc.h | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/glslang/Include/PoolAlloc.h b/glslang/Include/PoolAlloc.h +index 0e237a6a2..b8eccb883 100644 +--- a/glslang/Include/PoolAlloc.h ++++ b/glslang/Include/PoolAlloc.h +@@ -304,7 +304,6 @@ class pool_allocator { + size_type max_size() const { return static_cast<size_type>(-1) / sizeof(T); } + size_type max_size(int size) const { return static_cast<size_type>(-1) / size; } + +- void setAllocator(TPoolAllocator* a) { allocator = *a; } + TPoolAllocator& getAllocator() const { return allocator; } + + protected: Deleted: icu65.patch =================================================================== --- icu65.patch 2020-07-14 21:57:20 UTC (rev 663809) +++ icu65.patch 2020-07-14 21:57:34 UTC (rev 663810) @@ -1,64 +0,0 @@ -From 5679c3c191ed62b62d8db22f1657a296ee9bfe8e Mon Sep 17 00:00:00 2001 -From: Frank Tang <ft...@chromium.org> -Date: Wed, 30 Oct 2019 22:49:47 +0000 -Subject: [PATCH] Update ICU to 65.1 from 64 and fix broken tests - -ICU 65-1 release note -http://site.icu-project.org/download/65 - -CLDR 36 release blog -http://blog.unicode.org/2019/10/unicode-cldr-version-36-languagelocale.html - -Most of the test expectation change is due to CLDR 36 update -of Grapheme Cluster for Indic languages -See the following for related changes in ICU 65.1 in this area: -https://unicode-org.atlassian.net/browse/CLDR-10994 -https://unicode-org.atlassian.net/browse/ICU-13637 -https://github.com/unicode-org/cldr/blob/master/common/properties/segments/readme.txt - -Bug: chromium:1014272, chromium:1017047 -Change-Id: I9fc6d4620bf2a4c189940d06d8c79893502db3dd -Cq-Include-Trybots: luci.chromium.try:linux_layout_tests_layout_ng_disabled -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1866059 -Reviewed-by: Jungshik Shin <js...@chromium.org> -Reviewed-by: Doug Turner <do...@chromium.org> -Reviewed-by: Michael Wasserman <m...@chromium.org> -Reviewed-by: Kent Tamura <tk...@chromium.org> -Reviewed-by: Trent Apted <tap...@chromium.org> -Reviewed-by: Mason Freed <masonfr...@chromium.org> -Commit-Queue: Frank Tang <ft...@chromium.org> -Cr-Commit-Position: refs/heads/master@{#711027} ---- - third_party/blink/renderer/core/dom/document.cc | 2 +- - ui/gfx/render_text_harfbuzz.cc | 5 ++++- - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc -index 511aac29086..f188cf548a6 100644 ---- a/third_party/blink/renderer/core/dom/document.cc -+++ b/third_party/blink/renderer/core/dom/document.cc -@@ -6191,7 +6191,7 @@ static ParseQualifiedNameResult ParseQualifiedNameInternal( - - 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); -diff --git a/ui/gfx/render_text_harfbuzz.cc b/ui/gfx/render_text_harfbuzz.cc -index 50e86af6b97..0339ff3ff8e 100644 ---- a/ui/gfx/render_text_harfbuzz.cc -+++ b/ui/gfx/render_text_harfbuzz.cc -@@ -971,7 +971,10 @@ RangeF TextRunHarfBuzz::GetGraphemeBounds(RenderTextHarfBuzz* render_text, - ++total; - } - } -- DCHECK_GT(total, 0); -+ // With ICU 65.1, DCHECK_GT() below fails. -+ // See https://crbug.com/1017047 for more details. -+ // -+ // DCHECK_GT(total, 0); - - // It's possible for |text_index| to point to a diacritical mark, at the end - // of |chars|. In this case all the grapheme boundaries come before it. Just Copied: electron7/repos/community-x86_64/icu65.patch (from rev 663809, electron7/trunk/icu65.patch) =================================================================== --- icu65.patch (rev 0) +++ icu65.patch 2020-07-14 21:57:34 UTC (rev 663810) @@ -0,0 +1,64 @@ +From 5679c3c191ed62b62d8db22f1657a296ee9bfe8e Mon Sep 17 00:00:00 2001 +From: Frank Tang <ft...@chromium.org> +Date: Wed, 30 Oct 2019 22:49:47 +0000 +Subject: [PATCH] Update ICU to 65.1 from 64 and fix broken tests + +ICU 65-1 release note +http://site.icu-project.org/download/65 + +CLDR 36 release blog +http://blog.unicode.org/2019/10/unicode-cldr-version-36-languagelocale.html + +Most of the test expectation change is due to CLDR 36 update +of Grapheme Cluster for Indic languages +See the following for related changes in ICU 65.1 in this area: +https://unicode-org.atlassian.net/browse/CLDR-10994 +https://unicode-org.atlassian.net/browse/ICU-13637 +https://github.com/unicode-org/cldr/blob/master/common/properties/segments/readme.txt + +Bug: chromium:1014272, chromium:1017047 +Change-Id: I9fc6d4620bf2a4c189940d06d8c79893502db3dd +Cq-Include-Trybots: luci.chromium.try:linux_layout_tests_layout_ng_disabled +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1866059 +Reviewed-by: Jungshik Shin <js...@chromium.org> +Reviewed-by: Doug Turner <do...@chromium.org> +Reviewed-by: Michael Wasserman <m...@chromium.org> +Reviewed-by: Kent Tamura <tk...@chromium.org> +Reviewed-by: Trent Apted <tap...@chromium.org> +Reviewed-by: Mason Freed <masonfr...@chromium.org> +Commit-Queue: Frank Tang <ft...@chromium.org> +Cr-Commit-Position: refs/heads/master@{#711027} +--- + third_party/blink/renderer/core/dom/document.cc | 2 +- + ui/gfx/render_text_harfbuzz.cc | 5 ++++- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc +index 511aac29086..f188cf548a6 100644 +--- a/third_party/blink/renderer/core/dom/document.cc ++++ b/third_party/blink/renderer/core/dom/document.cc +@@ -6191,7 +6191,7 @@ static ParseQualifiedNameResult ParseQualifiedNameInternal( + + 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); +diff --git a/ui/gfx/render_text_harfbuzz.cc b/ui/gfx/render_text_harfbuzz.cc +index 50e86af6b97..0339ff3ff8e 100644 +--- a/ui/gfx/render_text_harfbuzz.cc ++++ b/ui/gfx/render_text_harfbuzz.cc +@@ -971,7 +971,10 @@ RangeF TextRunHarfBuzz::GetGraphemeBounds(RenderTextHarfBuzz* render_text, + ++total; + } + } +- DCHECK_GT(total, 0); ++ // With ICU 65.1, DCHECK_GT() below fails. ++ // See https://crbug.com/1017047 for more details. ++ // ++ // DCHECK_GT(total, 0); + + // It's possible for |text_index| to point to a diacritical mark, at the end + // of |chars|. In this case all the grapheme boundaries come before it. Just Deleted: icu67.patch =================================================================== --- icu67.patch 2020-07-14 21:57:20 UTC (rev 663809) +++ icu67.patch 2020-07-14 21:57:34 UTC (rev 663810) @@ -1,169 +0,0 @@ -From 2b107e7670ffb43719a66ee4a55ab408a5dcf2a5 Mon Sep 17 00:00:00 2001 -From: Ujjwal Sharma <ryzoku...@disroot.org> -Date: Wed, 22 Apr 2020 12:20:17 +0530 -Subject: [PATCH] deps: V8: backport 3f8dc4b2e5ba - -Original commit message: - - [intl] Remove soon-to-be removed getAllFieldPositions - - Needed to land ICU67.1 soon. - - Bug: v8:10393 - Change-Id: I3c7737ca600d6ccfdc46ffaddfb318ce60bc7618 - Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2136489 - Reviewed-by: Jakob Kummerow <jkumme...@chromium.org> - Commit-Queue: Frank Tang <ft...@chromium.org> - Cr-Commit-Position: refs/heads/master@{#67027} - -Refs: https://github.com/v8/v8/commit/3f8dc4b2e5baf77b463334c769af85b79d8c1463 ---- - common.gypi | 2 +- - deps/v8/src/objects/js-number-format.cc | 72 +++++++++++++------------ - 2 files changed, 38 insertions(+), 36 deletions(-) - -diff --git a/deps/v8/src/objects/js-number-format.cc b/deps/v8/src/objects/js-number-format.cc -index 92d3e2fb82e..ced408aa173 100644 ---- a/deps/v8/src/objects/js-number-format.cc -+++ b/deps/v8/src/objects/js-number-format.cc -@@ -1197,42 +1197,31 @@ MaybeHandle<JSNumberFormat> JSNumberFormat::New(Isolate* isolate, - } - - namespace { --Maybe<icu::UnicodeString> IcuFormatNumber( -+Maybe<bool> IcuFormatNumber( - Isolate* isolate, - const icu::number::LocalizedNumberFormatter& number_format, -- Handle<Object> numeric_obj, icu::FieldPositionIterator* fp_iter) { -+ Handle<Object> numeric_obj, icu::number::FormattedNumber* formatted) { - // If it is BigInt, handle it differently. - UErrorCode status = U_ZERO_ERROR; -- icu::number::FormattedNumber formatted; - if (numeric_obj->IsBigInt()) { - Handle<BigInt> big_int = Handle<BigInt>::cast(numeric_obj); - Handle<String> big_int_string; - ASSIGN_RETURN_ON_EXCEPTION_VALUE(isolate, big_int_string, - BigInt::ToString(isolate, big_int), -- Nothing<icu::UnicodeString>()); -- formatted = number_format.formatDecimal( -+ Nothing<bool>()); -+ *formatted = number_format.formatDecimal( - {big_int_string->ToCString().get(), big_int_string->length()}, status); - } else { - double number = numeric_obj->Number(); -- formatted = number_format.formatDouble(number, status); -+ *formatted = number_format.formatDouble(number, status); - } - if (U_FAILURE(status)) { - // This happen because of icu data trimming trim out "unit". - // See https://bugs.chromium.org/p/v8/issues/detail?id=8641 -- THROW_NEW_ERROR_RETURN_VALUE(isolate, -- NewTypeError(MessageTemplate::kIcuError), -- Nothing<icu::UnicodeString>()); -- } -- if (fp_iter) { -- formatted.getAllFieldPositions(*fp_iter, status); -+ THROW_NEW_ERROR_RETURN_VALUE( -+ isolate, NewTypeError(MessageTemplate::kIcuError), Nothing<bool>()); - } -- icu::UnicodeString result = formatted.toString(status); -- if (U_FAILURE(status)) { -- THROW_NEW_ERROR_RETURN_VALUE(isolate, -- NewTypeError(MessageTemplate::kIcuError), -- Nothing<icu::UnicodeString>()); -- } -- return Just(result); -+ return Just(true); - } - - } // namespace -@@ -1243,10 +1232,16 @@ MaybeHandle<String> JSNumberFormat::FormatNumeric( - Handle<Object> numeric_obj) { - DCHECK(numeric_obj->IsNumeric()); - -- Maybe<icu::UnicodeString> maybe_format = -- IcuFormatNumber(isolate, number_format, numeric_obj, nullptr); -+ icu::number::FormattedNumber formatted; -+ Maybe<bool> maybe_format = -+ IcuFormatNumber(isolate, number_format, numeric_obj, &formatted); - MAYBE_RETURN(maybe_format, Handle<String>()); -- return Intl::ToString(isolate, maybe_format.FromJust()); -+ UErrorCode status = U_ZERO_ERROR; -+ icu::UnicodeString result = formatted.toString(status); -+ if (U_FAILURE(status)) { -+ THROW_NEW_ERROR(isolate, NewTypeError(MessageTemplate::kIcuError), String); -+ } -+ return Intl::ToString(isolate, result); - } - - namespace { -@@ -1359,12 +1354,18 @@ std::vector<NumberFormatSpan> FlattenRegionsToParts( - } - - namespace { --Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted, -- icu::FieldPositionIterator* fp_iter, -+Maybe<int> ConstructParts(Isolate* isolate, -+ icu::number::FormattedNumber* formatted, - Handle<JSArray> result, int start_index, - Handle<Object> numeric_obj, bool style_is_unit) { -+ UErrorCode status = U_ZERO_ERROR; -+ icu::UnicodeString formatted_text = formatted->toString(status); -+ if (U_FAILURE(status)) { -+ THROW_NEW_ERROR_RETURN_VALUE( -+ isolate, NewTypeError(MessageTemplate::kIcuError), Nothing<int>()); -+ } - DCHECK(numeric_obj->IsNumeric()); -- int32_t length = formatted.length(); -+ int32_t length = formatted_text.length(); - int index = start_index; - if (length == 0) return Just(index); - -@@ -1373,13 +1374,14 @@ Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted, - // other region covers some part of the formatted string. It's possible - // there's another field with exactly the same begin and end as this backdrop, - // in which case the backdrop's field_id of -1 will give it lower priority. -- regions.push_back(NumberFormatSpan(-1, 0, formatted.length())); -+ regions.push_back(NumberFormatSpan(-1, 0, formatted_text.length())); - - { -- icu::FieldPosition fp; -- while (fp_iter->next(fp)) { -- regions.push_back(NumberFormatSpan(fp.getField(), fp.getBeginIndex(), -- fp.getEndIndex())); -+ icu::ConstrainedFieldPosition cfp; -+ cfp.constrainCategory(UFIELD_CATEGORY_NUMBER); -+ while (formatted->nextPosition(cfp, status)) { -+ regions.push_back( -+ NumberFormatSpan(cfp.getField(), cfp.getStart(), cfp.getLimit())); - } - } - -@@ -1401,7 +1403,7 @@ Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted, - Handle<String> substring; - ASSIGN_RETURN_ON_EXCEPTION_VALUE( - isolate, substring, -- Intl::ToString(isolate, formatted, part.begin_pos, part.end_pos), -+ Intl::ToString(isolate, formatted_text, part.begin_pos, part.end_pos), - Nothing<int>()); - Intl::AddElement(isolate, result, index, field_type_string, substring); - ++index; -@@ -1421,14 +1423,14 @@ MaybeHandle<JSArray> JSNumberFormat::FormatToParts( - number_format->icu_number_formatter().raw(); - CHECK_NOT_NULL(fmt); - -- icu::FieldPositionIterator fp_iter; -- Maybe<icu::UnicodeString> maybe_format = -- IcuFormatNumber(isolate, *fmt, numeric_obj, &fp_iter); -+ icu::number::FormattedNumber formatted; -+ Maybe<bool> maybe_format = -+ IcuFormatNumber(isolate, *fmt, numeric_obj, &formatted); - MAYBE_RETURN(maybe_format, Handle<JSArray>()); - - Handle<JSArray> result = factory->NewJSArray(0); - Maybe<int> maybe_format_to_parts = ConstructParts( -- isolate, maybe_format.FromJust(), &fp_iter, result, 0, numeric_obj, -+ isolate, &formatted, result, 0, numeric_obj, - number_format->style() == JSNumberFormat::Style::UNIT); - MAYBE_RETURN(maybe_format_to_parts, Handle<JSArray>()); - Copied: electron7/repos/community-x86_64/icu67.patch (from rev 663809, electron7/trunk/icu67.patch) =================================================================== --- icu67.patch (rev 0) +++ icu67.patch 2020-07-14 21:57:34 UTC (rev 663810) @@ -0,0 +1,169 @@ +From 2b107e7670ffb43719a66ee4a55ab408a5dcf2a5 Mon Sep 17 00:00:00 2001 +From: Ujjwal Sharma <ryzoku...@disroot.org> +Date: Wed, 22 Apr 2020 12:20:17 +0530 +Subject: [PATCH] deps: V8: backport 3f8dc4b2e5ba + +Original commit message: + + [intl] Remove soon-to-be removed getAllFieldPositions + + Needed to land ICU67.1 soon. + + Bug: v8:10393 + Change-Id: I3c7737ca600d6ccfdc46ffaddfb318ce60bc7618 + Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2136489 + Reviewed-by: Jakob Kummerow <jkumme...@chromium.org> + Commit-Queue: Frank Tang <ft...@chromium.org> + Cr-Commit-Position: refs/heads/master@{#67027} + +Refs: https://github.com/v8/v8/commit/3f8dc4b2e5baf77b463334c769af85b79d8c1463 +--- + common.gypi | 2 +- + deps/v8/src/objects/js-number-format.cc | 72 +++++++++++++------------ + 2 files changed, 38 insertions(+), 36 deletions(-) + +diff --git a/deps/v8/src/objects/js-number-format.cc b/deps/v8/src/objects/js-number-format.cc +index 92d3e2fb82e..ced408aa173 100644 +--- a/deps/v8/src/objects/js-number-format.cc ++++ b/deps/v8/src/objects/js-number-format.cc +@@ -1197,42 +1197,31 @@ MaybeHandle<JSNumberFormat> JSNumberFormat::New(Isolate* isolate, + } + + namespace { +-Maybe<icu::UnicodeString> IcuFormatNumber( ++Maybe<bool> IcuFormatNumber( + Isolate* isolate, + const icu::number::LocalizedNumberFormatter& number_format, +- Handle<Object> numeric_obj, icu::FieldPositionIterator* fp_iter) { ++ Handle<Object> numeric_obj, icu::number::FormattedNumber* formatted) { + // If it is BigInt, handle it differently. + UErrorCode status = U_ZERO_ERROR; +- icu::number::FormattedNumber formatted; + if (numeric_obj->IsBigInt()) { + Handle<BigInt> big_int = Handle<BigInt>::cast(numeric_obj); + Handle<String> big_int_string; + ASSIGN_RETURN_ON_EXCEPTION_VALUE(isolate, big_int_string, + BigInt::ToString(isolate, big_int), +- Nothing<icu::UnicodeString>()); +- formatted = number_format.formatDecimal( ++ Nothing<bool>()); ++ *formatted = number_format.formatDecimal( + {big_int_string->ToCString().get(), big_int_string->length()}, status); + } else { + double number = numeric_obj->Number(); +- formatted = number_format.formatDouble(number, status); ++ *formatted = number_format.formatDouble(number, status); + } + if (U_FAILURE(status)) { + // This happen because of icu data trimming trim out "unit". + // See https://bugs.chromium.org/p/v8/issues/detail?id=8641 +- THROW_NEW_ERROR_RETURN_VALUE(isolate, +- NewTypeError(MessageTemplate::kIcuError), +- Nothing<icu::UnicodeString>()); +- } +- if (fp_iter) { +- formatted.getAllFieldPositions(*fp_iter, status); ++ THROW_NEW_ERROR_RETURN_VALUE( ++ isolate, NewTypeError(MessageTemplate::kIcuError), Nothing<bool>()); + } +- icu::UnicodeString result = formatted.toString(status); +- if (U_FAILURE(status)) { +- THROW_NEW_ERROR_RETURN_VALUE(isolate, +- NewTypeError(MessageTemplate::kIcuError), +- Nothing<icu::UnicodeString>()); +- } +- return Just(result); ++ return Just(true); + } + + } // namespace +@@ -1243,10 +1232,16 @@ MaybeHandle<String> JSNumberFormat::FormatNumeric( + Handle<Object> numeric_obj) { + DCHECK(numeric_obj->IsNumeric()); + +- Maybe<icu::UnicodeString> maybe_format = +- IcuFormatNumber(isolate, number_format, numeric_obj, nullptr); ++ icu::number::FormattedNumber formatted; ++ Maybe<bool> maybe_format = ++ IcuFormatNumber(isolate, number_format, numeric_obj, &formatted); + MAYBE_RETURN(maybe_format, Handle<String>()); +- return Intl::ToString(isolate, maybe_format.FromJust()); ++ UErrorCode status = U_ZERO_ERROR; ++ icu::UnicodeString result = formatted.toString(status); ++ if (U_FAILURE(status)) { ++ THROW_NEW_ERROR(isolate, NewTypeError(MessageTemplate::kIcuError), String); ++ } ++ return Intl::ToString(isolate, result); + } + + namespace { +@@ -1359,12 +1354,18 @@ std::vector<NumberFormatSpan> FlattenRegionsToParts( + } + + namespace { +-Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted, +- icu::FieldPositionIterator* fp_iter, ++Maybe<int> ConstructParts(Isolate* isolate, ++ icu::number::FormattedNumber* formatted, + Handle<JSArray> result, int start_index, + Handle<Object> numeric_obj, bool style_is_unit) { ++ UErrorCode status = U_ZERO_ERROR; ++ icu::UnicodeString formatted_text = formatted->toString(status); ++ if (U_FAILURE(status)) { ++ THROW_NEW_ERROR_RETURN_VALUE( ++ isolate, NewTypeError(MessageTemplate::kIcuError), Nothing<int>()); ++ } + DCHECK(numeric_obj->IsNumeric()); +- int32_t length = formatted.length(); ++ int32_t length = formatted_text.length(); + int index = start_index; + if (length == 0) return Just(index); + +@@ -1373,13 +1374,14 @@ Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted, + // other region covers some part of the formatted string. It's possible + // there's another field with exactly the same begin and end as this backdrop, + // in which case the backdrop's field_id of -1 will give it lower priority. +- regions.push_back(NumberFormatSpan(-1, 0, formatted.length())); ++ regions.push_back(NumberFormatSpan(-1, 0, formatted_text.length())); + + { +- icu::FieldPosition fp; +- while (fp_iter->next(fp)) { +- regions.push_back(NumberFormatSpan(fp.getField(), fp.getBeginIndex(), +- fp.getEndIndex())); ++ icu::ConstrainedFieldPosition cfp; ++ cfp.constrainCategory(UFIELD_CATEGORY_NUMBER); ++ while (formatted->nextPosition(cfp, status)) { ++ regions.push_back( ++ NumberFormatSpan(cfp.getField(), cfp.getStart(), cfp.getLimit())); + } + } + +@@ -1401,7 +1403,7 @@ Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted, + Handle<String> substring; + ASSIGN_RETURN_ON_EXCEPTION_VALUE( + isolate, substring, +- Intl::ToString(isolate, formatted, part.begin_pos, part.end_pos), ++ Intl::ToString(isolate, formatted_text, part.begin_pos, part.end_pos), + Nothing<int>()); + Intl::AddElement(isolate, result, index, field_type_string, substring); + ++index; +@@ -1421,14 +1423,14 @@ MaybeHandle<JSArray> JSNumberFormat::FormatToParts( + number_format->icu_number_formatter().raw(); + CHECK_NOT_NULL(fmt); + +- icu::FieldPositionIterator fp_iter; +- Maybe<icu::UnicodeString> maybe_format = +- IcuFormatNumber(isolate, *fmt, numeric_obj, &fp_iter); ++ icu::number::FormattedNumber formatted; ++ Maybe<bool> maybe_format = ++ IcuFormatNumber(isolate, *fmt, numeric_obj, &formatted); + MAYBE_RETURN(maybe_format, Handle<JSArray>()); + + Handle<JSArray> result = factory->NewJSArray(0); + Maybe<int> maybe_format_to_parts = ConstructParts( +- isolate, maybe_format.FromJust(), &fp_iter, result, 0, numeric_obj, ++ isolate, &formatted, result, 0, numeric_obj, + number_format->style() == JSNumberFormat::Style::UNIT); + MAYBE_RETURN(maybe_format_to_parts, Handle<JSArray>()); + Deleted: perfetto-gcc10.patch =================================================================== --- perfetto-gcc10.patch 2020-07-14 21:57:20 UTC (rev 663809) +++ perfetto-gcc10.patch 2020-07-14 21:57:34 UTC (rev 663810) @@ -1,28 +0,0 @@ -From 0e7ca0bf9872932322563e70bcf84eb033ffde4f Mon Sep 17 00:00:00 2001 -From: Chisoon Jeong <chisoon.je...@lge.com> -Date: Tue, 24 Mar 2020 19:46:20 +0900 -Subject: [PATCH] Add #include <stdint.h> in - include/perfetto/base/task_runner.h - -Depending on compilation environment, task_runner.h|cc is -not compiled due to missing stdint.h. This change includes stdint.h in -task_runner.h to fix this issue. - -Change-Id: I6dcfbd4ad62cbd287b8e75e306930ad00731048a ---- - include/perfetto/base/task_runner.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/include/perfetto/base/task_runner.h b/include/perfetto/base/task_runner.h -index cf6040123..040aab2b7 100644 ---- a/include/perfetto/base/task_runner.h -+++ b/include/perfetto/base/task_runner.h -@@ -17,6 +17,8 @@ - #ifndef INCLUDE_PERFETTO_BASE_TASK_RUNNER_H_ - #define INCLUDE_PERFETTO_BASE_TASK_RUNNER_H_ - -+#include <stdint.h> -+ - #include <functional> - - #include "perfetto/base/export.h" Copied: electron7/repos/community-x86_64/perfetto-gcc10.patch (from rev 663809, electron7/trunk/perfetto-gcc10.patch) =================================================================== --- perfetto-gcc10.patch (rev 0) +++ perfetto-gcc10.patch 2020-07-14 21:57:34 UTC (rev 663810) @@ -0,0 +1,28 @@ +From 0e7ca0bf9872932322563e70bcf84eb033ffde4f Mon Sep 17 00:00:00 2001 +From: Chisoon Jeong <chisoon.je...@lge.com> +Date: Tue, 24 Mar 2020 19:46:20 +0900 +Subject: [PATCH] Add #include <stdint.h> in + include/perfetto/base/task_runner.h + +Depending on compilation environment, task_runner.h|cc is +not compiled due to missing stdint.h. This change includes stdint.h in +task_runner.h to fix this issue. + +Change-Id: I6dcfbd4ad62cbd287b8e75e306930ad00731048a +--- + include/perfetto/base/task_runner.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/include/perfetto/base/task_runner.h b/include/perfetto/base/task_runner.h +index cf6040123..040aab2b7 100644 +--- a/include/perfetto/base/task_runner.h ++++ b/include/perfetto/base/task_runner.h +@@ -17,6 +17,8 @@ + #ifndef INCLUDE_PERFETTO_BASE_TASK_RUNNER_H_ + #define INCLUDE_PERFETTO_BASE_TASK_RUNNER_H_ + ++#include <stdint.h> ++ + #include <functional> + + #include "perfetto/base/export.h" Deleted: use-system-libraries-in-node.patch =================================================================== --- use-system-libraries-in-node.patch 2020-07-14 21:57:20 UTC (rev 663809) +++ use-system-libraries-in-node.patch 2020-07-14 21:57:34 UTC (rev 663810) @@ -1,56 +0,0 @@ ---- a/third_party/electron_node/BUILD.gn -+++ b/third_party/electron_node/BUILD.gn -@@ -42,6 +42,18 @@ - node_module_version = "" - } - -+if (is_linux) { -+ import("//build/config/linux/pkg_config.gni") -+ -+ pkg_config("cares") { -+ packages = [ "libcares" ] -+ } -+ -+ pkg_config("nghttp2") { -+ packages = [ "libnghttp2" ] -+ } -+} -+ - assert(!node_use_dtrace, "node_use_dtrace not supported in GN") - assert(!node_use_etw, "node_use_etw not supported in GN") - -@@ -203,12 +215,8 @@ - component("node_lib") { - deps = [ - ":node_js2c", -- "deps/cares", - "deps/histogram", -- "deps/http_parser", - "deps/llhttp", -- "deps/nghttp2", -- "deps/zlib", - "//third_party/brotli:dec", - "//third_party/brotli:enc", - "//v8:v8_libplatform", -@@ -222,6 +230,21 @@ - public_configs = [ ":node_lib_config" ] - include_dirs = [ "src" ] - libs = [] -+ if (is_linux) { -+ configs += [ -+ ":cares", -+ ":nghttp2", -+ ] -+ deps += [ "//third_party/zlib" ] -+ libs += [ "http_parser" ] -+ } else { -+ deps += [ -+ "deps/cares", -+ "deps/http_parser", -+ "deps/nghttp2", -+ "deps/zlib", -+ ] -+ } - cflags_cc = [ - "-Wno-deprecated-declarations", - "-Wno-implicit-fallthrough", Copied: electron7/repos/community-x86_64/use-system-libraries-in-node.patch (from rev 663809, electron7/trunk/use-system-libraries-in-node.patch) =================================================================== --- use-system-libraries-in-node.patch (rev 0) +++ use-system-libraries-in-node.patch 2020-07-14 21:57:34 UTC (rev 663810) @@ -0,0 +1,56 @@ +--- a/third_party/electron_node/BUILD.gn ++++ b/third_party/electron_node/BUILD.gn +@@ -42,6 +42,18 @@ + node_module_version = "" + } + ++if (is_linux) { ++ import("//build/config/linux/pkg_config.gni") ++ ++ pkg_config("cares") { ++ packages = [ "libcares" ] ++ } ++ ++ pkg_config("nghttp2") { ++ packages = [ "libnghttp2" ] ++ } ++} ++ + assert(!node_use_dtrace, "node_use_dtrace not supported in GN") + assert(!node_use_etw, "node_use_etw not supported in GN") + +@@ -203,12 +215,8 @@ + component("node_lib") { + deps = [ + ":node_js2c", +- "deps/cares", + "deps/histogram", +- "deps/http_parser", + "deps/llhttp", +- "deps/nghttp2", +- "deps/zlib", + "//third_party/brotli:dec", + "//third_party/brotli:enc", + "//v8:v8_libplatform", +@@ -222,6 +230,21 @@ + public_configs = [ ":node_lib_config" ] + include_dirs = [ "src" ] + libs = [] ++ if (is_linux) { ++ configs += [ ++ ":cares", ++ ":nghttp2", ++ ] ++ deps += [ "//third_party/zlib" ] ++ libs += [ "http_parser" ] ++ } else { ++ deps += [ ++ "deps/cares", ++ "deps/http_parser", ++ "deps/nghttp2", ++ "deps/zlib", ++ ] ++ } + cflags_cc = [ + "-Wno-deprecated-declarations", + "-Wno-implicit-fallthrough", Deleted: webrtc-gcc10.patch =================================================================== --- webrtc-gcc10.patch 2020-07-14 21:57:20 UTC (rev 663809) +++ webrtc-gcc10.patch 2020-07-14 21:57:34 UTC (rev 663810) @@ -1,73 +0,0 @@ -From 03fade52dae736275c4f4e7fe1cbd6fe82d7aa4c Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann <sth...@googlemail.com> -Date: Sat, 2 May 2020 12:17:05 +0000 -Subject: [PATCH] IWYU: uint32_t is defined in cstdint - -This is required for gcc-10. - -Bug: None -Change-Id: I0d04f720d09b42e1d54e058b897ddc047ef64bf6 -Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/174204 -Reviewed-by: Magnus Flodman <mflod...@webrtc.org> -Commit-Queue: Mirko Bonadei <mbona...@webrtc.org> -Cr-Commit-Position: refs/heads/master@{#31184} ---- - AUTHORS | 1 + - call/rtx_receive_stream.h | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/call/rtx_receive_stream.h b/call/rtx_receive_stream.h -index 8ffa4400a9..a389fc2a57 100644 ---- a/call/rtx_receive_stream.h -+++ b/call/rtx_receive_stream.h -@@ -11,6 +11,7 @@ - #ifndef CALL_RTX_RECEIVE_STREAM_H_ - #define CALL_RTX_RECEIVE_STREAM_H_ - -+#include <cstdint> - #include <map> - - #include "call/rtp_packet_sink_interface.h" - -From 3ca2836f701fc2fbc2ddaa0000d6ad655b5e3caa Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann <sth...@googlemail.com> -Date: Sun, 31 May 2020 09:01:38 +0000 -Subject: [PATCH] IWYU: size_t is defined in stddef.h - -This required for gcc-10. - -Bug: None -Change-Id: Iba3ff0881005cb2ae4574e47284a1b881594de86 -Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/176361 -Reviewed-by: Ivo Creusen <i...@webrtc.org> -Commit-Queue: Ivo Creusen <i...@webrtc.org> -Cr-Commit-Position: refs/heads/master@{#31417} ---- - modules/audio_processing/aec3/clockdrift_detector.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/modules/audio_processing/aec3/clockdrift_detector.h b/modules/audio_processing/aec3/clockdrift_detector.h -index 22528c9489..2ba90bb889 100644 ---- a/modules/audio_processing/aec3/clockdrift_detector.h -+++ b/modules/audio_processing/aec3/clockdrift_detector.h -@@ -11,6 +11,8 @@ - #ifndef MODULES_AUDIO_PROCESSING_AEC3_CLOCKDRIFT_DETECTOR_H_ - #define MODULES_AUDIO_PROCESSING_AEC3_CLOCKDRIFT_DETECTOR_H_ - -+#include <stddef.h> -+ - #include <array> - - namespace webrtc { - -diff --meow-im-a-cat a/modules/video_coding/decoding_state.h b/modules/video_coding/decoding_state.h ---- a/modules/video_coding/decoding_state.h 2020-07-07 15:58:30.000000000 +0000 -+++ b/modules/video_coding/decoding_state.h 2020-07-07 16:24:41.667578586 +0000 -@@ -11,6 +11,7 @@ - #ifndef MODULES_VIDEO_CODING_DECODING_STATE_H_ - #define MODULES_VIDEO_CODING_DECODING_STATE_H_ - -+#include <cstdint> - #include <map> - #include <set> - #include <vector> Copied: electron7/repos/community-x86_64/webrtc-gcc10.patch (from rev 663809, electron7/trunk/webrtc-gcc10.patch) =================================================================== --- webrtc-gcc10.patch (rev 0) +++ webrtc-gcc10.patch 2020-07-14 21:57:34 UTC (rev 663810) @@ -0,0 +1,73 @@ +From 03fade52dae736275c4f4e7fe1cbd6fe82d7aa4c Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann <sth...@googlemail.com> +Date: Sat, 2 May 2020 12:17:05 +0000 +Subject: [PATCH] IWYU: uint32_t is defined in cstdint + +This is required for gcc-10. + +Bug: None +Change-Id: I0d04f720d09b42e1d54e058b897ddc047ef64bf6 +Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/174204 +Reviewed-by: Magnus Flodman <mflod...@webrtc.org> +Commit-Queue: Mirko Bonadei <mbona...@webrtc.org> +Cr-Commit-Position: refs/heads/master@{#31184} +--- + AUTHORS | 1 + + call/rtx_receive_stream.h | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/call/rtx_receive_stream.h b/call/rtx_receive_stream.h +index 8ffa4400a9..a389fc2a57 100644 +--- a/call/rtx_receive_stream.h ++++ b/call/rtx_receive_stream.h +@@ -11,6 +11,7 @@ + #ifndef CALL_RTX_RECEIVE_STREAM_H_ + #define CALL_RTX_RECEIVE_STREAM_H_ + ++#include <cstdint> + #include <map> + + #include "call/rtp_packet_sink_interface.h" + +From 3ca2836f701fc2fbc2ddaa0000d6ad655b5e3caa Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann <sth...@googlemail.com> +Date: Sun, 31 May 2020 09:01:38 +0000 +Subject: [PATCH] IWYU: size_t is defined in stddef.h + +This required for gcc-10. + +Bug: None +Change-Id: Iba3ff0881005cb2ae4574e47284a1b881594de86 +Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/176361 +Reviewed-by: Ivo Creusen <i...@webrtc.org> +Commit-Queue: Ivo Creusen <i...@webrtc.org> +Cr-Commit-Position: refs/heads/master@{#31417} +--- + modules/audio_processing/aec3/clockdrift_detector.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/modules/audio_processing/aec3/clockdrift_detector.h b/modules/audio_processing/aec3/clockdrift_detector.h +index 22528c9489..2ba90bb889 100644 +--- a/modules/audio_processing/aec3/clockdrift_detector.h ++++ b/modules/audio_processing/aec3/clockdrift_detector.h +@@ -11,6 +11,8 @@ + #ifndef MODULES_AUDIO_PROCESSING_AEC3_CLOCKDRIFT_DETECTOR_H_ + #define MODULES_AUDIO_PROCESSING_AEC3_CLOCKDRIFT_DETECTOR_H_ + ++#include <stddef.h> ++ + #include <array> + + namespace webrtc { + +diff --meow-im-a-cat a/modules/video_coding/decoding_state.h b/modules/video_coding/decoding_state.h +--- a/modules/video_coding/decoding_state.h 2020-07-07 15:58:30.000000000 +0000 ++++ b/modules/video_coding/decoding_state.h 2020-07-07 16:24:41.667578586 +0000 +@@ -11,6 +11,7 @@ + #ifndef MODULES_VIDEO_CODING_DECODING_STATE_H_ + #define MODULES_VIDEO_CODING_DECODING_STATE_H_ + ++#include <cstdint> + #include <map> + #include <set> + #include <vector>