<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9062d45125d4026f8d426dc991665126583c2c3e">https://github.com/macports/macports-ports/commit/9062d45125d4026f8d426dc991665126583c2c3e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 9062d45125d4026f8d426dc991665126583c2c3e
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Fri Jul 22 13:53:13 2022 -0500

<span style='display:block; white-space:pre;color:#404040;'>    qt5-qtbase: keep relevant lines together
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    [skip ci]
</span>---
 aqua/qt5/Portfile | 5 ++---
 1 file changed, 2 insertions(+), 3 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 1b63837c5fd..cea0f17c68b 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;'>@@ -1064,9 +1064,6 @@ foreach {module module_info} [array get modules] {
</span>             # see https://trac.macports.org/ticket/63805#comment:13
             patchfiles-append patch-sdk-no-stderr.diff
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            # find the Rez program
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            patchfiles-append patch-find_rez.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>             # Backported upstream patch to build with the macOS 12 SDK.
             # https://github.com/qt/qtbase/commit/dece6f5840463ae2ddf927d65eb1b3680e34a547
             patchfiles-append patch-qiosurfacegraphicsbuffer.h.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1074,6 +1071,8 @@ foreach {module module_info} [array get modules] {
</span>             # Backport from 5.15.6
             patchfiles-append patch-cve-2021-38593.diff
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+            # find the Rez program
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            patchfiles-append patch-find_rez.diff
</span>             post-patch {
                 reinplace \
                     "s|__MACPORTS_Rez__|[exec -ignorestderr xcrun --find Rez]|g" \
</pre><pre style='margin:0'>

</pre>