Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_171578058145670"
MIME-Version: 1.0
Date: Wed, 15 May 2024 13:43:01 +0000
From: "Thomas Klausner" <wiz@netbsd.org>
Subject: CVS commit: pkgsrc/devel/glib2
To: pkgsrc-changes@NetBSD.org
Reply-To: wiz@netbsd.org
Message-Id: <20240515134301.0FA33FA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_171578058145670
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiz
Date:		Wed May 15 13:43:00 UTC 2024

Modified Files:
	pkgsrc/devel/glib2: Makefile distinfo
Added Files:
	pkgsrc/devel/glib2/patches: patch-gio_gactiongroupexporter.c
	    patch-gio_gmenuexporter.c
Removed Files:
	pkgsrc/devel/glib2/patches: patch-gio_gdbusconnection.c

Log Message:
glib2: undo revert and add another upstream patch instead

https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4073

Fixes libreoffice startup as well.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.303 -r1.304 pkgsrc/devel/glib2/Makefile
cvs rdiff -u -r1.326 -r1.327 pkgsrc/devel/glib2/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/glib2/patches/patch-gio_gactiongroupexporter.c \
    pkgsrc/devel/glib2/patches/patch-gio_gmenuexporter.c
cvs rdiff -u -r1.2 -r0 pkgsrc/devel/glib2/patches/patch-gio_gdbusconnection.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_171578058145670
Content-Disposition: inline
Content-Length: 7603
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/glib2/Makefile
diff -u pkgsrc/devel/glib2/Makefile:1.303 pkgsrc/devel/glib2/Makefile:1.304
--- pkgsrc/devel/glib2/Makefile:1.303	Tue May 14 10:39:39 2024
+++ pkgsrc/devel/glib2/Makefile	Wed May 15 13:43:00 2024
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.303 2024/05/14 10:39:39 ryoon Exp $
+# $NetBSD: Makefile,v 1.304 2024/05/15 13:43:00 wiz Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel gnome
 COMMENT=	Some useful routines for C programming (glib2)
 

Index: pkgsrc/devel/glib2/distinfo
diff -u pkgsrc/devel/glib2/distinfo:1.326 pkgsrc/devel/glib2/distinfo:1.327
--- pkgsrc/devel/glib2/distinfo:1.326	Tue May 14 10:48:11 2024
+++ pkgsrc/devel/glib2/distinfo	Wed May 15 13:43:00 2024
@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.326 2024/05/14 10:48:11 wiz Exp $
+$NetBSD: distinfo,v 1.327 2024/05/15 13:43:00 wiz Exp $
 
 BLAKE2s (glib-2.80.2.tar.xz) = a819f1850f358ba58886fd8f95b331820735bf8fcebd67c61a5e053ed9dff030
 SHA512 (glib-2.80.2.tar.xz) = 9b00d6741523ba5bc60c83da9fbbc1a13bd61307612471acd7faaf57cbcb480941fd61dfff94b2712bd78094beff3af1ceffe4985db0ff97ffe948cc67b821aa
 Size (glib-2.80.2.tar.xz) = 5529096 bytes
+SHA1 (patch-gio_gactiongroupexporter.c) = 7c51f98fd523825e4aa0a42e766a5f95a96dea9b
 SHA1 (patch-gio_gcredentialsprivate.h) = f719ae41a9eb1d2f04d866b246fa5176543f2df9
 SHA1 (patch-gio_gdbus-2.0_codegen_meson.build) = 9bd0befe0dd547f6f2d818e52bee14e31a017ac7
-SHA1 (patch-gio_gdbusconnection.c) = ceaa60122d33b59bbce93cd96c346d320d091bc5
 SHA1 (patch-gio_giomodule.c) = 8e12ba27d0f13f43cff9a4e2301edf67aba0d1fe
 SHA1 (patch-gio_glib-compile-schemas.c) = 4fc8e8ba62bef01762007ebf21569053374808d0
+SHA1 (patch-gio_gmenuexporter.c) = dffce16c8def50ba5a73dcc51a34eff26661f752
 SHA1 (patch-gio_gresource-tool.c) = ad0e59f48f5f98ea66be568dbe2e5a5d1ac602fc
 SHA1 (patch-gio_gunixcredentialsmessage.c) = c13119ddd6262db7c03e53857e987f0c495d3312
 SHA1 (patch-gio_gunixmounts.c) = 48b6945fde5b1721ca246eb7e79f73b5b480e816

Added files:

Index: pkgsrc/devel/glib2/patches/patch-gio_gactiongroupexporter.c
diff -u /dev/null pkgsrc/devel/glib2/patches/patch-gio_gactiongroupexporter.c:1.1
--- /dev/null	Wed May 15 13:43:00 2024
+++ pkgsrc/devel/glib2/patches/patch-gio_gactiongroupexporter.c	Wed May 15 13:43:00 2024
@@ -0,0 +1,64 @@
+$NetBSD: patch-gio_gactiongroupexporter.c,v 1.1 2024/05/15 13:43:00 wiz Exp $
+
+gmenuexporter: Fix a NULL pointer dereference on an error handling path 
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4073
+
+--- gio/gactiongroupexporter.c.orig	2024-05-08 15:29:04.000000000 +0000
++++ gio/gactiongroupexporter.c
+@@ -531,10 +531,8 @@ org_gtk_Actions_method_call (GDBusConnec
+ }
+ 
+ static void
+-g_action_group_exporter_free (gpointer user_data)
++g_action_group_exporter_free (GActionGroupExporter *exporter)
+ {
+-  GActionGroupExporter *exporter = user_data;
+-
+   g_signal_handlers_disconnect_by_func (exporter->action_group,
+                                         g_action_group_exporter_action_added, exporter);
+   g_signal_handlers_disconnect_by_func (exporter->action_group,
+@@ -616,15 +614,6 @@ g_dbus_connection_export_action_group (G
+     }
+ 
+   exporter = g_slice_new (GActionGroupExporter);
+-  id = g_dbus_connection_register_object (connection, object_path, org_gtk_Actions, &vtable,
+-                                          exporter, g_action_group_exporter_free, error);
+-
+-  if (id == 0)
+-    {
+-      g_slice_free (GActionGroupExporter, exporter);
+-      return 0;
+-    }
+-
+   exporter->context = g_main_context_ref_thread_default ();
+   exporter->pending_changes = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+   exporter->pending_source = NULL;
+@@ -632,14 +621,20 @@ g_dbus_connection_export_action_group (G
+   exporter->connection = g_object_ref (connection);
+   exporter->object_path = g_strdup (object_path);
+ 
+-  g_signal_connect (action_group, "action-added",
+-                    G_CALLBACK (g_action_group_exporter_action_added), exporter);
+-  g_signal_connect (action_group, "action-removed",
+-                    G_CALLBACK (g_action_group_exporter_action_removed), exporter);
+-  g_signal_connect (action_group, "action-state-changed",
+-                    G_CALLBACK (g_action_group_exporter_action_state_changed), exporter);
+-  g_signal_connect (action_group, "action-enabled-changed",
+-                    G_CALLBACK (g_action_group_exporter_action_enabled_changed), exporter);
++  id = g_dbus_connection_register_object (connection, object_path, org_gtk_Actions, &vtable,
++                                          exporter, (GDestroyNotify) g_action_group_exporter_free, error);
++
++  if (id != 0)
++    {
++      g_signal_connect (action_group, "action-added",
++                        G_CALLBACK (g_action_group_exporter_action_added), exporter);
++      g_signal_connect (action_group, "action-removed",
++                        G_CALLBACK (g_action_group_exporter_action_removed), exporter);
++      g_signal_connect (action_group, "action-state-changed",
++                        G_CALLBACK (g_action_group_exporter_action_state_changed), exporter);
++      g_signal_connect (action_group, "action-enabled-changed",
++                        G_CALLBACK (g_action_group_exporter_action_enabled_changed), exporter);
++    }
+ 
+   return id;
+ }
Index: pkgsrc/devel/glib2/patches/patch-gio_gmenuexporter.c
diff -u /dev/null pkgsrc/devel/glib2/patches/patch-gio_gmenuexporter.c:1.1
--- /dev/null	Wed May 15 13:43:00 2024
+++ pkgsrc/devel/glib2/patches/patch-gio_gmenuexporter.c	Wed May 15 13:43:00 2024
@@ -0,0 +1,49 @@
+$NetBSD: patch-gio_gmenuexporter.c,v 1.1 2024/05/15 13:43:00 wiz Exp $
+
+gmenuexporter: Fix a NULL pointer dereference on an error handling path 
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4073
+
+--- gio/gmenuexporter.c.orig	2024-05-08 15:29:04.000000000 +0000
++++ gio/gmenuexporter.c
+@@ -707,11 +707,9 @@ g_menu_exporter_create_group (GMenuExpor
+ }
+ 
+ static void
+-g_menu_exporter_free (gpointer user_data)
++g_menu_exporter_free (GMenuExporter *exporter)
+ {
+-  GMenuExporter *exporter = user_data;
+-
+-  g_menu_exporter_menu_free (exporter->root);
++  g_clear_pointer (&exporter->root, g_menu_exporter_menu_free);
+   g_clear_pointer (&exporter->peer_remote, g_menu_exporter_remote_free);
+   g_hash_table_unref (exporter->remotes);
+   g_hash_table_unref (exporter->groups);
+@@ -794,21 +792,16 @@ g_dbus_connection_export_menu_model (GDB
+   guint id;
+ 
+   exporter = g_slice_new0 (GMenuExporter);
+-
+-  id = g_dbus_connection_register_object (connection, object_path, org_gtk_Menus_get_interface (),
+-                                          &vtable, exporter, g_menu_exporter_free, error);
+-
+-  if (id == 0)
+-    {
+-      g_slice_free (GMenuExporter, exporter);
+-      return 0;
+-    }
+-
+   exporter->connection = g_object_ref (connection);
+   exporter->object_path = g_strdup (object_path);
+   exporter->groups = g_hash_table_new (NULL, NULL);
+   exporter->remotes = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_menu_exporter_remote_free);
+-  exporter->root = g_menu_exporter_group_add_menu (g_menu_exporter_create_group (exporter), menu);
++
++  id = g_dbus_connection_register_object (connection, object_path, org_gtk_Menus_get_interface (),
++                                          &vtable, exporter, (GDestroyNotify) g_menu_exporter_free, error);
++
++  if (id != 0)
++    exporter->root = g_menu_exporter_group_add_menu (g_menu_exporter_create_group (exporter), menu);
+ 
+   return id;
+ }


--_----------=_171578058145670--