<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/a9ba31ffe6bdd86b9c13737aa583e7c003f1fb58">https://github.com/macports/macports-ports/commit/a9ba31ffe6bdd86b9c13737aa583e7c003f1fb58</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a9ba31ffe6bdd86b9c13737aa583e7c003f1fb58
</span>Author: Mark Anderson <mark@macports.org>
AuthorDate: Fri Sep 27 20:13:19 2024 -0400
<span style='display:block; white-space:pre;color:#404040;'> qt5-qtwebengine: fix build errors on macOS 15
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Turn off following warnings qt5-qtwebengine:
</span><span style='display:block; white-space:pre;color:#404040;'> * `-Wenum-constexpr-conversion`
</span><span style='display:block; white-space:pre;color:#404040;'> * `-Wunused-but-set-variable`
</span><span style='display:block; white-space:pre;color:#404040;'> * Fix -Wcast-function-type-struct errors in harfbuzz
</span><span style='display:block; white-space:pre;color:#404040;'> * Add missing dependencies in ninja files
</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/70850
</span>---
aqua/qt5/Portfile | 14 ++++++++
.../files/patch-qtwebengine-browser-build.gn.diff | 20 +++++++++++
.../files/patch-qtwebengine_hb-ft.cc_error.diff | 42 ++++++++++++++++++++++
.../files/patch-qtwebengine_v8_build.gn_error.diff | 11 ++++++
4 files changed, 87 insertions(+)
<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 b0b107b834e..3a8eacef35d 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;'>@@ -1784,6 +1784,20 @@ foreach {module module_info} [array get modules] {
</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:#e0ffe0;'>+ # Fix warning in ht-ff.cc causing error
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fix based on https://github.com/harfbuzz/harfbuzz/commit/d88269c827895b38f99f7cf741fa60210d4d5169
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See: https://trac.macports.org/ticket/70850
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtwebengine_hb-ft.cc_error.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fix missing header files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # from fix recommended in https://bugreports.qt.io/browse/QTBUG-124375
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtwebengine-browser-build.gn.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Suppress following warnings to avoid Warnings-as-errors:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -Wenum-constexpr-conversion
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -Wunused-but-set-variable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtwebengine_v8_build.gn_error.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # run syncqt.pl to generate headers needed to build from git snapshot (rather than release tarball)
# system Perl is sufficient, since syncqt.pl only uses standard core modules
# (although future macOS may not include Perl)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtwebengine-browser-build.gn.diff b/aqua/qt5/files/patch-qtwebengine-browser-build.gn.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f405a5e393d
</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-browser-build.gn.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/chromium/components/history/core/browser/BUILD.gn 2024-09-29 17:51:16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/chromium/components/history/core/browser/BUILD.gn 2024-09-29 17:52:37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -106,6 +106,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "//components/prefs",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "//components/query_parser",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "//components/signin/public/identity_manager",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "//components/signin/public/base:signin_buildflags",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "//components/sync",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "//components/url_formatter",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "//components/variations",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/chromium/content/public/browser/BUILD.gn 2024-09-29 19:28:09
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/chromium/content/public/browser/BUILD.gn 2024-09-29 19:29:18
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -469,6 +469,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "//build:chromeos_buildflags",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "//cc",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "//components/viz/host",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "//components/spellcheck:buildflags",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "//content/browser", # Must not be public_deps!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "//device/fido",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "//gpu",
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtwebengine_hb-ft.cc_error.diff b/aqua/qt5/files/patch-qtwebengine_hb-ft.cc_error.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a230a68734d
</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_hb-ft.cc_error.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,42 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/chromium/third_party/harfbuzz-ng/src/src/hb-ft.cc 2024-09-27 18:46:30
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/chromium/third_party/harfbuzz-ng/src/src/hb-ft.cc 2024-09-27 18:46:18
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -729,8 +729,9 @@
</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;'>+ static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-hb_ft_face_finalize (FT_Face ft_face)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++hb_ft_face_finalize (void *arg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ FT_Face ft_face = (FT_Face) arg;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hb_face_destroy ((hb_face_t *) ft_face->generic.data);
</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;'>+@@ -762,7 +763,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ft_face->generic.finalizer (ft_face);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ft_face->generic.data = hb_ft_face_create (ft_face, nullptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ft_face->generic.finalizer = (FT_Generic_Finalizer) hb_ft_face_finalize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ft_face->generic.finalizer = hb_ft_face_finalize;
</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;'>+ return hb_face_reference ((hb_face_t *) ft_face->generic.data);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -949,8 +950,9 @@
</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;'>+ static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-_release_blob (FT_Face ft_face)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_release_blob (void *arg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ FT_Face ft_face = (FT_Face) arg;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hb_blob_destroy ((hb_blob_t *) ft_face->generic.data);
</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;'>+@@ -1032,7 +1034,7 @@
</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;'>+ ft_face->generic.data = blob;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ft_face->generic.finalizer = (FT_Generic_Finalizer) _release_blob;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ft_face->generic.finalizer = _release_blob;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _hb_ft_font_set_funcs (font, ft_face, true);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hb_ft_font_set_load_flags (font, FT_LOAD_DEFAULT | FT_LOAD_NO_HINTING);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtwebengine_v8_build.gn_error.diff b/aqua/qt5/files/patch-qtwebengine_v8_build.gn_error.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ec30faaff45
</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_v8_build.gn_error.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/chromium/build/config/compiler/BUILD.gn 2024-09-27 21:58:44
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/chromium/build/config/compiler/BUILD.gn 2024-09-27 22:00:31
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -318,6 +318,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-Wno-parentheses-equality",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-Wno-tautological-compare",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-Wno-thread-safety-attributes",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "-Wno-enum-constexpr-conversion",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "-Wno-unused-but-set-variable"
</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;'>+
</span></pre><pre style='margin:0'>
</pre>