<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/f4633cbe77911ec31e4adadb896adf38c13a4786">https://github.com/macports/macports-ports/commit/f4633cbe77911ec31e4adadb896adf38c13a4786</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f4633cbe77911ec31e4adadb896adf38c13a4786
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Mon Apr 15 13:17:16 2024 -0400

<span style='display:block; white-space:pre;color:#404040;'>    glib2{,-devel}: cleanup patches
</span>---
 devel/glib2-devel/Portfile | 40 +++++++++++++++++++++-------------------
 devel/glib2/Portfile       | 40 +++++++++++++++++++++-------------------
 2 files changed, 42 insertions(+), 38 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/Portfile b/devel/glib2-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 68622d3a94c..ecebd98820f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,31 +43,33 @@ meson.wrap_mode             nodownload
</span> # Needed for clock_gettime
 legacysupport.newest_darwin_requires_legacy 15
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append           libintl.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            patch-gio-tests-meson.build.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            patch-glib_gmem.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            patch-glib_gspawn.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            patch-glib_gunicollate.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            patch-gio_xdgmime_xdgmime.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            patch-get-launchd-dbus-session-address.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            patch-gmodule-gmodule-dl.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            patch-meson_build-meson_options-appinfo.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            patch-meson-build-python-path.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            patch-meson_build-atomic-test-older-clang-versions.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            universal.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            patch-glib2-findfolders-before-SL.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            patch-declarations.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            no-distutils.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append           libintl.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append           patch-gio-tests-meson.build.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append           patch-glib_gmem.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append           patch-glib_gspawn.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append           patch-glib_gunicollate.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append           patch-gio_xdgmime_xdgmime.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append           patch-get-launchd-dbus-session-address.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append           patch-gmodule-gmodule-dl.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append           patch-meson_build-meson_options-appinfo.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append           patch-meson-build-python-path.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append           patch-meson_build-atomic-test-older-clang-versions.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append           universal.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append           patch-glib2-findfolders-before-SL.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append           patch-declarations.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append           no-distutils.patch
</span> 
 platform darwin {
     if {${os.major} < 11} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        patchfiles-append   patch-gio_gcredentialsprivate.h.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            patch-gio_gcredentials.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            patch-gio_gsocket.h.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        patchfiles-append   patch-gio_gcredentialsprivate.h.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        patchfiles-append   patch-gio_gcredentials.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        patchfiles-append   patch-gio_gsocket.h.diff
</span>     }
 
     if {${os.major} == 10 && ${build_arch} eq "ppc"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        patchfiles-replace  patch-glib2-findfolders-before-SL.diff patch-glib2-findfolders-before-Lion.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        patchfiles-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            patch-glib2-findfolders-before-SL.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            patch-glib2-findfolders-before-Lion.diff
</span>     }
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/Portfile b/devel/glib2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8b53f95e433..0a68b3d70f2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,31 +43,33 @@ meson.wrap_mode             nodownload
</span> # Needed for clock_gettime
 legacysupport.newest_darwin_requires_legacy 15
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append           libintl.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            patch-gio-tests-meson.build.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            patch-glib_gmem.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            patch-glib_gspawn.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            patch-glib_gunicollate.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            patch-gio_xdgmime_xdgmime.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            patch-get-launchd-dbus-session-address.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            patch-gmodule-gmodule-dl.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            patch-meson_build-meson_options-appinfo.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            patch-meson-build-python-path.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            patch-meson_build-atomic-test-older-clang-versions.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            universal.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            patch-glib2-findfolders-before-SL.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            patch-declarations.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            no-distutils.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append           libintl.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append           patch-gio-tests-meson.build.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append           patch-glib_gmem.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append           patch-glib_gspawn.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append           patch-glib_gunicollate.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append           patch-gio_xdgmime_xdgmime.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append           patch-get-launchd-dbus-session-address.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append           patch-gmodule-gmodule-dl.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append           patch-meson_build-meson_options-appinfo.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append           patch-meson-build-python-path.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append           patch-meson_build-atomic-test-older-clang-versions.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append           universal.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append           patch-glib2-findfolders-before-SL.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append           patch-declarations.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append           no-distutils.patch
</span> 
 platform darwin {
     if {${os.major} < 11} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        patchfiles-append   patch-gio_gcredentialsprivate.h.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            patch-gio_gcredentials.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            patch-gio_gsocket.h.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        patchfiles-append   patch-gio_gcredentialsprivate.h.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        patchfiles-append   patch-gio_gcredentials.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        patchfiles-append   patch-gio_gsocket.h.diff
</span>     }
 
     if {${os.major} == 10 && ${build_arch} eq "ppc"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        patchfiles-replace  patch-glib2-findfolders-before-SL.diff patch-glib2-findfolders-before-Lion.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        patchfiles-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            patch-glib2-findfolders-before-SL.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            patch-glib2-findfolders-before-Lion.diff
</span>     }
 }
 
</pre><pre style='margin:0'>

</pre>