CVS commit: pkgsrc/devel/glib2

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Tue May 14 10:39:39 UTC 2024

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

Log Message:
devel/glib2: Fix startup of misc/libreoffice

* Revert upstream's "gdbusconnection: Fix user_data leaks on error"
  747e3af9987b37847d7d5acbf882d1ee4a6bd91b
* Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.302 -r1.303 pkgsrc/devel/glib2/Makefile
cvs rdiff -u -r1.324 -r1.325 pkgsrc/devel/glib2/distinfo
cvs rdiff -u -r0 -r1.1 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.

Modified files:

Index: pkgsrc/devel/glib2/Makefile
diff -u pkgsrc/devel/glib2/Makefile:1.302 pkgsrc/devel/glib2/Makefile:1.303
--- pkgsrc/devel/glib2/Makefile:1.302   Tue Apr  9 20:23:44 2024
+++ pkgsrc/devel/glib2/Makefile Tue May 14 10:39:39 2024
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.302 2024/04/09 20:23:44 wiz Exp $
+# $NetBSD: Makefile,v 1.303 2024/05/14 10:39:39 ryoon Exp $
 
 .include "Makefile.common"
 
+PKGREVISION=   1
 CATEGORIES=    devel gnome
 COMMENT=       Some useful routines for C programming (glib2)
 

Index: pkgsrc/devel/glib2/distinfo
diff -u pkgsrc/devel/glib2/distinfo:1.324 pkgsrc/devel/glib2/distinfo:1.325
--- pkgsrc/devel/glib2/distinfo:1.324   Thu May  9 12:50:37 2024
+++ pkgsrc/devel/glib2/distinfo Tue May 14 10:39:39 2024
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.324 2024/05/09 12:50:37 adam Exp $
+$NetBSD: distinfo,v 1.325 2024/05/14 10:39:39 ryoon 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_gcredentialsprivate.h) = f719ae41a9eb1d2f04d866b246fa5176543f2df9
 SHA1 (patch-gio_gdbus-2.0_codegen_meson.build) = 9bd0befe0dd547f6f2d818e52bee14e31a017ac7
+SHA1 (patch-gio_gdbusconnection.c) = 4561d60920892986ab422f456aef90a059dfea10
 SHA1 (patch-gio_giomodule.c) = 8e12ba27d0f13f43cff9a4e2301edf67aba0d1fe
 SHA1 (patch-gio_glib-compile-schemas.c) = 4fc8e8ba62bef01762007ebf21569053374808d0
 SHA1 (patch-gio_gresource-tool.c) = ad0e59f48f5f98ea66be568dbe2e5a5d1ac602fc

Added files:

Index: pkgsrc/devel/glib2/patches/patch-gio_gdbusconnection.c
diff -u /dev/null pkgsrc/devel/glib2/patches/patch-gio_gdbusconnection.c:1.1
--- /dev/null   Tue May 14 10:39:39 2024
+++ pkgsrc/devel/glib2/patches/patch-gio_gdbusconnection.c      Tue May 14 10:39:39 2024
@@ -0,0 +1,29 @@
+$NetBSD: patch-gio_gdbusconnection.c,v 1.1 2024/05/14 10:39:39 ryoon Exp $
+
+* Revert https://github.com/GNOME/glib/commit/747e3af9987b37847d7d5acbf882d1ee4a6bd91b
+  to fix startup of misc/libreoffice.
+
+--- gio/gdbusconnection.c.orig 2024-05-14 10:29:05.451666538 +0000
++++ gio/gdbusconnection.c
+@@ -5805,8 +5805,10 @@ g_dbus_connection_register_object (GDBus
+  out:
+   CONNECTION_UNLOCK (connection);
+ 
++#if 0
+   if (ret == 0 && user_data_free_func != NULL)
+     user_data_free_func (user_data);
++#endif
+ 
+   return ret;
+ }
+@@ -7464,8 +7466,10 @@ g_dbus_connection_register_subtree (GDBu
+  out:
+   CONNECTION_UNLOCK (connection);
+ 
++#if 0
+   if (ret == 0 && user_data_free_func != NULL)
+     user_data_free_func (user_data);
++#endif
+ 
+   return ret;
+ }