<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/35cc68ecc89907246c26714f782b9ce753453c8a">https://github.com/macports/macports-ports/commit/35cc68ecc89907246c26714f782b9ce753453c8a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 35cc68ecc89907246c26714f782b9ce753453c8a
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sat Apr 15 17:49:29 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> glib2-devel: update to 2.74.0
</span>---
devel/glib2-devel/Portfile | 20 ++++++++------------
.../files/patch-glib2-pragmas-old-gcc.diff | 17 -----------------
.../patch-meson_build-meson_options-appinfo.diff | 16 ++++++++--------
devel/glib2-devel/files/universal.patch | 13 +++++++------
4 files changed, 23 insertions(+), 43 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 b7774a7c3de..d55172c7555 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;'>@@ -14,11 +14,12 @@ PortGroup legacysupport 1.1
</span> name glib2-devel
conflicts glib2 glib2-upstream
set my_name glib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.72.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.74.0
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 a2432f98501fe132d14e5ae1c44367d4030529c4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4a39a2f624b8512d500d5840173eda7fa85f51c109052eae806acece85d345f0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4893484
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+epoch 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 7f3943b84afb3e0ac56142246cb7d05ff626d3ab \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3652c7f072d7b031a6b5edd623f77ebc5dcd2ae698598abcc89ff39ca75add30 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5183072
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,11 +53,6 @@ patchfiles libintl.patch \
</span> patch-glib2-findfolders-before-SL.diff \
patch-declarations.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# patch for old gccs not accepting pragmas inside functions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[string match *gcc* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-glib2-pragmas-old-gcc.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> platform darwin {
if {${os.major} < 11} {
patchfiles-append patch-gio_gcredentialsprivate.h.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,10 +72,10 @@ depends_build-append port:gettext \
</span> set py_ver 3.10
set py_ver_nodot [string map {. {}} ${py_ver}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:gettext-runtime \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:gettext-runtime \
</span> port:libffi \
port:libiconv \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pcre \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pcre2 \
</span> port:python${py_ver_nodot} \
port:zlib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -162,7 +158,7 @@ post-destroot {
</span>
set docdir ${prefix}/share/doc/${my_name}
xinstall -d ${destroot}${docdir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 -W ${worksrcpath} AUTHORS COPYING HACKING NEWS README.md \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -W ${worksrcpath} COPYING HACKING NEWS README.md \
</span> ${destroot}${docdir}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/files/patch-glib2-pragmas-old-gcc.diff b/devel/glib2-devel/files/patch-glib2-pragmas-old-gcc.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0673035e178..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-devel/files/patch-glib2-pragmas-old-gcc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git glib/tests/atomic.c.orig glib/tests/atomic.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 8bc100f..fb8cdcd 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- glib/tests/atomic.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ glib/tests/atomic.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -97,12 +97,9 @@ test_types (void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Note that atomic variables should almost certainly not be marked as
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * `volatile` — see http://isvolatileusefulwiththreads.in/c/. This test exists
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * to make sure that we don’t warn when built against older third party code. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#pragma GCC diagnostic push
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#pragma GCC diagnostic ignored "-Wincompatible-pointer-types"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_atomic_pointer_set (&vp_str_vol, NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- res = g_atomic_pointer_compare_and_exchange (&vp_str_vol, NULL, str);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_assert_true (res);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#pragma GCC diagnostic pop
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_atomic_pointer_set (&ip, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ip2 = g_atomic_pointer_get (&ip);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/files/patch-meson_build-meson_options-appinfo.diff b/devel/glib2-devel/files/patch-meson_build-meson_options-appinfo.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5eb70977384..4e227d0c2d5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-devel/files/patch-meson_build-meson_options-appinfo.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-devel/files/patch-meson_build-meson_options-appinfo.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gio/giomodule.c.orig 2020-03-18 08:16:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gio/giomodule.c 2021-08-14 00:05:07.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -47,12 +47,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gio/giomodule.c.orig 2022-09-17 14:38:17.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gio/giomodule.c 2022-09-18 08:55:13.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -61,12 +61,13 @@
</span> #endif
#include <glib/gstdio.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,16 +17,16 @@
</span>
#ifdef HAVE_COCOA
#include <AvailabilityMacros.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1088,7 +1089,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1183,7 +1184,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (g_once_init_enter (®istered_extensions))
</span> {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- registered_extensions = TRUE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> -#if defined(G_OS_UNIX) && !defined(HAVE_COCOA)
+#if defined(G_OS_UNIX) && (!defined(HAVE_COCOA) || defined(USE_APPINFO_GENERIC))
#if !GLIB_CHECK_VERSION (3, 0, 0)
ep = g_io_extension_point_register (G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME);
g_io_extension_point_set_required_type (ep, G_TYPE_DESKTOP_APP_INFO_LOOKUP);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1219,8 +1220,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1327,8 +1328,10 @@
</span> #endif
#ifdef HAVE_COCOA
g_type_ensure (g_nextstep_settings_backend_get_type ());
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +36,7 @@
</span> +#endif
#ifdef G_OS_UNIX
g_type_ensure (_g_unix_volume_monitor_get_type ());
<span style='display:block; white-space:pre;background:#ffe0e0;'>- g_type_ensure (g_fdo_notification_backend_get_type ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_type_ensure (g_debug_controller_dbus_get_type ());
</span> --- meson_options.txt.orig 2019-11-13 18:24:37.000000000 -0300
+++ meson_options.txt 2019-11-13 18:27:07.000000000 -0300
@@ -1,3 +1,9 @@
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/files/universal.patch b/devel/glib2-devel/files/universal.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 5ea5aa67848..5ca3990bd27 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-devel/files/universal.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-devel/files/universal.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -221,14 +221,15 @@ here and in config.h.ed.
</span>
#define GLIB_SYSDEF_POLLIN =@g_pollin@
#define GLIB_SYSDEF_POLLOUT =@g_pollout@
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- meson.build.orig 2019-11-17 14:26:49.000000000 -0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ meson.build 2019-11-17 14:27:32.000000000 -0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1584,6 +1584,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.orig 2022-09-18 08:59:25.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2022-09-18 09:02:33.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1851,6 +1851,9 @@
</span> glibconfig_conf.set(d[1], val)
endforeach
+glib_is_powerpc = '#if (defined(__PPC__) || defined(__PPC64__) || defined(__powerpc__) || defined(__powerpc64__) || defined(_ARCH_PPC) || defined(_ARCH_PPC64))\n#ifdef G_ATOMIC_OP_MEMORY_BARRIER_NEEDED\n#undef G_ATOMIC_OP_MEMORY_BARRIER_NEEDED\n#endif\n#define G_ATOMIC_OP_MEMORY_BARRIER_NEEDED 1\n#else\n#ifdef G_ATOMIC_OP_MEMORY_BARRIER_NEEDED\n#undef G_ATOMIC_OP_MEMORY_BARRIER_NEEDED\n#endif\n#endif'
+glibconfig_conf.set('glib_is_powerpc', glib_is_powerpc)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # We need to decide at configure time if GLib will use real atomic
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # operations ("lock free") or emulated ones with a mutex. This is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if host_system == 'windows'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ have_ipv6 = true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span></pre><pre style='margin:0'>
</pre>