<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/55faeb15ba24ecb1e3c8cc024453a0c8488e0ab6">https://github.com/macports/macports-ports/commit/55faeb15ba24ecb1e3c8cc024453a0c8488e0ab6</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 55faeb15ba2 qt6-qtbase: Fix build with CMake 3.28
</span>55faeb15ba2 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 55faeb15ba24ecb1e3c8cc024453a0c8488e0ab6
</span>Author: Filippe LeMarchand <gasinvein@gmail.com>
AuthorDate: Sat Apr 20 14:11:10 2024 +0300

<span style='display:block; white-space:pre;color:#404040;'>    qt6-qtbase: Fix build with CMake 3.28
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/68713
</span>---
 aqua/qt6/Portfile                               |  3 ++
 aqua/qt6/files/patch-qtbase-fix-cmake-3.28.diff | 45 +++++++++++++++++++++++++
 2 files changed, 48 insertions(+)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt6/Portfile b/aqua/qt6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ece1efa5819..7259d7a2696 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1053,6 +1053,9 @@ if { ${subport} eq "${name}-qtbase" || ${subport} eq "${name}-qtbase-docs" } {
</span>     # see https://codereview.qt-project.org/c/qt/qtbase/+/507393
     patchfiles-append               patch-qtbase-macdeployqt.diff
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    # see https://trac.macports.org/ticket/68713
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append               patch-qtbase-fix-cmake-3.28.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     configure.pre_args-replace      --prefix=${prefix} \
                                     "-prefix ${qt6.dir}"
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt6/files/patch-qtbase-fix-cmake-3.28.diff b/aqua/qt6/files/patch-qtbase-fix-cmake-3.28.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..923476a4735
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt6/files/patch-qtbase-fix-cmake-3.28.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,45 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 0efea8020c1d221635aaa0a71529edb392cfe3cc Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Joerg Bornemann <joerg.bornemann@qt.io>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 11 Sep 2023 14:48:32 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] CMake: Fix build with CMake 3.28 on macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+FindWrapOpenGL.cmake assumed that IMPORTED_LOCATION is the absolute path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+of the library within the framework. That's not the case with CMake 3.28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+anymore. There, IMPORTED_LOCATION is the absolute path of the framework
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+directory.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The relevant upstream CMake change is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+6b01a27f901b5eb392955fea322cde44a1b782a3.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Pick-to: 6.2 6.5 6.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Change-Id: I6b702a28318e0978c56dec83c398965aa77ef020
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake/FindWrapOpenGL.cmake | 8 ++++++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 6 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/cmake/FindWrapOpenGL.cmake b/cmake/FindWrapOpenGL.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3e6abaf4dda..7295a159caf 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/FindWrapOpenGL.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/FindWrapOpenGL.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,14 +17,18 @@ if (OpenGL_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     add_library(WrapOpenGL::WrapOpenGL INTERFACE IMPORTED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        # CMake 3.27 and older:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         # On Darwin platforms FindOpenGL sets IMPORTED_LOCATION to the absolute path of the library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         # within the framework. This ends up as an absolute path link flag, which we don't want,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         # because that makes our .prl files un-relocatable.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         # Extract the framework path instead, and use that in INTERFACE_LINK_LIBRARIES,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        # which CMake ends up transforming into a reloctable -framework flag.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        # which CMake ends up transforming into a relocatable -framework flag.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         # See https://gitlab.kitware.com/cmake/cmake/-/issues/20871 for details.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        # CMake 3.28 and above:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        # IMPORTED_LOCATION is the absolute path the the OpenGL.framework folder.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         get_target_property(__opengl_fw_lib_path OpenGL::GL IMPORTED_LOCATION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        if(__opengl_fw_lib_path)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        if(__opengl_fw_lib_path AND NOT __opengl_fw_lib_path MATCHES "/([^/]+)\\.framework$")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             get_filename_component(__opengl_fw_path "${__opengl_fw_lib_path}" DIRECTORY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span></pre><pre style='margin:0'>

</pre>