<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/2d9ebf487993915a305fc9914cd4d9443cdb8eb7">https://github.com/macports/macports-ports/commit/2d9ebf487993915a305fc9914cd4d9443cdb8eb7</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 2d9ebf487993915a305fc9914cd4d9443cdb8eb7
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Thu Jul 7 11:39:09 2022 -0400

<span style='display:block; white-space:pre;color:#404040;'>    glib2-devel: update to 2.68.4
</span>---
 devel/glib2-devel/Portfile                           | 11 +++++------
 .../glib2-devel/files/patch-gio_gdbusprivate.c.diff  | 20 --------------------
 2 files changed, 5 insertions(+), 26 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 34bed627c4f..a397ec7dde7 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;'>@@ -11,11 +11,11 @@ PortGroup                   muniversal 1.0
</span> name                        glib2-devel
 conflicts                   glib2 glib2-upstream
 set my_name                 glib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version                     2.66.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version                     2.68.4
</span> revision                    0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums                   rmd160  d0cf7cb648c93cfee7288c586960b164d5e85f21 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            sha256  97bc87dd91365589af5cbbfea2574833aea7a1b71840fd365ecd2852c76b9c8b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            size    4845548
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums                   rmd160  cf4d834a0e8f5e77ba39d627290ac0263ba0f177 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            sha256  62fd061d08a75492617e625a73e2c05e259f831acbb8e1f8b9c81f23f7993a3b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            size    4945212
</span> 
 set branch                  [join [lrange [split ${version} .] 0 1] .]
 categories                  devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +41,6 @@ patchfiles                  libintl.patch \
</span>                             patch-gio-tests-meson.build.diff \
                             patch-glib_gunicollate.c.diff \
                             patch-gio_xdgmime_xdgmime.c.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            patch-gio_gdbusprivate.c.diff \
</span>                             patch-get-launchd-dbus-session-address.diff \
                             patch-gmodule-gmodule-dl.c.diff \
                             patch-meson_build-meson_options-appinfo.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,7 +100,7 @@ if {${universal_possible} && [variant_isset universal]} {
</span> 
 post-patch {
     reinplace -W ${worksrcpath} "s|@PYTHON@|${configure.python}|" meson.build
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace -W ${worksrcpath} "s|@PREFIX@|${prefix}|g" gio/gdbusprivate.c gio/xdgmime/xdgmime.c glib/gi18n-lib.h glib/gi18n.h gio/gdbusaddress.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace -W ${worksrcpath} "s|@PREFIX@|${prefix}|g" gio/xdgmime/xdgmime.c glib/gi18n-lib.h glib/gi18n.h gio/gdbusaddress.c
</span>     reinplace "s|data_dirs = \"/usr|data_dirs = \"${prefix}/share:/usr|g" ${worksrcpath}/glib/gutils.c
     reinplace "s|path = \"/bin|path = \"${prefix}/bin:/bin|g" ${worksrcpath}/glib/gutils.c ${worksrcpath}/glib/gspawn.c
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/files/patch-gio_gdbusprivate.c.diff b/devel/glib2-devel/files/patch-gio_gdbusprivate.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8991bbe08e6..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-devel/files/patch-gio_gdbusprivate.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gio/gdbusprivate.c.orig        2017-05-31 15:16:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/gdbusprivate.c     2017-06-24 05:53:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2471,7 +2471,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   /* TODO: use PACKAGE_LOCALSTATEDIR ? */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   ret = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   first_error = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--  if (!g_file_get_contents ("/var/lib/dbus/machine-id",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  if (!g_file_get_contents ("@PREFIX@/var/lib/dbus/machine-id",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                             &ret,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                             NULL,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                             &first_error) &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2481,7 +2481,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                             NULL))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       g_propagate_prefixed_error (error, first_error,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                                  _("Unable to load /var/lib/dbus/machine-id or /etc/machine-id: "));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+                                  _("Unable to load @PREFIX@/var/lib/dbus/machine-id or /etc/machine-id: "));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     {
</span></pre><pre style='margin:0'>

</pre>