Re: glib2 update issue

On Sun, Nov 27, 2022 at 01:09:17AM +0000, Stuart Henderson wrote:
> On 2022/11/27 00:19, Stuart Henderson wrote:
> > Might be
> > https://github.com/GNOME/glib/commit/bcd364afef984da894045e7d4d618942459a9ee5
>
> Ah no, that was in the release already, vte builds with this:

Yes this is what I intended to commit.
ok for me

>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/glib2/Makefile,v
> retrieving revision 1.366
> diff -u -p -r1.366 Makefile
> --- Makefile 26 Nov 2022 08:06:42 -0000 1.366
> +++ Makefile 27 Nov 2022 01:03:38 -0000
> @@ -2,6 +2,7 @@ COMMENT= general-purpose utility librar
>
> GNOME_PROJECT= glib
> GNOME_VERSION= 2.74.2
> +REVISION= 0
> PKGNAME= ${DISTNAME:S/glib/glib2/}
>
> CATEGORIES= devel
> Index: patches/patch-glib_ghash_h
> ===================================================================
> RCS file: patches/patch-glib_ghash_h
> diff -N patches/patch-glib_ghash_h
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-glib_ghash_h 27 Nov 2022 01:03:38 -0000
> @@ -0,0 +1,14 @@
> +https://gitlab.gnome.org/GNOME/glib/-/issues/2820
> +
> +Index: glib/ghash.h
> +--- glib/ghash.h.orig
> ++++ glib/ghash.h
> +@@ -162,7 +162,7 @@ gboolean g_str_equal (gconstpointer v1,
> + gconstpointer v2);
> +
> + /* Macro for optimization in the case it is not used as callback function */
> +-#define g_str_equal(v1, v2) (strcmp ((gconstpointer) (v1), (gconstpointer) (v2)) == 0)
> ++#define g_str_equal(v1, v2) (strcmp ((const char*) (gconstpointer) (v1),(const char*) (gconstpointer) (v2)) == 0)
> +
> + GLIB_AVAILABLE_IN_ALL
> + guint g_str_hash (gconstpointer v);
>

--
Antoine