<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/84b03efe654c40d21fe76f2625043eb36e6d5e17">https://github.com/macports/macports-ports/commit/84b03efe654c40d21fe76f2625043eb36e6d5e17</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 84b03efe654c40d21fe76f2625043eb36e6d5e17
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Fri Dec 6 23:03:27 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> qt64-qtbase: fix build on macOS 15
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - update dependencies for subports, similarly as for Qt 6.8.1
</span>---
aqua/qt64/Portfile | 45 ++++++++++++++++++++++++++++-----------------
1 file changed, 28 insertions(+), 17 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt64/Portfile b/aqua/qt64/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 66dfab00b40..6be76d3eff5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt64/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt64/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,6 +47,12 @@ foreach {qt_base qt_info} ${qt6::available_versions} {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# qt64-qtbase is broken on macOS 15+ because of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# `error: 'CGDisplayCreateImageForRect' is unavailable: obsoleted in macOS 15.0 - Please use ScreenCaptureKit instead.`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin 24 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macosx_deployment_target 14.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # MacPorts LLVM/Clang version to use when required
set llvm_version 17
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,12 +152,12 @@ array set modules {
</span> 5941312
}
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "path:lib/libavcodec.dylib:ffmpeg port:pulseaudio"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "port:ffmpeg7 port:pulseaudio"
</span> "qtbase qtshadertools qtdeclarative qtquick3d"
{"Qt Multimedia"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 2"
</span> "License: "
}
qttools {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -161,12 +167,12 @@ array set modules {
</span> 8738280
}
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "port:clang-${llvm_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "port:clang-${llvm_version} path:lib/pkgconfig/libzstd.pc:zstd"
</span> "qtbase qtdeclarative"
{"Qt Designer" "Qt Help" "Qt UI Tools"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 2"
</span> "License: "
}
qttranslations {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -175,13 +181,13 @@ array set modules {
</span> 79e56b7800d49649a8a8010818538c367a829e0b7a09d5f60bd3aecf5abe972c
1466828
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "port:qt64-qttools"
</span> ""
""
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ "qttools"
</span> {"translation files"}
""
"variant overrides: ~examples ~tests ~debug noarch ~docs"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 2"
</span> "License: "
}
qtdoc {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -206,12 +212,12 @@ array set modules {
</span> 1494352
}
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "port:gconf"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "port:gconf port:gettext-runtime path:lib/pkgconfig/glib-2.0.pc:glib2"
</span> "qtbase qtdeclarative qtserialport"
{"Qt Positioning"}
""
"variant overrides: ~examples ~tests"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: "
}
qtsensors {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -251,12 +257,12 @@ array set modules {
</span> 104002896
}
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "port:assimp"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "port:assimp port:zlib port:minizip port:pugixml"
</span> "qtbase qtdeclarative qtshadertools"
{"Qt 3D"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: "
}
qtimageformats {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -266,7 +272,8 @@ array set modules {
</span> 1962440
}
""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "path:lib/pkgconfig/jasper.pc:jasper port:libmng port:tiff port:webp"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "path:lib/pkgconfig/jasper.pc:jasper port:libmng port:tiff port:webp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:include/turbojpeg.h:libjpeg-turbo"
</span> "qtbase"
{"Qt Image Formats"}
""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -341,16 +348,12 @@ array set modules {
</span> 440562844
}
"path:bin/node:nodejs20 port:python${python_version} port:py${python_version}-html5lib"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "port:re2 port:webp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libopus path:lib/libavcodec.dylib:ffmpeg path:lib/pkgconfig/vpx.pc:libvpx \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:snappy path:lib/pkgconfig/glib-2.0.pc:glib2 port:zlib port:minizip port:libevent \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libxml2 port:libxslt port:lcms2 port:libpng path:include/turbojpeg.h:libjpeg-turbo \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/harfbuzz.pc:harfbuzz port:freetype port:pciutils port:pulseaudio"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "port:libpng port:zlib"
</span> "qtdeclarative qtwebchannel qttools qtpositioning"
{"Qt WebEngine Qt" "Qt PDF"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 6"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 7"
</span> "License: "
}
qtwebview {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -995,6 +998,14 @@ subport ${name}-qtmultimedia {
</span> # https://code.qt.io/cgit/qt/qtmultimedia.git/tree/src/multimedia/configure.cmake
configure.args-append -no-gstreamer
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.post_args-append -DFFMPEG_DIR=/opt/local/libexec/ffmpeg7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DAVCODEC_INCLUDE_DIR=/opt/local/libexec/ffmpeg7/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DAVCODEC_LIBRARY=/opt/local/libexec/ffmpeg7/lib/libavcodec.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DAVFORMAT_INCLUDE_DIR=/opt/local/libexec/ffmpeg7/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DAVFORMAT_LIBRARY=/opt/local/libexec/ffmpeg7/lib/libavformat.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DAVUTIL_INCLUDE_DIR=/opt/local/libexec/ffmpeg7/include\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DAVUTIL_LIBRARY=/opt/local/libexec/ffmpeg7/lib/libavutil.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # std::unary_function removed in Xcode clang 15
patchfiles-append patch-qtmultimedia_no_std_unary_function.diff
}
</pre><pre style='margin:0'>
</pre>