CVS commit: pkgsrc/devel/ruby-gnome2-glib

["Izumi Tsutsui" <tsutsui%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Sat May 26 15:58:59 UTC 2018

Modified Files:
        pkgsrc/devel/ruby-gnome2-glib: Makefile distinfo
Added Files:
        pkgsrc/devel/ruby-gnome2-glib/patches:
            patch-ext_glib2_rbgobj__closure.c

Log Message:
ruby-gnome2-glib: pull upstream fixes for issue #1166.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/devel/ruby-gnome2-glib/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/ruby-gnome2-glib/distinfo
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/devel/ruby-gnome2-glib/patches/patch-ext_glib2_rbgobj__closure.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/ruby-gnome2-glib/Makefile
diff -u pkgsrc/devel/ruby-gnome2-glib/Makefile:1.32 pkgsrc/devel/ruby-gnome2-glib/Makefile:1.33
--- pkgsrc/devel/ruby-gnome2-glib/Makefile:1.32 Thu May  3 12:04:02 2018
+++ pkgsrc/devel/ruby-gnome2-glib/Makefile      Sat May 26 15:58:59 2018
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.32 2018/05/03 12:04:02 tsutsui Exp $
+# $NetBSD: Makefile,v 1.33 2018/05/26 15:58:59 tsutsui Exp $
 #
 
 DISTNAME=              glib2-${VERSION}
 PKGNAME=               ${RUBY_PKGPREFIX}-gnome2-glib-${VERSION}
+PKGREVISION=           1
 COMMENT=               Ruby binding of GLib-2.x
 CATEGORIES=            devel
 

Index: pkgsrc/devel/ruby-gnome2-glib/distinfo
diff -u pkgsrc/devel/ruby-gnome2-glib/distinfo:1.16 pkgsrc/devel/ruby-gnome2-glib/distinfo:1.17
--- pkgsrc/devel/ruby-gnome2-glib/distinfo:1.16 Thu May  3 12:04:02 2018
+++ pkgsrc/devel/ruby-gnome2-glib/distinfo      Sat May 26 15:58:59 2018
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.16 2018/05/03 12:04:02 tsutsui Exp $
+$NetBSD: distinfo,v 1.17 2018/05/26 15:58:59 tsutsui Exp $
 
 SHA1 (glib2-3.2.5.gem) = c48e4b6e17635a6b403e1b98565d6994d7bf69ac
 RMD160 (glib2-3.2.5.gem) = 0cbe598a9df602fbb18ef73a1b3355cca48eab3c
 SHA512 (glib2-3.2.5.gem) = 7c18dd94bd235381593f04fd429fb523d7c69a209ec7fb17216365c50615d01a0713d86aa92e32980a892f77a300be45db6ccaa52f81aade76e4808cdc47d4d9
 Size (glib2-3.2.5.gem) = 142848 bytes
+SHA1 (patch-ext_glib2_rbgobj__closure.c) = 4dec1acd7a32c2c13dd5b802b75600a8a301fc4e

Added files:

Index: pkgsrc/devel/ruby-gnome2-glib/patches/patch-ext_glib2_rbgobj__closure.c
diff -u /dev/null pkgsrc/devel/ruby-gnome2-glib/patches/patch-ext_glib2_rbgobj__closure.c:1.3
--- /dev/null   Sat May 26 15:58:59 2018
+++ pkgsrc/devel/ruby-gnome2-glib/patches/patch-ext_glib2_rbgobj__closure.c     Sat May 26 15:58:59 2018
@@ -0,0 +1,23 @@
+$NetBSD: patch-ext_glib2_rbgobj__closure.c,v 1.3 2018/05/26 15:58:59 tsutsui Exp $
+
+- pull upstream fix for issue #1166
+ https://github.com/ruby-gnome2/ruby-gnome2/commit/e11ae27581af70fb09ce26ef038d8ebfac49047a
+ https://github.com/ruby-gnome2/ruby-gnome2/commit/e77f03b60045c40b9851cc9ef5195c168c674fd0
+
+--- ext/glib2/rbgobj_closure.c.orig    2018-05-04 23:58:14.749953854 +0000
++++ ext/glib2/rbgobj_closure.c
+@@ -290,12 +290,13 @@ g_rclosure_attach(GClosure *closure, VALUE object)
+     static VALUE cGLibObject = Qnil;
+     GRClosure *rclosure = (GRClosure *)closure;
+ 
++    rbgobj_add_relative(object, rclosure->rb_holder);
++
+     if (NIL_P(cGLibObject)) {
+         cGLibObject = rb_const_get(mGLib, rb_intern("Object"));
+     }
+     if (rb_obj_is_kind_of(object, cGLibObject)) {
+         GObject *gobject;
+-        rbgobj_object_add_relative(object, rclosure->rb_holder);
+         gobject = RVAL2GOBJ(object);
+         rclosure->count++;
+         g_object_weak_ref(gobject, rclosure_weak_notify, rclosure);