<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/e28dd69619c9ffb13f027d81d12fd25b38187dd7">https://github.com/macports/macports-ports/commit/e28dd69619c9ffb13f027d81d12fd25b38187dd7</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 e28dd69619c glib2-devel: remove legacysupport, fix Tiger
</span>e28dd69619c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e28dd69619c9ffb13f027d81d12fd25b38187dd7
</span>Author: Evan Miller <emmiller@gmail.com>
AuthorDate: Sun May 14 11:05:39 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> glib2-devel: remove legacysupport, fix Tiger
</span>---
devel/glib2-devel/Portfile | 10 +++++---
devel/glib2-devel/files/patch-glib_gmem.c.diff | 12 +++++++++
devel/glib2-devel/files/patch-glib_gspawn.c.diff | 32 ++++++++++++++++++++++++
3 files changed, 50 insertions(+), 4 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 6eb6805d9fd..d15b6e1bed5 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;'>@@ -6,16 +6,13 @@ PortGroup clang_dependency 1.0
</span> PortGroup meson 1.0
PortGroup muniversal 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# to get past the aligned memory access error
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup legacysupport 1.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Please keep the glib2 and glib2-devel ports as similar as possible.
name glib2-devel
conflicts glib2
set my_name glib
version 2.76.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> epoch 0
checksums rmd160 537272ca0c11b2a056b07a9d4dc089815402375a \
sha256 24f3847857b1d8674cdb0389a36edec0f13c666cd3ce727ecd340eb9da8aca9e \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,6 +37,8 @@ master_sites gnome:sources/${my_name}/${branch}/
</span>
patchfiles-append libintl.patch \
patch-gio-tests-meson.build.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-glib_gmem.c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-glib_gspawn.c.diff \
</span> patch-glib_gunicollate.c.diff \
patch-gio_xdgmime_xdgmime.c.diff \
patch-get-launchd-dbus-session-address.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -193,6 +192,9 @@ platform darwin {
</span> }
platform darwin 8 {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/67307
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cflags-append -D__DARWIN_NON_CANCELABLE=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # meson on Tiger cannot use rpaths, so we workaround with this to find dylibs
foreach my_phase {build test destroot} {
${my_phase}.env-append "DYLD_LIBRARY_PATH=${build_dir}/glib:${build_dir}/gobject:${build_dir}/gio:${build_dir}/gthread:${build_dir}/gmodule"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/files/patch-glib_gmem.c.diff b/devel/glib2-devel/files/patch-glib_gmem.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3fbeb8f694c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-devel/files/patch-glib_gmem.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glib/gmem.c.orig 2023-05-14 09:57:50.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glib/gmem.c 2023-05-14 09:59:39.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -679,7 +679,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(HAVE_MEMALIGN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ res = memalign (alignment, real_size);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# error "This platform does not have an aligned memory allocator."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* malloc is 16-byte aligned; otherwise page alignment will do */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ res = alignment <= 16 ? malloc(real_size) : valloc(real_size);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TRACE (GLIB_MEM_ALLOC((void*) res, (unsigned int) real_size, 0, 0));
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/files/patch-glib_gspawn.c.diff b/devel/glib2-devel/files/patch-glib_gspawn.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4e171b2c65b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-devel/files/patch-glib_gspawn.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+libproc.h isn't available on older systems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.orig 2023-05-13 23:04:36.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2023-05-13 23:04:51.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -350,6 +350,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'fstab.h',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'grp.h',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'inttypes.h',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 'libproc.h',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'limits.h',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'locale.h',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'mach/mach_time.h',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glib/gspawn.c.orig 2023-05-13 23:05:53.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glib/gspawn.c 2023-05-13 23:06:23.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -70,7 +70,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "glibintl.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "glib-unix.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef HAVE_LIBPROC_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <libproc.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/proc_info.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1544,7 +1544,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (open_max < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ open_max = 4096;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(HAVE_LIBPROC_H)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* proc_pidinfo isn't documented as async-signal-safe but looking at the implementation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * in the darwin tree here:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span></pre><pre style='margin:0'>
</pre>