[arch-commits] Commit in electron/repos (10 files)

Nicola Squartini tensor5 at archlinux.org
Thu Apr 25 10:43:44 UTC 2019


    Date: Thursday, April 25, 2019 @ 10:43:43
  Author: tensor5
Revision: 453701

archrelease: copy trunk to community-staging-x86_64

Added:
  electron/repos/community-staging-x86_64/
  electron/repos/community-staging-x86_64/PKGBUILD
    (from rev 453700, electron/trunk/PKGBUILD)
  electron/repos/community-staging-x86_64/chromium-avoid-log-flooding-in-GLSurfacePresentationHelper.patch
    (from rev 453700, electron/trunk/chromium-avoid-log-flooding-in-GLSurfacePresentationHelper.patch)
  electron/repos/community-staging-x86_64/chromium-color_utils-use-std-sqrt.patch
    (from rev 453700, electron/trunk/chromium-color_utils-use-std-sqrt.patch)
  electron/repos/community-staging-x86_64/chromium-media-fix-build-with-libstdc++.patch
    (from rev 453700, electron/trunk/chromium-media-fix-build-with-libstdc++.patch)
  electron/repos/community-staging-x86_64/chromium-skia-harmony.patch
    (from rev 453700, electron/trunk/chromium-skia-harmony.patch)
  electron/repos/community-staging-x86_64/chromium-system-icu.patch
    (from rev 453700, electron/trunk/chromium-system-icu.patch)
  electron/repos/community-staging-x86_64/default_app-icon.patch
    (from rev 453700, electron/trunk/default_app-icon.patch)
  electron/repos/community-staging-x86_64/electron.desktop
    (from rev 453700, electron/trunk/electron.desktop)
  electron/repos/community-staging-x86_64/use-system-libraries-in-node.patch
    (from rev 453700, electron/trunk/use-system-libraries-in-node.patch)

------------------------------------------------------------------+
 PKGBUILD                                                         |  185 ++++++++++
 chromium-avoid-log-flooding-in-GLSurfacePresentationHelper.patch |   34 +
 chromium-color_utils-use-std-sqrt.patch                          |   48 ++
 chromium-media-fix-build-with-libstdc++.patch                    |   48 ++
 chromium-skia-harmony.patch                                      |   13 
 chromium-system-icu.patch                                        |   19 +
 default_app-icon.patch                                           |   21 +
 electron.desktop                                                 |    7 
 use-system-libraries-in-node.patch                               |   56 +++
 9 files changed, 431 insertions(+)

Copied: electron/repos/community-staging-x86_64/PKGBUILD (from rev 453700, electron/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2019-04-25 10:43:43 UTC (rev 453701)
@@ -0,0 +1,185 @@
+# Maintainer: Nicola Squartini <tensor5 at gmail.com>
+
+pkgname=electron
+pkgver=5.0.0
+_commit=7514372e7959d7e44286797a2f3688382d6a90b3
+#_chromiumver=73.0.3683.119
+_chromiumver=73.0.3683.114
+pkgrel=1
+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'
+             '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'
+        "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${_chromiumver}.tar.xz"
+        'git+https://chromium.googlesource.com/chromium/tools/depot_tools.git'
+        'electron.desktop'
+        'default_app-icon.patch'
+        'use-system-libraries-in-node.patch'
+        'chromium-avoid-log-flooding-in-GLSurfacePresentationHelper.patch'
+        'chromium-color_utils-use-std-sqrt.patch'
+        'chromium-media-fix-build-with-libstdc++.patch'
+        'chromium-skia-harmony.patch'
+        'chromium-system-icu.patch'
+       )
+sha256sums=('SKIP'
+            'b8153bcb1efe620b7f5d9d74c4017771710fc4432872b1f0b73c92146e868d0c'
+            'SKIP'
+            '5270db01f3f8aaa5137dec275a02caa832b7f2e37942e068cba8d28b3a29df39'
+            'a9f4d2af71c4399dd01047bb1205c0ca9bb5ce6bf0eeaeb57acf4c69724b668b'
+            'e38b50ef16e6fc7520b1892f3b17758db14733d207cc083cfcd899954444248f'
+            'f2b12ccf83a8e0adda4a87ae5c983df5e092ccf1f9a6f2e05799ce4d451dbda1'
+            'b3b6f5147d519c586cbdaf3b227dd1719676fa3a65edd6f08989087afd287afa'
+            'f51fe91427d8638c5551746d2ec7de99e8059dd76889cfeaee8ca3d8fed62265'
+            '5887f78b55c4ecbbcba5930f3f0bb7bc0117c2a41c2f761805fcf7f46f1ca2b3'
+            'e2d284311f49c529ea45083438a768db390bde52949995534034d2a814beab89'
+           )
+
+_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"
+
+  mv chromium-${_chromiumver} src
+
+  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/electron/script/apply_all_patches.py \
+      src/electron/patches/common/config.json
+  cd src/electron
+  npm install
+  cd ..
+  # Create sysmlink to system Node.js
+  mkdir -p third_party/node/linux/node-linux-x64/bin
+  ln -sf /usr/bin/node third_party/node/linux/node-linux-x64/bin
+
+  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-avoid-log-flooding-in-GLSurfacePresentationHelper.patch
+  patch -Np1 -i ../chromium-color_utils-use-std-sqrt.patch
+  patch -d media -Np1 -i ../../chromium-media-fix-build-with-libstdc++.patch
+  patch -Np0 -i ../chromium-skia-harmony.patch
+  patch -Np1 -i ../chromium-system-icu.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 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/electron"
+  bsdtar -xf src/out/Release/dist.zip -C "${pkgdir}/usr/lib/electron"
+
+  install -dm755 "${pkgdir}/usr/share/licenses/${pkgname}"
+  for l in "${pkgdir}/usr/lib/electron"/{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/electron/electron "${pkgdir}"/usr/bin
+
+  # Install .desktop and icon file (see default_app-icon.patch)
+  install -Dm644 -t "${pkgdir}/usr/share/applications" electron.desktop
+  install -Dm644 src/electron/default_app/icon.png \
+          "${pkgdir}/usr/share/pixmaps/electron.png"  # hicolor has no 1024x1024
+}

Copied: electron/repos/community-staging-x86_64/chromium-avoid-log-flooding-in-GLSurfacePresentationHelper.patch (from rev 453700, electron/trunk/chromium-avoid-log-flooding-in-GLSurfacePresentationHelper.patch)
===================================================================
--- community-staging-x86_64/chromium-avoid-log-flooding-in-GLSurfacePresentationHelper.patch	                        (rev 0)
+++ community-staging-x86_64/chromium-avoid-log-flooding-in-GLSurfacePresentationHelper.patch	2019-04-25 10:43:43 UTC (rev 453701)
@@ -0,0 +1,34 @@
+From 1fb4edaf534c278a0b7a3150efff8e712c1efe91 Mon Sep 17 00:00:00 2001
+From: Peng Huang <penghuang at chromium.org>
+Date: Tue, 19 Feb 2019 22:01:52 +0000
+Subject: [PATCH] Avoid log flooding in GLSurfacePresentationHelper
+
+Bug: 879929
+Change-Id: Ifb452736573e65791ed5e3f143778f576854a167
+Reviewed-on: https://chromium-review.googlesource.com/c/1477918
+Commit-Queue: Peng Huang <penghuang at chromium.org>
+Reviewed-by: Antoine Labour <piman at chromium.org>
+Cr-Commit-Position: refs/heads/master@{#633415}
+---
+ ui/gl/gl_surface_presentation_helper.cc | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/ui/gl/gl_surface_presentation_helper.cc b/ui/gl/gl_surface_presentation_helper.cc
+index 987725ca1c931..e7bcd1a5b79ff 100644
+--- a/ui/gl/gl_surface_presentation_helper.cc
++++ b/ui/gl/gl_surface_presentation_helper.cc
+@@ -237,7 +237,13 @@ void GLSurfacePresentationHelper::CheckPendingFrames() {
+                                                         &vsync_interval_)) {
+       vsync_timebase_ = base::TimeTicks();
+       vsync_interval_ = base::TimeDelta();
+-      LOG(ERROR) << "GetVSyncParametersIfAvailable() failed!";
++      static unsigned int count = 0;
++      ++count;
++      // GetVSyncParametersIfAvailable() could be called and failed frequently,
++      // so we have to limit the LOG to avoid flooding the log.
++      LOG_IF(ERROR, count < 20 || !(count & 0xff))
++          << "GetVSyncParametersIfAvailable() failed for " << count
++          << " times!";
+     }
+   }
+ 

Copied: electron/repos/community-staging-x86_64/chromium-color_utils-use-std-sqrt.patch (from rev 453700, electron/trunk/chromium-color_utils-use-std-sqrt.patch)
===================================================================
--- community-staging-x86_64/chromium-color_utils-use-std-sqrt.patch	                        (rev 0)
+++ community-staging-x86_64/chromium-color_utils-use-std-sqrt.patch	2019-04-25 10:43:43 UTC (rev 453701)
@@ -0,0 +1,48 @@
+From a5ba6f9bb7665040045dc0f8087407096630ad7b Mon Sep 17 00:00:00 2001
+From: Raphael Kubo da Costa <raphael.kubo.da.costa at intel.com>
+Date: Fri, 8 Feb 2019 02:57:28 +0000
+Subject: [PATCH] color_utils: Use std::sqrt() instead of std::sqrtf()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This fixes the build with libstdc++:
+
+    ../../ui/gfx/color_utils.cc: In function ‘SkColor color_utils::SetDarkestColorForTesting(SkColor)’:
+    ../../ui/gfx/color_utils.cc:434:12: error: ‘sqrtf’ is not a member of ‘std’
+           std::sqrtf((dark_luminance + 0.05f) * (kWhiteLuminance + 0.05f)) - 0.05f;
+                ^~~~~
+    ../../ui/gfx/color_utils.cc:434:12: note: suggested alternative: ‘sqrt’
+           std::sqrtf((dark_luminance + 0.05f) * (kWhiteLuminance + 0.05f)) - 0.05f;
+                ^~~~~
+                sqrt
+
+sqrtf() is not formally part of C++14 as far as I can see even though libc++
+has it in <cmath>. Additionally, we're only dealing with floats in all parts
+of the expression above, so using the float sqrt() overload should be
+harmless anyway.
+
+Bug: 819294
+Change-Id: If6c7bf31819df97a761e6963def6d6506154c34d
+Reviewed-on: https://chromium-review.googlesource.com/c/1458193
+Auto-Submit: Raphael Kubo da Costa <raphael.kubo.da.costa at intel.com>
+Reviewed-by: Peter Kasting <pkasting at chromium.org>
+Commit-Queue: Raphael Kubo da Costa <raphael.kubo.da.costa at intel.com>
+Cr-Commit-Position: refs/heads/master@{#630140}
+---
+ ui/gfx/color_utils.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ui/gfx/color_utils.cc b/ui/gfx/color_utils.cc
+index c868cd54bac3f..92ba1407d594f 100644
+--- a/ui/gfx/color_utils.cc
++++ b/ui/gfx/color_utils.cc
+@@ -431,7 +431,7 @@ SkColor SetDarkestColorForTesting(SkColor color) {
+   // GetContrastRatio(kWhiteLuminance, g_luminance_midpoint).  The formula below
+   // can be verified by plugging it into how GetContrastRatio() operates.
+   g_luminance_midpoint =
+-      std::sqrtf((dark_luminance + 0.05f) * (kWhiteLuminance + 0.05f)) - 0.05f;
++      std::sqrt((dark_luminance + 0.05f) * (kWhiteLuminance + 0.05f)) - 0.05f;
+ 
+   return previous_darkest_color;
+ }

Copied: electron/repos/community-staging-x86_64/chromium-media-fix-build-with-libstdc++.patch (from rev 453700, electron/trunk/chromium-media-fix-build-with-libstdc++.patch)
===================================================================
--- community-staging-x86_64/chromium-media-fix-build-with-libstdc++.patch	                        (rev 0)
+++ community-staging-x86_64/chromium-media-fix-build-with-libstdc++.patch	2019-04-25 10:43:43 UTC (rev 453701)
@@ -0,0 +1,48 @@
+From d4824fb46a07f3dbecf6358020f0f0da2c586475 Mon Sep 17 00:00:00 2001
+From: Tom Anderson <thomasanderson at chromium.org>
+Date: Sat, 16 Feb 2019 05:35:55 +0000
+Subject: [PATCH] Fix build with libstdc++
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When building with libstdc++ (use_custom_libcxx=false), we get (different) build
+erros when building with clang and gcc.
+
+clang:
+    base/optional.h:348:61: error: no member named 'value' in
+    'std::is_constructible<media::learning::Value, const
+    base::Optional<media::learning::Value> &>'
+
+gcc:
+    base/optional.h:347:57: error: incomplete type
+    ‘std::is_constructible<media::learning::Value,
+    base::Optional<media::learning::Value>&>’ used in nested name specifier
+
+BUG=931373
+
+Change-Id: I133ff4f30398202b5726c605fafee8aa916179d3
+Reviewed-on: https://chromium-review.googlesource.com/c/1475936
+Auto-Submit: Thomas Anderson <thomasanderson at chromium.org>
+Commit-Queue: Frank Liberato <liberato at chromium.org>
+Reviewed-by: Frank Liberato <liberato at chromium.org>
+Cr-Original-Commit-Position: refs/heads/master@{#632921}
+Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
+Cr-Mirrored-Commit: 08b9fbc728043c89f21af46796bacd7324b7ce06
+---
+ learning/common/value.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/learning/common/value.h b/learning/common/value.h
+index 62f4953f6..ef37eebd4 100644
+--- a/learning/common/value.h
++++ b/learning/common/value.h
+@@ -27,7 +27,7 @@ class COMPONENT_EXPORT(LEARNING_COMMON) Value {
+  public:
+   Value();
+   template <typename T>
+-  explicit Value(T x) : value_(x) {
++  explicit Value(const T& x) : value_(x) {
+     // We want to rule out mostly pointers, since they wouldn't make much sense.
+     // Note that the implicit cast would likely fail anyway.
+     static_assert(std::is_arithmetic<T>::value || std::is_enum<T>::value,

Copied: electron/repos/community-staging-x86_64/chromium-skia-harmony.patch (from rev 453700, electron/trunk/chromium-skia-harmony.patch)
===================================================================
--- community-staging-x86_64/chromium-skia-harmony.patch	                        (rev 0)
+++ community-staging-x86_64/chromium-skia-harmony.patch	2019-04-25 10:43:43 UTC (rev 453701)
@@ -0,0 +1,13 @@
+--- third_party/skia/src/ports/SkFontHost_FreeType.cpp.orig	2019-01-20 10:54:56.415239030 +0000
++++ third_party/skia/src/ports/SkFontHost_FreeType.cpp	2019-01-20 10:55:05.695307733 +0000
+@@ -121,8 +121,8 @@ public:
+         : fGetVarDesignCoordinates(nullptr)
+         , fGetVarAxisFlags(nullptr)
+         , fLibrary(nullptr)
+-        , fIsLCDSupported(false)
+-        , fLCDExtra(0)
++        , fIsLCDSupported(true)
++        , fLCDExtra(2)
+     {
+         if (FT_New_Library(&gFTMemory, &fLibrary)) {
+             return;

Copied: electron/repos/community-staging-x86_64/chromium-system-icu.patch (from rev 453700, electron/trunk/chromium-system-icu.patch)
===================================================================
--- community-staging-x86_64/chromium-system-icu.patch	                        (rev 0)
+++ community-staging-x86_64/chromium-system-icu.patch	2019-04-25 10:43:43 UTC (rev 453701)
@@ -0,0 +1,19 @@
+diff --git a/third_party/blink/renderer/platform/text/character_property_data.h b/third_party/blink/renderer/platform/text/character_property_data.h
+index 28fb6a9..bb4dbd7 100644
+--- a/third_party/blink/renderer/platform/text/character_property_data.h
++++ b/third_party/blink/renderer/platform/text/character_property_data.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,
++};
+ 
+ #if !defined(USING_SYSTEM_ICU)
+ // Freezed trie tree, see character_property_data_generator.cc.

Copied: electron/repos/community-staging-x86_64/default_app-icon.patch (from rev 453700, electron/trunk/default_app-icon.patch)
===================================================================
--- community-staging-x86_64/default_app-icon.patch	                        (rev 0)
+++ community-staging-x86_64/default_app-icon.patch	2019-04-25 10:43:43 UTC (rev 453701)
@@ -0,0 +1,21 @@
+--- a/electron/default_app/default_app.js
++++ b/electron/default_app/default_app.js
+@@ -28,7 +28,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
+@@ -92,7 +92,6 @@
+ 
+   default_app_sources = [
+     "default_app/default_app.js",
+-    "default_app/icon.png",
+     "default_app/index.html",
+     "default_app/main.js",
+     "default_app/package.json",

Copied: electron/repos/community-staging-x86_64/electron.desktop (from rev 453700, electron/trunk/electron.desktop)
===================================================================
--- community-staging-x86_64/electron.desktop	                        (rev 0)
+++ community-staging-x86_64/electron.desktop	2019-04-25 10:43:43 UTC (rev 453701)
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Application
+Name=Electron
+Icon=electron
+Exec=electron %u
+Categories=Development;GTK;
+StartupNotify=true

Copied: electron/repos/community-staging-x86_64/use-system-libraries-in-node.patch (from rev 453700, electron/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	2019-04-25 10:43:43 UTC (rev 453701)
@@ -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")
+ 
+@@ -206,12 +218,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",
+@@ -225,6 +233,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