<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/233fe32a3fc6f76ed21e064566cbaa3a21f77cdd">https://github.com/macports/macports-ports/commit/233fe32a3fc6f76ed21e064566cbaa3a21f77cdd</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 233fe32a3fc qt5-qtwebengine: update to 5.15.10
</span>233fe32a3fc is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 233fe32a3fc6f76ed21e064566cbaa3a21f77cdd
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Tue Jun 7 17:57:43 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> qt5-qtwebengine: update to 5.15.10
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> [skip ci]
</span>---
aqua/qt5/Portfile | 31 +++++------------
.../patch-qtwebengine_SkRasterPipeline_opts.h.diff | 32 ------------------
...ch-qtwebengine_harfbuzz_no_unused_variable.diff | 39 ----------------------
.../files/patch-qtwebengine_reenable_arm64.diff | 33 ------------------
devel/gn-devel/Portfile | 17 ++++------
.../files/patch-qtwebengine_gn_host_cpu_arm64.diff | 37 --------------------
6 files changed, 14 insertions(+), 175 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/Portfile b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 276283a4b8d..663827c733d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,14 +53,14 @@ master_sites \
</span> # latest qtwebengine 5.15.x releases are only tagged on git
if { ${subport} in [list "${name}-qtwebengine" "${name}-qtwebengine-docs"] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 5.15.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 5.15.10
</span> # set revision in module info below
# fetch archives generated by GitHub mirrors: repository uses submodule qtwebengine-chromium
# which has to be fetched separately and extracted into src/3rdparty
set qtwebengine_ref v${version}-lts
# keep this ref synchronized with qt5-qtwebengine-gn to allow distfile reuse
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set qtwebengine_chromium_ref d13d0924c4e18ecc4b79adf0fec142ee9a9eaa14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set qtwebengine_chromium_ref caba2fcb0fe8a8d213c4c79d26da3bb88eee61c7
</span>
distname qtwebengine-${version}-lts
set qtwebengine_distfile ${distname}${extract.suffix}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,13 +76,13 @@ if { ${subport} in [list "${name}-qtwebengine" "${name}-qtwebengine-docs"] } {
</span> https://github.com/qt/qtwebengine-chromium/archive/${qtwebengine_chromium_ref}:tagtwo
checksums ${qtwebengine_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 ca7786a90d222e891cb2625ab7da9edecb550ebe \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 cfa4a4d06ea3caacf319f360497820870273f97a6f6e2f30e27da6cab1d3c671 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3775445 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 6e7585f1fc06ce92d1a613a895af99d4ff8166b7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 69ac738ab48eea161ea9b66e3cbde9e74b631125074762adcae0909cdd4dc83d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3776553 \
</span> ${qtwebengine_chromium_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 160e76068d66f3f2291f57030a1e325914f3ee7d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 354189a637c3335f5b601501617706a5a376e4e546d673e9fcd68b2704d0cbc1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 462412318
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 3086df102608f70ca446840f21861c5472106812 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 be5f033fa0b3cbb8e39e036d5eed3daa20e426932fb5783dceb8beb375772e83 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 462179531
</span>
# Using system ninja: no need to extract bundled ninja
extract.post_args-append --exclude=${distname}/ninja/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1759,22 +1759,9 @@ foreach {module module_info} [array get modules] {
</span> | /usr/bin/patch -p0"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # avoid build issues on arm64:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # warning: 'memcpy' will always overflow; destination buffer has size 2, but size argument is 8 [-Wfortify-source]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # error: functional-style cast from 'neon_and_crc32::F' (aka 'V<float>') to '__fp16' is not allowed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-qtwebengine_SkRasterPipeline_opts.h.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # chromium/base/process/process_metrics_mac.cc assumes PAGE_SIZE is a constexpr
patchfiles-append patch-qtwebengine_chromium_static_page_size.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Upstream disabled building on Apple Silicon as of 5.15.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Re-enable building since MacPorts builds it successfully with patches
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-qtwebengine_reenable_arm64.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # backport harfbuzz fix needed for Xcode 13.3 clang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # error: variable 'supp_size' set but not used [-Werror,-Wunused-but-set-variable]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-qtwebengine_harfbuzz_no_unused_variable.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # see https://trac.macports.org/ticket/59294
use_xcode yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1947,8 +1934,6 @@ foreach {module module_info} [array get modules] {
</span> build.env-append CXX=${configure.cxx}
build.env-append CC=${configure.cc}
configure.args-append QMAKE_LINK=${configure.cxx}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # re-enable build on Apple Silicon
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-qtwebengine_reenable_arm64.diff
</span> # see https://trac.macports.org/ticket/59294
use_xcode yes
# Use bundled GN from separately-built qt5-qtwebengine-gn port
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtwebengine_SkRasterPipeline_opts.h.diff b/aqua/qt5/files/patch-qtwebengine_SkRasterPipeline_opts.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 077702e50f9..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-qtwebengine_SkRasterPipeline_opts.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,32 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Adapted from OpenBSD patch:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/x11/qt5/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_skia_src_opts_SkRasterPipeline_opts_h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-aarch64: revert "Fix building on aarch64 without fp16"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/qt/qtwebengine-chromium/commit/918116a76b56c63e740157b68d1c35708c091e4d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: src/3rdparty/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/3rdparty/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/3rdparty/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -980,9 +980,7 @@ SI F approx_powf(F x, F y) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SI F from_half(U16 h) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- __fp16 fp16;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- memcpy(&fp16, &h, sizeof(U16));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return float(fp16);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return vcvt_f32_f16(h);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_SKX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return _mm256_cvtph_ps(h);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1003,10 +1001,7 @@ SI F from_half(U16 h) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SI U16 to_half(F f) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- __fp16 fp16 = __fp16(f);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- U16 u16;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- memcpy(&u16, &fp16, sizeof(U16));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return u16;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return vcvt_f16_f32(f);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_SKX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return _mm256_cvtps_ph(f, _MM_FROUND_CUR_DIRECTION);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtwebengine_harfbuzz_no_unused_variable.diff b/aqua/qt5/files/patch-qtwebengine_harfbuzz_no_unused_variable.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2e17b574679..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-qtwebengine_harfbuzz_no_unused_variable.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,39 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 243d056ff1c2af583ceb67e5dfbfaac51dc96e63 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Andi-Bogdan Postelnicu <abpostelnicu@me.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 2 Jun 2021 14:08:11 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Removed unused variable `supp_size` from
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- plan_subset_encoding(...).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/hb-subset-cff1.cc | 4 +---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+), 3 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/hb-subset-cff1.cc b/src/hb-subset-cff1.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index df322f8451..35dae7b1f1 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/3rdparty/chromium/third_party/harfbuzz-ng/src/src/hb-subset-cff1.cc.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/3rdparty/chromium/third_party/harfbuzz-ng/src/src/hb-subset-cff1.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -402,7 +402,7 @@ struct cff_subset_plan {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void plan_subset_encoding (const OT::cff1::accelerator_subset_t &acc, hb_subset_plan_t *plan)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const Encoding *encoding = acc.encoding;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- unsigned int size0, size1, supp_size;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ unsigned int size0, size1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hb_codepoint_t code, last_code = CFF_UNDEF_CODE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hb_vector_t<hb_codepoint_t> supp_codes;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -412,7 +412,6 @@ struct cff_subset_plan {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- supp_size = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- supp_codes.init ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- subset_enc_num_codes = plan->num_output_glyphs () - 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -448,7 +447,6 @@ struct cff_subset_plan {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- code_pair_t pair = { supp_codes[i], sid };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- subset_enc_supp_codes.push (pair);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- supp_size += SuppEncoding::static_size * supp_codes.length;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- supp_codes.fini ();
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtwebengine_reenable_arm64.diff b/aqua/qt5/files/patch-qtwebengine_reenable_arm64.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b8c73b3eb32..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-qtwebengine_reenable_arm64.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,33 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Revert upstream commits 1c9785b and 3387ca5 since MacPorts has successfully
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patched and built qtwebengine on Apple Silicon.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git configure.pri configure.pri
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 8705ad9..e072961 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.pri
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.pri
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -140,10 +140,6 @@ defineTest(qtConfTest_detectPlatform) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- defineTest(qtConfTest_detectArch) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- macos:contains(QT_ARCHS, "arm64") {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- qtLog("Apple Silicon not supported yet.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return(false)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- contains(QT_ARCH, "i386")|contains(QT_ARCH, "x86_64"): return(true)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- contains(QT_ARCH, "arm")|contains(QT_ARCH, "arm64"): return(true)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- contains(QT_ARCH, "mips"): return(true)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/buildtools/config/support.pri src/buildtools/config/support.pri
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 7a07b1b..e7f869a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/buildtools/config/support.pri
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/buildtools/config/support.pri
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -110,10 +110,6 @@ defineTest(qtwebengine_checkForPlatform) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- defineTest(qtwebengine_checkForArch) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- module = $$1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- !qtConfig(webengine-arch-support) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- macos:contains(QT_ARCHS, "arm64") {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- qtwebengine_skipBuild("$${module} can not be built for Apple Silicon yet.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return(false)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qtwebengine_skipBuild("$${module} can only be built for x86, x86-64, ARM, Aarch64, and MIPSel architectures.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return(false)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gn-devel/Portfile b/devel/gn-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6000e3c69de..e154d225538 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gn-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gn-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,7 +14,7 @@ long_description GN is a meta-build system that generates build files for Nin
</span> homepage https://gn.googlesource.com/gn
subport qt5-qtwebengine-gn {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set hyphen_version 2020-12-10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set hyphen_version 2022-04-20
</span> version [string map {"-" ""} ${hyphen_version}]
revision 0
description {*}${description} (for building qtwebengine)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,28 +52,23 @@ if {${subport} eq ${name}} {
</span>
# Fetch archives generated by GitHub mirrors
# Use same ref as qt5-qtwebengine to reuse distfile,
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # even though bundled GN has not been updated since 5.15.3 (0d0da86)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # even though bundled GN has not been updated since 5.15.10 (2082566)
</span> # See https://github.com/qt/qtwebengine-chromium/commits/87-based/gn
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set qtwebengine_chromium_ref d13d0924c4e18ecc4b79adf0fec142ee9a9eaa14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set qtwebengine_chromium_ref caba2fcb0fe8a8d213c4c79d26da3bb88eee61c7
</span> fetch.type standard
dist_subdir qt5
distname qtwebengine-chromium-${qtwebengine_chromium_ref}
master_sites https://github.com/qt/qtwebengine-chromium/archive/${qtwebengine_chromium_ref}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 160e76068d66f3f2291f57030a1e325914f3ee7d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 354189a637c3335f5b601501617706a5a376e4e546d673e9fcd68b2704d0cbc1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 462412318
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 3086df102608f70ca446840f21861c5472106812 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 be5f033fa0b3cbb8e39e036d5eed3daa20e426932fb5783dceb8beb375772e83 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 462179531
</span>
# Just extract gn; do not extract all of chromium (~2GB) or ninja
worksrcdir ${distname}/gn
extract.post_args-append ${worksrcdir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch.pre_args -p3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Backport change to avoid "unknown current_cpu arm" build error on arm64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-qtwebengine_gn_host_cpu_arm64.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> compiler.cxx_standard 2014
# see https://github.com/qt/qtwebengine/blob/v5.15.8-lts/src/buildtools/gn.pro#L21
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gn-devel/files/patch-qtwebengine_gn_host_cpu_arm64.diff b/devel/gn-devel/files/patch-qtwebengine_gn_host_cpu_arm64.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 957c7c377d3..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gn-devel/files/patch-qtwebengine_gn_host_cpu_arm64.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,37 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From f45a703d8fd97817529e00a70ca4bae75abec3e3 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Nico Weber <thakis@chromium.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Thu, 2 Jul 2020 13:15:08 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] On arm64 hosts, set host_cpu to 'arm64', not 'arm'.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The existing `substr()` was likely to make armv7 etc all map
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-to "arm". 64-bit arm hosts should get "arm64", to be consistent
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-with target_cpu.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-At least on macOS, OperatingSystemArchitecture() returns "arm64",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-not "aarch64".
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Change-Id: I95b4d84040ad9984e303ced74a3a2685304bc78b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-on: https://gn-review.googlesource.com/c/gn/+/9261
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Brett Wilson <brettw@chromium.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Commit-Queue: Nico Weber <thakis@chromium.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/gn/args.cc | 4 ++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 2 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/gn/args.cc b/src/gn/args.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index c40c7e183..4d5a7204b 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/3rdparty/gn/tools/gn/args.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/3rdparty/gn/tools/gn/args.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -338,10 +338,10 @@ void Args::SetSystemVarsLocked(Scope* dest) const {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- arch = kX86;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if (os_arch == "x86_64")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- arch = kX64;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else if (os_arch == "aarch64" || os_arch == "arm64")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ arch = kArm64;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if (os_arch.substr(0, 3) == "arm")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- arch = kArm;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else if (os_arch == "aarch64")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- arch = kArm64;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if (os_arch == "mips")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- arch = kMips;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if (os_arch == "mips64")
</span></pre><pre style='margin:0'>
</pre>