<pre style='margin:0'>
Mohamed Akram (mohd-akram) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f9a4136c48020b01ecc6dffa99b88333c360f056">https://github.com/macports/macports-ports/commit/f9a4136c48020b01ecc6dffa99b88333c360f056</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 f9a4136c480 qt5-qtwebengine: fix build
</span>f9a4136c480 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f9a4136c48020b01ecc6dffa99b88333c360f056
</span>Author: Mohamed Akram <makr@macports.org>
AuthorDate: Mon Jan 6 20:10:21 2025 +0400
<span style='display:block; white-space:pre;color:#404040;'> qt5-qtwebengine: fix build
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - use ffmpeg4
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/71563
</span>---
aqua/qt5/Portfile | 7 ++++++-
aqua/qt5/files/patch-qtwebengine-chromium-freetype-gzip.diff | 12 ++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
<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 2f225ce9104..81a786198f9 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;'>@@ -676,7 +676,7 @@ array set modules {
</span> qtwebengine {
{}
"port:python27 port:py27-ply path:bin/ninja:ninja port:gperf port:bison port:flex port:qt5-qtwebengine-gn"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "port:fontconfig port:dbus path:lib/pkgconfig/harfbuzz.pc:harfbuzz path:lib/pkgconfig/glib-2.0.pc:glib2 port:zlib port:minizip port:libevent port:libxml2 path:lib/pkgconfig/poppler.pc:poppler port:pulseaudio path:lib/libavcodec.dylib:ffmpeg port:libopus port:webp port:libpng port:lcms2 port:freetype port:re2 port:snappy"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "port:fontconfig port:dbus path:lib/pkgconfig/harfbuzz.pc:harfbuzz path:lib/pkgconfig/glib-2.0.pc:glib2 port:zlib port:minizip port:libevent port:libxml2 path:lib/pkgconfig/poppler.pc:poppler port:pulseaudio port:ffmpeg4 port:libopus port:webp port:libpng port:lcms2 port:freetype port:re2 port:snappy"
</span> "qtdeclarative qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools"
{"Qt WebEngine"}
"very large and relatively new"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1768,6 +1768,9 @@ 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;'>+ # Fix build on macOS 15+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtwebengine-chromium-freetype-gzip.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;'>@@ -1780,6 +1783,8 @@ foreach {module module_info} [array get modules] {
</span> -system-webengine-icu \
-system-webengine-ffmpeg
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pkg_config_path ${prefix}/libexec/ffmpeg4/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # missing file spell_check_host_chrome_impl_mac.cc
# TODO: investigate further
configure.post_args-delete \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtwebengine-chromium-freetype-gzip.diff b/aqua/qt5/files/patch-qtwebengine-chromium-freetype-gzip.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4397b672a5b
</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-chromium-freetype-gzip.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From Freetype 1.12.0+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/chromium/third_party/freetype/src/src/gzip/ftzconf.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/chromium/third_party/freetype/src/src/gzip/ftzconf.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -215,7 +215,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define FAR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !defined(MACOS) && !defined(TARGET_OS_MAC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(__MACTYPES__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef unsigned char Byte; /* 8 bits */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef unsigned int uInt; /* 16 bits or more */
</span></pre><pre style='margin:0'>
</pre>