[arch-commits] Commit in electron6/trunk (PKGBUILD)
Date: Saturday, December 19, 2020 @ 15:19:50 Author: foutrelis Revision: 779982 upgpkg: electron6 6.1.12-3: icu 68.2 rebuild Modified: electron6/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-12-19 15:02:15 UTC (rev 779981) +++ PKGBUILD2020-12-19 15:19:50 UTC (rev 779982) @@ -4,7 +4,7 @@ pkgver=6.1.12 _commit=cb408dbb5bc2e98b22690a22bf3e14d233d76676 _chromiumver=76.0.3809.146 -pkgrel=2 +pkgrel=3 pkgdesc='Build cross platform desktop apps with web technologies' arch=('x86_64') url='https://electronjs.org/'
[arch-commits] Commit in electron6/trunk (PKGBUILD)
Date: Saturday, December 19, 2020 @ 12:58:17 Author: foutrelis Revision: 779962 Add workaround for ICU 68 Modified: electron6/trunk/PKGBUILD --+ PKGBUILD |3 +++ 1 file changed, 3 insertions(+) Modified: PKGBUILD === --- PKGBUILD2020-12-19 12:54:58 UTC (rev 779961) +++ PKGBUILD2020-12-19 12:58:17 UTC (rev 779962) @@ -161,6 +161,9 @@ export AR=ar export NM=nm + # Workaround for building with ICU 68.x + CPPFLAGS+=' -DU_DEFINE_FALSE_AND_TRUE=1' + cd src export CHROMIUM_BUILDTOOLS_PATH="$PWD"/buildtools GN_EXTRA_ARGS='
[arch-commits] Commit in electron6/trunk (PKGBUILD perfetto-clang11.patch)
Date: Monday, December 14, 2020 @ 14:59:43 Author: foutrelis Revision: 775067 upgpkg: electron6 6.1.12-2: re2 20201101 rebuild Still had to build with clang 10 because of errors like: ../../base/optional.h:346:61: error: no member named 'value' in 'std::is_constructible &>' std::is_constructible&>::value || ~~^ Added: electron6/trunk/perfetto-clang11.patch Modified: electron6/trunk/PKGBUILD + PKGBUILD |5 - perfetto-clang11.patch | 32 2 files changed, 36 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-12-14 14:59:04 UTC (rev 775066) +++ PKGBUILD2020-12-14 14:59:43 UTC (rev 775067) @@ -4,7 +4,7 @@ pkgver=6.1.12 _commit=cb408dbb5bc2e98b22690a22bf3e14d233d76676 _chromiumver=76.0.3809.146 -pkgrel=1 +pkgrel=2 pkgdesc='Build cross platform desktop apps with web technologies' arch=('x86_64') url='https://electronjs.org/' @@ -26,6 +26,7 @@ 'icu67.patch' 'chromium-gcc10.patch' 'angle-gcc10.patch' +'perfetto-clang11.patch' 'perfetto-gcc10.patch' 'webrtc-gcc10.patch' 'glslang-remove-setAllocator.patch' @@ -41,6 +42,7 @@ 'b46eeef32c7c773babe15da0c118ca55bf3c084142592695853a73f80b5dc55336cad72636f8ed2308fe9c10bcab953e37ca7ab08f20f545b881fe99a543d247' '682cbc25a332ea30e2475fc39fa8e6ce395f65b974520121ccf7be90b7744b0f9b98313e2d9ac0e56a0e41fd444e8dec80a7e8565b7e91508bfe8234e4105f6b' 'fd8e523b657205ed1cb64581bd9e5597183c1575f0d0523dcc708e3b67e4ff2dcb962b41254b7ad7b180a317161ab47b7e262d2321ac1b21718c3b1bccc54c3e' + 'd9d232c98cf80d2b337e85883fa07a845fa2f4ffdc73b890f46aa5abba14efadba80d964995b3088476dc93237c203b8bfa91f3bc5f95ab3eb71b57dc3c127b0' '047606dacc67dc689bac9d30540331c4f4a56f5ff664115c779b13376918a0279fa0466099aa5e36a6541faa7479ae567ac50a4d4b482cdc34c95ae04aceb51d' 'a4340a6b338768d51600853d101f7b4e06c7b733bda71f1e193c457edac3bb07887f7c307e60e26edf2fda47986788df8c4645b6ce26dae0d1e0b091f4520e91' 'e34562b4b6cf4f0afa3f23afe7336fed4614201b39bfb73871899081161f5927d273c1da14b3ab7edeeb803300ba6e07c1ddf7261e8be12555cbfc4fe0a0d23c' @@ -145,6 +147,7 @@ patch -Np1 -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-clang11.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 Added: perfetto-clang11.patch === --- perfetto-clang11.patch (rev 0) +++ perfetto-clang11.patch 2020-12-14 14:59:43 UTC (rev 775067) @@ -0,0 +1,32 @@ +From 46f0abc66c1d78c60a0415c5cb46852ef3bfa9bb Mon Sep 17 00:00:00 2001 +From: Nico Weber +Date: Sat, 8 Feb 2020 21:26:53 -0500 +Subject: [PATCH] Fix compile error emitted by trunk clang + +../../third_party/perfetto/src/tracing/core/virtual_destructors.cc:33:35: +error: destructor cannot be declared using a type alias +'perfetto::TracingService::ConsumerEndpoint' (aka +'perfetto::ConsumerEndpoint') of the class name +TracingService::ConsumerEndpoint::~ConsumerEndpoint() = default; + +Bug: chromium:1050372 +Change-Id: Icc1a8cca06b72ee3322924dc0825ebb62086f730 +--- + src/tracing/core/virtual_destructors.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/tracing/core/virtual_destructors.cc b/src/tracing/core/virtual_destructors.cc +index 75fc806a5..2f8bb3cef 100644 +--- a/src/tracing/core/virtual_destructors.cc b/src/tracing/core/virtual_destructors.cc +@@ -30,8 +30,8 @@ namespace perfetto { + Consumer::~Consumer() = default; + Producer::~Producer() = default; + TracingService::~TracingService() = default; +-TracingService::ConsumerEndpoint::~ConsumerEndpoint() = default; +-TracingService::ProducerEndpoint::~ProducerEndpoint() = default; ++ConsumerEndpoint::~ConsumerEndpoint() = default; ++ProducerEndpoint::~ProducerEndpoint() = default; + SharedMemory::~SharedMemory() = default; + SharedMemory::Factory::~Factory() = default; + SharedMemoryArbiter::~SharedMemoryArbiter() = default;
[arch-commits] Commit in electron6/trunk (PKGBUILD chromium-ffmpeg-4.3.patch)
Date: Tuesday, July 14, 2020 @ 21:57:06 Author: foutrelis Revision: 663807 upgpkg: electron6 6.1.9-7: add patch for ffmpeg 4.3 (FS#67020) Added: electron6/trunk/chromium-ffmpeg-4.3.patch Modified: electron6/trunk/PKGBUILD ---+ PKGBUILD |5 - chromium-ffmpeg-4.3.patch | 21 + 2 files changed, 25 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-07-14 21:57:04 UTC (rev 663806) +++ PKGBUILD2020-07-14 21:57:06 UTC (rev 663807) @@ -5,7 +5,7 @@ pkgver=6.1.9 _commit=26ee9476def66d6a57f12df9918145c303afa4ff _chromiumver=76.0.3809.146 -pkgrel=6 +pkgrel=7 pkgdesc='Build cross platform desktop apps with web technologies' arch=('x86_64') url='https://electronjs.org/' @@ -30,6 +30,7 @@ 'perfetto-gcc10.patch' 'webrtc-gcc10.patch' 'glslang-remove-setAllocator.patch' +'chromium-ffmpeg-4.3.patch' 'chromium-skia-harmony.patch') sha512sums=('SKIP' 'SKIP' @@ -43,6 +44,7 @@ '047606dacc67dc689bac9d30540331c4f4a56f5ff664115c779b13376918a0279fa0466099aa5e36a6541faa7479ae567ac50a4d4b482cdc34c95ae04aceb51d' 'a4340a6b338768d51600853d101f7b4e06c7b733bda71f1e193c457edac3bb07887f7c307e60e26edf2fda47986788df8c4645b6ce26dae0d1e0b091f4520e91' 'e34562b4b6cf4f0afa3f23afe7336fed4614201b39bfb73871899081161f5927d273c1da14b3ab7edeeb803300ba6e07c1ddf7261e8be12555cbfc4fe0a0d23c' + '70c30709a9bb6abc7a61a17cdc90cb2c4bad907f13f3bdd595906d87f7ad9a45100f237885e08d3dd4373a19a0716e8a4fa72a3950b7f779c8755cf0349f63d2' '6fa7c5f737b3f86274b1f768aadf863dd7542fca9c8885d5c3804590bd04c288394c54b2003234be37d961f48b5470ce15254ba64b2716f8aceb181e1fd3c7c0') _system_libs=('ffmpeg' @@ -135,6 +137,7 @@ "${_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 -Np1 -d v8 <../icu67.patch Added: chromium-ffmpeg-4.3.patch === --- chromium-ffmpeg-4.3.patch (rev 0) +++ chromium-ffmpeg-4.3.patch 2020-07-14 21:57:06 UTC (rev 663807) @@ -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 + #include "third_party/ffmpeg/ffmpeg_features.h" // nogncheck + extern "C" { + #include +@@ -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::max()); + #endif // BUILDFLAG(USE_ALLOCATOR_SHIM) + + #endif // BUILDFLAG(ENABLE_FFMPEG)
[arch-commits] Commit in electron6/trunk (PKGBUILD)
Date: Thursday, May 7, 2020 @ 14:11:33 Author: foutrelis Revision: 625395 upgpkg: electron6 6.1.9-5: re2 20200501 rebuild Modified: electron6/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-05-07 14:11:31 UTC (rev 625394) +++ PKGBUILD2020-05-07 14:11:33 UTC (rev 625395) @@ -5,7 +5,7 @@ pkgver=6.1.9 _commit=26ee9476def66d6a57f12df9918145c303afa4ff _chromiumver=76.0.3809.146 -pkgrel=4 +pkgrel=5 pkgdesc='Build cross platform desktop apps with web technologies' arch=('x86_64') url='https://electronjs.org/'
[arch-commits] Commit in electron6/trunk (PKGBUILD)
Date: Wednesday, April 29, 2020 @ 15:33:43 Author: felixonmars Revision: 622275 icu 67.1 rebuild Modified: electron6/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-04-29 14:50:26 UTC (rev 622274) +++ PKGBUILD2020-04-29 15:33:43 UTC (rev 622275) @@ -5,7 +5,7 @@ pkgver=6.1.9 _commit=26ee9476def66d6a57f12df9918145c303afa4ff _chromiumver=76.0.3809.146 -pkgrel=3 +pkgrel=4 pkgdesc='Build cross platform desktop apps with web technologies' arch=('x86_64') url='https://electronjs.org/'
[arch-commits] Commit in electron6/trunk (PKGBUILD)
Date: Wednesday, March 25, 2020 @ 11:27:12 Author: diabonas Revision: 604056 upgpkg: electron6 6.1.9-3: http-parser 2.9.4 rebuild Modified: electron6/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-03-25 11:10:06 UTC (rev 604055) +++ PKGBUILD2020-03-25 11:27:12 UTC (rev 604056) @@ -5,7 +5,7 @@ pkgver=6.1.9 _commit=26ee9476def66d6a57f12df9918145c303afa4ff _chromiumver=76.0.3809.146 -pkgrel=2 +pkgrel=3 pkgdesc='Build cross platform desktop apps with web technologies' arch=('x86_64') url='https://electronjs.org/'
[arch-commits] Commit in electron6/trunk (PKGBUILD)
Date: Friday, March 6, 2020 @ 07:44:30 Author: foutrelis Revision: 590915 upgpkg: electron6 6.1.9-2: re2 20200303 rebuild. Modified: electron6/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-03-06 07:44:27 UTC (rev 590914) +++ PKGBUILD2020-03-06 07:44:30 UTC (rev 590915) @@ -5,7 +5,7 @@ pkgver=6.1.9 _commit=26ee9476def66d6a57f12df9918145c303afa4ff _chromiumver=76.0.3809.146 -pkgrel=1 +pkgrel=2 pkgdesc='Build cross platform desktop apps with web technologies' arch=('x86_64') url='https://electronjs.org/'
[arch-commits] Commit in electron6/trunk (PKGBUILD)
Date: Tuesday, March 3, 2020 @ 12:15:09 Author: ffy00 Revision: 589639 upgpkg: electron6 6.1.9-1 Modified: electron6/trunk/PKGBUILD --+ PKGBUILD |8 1 file changed, 4 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-03-03 12:13:02 UTC (rev 589638) +++ PKGBUILD2020-03-03 12:15:09 UTC (rev 589639) @@ -2,8 +2,8 @@ # Contributor: Nicola Squartini pkgname=electron6 -pkgver=6.1.7 -_commit=47ee65c66ce0a1fcd476ac4cefcdc2b3b96cede9 +pkgver=6.1.9 +_commit=26ee9476def66d6a57f12df9918145c303afa4ff _chromiumver=76.0.3809.146 pkgrel=1 pkgdesc='Build cross platform desktop apps with web technologies' @@ -12,7 +12,7 @@ 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' +makedepends=('clang' 'git' 'gn-m76' 'gperf' 'harfbuzz-icu' 'java-runtime-headless' 'jsoncpp' 'libnotify' 'lld' 'llvm' 'ninja' 'npm' 'pciutils' 'python2' 'wget' 'yasm') optdepends=('kde-cli-tools: file deletion support (kioclient5)' @@ -151,7 +151,7 @@ use_gnome_keyring = false use_sysroot = false ' - gn gen out/Release \ + 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
[arch-commits] Commit in electron6/trunk (PKGBUILD)
Date: Friday, December 20, 2019 @ 10:54:56 Author: ffy00 Revision: 538474 upgpkg: electron6 6.1.7-1 Modified: electron6/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-12-20 10:16:31 UTC (rev 538473) +++ PKGBUILD2019-12-20 10:54:56 UTC (rev 538474) @@ -2,8 +2,8 @@ # Contributor: Nicola Squartini pkgname=electron6 -pkgver=6.1.5 -_commit=6f62f91822a80192cb711c604f1a8f1a176f328d +pkgver=6.1.7 +_commit=47ee65c66ce0a1fcd476ac4cefcdc2b3b96cede9 _chromiumver=76.0.3809.146 pkgrel=1 pkgdesc='Build cross platform desktop apps with web technologies'
[arch-commits] Commit in electron6/trunk (PKGBUILD)
Date: Tuesday, November 26, 2019 @ 23:12:00 Author: ffy00 Revision: 533672 upgpkg: electron6 6.1.5-1 Modified: electron6/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-11-26 22:57:15 UTC (rev 533671) +++ PKGBUILD2019-11-26 23:12:00 UTC (rev 533672) @@ -2,10 +2,10 @@ # Contributor: Nicola Squartini pkgname=electron6 -pkgver=6.1.4 -_commit=aa863bc323d8ddfcae9e1211d9c2cb05f1f77c46 +pkgver=6.1.5 +_commit=6f62f91822a80192cb711c604f1a8f1a176f328d _chromiumver=76.0.3809.146 -pkgrel=2 +pkgrel=1 pkgdesc='Build cross platform desktop apps with web technologies' arch=('x86_64') url='https://electronjs.org/'
[arch-commits] Commit in electron6/trunk (PKGBUILD)
Date: Tuesday, November 12, 2019 @ 12:43:38 Author: foutrelis Revision: 526991 icu 65.1 / poppler 0.82.0 rebuild Modified: electron6/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-11-12 11:47:18 UTC (rev 526990) +++ PKGBUILD2019-11-12 12:43:38 UTC (rev 526991) @@ -5,7 +5,7 @@ pkgver=6.1.4 _commit=aa863bc323d8ddfcae9e1211d9c2cb05f1f77c46 _chromiumver=76.0.3809.146 -pkgrel=1 +pkgrel=2 pkgdesc='Build cross platform desktop apps with web technologies' arch=('x86_64') url='https://electronjs.org/'
[arch-commits] Commit in electron6/trunk (PKGBUILD icu65.patch)
Date: Tuesday, November 12, 2019 @ 10:27:44 Author: foutrelis Revision: 526973 Fix build with ICU 65 Added: electron6/trunk/icu65.patch Modified: electron6/trunk/PKGBUILD -+ PKGBUILD|3 ++ icu65.patch | 64 ++ 2 files changed, 67 insertions(+) Modified: PKGBUILD === --- PKGBUILD2019-11-12 10:27:26 UTC (rev 526972) +++ PKGBUILD2019-11-12 10:27:44 UTC (rev 526973) @@ -23,6 +23,7 @@ 'electron6.desktop' 'default_app-icon.patch' 'use-system-libraries-in-node.patch' +'icu65.patch' 'chromium-skia-harmony.patch') sha512sums=('SKIP' 'SKIP' @@ -29,6 +30,7 @@ 'f2384d851478507b8b76ada5822d021b0ab86e6cb7d078294171cf43935f3362f383b8399fa29acd11f021df5f43c3a0337b173702313c4533946bb36b7e512d' '81a959a2873e868bb9394b1e5371d8c77f13f47d88c070016394188e96420ed64c8d6efa518e854f302ec4e6e7e17888d508f6a3598f433f6f82b8507639c0b7' '147563fe422108598af26c617edf78d146d4e70223e3093216d5f63a1ab051eff95abd0c8f8c0b6f8a504ae26557d65cd0ffd90c542d6534176b72b99ea44a5e' + 'd109937c4a5fba96e82d6fbc7b804943010d5723eef91af4f79355c8b84214da3978fc784dd0fcc3ed228c4684d0d06cf8cd21fa32fc5ec80c00d1bb4e3b9c90' '6fa7c5f737b3f86274b1f768aadf863dd7542fca9c8885d5c3804590bd04c288394c54b2003234be37d961f48b5470ce15254ba64b2716f8aceb181e1fd3c7c0') _system_libs=('ffmpeg' @@ -122,6 +124,7 @@ echo 'Applying local patches...' patch -Np0 -i ../chromium-skia-harmony.patch + patch -Np1 -i ../icu65.patch patch -Np1 -i ../use-system-libraries-in-node.patch patch -Np1 -i ../default_app-icon.patch # Icon from .desktop file } Added: icu65.patch === --- icu65.patch (rev 0) +++ icu65.patch 2019-11-12 10:27:44 UTC (rev 526973) @@ -0,0 +1,64 @@ +From 5679c3c191ed62b62d8db22f1657a296ee9bfe8e Mon Sep 17 00:00:00 2001 +From: Frank Tang +Date: Wed, 30 Oct 2019 22:49:47 + +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 +Reviewed-by: Doug Turner +Reviewed-by: Michael Wasserman +Reviewed-by: Kent Tamura +Reviewed-by: Trent Apted +Reviewed-by: Mason Freed +Commit-Queue: Frank Tang +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
[arch-commits] Commit in electron6/trunk (PKGBUILD)
Date: Sunday, November 10, 2019 @ 18:24:58 Author: ffy00 Revision: 526481 upgpkg: electron6 6.1.4-1 Modified: electron6/trunk/PKGBUILD --+ PKGBUILD | 76 + 1 file changed, 37 insertions(+), 39 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-11-10 18:24:31 UTC (rev 526480) +++ PKGBUILD2019-11-10 18:24:58 UTC (rev 526481) @@ -2,7 +2,7 @@ # Contributor: Nicola Squartini pkgname=electron6 -pkgver=6.1.1 +pkgver=6.1.4 _commit=aa863bc323d8ddfcae9e1211d9c2cb05f1f77c46 _chromiumver=76.0.3809.146 pkgrel=1 @@ -23,14 +23,13 @@ 'electron6.desktop' 'default_app-icon.patch' 'use-system-libraries-in-node.patch' -'chromium-skia-harmony.patch' - ) -sha256sums=('SKIP' +'chromium-skia-harmony.patch') +sha512sums=('SKIP' 'SKIP' -'2256aa92a70d191962207008564df74cbe3ad2ace71a174cc41fee43379ec4cb' -'545196274b7fac0cf1e1169624bbc67414bb47a65c5112c88b6c0f4f9cb5914c' -'c7eadac877179e586d0cce7f898aa1462b4c207733e68ecc17de9754b691713a' -'771292942c0901092a402cc60ee883877a99fb804cb54d568c8c6c94565a48e1') + 'f2384d851478507b8b76ada5822d021b0ab86e6cb7d078294171cf43935f3362f383b8399fa29acd11f021df5f43c3a0337b173702313c4533946bb36b7e512d' + '81a959a2873e868bb9394b1e5371d8c77f13f47d88c070016394188e96420ed64c8d6efa518e854f302ec4e6e7e17888d508f6a3598f433f6f82b8507639c0b7' + '147563fe422108598af26c617edf78d146d4e70223e3093216d5f63a1ab051eff95abd0c8f8c0b6f8a504ae26557d65cd0ffd90c542d6534176b72b99ea44a5e' + '6fa7c5f737b3f86274b1f768aadf863dd7542fca9c8885d5c3804590bd04c288394c54b2003234be37d961f48b5470ce15254ba64b2716f8aceb181e1fd3c7c0') _system_libs=('ffmpeg' 'flac' @@ -54,18 +53,17 @@ '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" + 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 '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}\", +\"url\": \"file://$srcdir/electron@$_commit\", \"deps_file\": \"DEPS\", \"managed\": False, \"custom_deps\": { @@ -75,7 +73,7 @@ }, ]" > .gclient - python2 "${srcdir}/depot_tools/gclient.py" sync \ + python2 "$srcdir"/depot_tools/gclient.py sync \ --with_branch_heads \ --with_tags \ --nohooks @@ -82,8 +80,8 @@ sed -e "s/'am'/'apply'/" -i src/electron/script/lib/git.py - echo "Running hooks..." - # python2 "${srcdir}/depot_tools/gclient.py" runhooks + 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 \ @@ -103,17 +101,17 @@ npm install cd .. - echo "Patching Chromium for using system libraries..." + 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}" + 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/*" \ + 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 @@ -122,7 +120,7 @@ --system-libraries \ "${_system_libs[@]}" - echo "Applying local patches..." + echo 'Applying local patches...' patch -Np0 -i ../chromium-skia-harmony.patch patch -Np1 -i ../use-system-libraries-in-node.patch patch -Np1 -i ../default_app-icon.patch # Icon from .desktop file @@ -135,7 +133,7 @@ export NM=nm cd src - export CHROMIUM_BUILDTOOLS_PATH="${PWD}/buildtools" + export CHROMIUM_BUILDTOOLS_PATH="$PWD"/buildtools GN_EXTRA_ARGS=' blink_symbol_level = 0 clang_use_chrome_p