<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d9b50f31b4bfd86d81552dabbd2b37fb78456bcd">https://github.com/macports/macports-ports/commit/d9b50f31b4bfd86d81552dabbd2b37fb78456bcd</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d9b50f31b4bfd86d81552dabbd2b37fb78456bcd
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Tue Jan 4 23:27:43 2022 -0600
<span style='display:block; white-space:pre;color:#404040;'> qt5-qtwebengine: update to 5.15.8
</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;'> Drop patch-qtwebengine_shrink_to_fit.diff
</span><span style='display:block; white-space:pre;color:#404040;'> in favor of upstream (Qt) approach
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Use subsequent commit from qtwebengine-chromium
</span><span style='display:block; white-space:pre;color:#404040;'> 87-based branch to include bugfix
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Do not extract ninja from qtwebengine-chromium distfile
</span><span style='display:block; white-space:pre;color:#404040;'> since build uses ninja from MacPorts
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Disable conflicts_build for now
</span>---
aqua/qt5/Portfile | 29 ++++++++++-------
.../qt5/files/patch-qtwebengine_shrink_to_fit.diff | 37 ----------------------
2 files changed, 17 insertions(+), 49 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 fd6fecc0cc0..f6913e84586 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;'>@@ -50,13 +50,15 @@ 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.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 5.15.8
</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;'>- set qtwebengine_chromium_ref 8c0a9b4459f5200a24ab9e687a3fb32e975382e5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # qtwebengine v5.15.8-lts specifies qtwebengine-chromium 0ad2814
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include bugfix from d505a37 (one commit after 0ad2814 on branch 87-based)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set qtwebengine_chromium_ref d505a379d3b1bd92d15c5a7051c3ed7b83743424
</span>
distname qtwebengine-${version}-lts
set qtwebengine_distfile ${distname}${extract.suffix}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,13 +74,16 @@ 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 57127dda5493cb13fbe2190bc547063de3c96957 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ef71f5bd741c917787a9431a2c359842de15a14126ef5f34ac28c8b0c07304ae \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3771725 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 bce8cf438c61aa74b85e300f92b7fc181721d52f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2f92476a1b635f441370836ca57855efdbb2cab0983f2d526b80cfb413631480 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3774901 \
</span> ${qtwebengine_chromium_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 2716c49007023523423ec24e31ac056d59ef3f13 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 75c79b886cf9c10778c5880754e1cf021e9a5e4fc372e8e6ab252d4ada263062 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 462432792
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 90cf613a0d96297bb4f1373287f22f9900cfedba \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a6c578f7feec67b090fd10e1462590ce6d2182b4e889f2f92a5fde5acbf84d38 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 462445254
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Using system ninja: no need to extract bundled ninja
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extract.post_args-append --exclude=${distname}/ninja/
</span>
post-extract {
ui_debug "delete ${worksrcpath}/src/3rdparty"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1714,7 +1719,10 @@ foreach {module module_info} [array get modules] {
</span>
# avoid
# Undefined symbols for architecture x86_64
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts_build-append ${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #conflicts_build-append ${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Disabled for now; not sure why this was needed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See https://github.com/macports/macports-ports/commit/bd858ac96b41#commitcomment-61755245
</span>
# do not opportunistically find MacPorts libraries (e.g. X11 libraries)
patchfiles-append patch-qtwebengine_tests.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1751,9 +1759,6 @@ foreach {module module_info} [array get modules] {
</span> # error: functional-style cast from 'neon_and_crc32::F' (aka 'V<float>') to '__fp16' is not allowed
patchfiles-append patch-qtwebengine_SkRasterPipeline_opts.h.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # workaround for https://trac.macports.org/ticket/63725
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-qtwebengine_shrink_to_fit.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;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtwebengine_shrink_to_fit.diff b/aqua/qt5/files/patch-qtwebengine_shrink_to_fit.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0d52aa9493a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-qtwebengine_shrink_to_fit.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;'>-https://trac.macports.org/ticket/63725#comment:12
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-UTFConversion() in chromium/base/strings/utf_string_conversions.cc requires
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-base::string16::shrink_to_fit(). When chromium/base/strings/string16.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-is compiled with the macOS 12 SDK, the output object file contains
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-base::string16::reserve(unsigned long), but not base::string16::shrink_to_fit().
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Since reserve(0) is equivalent to shrink_to_fit() for std::basic_string
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-in C++17 and earlier, and string16.cc is being compiled with -std=c++14,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-UTFConversion() can instead use reserve(0) as a workaround.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Compile relevant files separately from jumbo build for debugging.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/3rdparty/chromium/base/BUILD.gn.orig 2021-10-19 13:12:47.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/3rdparty/chromium/base/BUILD.gn 2021-11-30 01:54:23.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -901,6 +901,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- jumbo_excluded_sources = [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "logging.cc",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "strings/string16.cc",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "strings/utf_string_conversions.cc",
</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;'>- if (is_win) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/chromium/base/strings/utf_string_conversions.cc b/chromium/base/strings/utf_string_conversions.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0b55cd9e5..2451a4311 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/3rdparty/chromium/base/strings/utf_string_conversions.cc.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/3rdparty/chromium/base/strings/utf_string_conversions.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -202,7 +202,7 @@ bool UTFConversion(const InputString& src_str, DestString* dest_str) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool res = DoUTFConversion(src_str.data(), src_len32, dest, &dest_len32);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dest_str->resize(dest_len32);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- dest_str->shrink_to_fit();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ dest_str->reserve(0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return res;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span></pre><pre style='margin:0'>
</pre>