<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/623983cf59c224e2c0e7a78745d87b040de5ba98">https://github.com/macports/macports-ports/commit/623983cf59c224e2c0e7a78745d87b040de5ba98</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 623983cf59c qt5-qtwebengine: update to 5.15.9
</span>623983cf59c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 623983cf59c224e2c0e7a78745d87b040de5ba98
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Wed Apr 6 07:18:07 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> qt5-qtwebengine: update to 5.15.9
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> [skip ci]
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add patch re-enabling Apple Silicon builds (disabled by upstream)
</span>---
aqua/qt5/Portfile | 29 ++++++++++------
...ch-qtwebengine_harfbuzz_no_unused_variable.diff | 39 ++++++++++++++++++++++
.../files/patch-qtwebengine_reenable_arm64.diff | 33 ++++++++++++++++++
devel/gn-devel/Portfile | 8 ++---
4 files changed, 95 insertions(+), 14 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 d1d0e950c36..24b20ba9efb 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,15 +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.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 5.15.9
</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
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # qtwebengine v5.15.8-lts specifies qtwebengine-chromium 0ad2814
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include bugfix from d505a37 (one commit after 0ad2814 on branch 87-based)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set qtwebengine_chromium_ref d505a379d3b1bd92d15c5a7051c3ed7b83743424
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # keep this ref synchronized with qt5-qtwebengine-gn to allow distfile reuse
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set qtwebengine_chromium_ref d13d0924c4e18ecc4b79adf0fec142ee9a9eaa14
</span>
distname qtwebengine-${version}-lts
set qtwebengine_distfile ${distname}${extract.suffix}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,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 bce8cf438c61aa74b85e300f92b7fc181721d52f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2f92476a1b635f441370836ca57855efdbb2cab0983f2d526b80cfb413631480 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3774901 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 ca7786a90d222e891cb2625ab7da9edecb550ebe \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 cfa4a4d06ea3caacf319f360497820870273f97a6f6e2f30e27da6cab1d3c671 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3775445 \
</span> ${qtwebengine_chromium_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 90cf613a0d96297bb4f1373287f22f9900cfedba \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a6c578f7feec67b090fd10e1462590ce6d2182b4e889f2f92a5fde5acbf84d38 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 462445254
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 160e76068d66f3f2291f57030a1e325914f3ee7d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 354189a637c3335f5b601501617706a5a376e4e546d673e9fcd68b2704d0cbc1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 462412318
</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;'>@@ -1768,6 +1767,14 @@ foreach {module module_info} [array get modules] {
</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:#e0ffe0;'>+ # Upstream disabled building on Apple Silicon as of 5.15.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Re-enable building since MacPorts builds it successfully with patches
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtwebengine_reenable_arm64.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # backport harfbuzz fix needed for Xcode 13.3 clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # error: variable 'supp_size' set but not used [-Werror,-Wunused-but-set-variable]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtwebengine_harfbuzz_no_unused_variable.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # see https://trac.macports.org/ticket/59294
use_xcode yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1940,6 +1947,8 @@ 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:#e0ffe0;'>+ # re-enable build on Apple Silicon
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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_harfbuzz_no_unused_variable.diff b/aqua/qt5/files/patch-qtwebengine_harfbuzz_no_unused_variable.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..2e17b574679
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-qtwebengine_harfbuzz_no_unused_variable.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,39 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 243d056ff1c2af583ceb67e5dfbfaac51dc96e63 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Andi-Bogdan Postelnicu <abpostelnicu@me.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 2 Jun 2021 14:08:11 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Removed unused variable `supp_size` from
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ plan_subset_encoding(...).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/hb-subset-cff1.cc | 4 +---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 3 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/hb-subset-cff1.cc b/src/hb-subset-cff1.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index df322f8451..35dae7b1f1 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/chromium/third_party/harfbuzz-ng/src/src/hb-subset-cff1.cc.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/chromium/third_party/harfbuzz-ng/src/src/hb-subset-cff1.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -402,7 +402,7 @@ struct cff_subset_plan {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const Encoding *encoding = acc.encoding;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- unsigned int size0, size1, supp_size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ unsigned int size0, size1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hb_codepoint_t code, last_code = CFF_UNDEF_CODE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hb_vector_t<hb_codepoint_t> supp_codes;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -412,7 +412,6 @@ struct cff_subset_plan {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- supp_size = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ supp_codes.init ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subset_enc_num_codes = plan->num_output_glyphs () - 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -448,7 +447,6 @@ struct cff_subset_plan {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ code_pair_t pair = { supp_codes[i], sid };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subset_enc_supp_codes.push (pair);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- supp_size += SuppEncoding::static_size * supp_codes.length;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b8c73b3eb32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-qtwebengine_reenable_arm64.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Revert upstream commits 1c9785b and 3387ca5 since MacPorts has successfully
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patched and built qtwebengine on Apple Silicon.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git configure.pri configure.pri
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8705ad9..e072961 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.pri
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.pri
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -140,10 +140,6 @@ defineTest(qtConfTest_detectPlatform) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ defineTest(qtConfTest_detectArch) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- macos:contains(QT_ARCHS, "arm64") {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- qtLog("Apple Silicon not supported yet.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return(false)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ contains(QT_ARCH, "i386")|contains(QT_ARCH, "x86_64"): return(true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ contains(QT_ARCH, "arm")|contains(QT_ARCH, "arm64"): return(true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ contains(QT_ARCH, "mips"): return(true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/buildtools/config/support.pri src/buildtools/config/support.pri
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7a07b1b..e7f869a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/buildtools/config/support.pri
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/buildtools/config/support.pri
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -110,10 +110,6 @@ defineTest(qtwebengine_checkForPlatform) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ defineTest(qtwebengine_checkForArch) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ module = $$1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !qtConfig(webengine-arch-support) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- macos:contains(QT_ARCHS, "arm64") {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- qtwebengine_skipBuild("$${module} can not be built for Apple Silicon yet.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return(false)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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:#e0ffe0;'>+ return(false)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</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 3d9ef8e3544..6000e3c69de 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;'>@@ -54,16 +54,16 @@ if {${subport} eq ${name}} {
</span> # Use same ref as qt5-qtwebengine to reuse distfile,
# even though bundled GN has not been updated since 5.15.3 (0d0da86)
# See https://github.com/qt/qtwebengine-chromium/commits/87-based/gn
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set qtwebengine_chromium_ref d505a379d3b1bd92d15c5a7051c3ed7b83743424
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set qtwebengine_chromium_ref d13d0924c4e18ecc4b79adf0fec142ee9a9eaa14
</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 90cf613a0d96297bb4f1373287f22f9900cfedba \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a6c578f7feec67b090fd10e1462590ce6d2182b4e889f2f92a5fde5acbf84d38 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 462445254
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 160e76068d66f3f2291f57030a1e325914f3ee7d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 354189a637c3335f5b601501617706a5a376e4e546d673e9fcd68b2704d0cbc1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 462412318
</span>
# Just extract gn; do not extract all of chromium (~2GB) or ninja
worksrcdir ${distname}/gn
</pre><pre style='margin:0'>
</pre>