Date: Thursday, August 1, 2019 @ 06:07:25 Author: tensor5 Revision: 496147
upgpkg: electron 6.0.0-1 Modified: electron/trunk/PKGBUILD electron/trunk/chromium-skia-harmony.patch electron/trunk/default_app-icon.patch electron/trunk/use-system-libraries-in-node.patch Deleted: electron/trunk/chromium-avoid-log-flooding-in-GLSurfacePresentationHelper.patch electron/trunk/chromium-color_utils-use-std-sqrt.patch electron/trunk/chromium-media-fix-build-with-libstdc++.patch electron/trunk/chromium-system-icu.patch ------------------------------------------------------------------+ PKGBUILD | 26 +---- 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 | 9 + chromium-system-icu.patch | 19 --- default_app-icon.patch | 14 +- use-system-libraries-in-node.patch | 4 8 files changed, 21 insertions(+), 181 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-08-01 06:07:01 UTC (rev 496146) +++ PKGBUILD 2019-08-01 06:07:25 UTC (rev 496147) @@ -1,9 +1,9 @@ # Maintainer: Nicola Squartini <[email protected]> pkgname=electron -pkgver=5.0.8 -_commit=7e80f3fb19ab4ec82de6a083efda3b91be7d6d83 -_chromiumver=73.0.3683.121 +pkgver=6.0.0 +_commit=825bd6d45ed0914bd8749c077e6d7533efd5d9c2 +_chromiumver=76.0.3809.88 pkgrel=1 pkgdesc='Build cross platform desktop apps with web technologies' arch=('x86_64') @@ -22,22 +22,14 @@ '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' 'SKIP' '5270db01f3f8aaa5137dec275a02caa832b7f2e37942e068cba8d28b3a29df39' - 'a9f4d2af71c4399dd01047bb1205c0ca9bb5ce6bf0eeaeb57acf4c69724b668b' - 'e38b50ef16e6fc7520b1892f3b17758db14733d207cc083cfcd899954444248f' - 'f2b12ccf83a8e0adda4a87ae5c983df5e092ccf1f9a6f2e05799ce4d451dbda1' - 'b3b6f5147d519c586cbdaf3b227dd1719676fa3a65edd6f08989087afd287afa' - 'f51fe91427d8638c5551746d2ec7de99e8059dd76889cfeaee8ca3d8fed62265' - '5887f78b55c4ecbbcba5930f3f0bb7bc0117c2a41c2f761805fcf7f46f1ca2b3' - 'e2d284311f49c529ea45083438a768db390bde52949995534034d2a814beab89' + '545196274b7fac0cf1e1169624bbc67414bb47a65c5112c88b6c0f4f9cb5914c' + 'c7eadac877179e586d0cce7f898aa1462b4c207733e68ecc17de9754b691713a' + '771292942c0901092a402cc60ee883877a99fb804cb54d568c8c6c94565a48e1' ) _system_libs=('ffmpeg' @@ -132,11 +124,7 @@ "${_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 } @@ -150,6 +138,7 @@ 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" @@ -157,7 +146,6 @@ 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 Deleted: chromium-avoid-log-flooding-in-GLSurfacePresentationHelper.patch =================================================================== --- chromium-avoid-log-flooding-in-GLSurfacePresentationHelper.patch 2019-08-01 06:07:01 UTC (rev 496146) +++ chromium-avoid-log-flooding-in-GLSurfacePresentationHelper.patch 2019-08-01 06:07:25 UTC (rev 496147) @@ -1,34 +0,0 @@ -From 1fb4edaf534c278a0b7a3150efff8e712c1efe91 Mon Sep 17 00:00:00 2001 -From: Peng Huang <[email protected]> -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 <[email protected]> -Reviewed-by: Antoine Labour <[email protected]> -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!"; - } - } - Deleted: chromium-color_utils-use-std-sqrt.patch =================================================================== --- chromium-color_utils-use-std-sqrt.patch 2019-08-01 06:07:01 UTC (rev 496146) +++ chromium-color_utils-use-std-sqrt.patch 2019-08-01 06:07:25 UTC (rev 496147) @@ -1,48 +0,0 @@ -From a5ba6f9bb7665040045dc0f8087407096630ad7b Mon Sep 17 00:00:00 2001 -From: Raphael Kubo da Costa <[email protected]> -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 <[email protected]> -Reviewed-by: Peter Kasting <[email protected]> -Commit-Queue: Raphael Kubo da Costa <[email protected]> -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; - } Deleted: chromium-media-fix-build-with-libstdc++.patch =================================================================== --- chromium-media-fix-build-with-libstdc++.patch 2019-08-01 06:07:01 UTC (rev 496146) +++ chromium-media-fix-build-with-libstdc++.patch 2019-08-01 06:07:25 UTC (rev 496147) @@ -1,48 +0,0 @@ -From d4824fb46a07f3dbecf6358020f0f0da2c586475 Mon Sep 17 00:00:00 2001 -From: Tom Anderson <[email protected]> -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 <[email protected]> -Commit-Queue: Frank Liberato <[email protected]> -Reviewed-by: Frank Liberato <[email protected]> -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, Modified: chromium-skia-harmony.patch =================================================================== --- chromium-skia-harmony.patch 2019-08-01 06:07:01 UTC (rev 496146) +++ chromium-skia-harmony.patch 2019-08-01 06:07:25 UTC (rev 496147) @@ -1,12 +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: +--- 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) -+ , fIsLCDSupported(true) + , fLCDExtra(2) { if (FT_New_Library(&gFTMemory, &fLibrary)) { Deleted: chromium-system-icu.patch =================================================================== --- chromium-system-icu.patch 2019-08-01 06:07:01 UTC (rev 496146) +++ chromium-system-icu.patch 2019-08-01 06:07:25 UTC (rev 496147) @@ -1,19 +0,0 @@ -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. Modified: default_app-icon.patch =================================================================== --- default_app-icon.patch 2019-08-01 06:07:01 UTC (rev 496146) +++ default_app-icon.patch 2019-08-01 06:07:25 UTC (rev 496147) @@ -1,6 +1,6 @@ ---- a/electron/default_app/default_app.js -+++ b/electron/default_app/default_app.js -@@ -28,7 +28,7 @@ +--- a/electron/default_app/default_app.ts ++++ b/electron/default_app/default_app.ts +@@ -64,7 +64,7 @@ } if (process.platform === 'linux') { @@ -11,11 +11,11 @@ mainWindow = new BrowserWindow(options) --- a/electron/filenames.gni +++ b/electron/filenames.gni -@@ -92,7 +92,6 @@ +@@ -100,7 +100,6 @@ + ] - default_app_sources = [ - "default_app/default_app.js", + default_app_static_sources = [ - "default_app/icon.png", "default_app/index.html", - "default_app/main.js", "default_app/package.json", + "default_app/styles.css", Modified: use-system-libraries-in-node.patch =================================================================== --- use-system-libraries-in-node.patch 2019-08-01 06:07:01 UTC (rev 496146) +++ use-system-libraries-in-node.patch 2019-08-01 06:07:25 UTC (rev 496147) @@ -19,7 +19,7 @@ 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 @@ +@@ -203,12 +215,8 @@ component("node_lib") { deps = [ ":node_js2c", @@ -32,7 +32,7 @@ "//third_party/brotli:dec", "//third_party/brotli:enc", "//v8:v8_libplatform", -@@ -225,6 +233,21 @@ +@@ -222,6 +230,21 @@ public_configs = [ ":node_lib_config" ] include_dirs = [ "src" ] libs = []
