[arch-commits] Commit in electron4/repos (12 files)

Felix Yan felixonmars at archlinux.org
Wed Apr 29 10:08:35 UTC 2020


    Date: Wednesday, April 29, 2020 @ 10:08:34
  Author: felixonmars
Revision: 622231

archrelease: copy trunk to community-staging-x86_64

Added:
  electron4/repos/community-staging-x86_64/
  electron4/repos/community-staging-x86_64/PKGBUILD
    (from rev 622230, electron4/trunk/PKGBUILD)
  electron4/repos/community-staging-x86_64/chromium-SIOCGSTAMP.patch
    (from rev 622230, electron4/trunk/chromium-SIOCGSTAMP.patch)
  electron4/repos/community-staging-x86_64/chromium-skia-harmony.patch
    (from rev 622230, electron4/trunk/chromium-skia-harmony.patch)
  electron4/repos/community-staging-x86_64/chromium-system-icu.patch
    (from rev 622230, electron4/trunk/chromium-system-icu.patch)
  electron4/repos/community-staging-x86_64/default_app-icon.patch
    (from rev 622230, electron4/trunk/default_app-icon.patch)
  electron4/repos/community-staging-x86_64/electron4.desktop
    (from rev 622230, electron4/trunk/electron4.desktop)
  electron4/repos/community-staging-x86_64/fix-cfi-icall-failure-with-use_system_libjpeg-true.patch
    (from rev 622230, electron4/trunk/fix-cfi-icall-failure-with-use_system_libjpeg-true.patch)
  electron4/repos/community-staging-x86_64/glslang-remove-setAllocator.patch
    (from rev 622230, electron4/trunk/glslang-remove-setAllocator.patch)
  electron4/repos/community-staging-x86_64/icu65.patch
    (from rev 622230, electron4/trunk/icu65.patch)
  electron4/repos/community-staging-x86_64/only-disable-cfi-icall-when-use_system_libjpeg-true.patch
    (from rev 622230, electron4/trunk/only-disable-cfi-icall-when-use_system_libjpeg-true.patch)
  electron4/repos/community-staging-x86_64/use-system-libraries-in-node.patch
    (from rev 622230, electron4/trunk/use-system-libraries-in-node.patch)

-----------------------------------------------------------+
 PKGBUILD                                                  |  199 ++++++++++++
 chromium-SIOCGSTAMP.patch                                 |   13 
 chromium-skia-harmony.patch                               |   77 ++++
 chromium-system-icu.patch                                 |   19 +
 default_app-icon.patch                                    |   21 +
 electron4.desktop                                         |    7 
 fix-cfi-icall-failure-with-use_system_libjpeg-true.patch  |   52 +++
 glslang-remove-setAllocator.patch                         |   24 +
 icu65.patch                                               |   64 +++
 only-disable-cfi-icall-when-use_system_libjpeg-true.patch |   34 ++
 use-system-libraries-in-node.patch                        |   54 +++
 11 files changed, 564 insertions(+)

Copied: electron4/repos/community-staging-x86_64/PKGBUILD (from rev 622230, electron4/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2020-04-29 10:08:34 UTC (rev 622231)
@@ -0,0 +1,199 @@
+# Maintainer: Nicola Squartini <tensor5 at gmail.com>
+
+pkgname=electron4
+pkgver=4.2.12
+_commit=3e0e966662c0ef2994d52566aaeb0850e18cdb3e
+_chromiumver=69.0.3497.128
+pkgrel=5
+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-m76' 'gperf' 'harfbuzz-icu' 'jsoncpp' 'libnotify'
+             'lld' 'llvm' 'ninja' 'npm' 'pciutils' 'python2' 'wget' 'yasm')
+optdepends=('kde-cli-tools: file deletion support (kioclient5)'
+            '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'
+        'electron4.desktop'
+        'default_app-icon.patch'
+        'use-system-libraries-in-node.patch'
+        'chromium-SIOCGSTAMP.patch'
+        'chromium-skia-harmony.patch'
+        'icu65.patch'
+        'glslang-remove-setAllocator.patch'
+        'chromium-system-icu.patch'
+        'fix-cfi-icall-failure-with-use_system_libjpeg-true.patch'
+        'only-disable-cfi-icall-when-use_system_libjpeg-true.patch'
+       )
+sha256sums=('SKIP'
+            'SKIP'
+            '6a4f7164c60aede9bdc866a5f8b6a1bb473e498a6dcea9bf73f64843af34f0aa'
+            '37372e8afd7c2405a8e50bca95c98b3c78e4c9b681cbef16da9c7a84b45e41e3'
+            '3a81953701ac976a311db4e17999e67ab7c6de97ff63388f287d6497ef9adb9b'
+            '7acc4dd59b70fb64f602ceda2846ccddcb46f64a18f912658d1034965f6c1276'
+            'feca54ab09ac0fc9d0626770a6b899a6ac5a12173c7d0c1005bc3964ec83e7b3'
+            '1de9bdbfed482295dda45c7d4e323cee55a34e42f66b892da1c1a778682b7a41'
+            '06738b3f2d3579cd9b4d1ff876ba93d6b10a741b4deb4eab7fe3008cc577c893'
+            'c4f2d1bed9034c02b8806f00c2e8165df24de467803855904bff709ceaf11af5'
+            '97b421bc60a4abdf37de2d88a51b973e9f68fb44d1eccd464adfb3d9f5d71478'
+            '9cae9ded6497afd15ad72d963897425ab6c7f28941bb3c3948e7996610a0d180')
+
+_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/chrome/android/profiles/update_afdo_profile.py
+  python2 src/electron/script/apply_all_patches.py \
+      src/electron/patches/common/config.json
+  cd src/electron
+  npm install
+  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-SIOCGSTAMP.patch
+  patch -Np4 -i ../chromium-skia-harmony.patch
+  patch -Np1 -i ../icu65.patch
+  patch -Np1 -d third_party/glslang/src <../glslang-remove-setAllocator.patch
+  patch -Np1 -d third_party/angle/third_party/glslang/src <../glslang-remove-setAllocator.patch
+  patch -Np1 -i ../chromium-system-icu.patch
+  patch -Np1 -i ../fix-cfi-icall-failure-with-use_system_libjpeg-true.patch
+  patch -Np1 -i ../only-disable-cfi-icall-when-use_system_libjpeg-true.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
+
+  cd src
+  export CHROMIUM_BUILDTOOLS_PATH="${PWD}/buildtools"
+  GN_EXTRA_ARGS='
+    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
+    remove_webcore_debug_symbols = true
+    treat_warnings_as_errors = false
+    use_custom_libcxx = false
+    use_gnome_keyring = false
+    use_sysroot = false
+  '
+  gn-m76 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}"
+
+  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: electron4/repos/community-staging-x86_64/chromium-SIOCGSTAMP.patch (from rev 622230, electron4/trunk/chromium-SIOCGSTAMP.patch)
===================================================================
--- community-staging-x86_64/chromium-SIOCGSTAMP.patch	                        (rev 0)
+++ community-staging-x86_64/chromium-SIOCGSTAMP.patch	2020-04-29 10:08:34 UTC (rev 622231)
@@ -0,0 +1,13 @@
+--- a/third_party/webrtc/rtc_base/physicalsocketserver.cc
++++ b/third_party/webrtc/rtc_base/physicalsocketserver.cc
+@@ -67,6 +67,10 @@
+
+ #endif  // WEBRTC_POSIX
+
++#if defined(WEBRTC_LINUX)
++#include <linux/sockios.h>
++#endif
++
+ #if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(__native_client__)
+
+ int64_t GetSocketRecvTimestamp(int socket) {

Copied: electron4/repos/community-staging-x86_64/chromium-skia-harmony.patch (from rev 622230, electron4/trunk/chromium-skia-harmony.patch)
===================================================================
--- community-staging-x86_64/chromium-skia-harmony.patch	                        (rev 0)
+++ community-staging-x86_64/chromium-skia-harmony.patch	2020-04-29 10:08:34 UTC (rev 622231)
@@ -0,0 +1,77 @@
+--- qtwebengine-opensource-src-5.9.1/src/3rdparty/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp.orig	2017-10-10 17:42:06.956950985 +0200
++++ qtwebengine-opensource-src-5.9.1/src/3rdparty/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp	2017-10-10 17:46:05.824187787 +0200
+@@ -99,8 +99,6 @@
+     FreeTypeLibrary()
+         : fGetVarDesignCoordinates(nullptr)
+         , fLibrary(nullptr)
+-        , fIsLCDSupported(false)
+-        , fLCDExtra(0)
+     {
+         if (FT_New_Library(&gFTMemory, &fLibrary)) {
+             return;
+@@ -147,12 +145,7 @@
+         }
+ #endif
+ 
+-        // Setup LCD filtering. This reduces color fringes for LCD smoothed glyphs.
+-        // The default has changed over time, so this doesn't mean the same thing to all users.
+-        if (FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT) == 0) {
+-            fIsLCDSupported = true;
+-            fLCDExtra = 2; //Using a filter adds one full pixel to each side.
+-        }
++        FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT);
+     }
+     ~FreeTypeLibrary() {
+         if (fLibrary) {
+@@ -161,8 +153,6 @@
+     }
+ 
+     FT_Library library() { return fLibrary; }
+-    bool isLCDSupported() { return fIsLCDSupported; }
+-    int lcdExtra() { return fLCDExtra; }
+ 
+     // FT_Get_{MM,Var}_{Blend,Design}_Coordinates were added in FreeType 2.7.1.
+     // Prior to this there was no way to get the coordinates out of the FT_Face.
+@@ -173,8 +163,6 @@
+ 
+ private:
+     FT_Library fLibrary;
+-    bool fIsLCDSupported;
+-    int fLCDExtra;
+ 
+     // FT_Library_SetLcdFilterWeights was introduced in FreeType 2.4.0.
+     // The following platforms provide FreeType of at least 2.4.0.
+@@ -704,17 +692,6 @@
+         rec->fTextSize = SkIntToScalar(1 << 14);
+     }
+ 
+-    if (isLCD(*rec)) {
+-        // TODO: re-work so that FreeType is set-up and selected by the SkFontMgr.
+-        SkAutoMutexAcquire ama(gFTMutex);
+-        ref_ft_library();
+-        if (!gFTLibrary->isLCDSupported()) {
+-            // If the runtime Freetype library doesn't support LCD, disable it here.
+-            rec->fMaskFormat = SkMask::kA8_Format;
+-        }
+-        unref_ft_library();
+-    }
+-
+     SkPaint::Hinting h = rec->getHinting();
+     if (SkPaint::kFull_Hinting == h && !isLCD(*rec)) {
+         // collapse full->normal hinting if we're not doing LCD
+@@ -1115,11 +1092,11 @@
+ void SkScalerContext_FreeType::updateGlyphIfLCD(SkGlyph* glyph) {
+     if (isLCD(fRec)) {
+         if (fLCDIsVert) {
+-            glyph->fHeight += gFTLibrary->lcdExtra();
+-            glyph->fTop -= gFTLibrary->lcdExtra() >> 1;
++            glyph->fHeight += 2;
++            glyph->fTop -= 1;
+         } else {
+-            glyph->fWidth += gFTLibrary->lcdExtra();
+-            glyph->fLeft -= gFTLibrary->lcdExtra() >> 1;
++            glyph->fWidth += 2;
++            glyph->fLeft -= 1;
+         }
+     }
+ }

Copied: electron4/repos/community-staging-x86_64/chromium-system-icu.patch (from rev 622230, electron4/trunk/chromium-system-icu.patch)
===================================================================
--- community-staging-x86_64/chromium-system-icu.patch	                        (rev 0)
+++ community-staging-x86_64/chromium-system-icu.patch	2020-04-29 10:08:34 UTC (rev 622231)
@@ -0,0 +1,19 @@
+diff --git a/third_party/blink/renderer/platform/text/character_property_data_generator.h b/third_party/blink/renderer/platform/text/character_property_data_generator.h
+index 28fb6a9..bb4dbd7 100644
+--- a/third_party/blink/renderer/platform/text/character_property_data_generator.h
++++ b/third_party/blink/renderer/platform/text/character_property_data_generator.h
+@@ -244,10 +244,12 @@ static const UChar32 kIsHangulRanges[] = {
+     0xD7B0, 0xD7FF,
+     // Halfwidth Hangul Jamo
+     // https://www.unicode.org/charts/nameslist/c_FF00.html
+-    0xFFA0, 0xFFDC,
++    0xFFA0, 0xFFDB,
+ };
+ 
+-static const UChar32 kIsHangulArray[] = {};
++static const UChar32 kIsHangulArray[] = {
++  0xFFDC,
++};
+ 
+ }  // namespace blink
+ 

Copied: electron4/repos/community-staging-x86_64/default_app-icon.patch (from rev 622230, electron4/trunk/default_app-icon.patch)
===================================================================
--- community-staging-x86_64/default_app-icon.patch	                        (rev 0)
+++ community-staging-x86_64/default_app-icon.patch	2020-04-29 10:08:34 UTC (rev 622231)
@@ -0,0 +1,21 @@
+--- a/electron/default_app/default_app.js
++++ b/electron/default_app/default_app.js
+@@ -27,7 +27,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
+@@ -95,7 +95,6 @@
+ 
+   default_app_sources = [
+     "default_app/default_app.js",
+-    "default_app/icon.png",
+     "default_app/index.html",
+     "default_app/main.js",
+     "default_app/menu.js",

Copied: electron4/repos/community-staging-x86_64/electron4.desktop (from rev 622230, electron4/trunk/electron4.desktop)
===================================================================
--- community-staging-x86_64/electron4.desktop	                        (rev 0)
+++ community-staging-x86_64/electron4.desktop	2020-04-29 10:08:34 UTC (rev 622231)
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Application
+Name=Electron 4
+Icon=electron4
+Exec=electron4 %u
+Categories=Development;GTK;
+StartupNotify=true

Copied: electron4/repos/community-staging-x86_64/fix-cfi-icall-failure-with-use_system_libjpeg-true.patch (from rev 622230, electron4/trunk/fix-cfi-icall-failure-with-use_system_libjpeg-true.patch)
===================================================================
--- community-staging-x86_64/fix-cfi-icall-failure-with-use_system_libjpeg-true.patch	                        (rev 0)
+++ community-staging-x86_64/fix-cfi-icall-failure-with-use_system_libjpeg-true.patch	2020-04-29 10:08:34 UTC (rev 622231)
@@ -0,0 +1,52 @@
+From db82db1b609f30d144d45477f55697818bcd363c Mon Sep 17 00:00:00 2001
+From: Vlad Tsyrklevich <vtsyrklevich at chromium.org>
+Date: Tue, 31 Jul 2018 01:03:22 +0000
+Subject: [PATCH] Fix cfi-icall failure with use_system_libjpeg=true
+
+JPEGImageReader::AllocateSampleArray() can call the function pointer
+(*info_.mem->alloc_sarray) which can be set by the systems non-CFI
+enabled libjpeg DSO when chromium is built with use_system_libjpeg=true.
+Disable cfi-icall for that method.
+
+Bug: 866290
+Change-Id: I6d9bbf08c514d6d5f48ad34c3802c63419ed1223
+Reviewed-on: https://chromium-review.googlesource.com/1155927
+Reviewed-by: Kentaro Hara <haraken at chromium.org>
+Commit-Queue: Vlad Tsyrklevich <vtsyrklevich at chromium.org>
+Cr-Commit-Position: refs/heads/master@{#579270}
+---
+ .../renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc | 2 +-
+ third_party/blink/renderer/platform/wtf/compiler.h              | 2 ++
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc b/third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc
+index a1e440f6eed5..fd4e72ba053c 100644
+--- a/third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc
++++ b/third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc
+@@ -643,7 +643,7 @@ class JPEGImageReader final {
+   IntSize UvSize() const { return uv_size_; }
+ 
+  private:
+-  JSAMPARRAY AllocateSampleArray() {
++  NO_SANITIZE_CFI_ICALL JSAMPARRAY AllocateSampleArray() {
+ // Some output color spaces don't need the sample array: don't allocate in that
+ // case.
+ #if defined(TURBO_JPEG_RGB_SWIZZLE)
+diff --git a/third_party/blink/renderer/platform/wtf/compiler.h b/third_party/blink/renderer/platform/wtf/compiler.h
+index 51595afdc955..5225a70309d6 100644
+--- a/third_party/blink/renderer/platform/wtf/compiler.h
++++ b/third_party/blink/renderer/platform/wtf/compiler.h
+@@ -57,8 +57,10 @@
+ #if defined(__clang__)
+ #define NO_SANITIZE_UNRELATED_CAST \
+   __attribute__((no_sanitize("cfi-unrelated-cast", "vptr")))
++#define NO_SANITIZE_CFI_ICALL __attribute__((no_sanitize("cfi-icall")))
+ #else
+ #define NO_SANITIZE_UNRELATED_CAST
++#define NO_SANITIZE_CFI_ICALL
+ #endif
+ 
+ #endif /* WTF_Compiler_h */
+-- 
+2.18.0
+

Copied: electron4/repos/community-staging-x86_64/glslang-remove-setAllocator.patch (from rev 622230, electron4/trunk/glslang-remove-setAllocator.patch)
===================================================================
--- community-staging-x86_64/glslang-remove-setAllocator.patch	                        (rev 0)
+++ community-staging-x86_64/glslang-remove-setAllocator.patch	2020-04-29 10:08:34 UTC (rev 622231)
@@ -0,0 +1,24 @@
+From 24b3e8384e93f3e73b6aa14ea00a30574112f9ba Mon Sep 17 00:00:00 2001
+From: Reid Kleckner <rnk at 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: electron4/repos/community-staging-x86_64/icu65.patch (from rev 622230, electron4/trunk/icu65.patch)
===================================================================
--- community-staging-x86_64/icu65.patch	                        (rev 0)
+++ community-staging-x86_64/icu65.patch	2020-04-29 10:08:34 UTC (rev 622231)
@@ -0,0 +1,64 @@
+From 5679c3c191ed62b62d8db22f1657a296ee9bfe8e Mon Sep 17 00:00:00 2001
+From: Frank Tang <ftang at 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 <jshin at chromium.org>
+Reviewed-by: Doug Turner <dougt at chromium.org>
+Reviewed-by: Michael Wasserman <msw at chromium.org>
+Reviewed-by: Kent Tamura <tkent at chromium.org>
+Reviewed-by: Trent Apted <tapted at chromium.org>
+Reviewed-by: Mason Freed <masonfreed at chromium.org>
+Commit-Queue: Frank Tang <ftang at 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: electron4/repos/community-staging-x86_64/only-disable-cfi-icall-when-use_system_libjpeg-true.patch (from rev 622230, electron4/trunk/only-disable-cfi-icall-when-use_system_libjpeg-true.patch)
===================================================================
--- community-staging-x86_64/only-disable-cfi-icall-when-use_system_libjpeg-true.patch	                        (rev 0)
+++ community-staging-x86_64/only-disable-cfi-icall-when-use_system_libjpeg-true.patch	2020-04-29 10:08:34 UTC (rev 622231)
@@ -0,0 +1,34 @@
+From 20f81a066ffdf6bd30fb4b696b8b3e101368e2f6 Mon Sep 17 00:00:00 2001
+From: Vlad Tsyrklevich <vtsyrklevich at chromium.org>
+Date: Tue, 31 Jul 2018 23:21:09 +0000
+Subject: [PATCH] Only disable cfi-icall when use_system_libjpeg=true
+
+Bug: 866290
+Change-Id: Ic5d175b3b854665f50781650406d599d09ee9849
+Reviewed-on: https://chromium-review.googlesource.com/1157136
+Reviewed-by: Kentaro Hara <haraken at chromium.org>
+Commit-Queue: Vlad Tsyrklevich <vtsyrklevich at chromium.org>
+Cr-Commit-Position: refs/heads/master@{#579614}
+---
+ .../platform/image-decoders/jpeg/jpeg_image_decoder.cc       | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc b/third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc
+index fd4e72ba053c..afa90d83efee 100644
+--- a/third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc
++++ b/third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc
+@@ -643,7 +643,10 @@ class JPEGImageReader final {
+   IntSize UvSize() const { return uv_size_; }
+ 
+  private:
+-  NO_SANITIZE_CFI_ICALL JSAMPARRAY AllocateSampleArray() {
++#if defined(USE_SYSTEM_LIBJPEG)
++  NO_SANITIZE_CFI_ICALL
++#endif
++  JSAMPARRAY AllocateSampleArray() {
+ // Some output color spaces don't need the sample array: don't allocate in that
+ // case.
+ #if defined(TURBO_JPEG_RGB_SWIZZLE)
+-- 
+2.18.0
+

Copied: electron4/repos/community-staging-x86_64/use-system-libraries-in-node.patch (from rev 622230, electron4/trunk/use-system-libraries-in-node.patch)
===================================================================
--- community-staging-x86_64/use-system-libraries-in-node.patch	                        (rev 0)
+++ community-staging-x86_64/use-system-libraries-in-node.patch	2020-04-29 10:08:34 UTC (rev 622231)
@@ -0,0 +1,54 @@
+--- a/third_party/electron_node/BUILD.gn
++++ b/third_party/electron_node/BUILD.gn
+@@ -42,6 +42,18 @@
+   node_release_urlbase = ""
+ }
+ 
++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")
+ assert(!node_use_perfctr, "node_use_perfctr not supported in GN")
+@@ -128,10 +140,6 @@
+ component("node_lib") {
+   deps = [
+     ":node_js2c",
+-    "deps/cares",
+-    "deps/http_parser",
+-    "deps/nghttp2",
+-    "deps/zlib",
+     "//v8:v8_libplatform",
+   ]
+   public_deps = [
+@@ -141,6 +149,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",



More information about the arch-commits mailing list