ruby-gnome2: update to 3.2.5.

Upstream changes (from NEWS):

== Ruby-GNOME2 3.2.5: 2018-05-02

This is a bug fix release of 3.2.4.

=== Changes

==== Document

  * Fixes

    * Fixed typos.
      [GitHub#1158][Patch by kojix2]
      [GitHub#1160][Patch by kojix2]

==== Ruby/GLib2

  * Fixes

    * Fixed a GC related crash bug.
      [GitHub#1162][Reported by Izumi Tsutsui]

==== Ruby/GObjectIntrospection

  * Improvements

    * Disabled NULL check for GObject Introspection < 1.42. Because
      GObject Introspection < 1.42 doesn't support "(nullable)"
      annotation yet.

==== Ruby/GdkPixbuf2

  * Improvements

    * (({GdkPixbuf::Pixbuf#composite})): Suppressed wrong warning.
      [GitHub#1156][Reported by Chaistrin]
      [GitHub#1157][Patch by cedlemo]

  * Fixes

    * Added a missing white space into message.
      [GitHub#1155][Reported by Robert A. Heiler]

    * (({GdkPixbuf::Pixbuf#composite})): Fixed a bug that width and
      height are ignored.
      [Patch by cedlemo]

==== Ruby/GTK3

  * Improvements

    * (({Gtk::TextBuffer#initialize})): Accepted "property-name" form.
      [GitHub#1161][Reported by kojix2]

==== Ruby/Poppler

  * Improvements

    * Added a workaround for poppler-glib 0.63 bug.
      [GitHub#1159][Reported by HIGUCHI Daisuke]

=== Thanks

  * Robert A. Heiler

  * Chaistrin

  * cedlemo

  * kojix2

  * Izumi Tsutsui

  * HIGUCHI Daisuke

18 files changed, 33 insertions, 487 deletions

diff --git a/devel/ruby-gnome2-atk/distinfo b/devel/ruby-gnome2-atk/distinfo
index 48e762c9abd..b218217f7c6 100644
--- a/devel/ruby-gnome2-atk/distinfo
+++ b/devel/ruby-gnome2-atk/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.11 2018/04/13 16:31:09 tsutsui Exp $
+$NetBSD: distinfo,v 1.12 2018/05/03 12:04:02 tsutsui Exp $
 
-SHA1 (atk-3.2.4.gem) = 2f57fbd24b50966aef3e30e2240e1081d688e541
-RMD160 (atk-3.2.4.gem) = 0a70c39de1c90d0a619e893dfa70503efedbeae0
-SHA512 (atk-3.2.4.gem) = 7f1a6e29b24e7c464b52f2c799aaa7512c23593c65acccad7fb2b3c90b22baf17d0055cc1223ab3a2ff7211abdfd82c1853df5389fde659e62573d277b28d0c4
-Size (atk-3.2.4.gem) = 6656 bytes
+SHA1 (atk-3.2.5.gem) = 541f914abad1e016c69d0a66aec613d8def6d960
+RMD160 (atk-3.2.5.gem) = f8054789236c468068933592e8e1dc434f3d4491
+SHA512 (atk-3.2.5.gem) = c1f555793bd3920af773aa427ed484a78192373a07161a4baca5ecba40d9f188a8f334410421c0c753bd10f694170e02b62ce63cc725b6bf006b69863978112f
+Size (atk-3.2.5.gem) = 6656 bytes
diff --git a/devel/ruby-gnome2-gio/distinfo b/devel/ruby-gnome2-gio/distinfo
index e2b37b1dcc4..887756a52b4 100644
--- a/devel/ruby-gnome2-gio/distinfo
+++ b/devel/ruby-gnome2-gio/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.11 2018/04/13 16:31:09 tsutsui Exp $
+$NetBSD: distinfo,v 1.12 2018/05/03 12:04:02 tsutsui Exp $
 
-SHA1 (gio2-3.2.4.gem) = e89206785eff4f885f7d8d67f44571dc2ea1e5ab
-RMD160 (gio2-3.2.4.gem) = 1782c5fabb9fc96fe79dcb13aeff722c4285b251
-SHA512 (gio2-3.2.4.gem) = 55a4dd2dc46d012a3f92f52516acc5995b331f71f9f4d24eaa7df888c28fc5a602648f181aad48338e9bfbe27f1f6ab987b11a4fb3bc713721ae52944116f65a
-Size (gio2-3.2.4.gem) = 26112 bytes
+SHA1 (gio2-3.2.5.gem) = 8bbffffe54e5622c89ef0d8cdbd838618f962bd3
+RMD160 (gio2-3.2.5.gem) = 35f3ab9d1ca868c4a6ba219ed265e354ec5caf6e
+SHA512 (gio2-3.2.5.gem) = a2b7f838675d3071068a576e06cfd2cc3d94187e3486b8f74ea348b54c51bdbe52b2fe9a78ba01f21ad9723772035abae53afb3694e48de89dee09b669bff650
+Size (gio2-3.2.5.gem) = 26112 bytes
diff --git a/devel/ruby-gnome2-glib/Makefile b/devel/ruby-gnome2-glib/Makefile
index 5fe57635a91..06f89f3eab4 100644
--- a/devel/ruby-gnome2-glib/Makefile
+++ b/devel/ruby-gnome2-glib/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2018/04/29 15:36:44 tsutsui Exp $
+# $NetBSD: Makefile,v 1.32 2018/05/03 12:04:02 tsutsui Exp $
 #
 
 DISTNAME=		glib2-${VERSION}
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-glib-${VERSION}
-PKGREVISION=		1
 COMMENT=		Ruby binding of GLib-2.x
 CATEGORIES=		devel
 
diff --git a/devel/ruby-gnome2-glib/buildlink3.mk b/devel/ruby-gnome2-glib/buildlink3.mk
index 841cc087b1a..98875d0dd0d 100644
--- a/devel/ruby-gnome2-glib/buildlink3.mk
+++ b/devel/ruby-gnome2-glib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2018/04/29 15:36:44 tsutsui Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2018/05/03 12:04:02 tsutsui Exp $
 
 BUILDLINK_TREE+=	ruby-gnome2-glib
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ruby-gnome2-glib
 RUBY_GNOME2_GLIB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ruby-gnome2-glib+=	${RUBY_PKGPREFIX}-gnome2-glib>=0.17.0
-BUILDLINK_ABI_DEPENDS.ruby-gnome2-glib+=	${RUBY_PKGPREFIX}-gnome2-glib>=2.2.4nb1
+BUILDLINK_ABI_DEPENDS.ruby-gnome2-glib+=	${RUBY_PKGPREFIX}-gnome2-glib>=2.2.5
 BUILDLINK_PKGSRCDIR.ruby-gnome2-glib?=		../../devel/ruby-gnome2-glib
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/devel/ruby-gnome2-glib/distinfo b/devel/ruby-gnome2-glib/distinfo
index e0b7f920925..aff07ebf7d2 100644
--- a/devel/ruby-gnome2-glib/distinfo
+++ b/devel/ruby-gnome2-glib/distinfo
@@ -1,14 +1,6 @@
-$NetBSD: distinfo,v 1.15 2018/04/29 15:36:44 tsutsui Exp $
+$NetBSD: distinfo,v 1.16 2018/05/03 12:04:02 tsutsui Exp $
 
-SHA1 (glib2-3.2.4.gem) = a1aa0ea0d88fe241825daee9f2a7e9a444cb60fe
-RMD160 (glib2-3.2.4.gem) = f6b6da60e27bf9ebaee6757d0fa7df01b9dcb73e
-SHA512 (glib2-3.2.4.gem) = d766787ad15ead3f0b8ff0a334fd0a8df5b6ea719fee36aa5c3aa38273d1e4ccfb1ceab4564b0c01e597a413a8e49009adf70a6ac27b930465a9aa7d8b033418
-Size (glib2-3.2.4.gem) = 142336 bytes
-SHA1 (patch-ext_glib2_glib2.def) = 9f6e593c494930e28c683689d7438d14333377b8
-SHA1 (patch-ext_glib2_rbglib.h) = 97a9088fb749f0985d415ee068eceb1e78237661
-SHA1 (patch-ext_glib2_rbgobj__binding.c) = 1c6459564d08d86570ad631dbd95b20f9ff22ba5
-SHA1 (patch-ext_glib2_rbgobj__closure.c) = 6655f9a2e49f8bfd1eb0ec2208ab566d5d13b02e
-SHA1 (patch-ext_glib2_rbgobj__object.c) = c0099a33d3805d2137b1f76f8050bb1c075bfefa
-SHA1 (patch-ext_glib2_rbgobject.c) = 5e81544395ee1dc543ab5cf926ea19d1ade89431
-SHA1 (patch-ext_glib2_rbgobject.h) = 8023d86bc2d119f83d37c27e7686f6a55816616c
-SHA1 (patch-ext_glib2_rbgprivate.h) = 9cad0b23a174b500a940d5d1fa4d66a6aeac3566
+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
diff --git a/devel/ruby-gnome2-glib/patches/patch-ext_glib2_glib2.def b/devel/ruby-gnome2-glib/patches/patch-ext_glib2_glib2.def
deleted file mode 100644
index 9dbb3ebf3e8..00000000000
--- a/devel/ruby-gnome2-glib/patches/patch-ext_glib2_glib2.def
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ext_glib2_glib2.def,v 1.1 2018/04/29 15:36:44 tsutsui Exp $
-
-- pull upstream fix for issue #1162
-
---- ext/glib2/glib2.def.orig	2018-04-29 15:03:29.000000000 +0000
-+++ ext/glib2/glib2.def
-@@ -61,6 +61,9 @@ EXPORTS
- 	rbgobj_class_init_func
- 	rbgobj_register_type
- 	rbgobj_object_alloc_func
-+	rbgobj_object_add_relative
-+	rbgobj_object_remove_relative
-+	rbgobj_object_remove_relatives
- 	rbgobj_set_signal_func
- 	rbgobj_get_signal_func
- 	rbgobj_set_signal_call_func
diff --git a/devel/ruby-gnome2-glib/patches/patch-ext_glib2_rbglib.h b/devel/ruby-gnome2-glib/patches/patch-ext_glib2_rbglib.h
deleted file mode 100644
index dcc200fe5c7..00000000000
--- a/devel/ruby-gnome2-glib/patches/patch-ext_glib2_rbglib.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ext_glib2_rbglib.h,v 1.1 2018/04/29 15:36:44 tsutsui Exp $
-
-- pull upstream fix for issue #1162
-
---- ext/glib2/rbglib.h.orig	2018-04-29 15:03:29.000000000 +0000
-+++ ext/glib2/rbglib.h
-@@ -46,6 +46,10 @@ extern "C" {
- #  endif
- #endif
- 
-+#ifndef RB_ALLOC
-+#  define RB_ALLOC(type) ALLOC(type)
-+#endif
-+
- #ifndef RB_ALLOC_N
- #  define RB_ALLOC_N(type, n) ALLOC_N(type, n)
- #endif
diff --git a/devel/ruby-gnome2-glib/patches/patch-ext_glib2_rbgobj__binding.c b/devel/ruby-gnome2-glib/patches/patch-ext_glib2_rbgobj__binding.c
deleted file mode 100644
index 973de67988b..00000000000
--- a/devel/ruby-gnome2-glib/patches/patch-ext_glib2_rbgobj__binding.c
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ext_glib2_rbgobj__binding.c,v 1.1 2018/04/29 15:36:44 tsutsui Exp $
-
-- pull upstream fix for issue #1162
-
---- ext/glib2/rbgobj_binding.c.orig	2018-04-29 15:03:30.000000000 +0000
-+++ ext/glib2/rbgobj_binding.c
-@@ -28,7 +28,15 @@
- static VALUE
- rg_unbind(VALUE self)
- {
--    g_binding_unbind(_SELF(self));
-+    GBinding *binding = _SELF(self);
-+    GObject *source;
-+    VALUE rb_source;
-+
-+    source = g_binding_get_source(binding);
-+    rb_source = GOBJ2RVAL(source);
-+    rbgobj_object_remove_relative(rb_source, self);
-+    g_binding_unbind(binding);
-+
-     return self;
- }
- #endif
diff --git a/devel/ruby-gnome2-glib/patches/patch-ext_glib2_rbgobj__closure.c b/devel/ruby-gnome2-glib/patches/patch-ext_glib2_rbgobj__closure.c
deleted file mode 100644
index 6833736cfcc..00000000000
--- a/devel/ruby-gnome2-glib/patches/patch-ext_glib2_rbgobj__closure.c
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-ext_glib2_rbgobj__closure.c,v 1.1 2018/04/29 15:36:44 tsutsui Exp $
-
-- pull upstream fix for issue #1162
-
---- ext/glib2/rbgobj_closure.c.orig	2018-04-29 15:03:30.000000000 +0000
-+++ ext/glib2/rbgobj_closure.c
-@@ -1,6 +1,6 @@
- /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
- /*
-- *  Copyright (C) 2011-2016  Ruby-GNOME2 Project Team
-+ *  Copyright (C) 2011-2018  Ruby-GNOME2 Project Team
-  *  Copyright (C) 2002-2006  Ruby-GNOME2 Project
-  *  Copyright (C) 2002,2003  Masahiro Sakai
-  *
-@@ -191,8 +191,9 @@ rclosure_invalidate(G_GNUC_UNUSED gpoint
-         for (next = rclosure->objects; next; next = next->next) {
-             GObject *object = G_OBJECT(next->data);
-             VALUE obj = rbgobj_ruby_object_from_instance2(object, FALSE);
--            if (!NIL_P(rclosure->rb_holder) && !NIL_P(obj))
--                G_REMOVE_RELATIVE(obj, id_closures, rclosure->rb_holder);
-+            if (!NIL_P(rclosure->rb_holder) && !NIL_P(obj)) {
-+                rbgobj_object_remove_relative(obj, rclosure->rb_holder);
-+            }
-         }
- 
-         rclosure_unref(rclosure);
-@@ -286,16 +287,15 @@ rclosure_weak_notify(gpointer data, GObj
- void
- g_rclosure_attach(GClosure *closure, VALUE object)
- {
--    static VALUE mGLibObject = (VALUE)NULL;
-+    static VALUE cGLibObject = Qnil;
-     GRClosure *rclosure = (GRClosure *)closure;
- 
--    G_RELATIVE2(object, Qnil, id_closures, rclosure->rb_holder);
--
--    if (!mGLibObject) {
--        mGLibObject = rb_const_get(mGLib, rb_intern("Object"));
-+    if (NIL_P(cGLibObject)) {
-+        cGLibObject = rb_const_get(mGLib, rb_intern("Object"));
-     }
--    if (rb_obj_is_kind_of(object, mGLibObject)) {
-+    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);
diff --git a/devel/ruby-gnome2-glib/patches/patch-ext_glib2_rbgobj__object.c b/devel/ruby-gnome2-glib/patches/patch-ext_glib2_rbgobj__object.c
deleted file mode 100644
index b7cb3d23678..00000000000
--- a/devel/ruby-gnome2-glib/patches/patch-ext_glib2_rbgobj__object.c
+++ /dev/null
@@ -1,176 +0,0 @@
-$NetBSD: patch-ext_glib2_rbgobj__object.c,v 1.1 2018/04/29 15:36:44 tsutsui Exp $
-
-- pull upstream fix for issue #1162
-
---- ext/glib2/rbgobj_object.c.orig	2018-04-29 15:03:30.000000000 +0000
-+++ ext/glib2/rbgobj_object.c
-@@ -43,7 +43,8 @@ weak_notify(gpointer data, G_GNUC_UNUSED
-     gobj_holder *holder = data;
- 
-     rbgobj_instance_call_cinfo_free(holder->gobj);
--    rbgobj_invalidate_relatives(holder->self);
-+    g_hash_table_unref(holder->rb_relatives);
-+    holder->rb_relatives = NULL;
-     holder->destroyed = TRUE;
- 
-     g_object_unref(holder->gobj);
-@@ -51,11 +52,24 @@ weak_notify(gpointer data, G_GNUC_UNUSED
- }
- 
- static void
-+holder_relatives_mark(gpointer key, gpointer value, gpointer user_data)
-+{
-+    VALUE rb_relative = (VALUE)value;
-+    rb_gc_mark(rb_relative);
-+}
-+
-+static void
- holder_mark(void *data)
- {
-     gobj_holder *holder = data;
--    if (holder->gobj && !holder->destroyed)
--        rbgobj_instance_call_cinfo_mark(holder->gobj);
-+
-+    if (!holder->gobj)
-+        return;
-+    if (holder->destroyed)
-+        return;
-+
-+    rbgobj_instance_call_cinfo_mark(holder->gobj);
-+    g_hash_table_foreach(holder->rb_relatives, holder_relatives_mark, NULL);
- }
- 
- static void
-@@ -91,6 +105,59 @@ static const rb_data_type_t rg_glib_obje
-     RUBY_TYPED_FREE_IMMEDIATELY,
- };
- 
-+void
-+rbgobj_object_add_relative(VALUE rb_gobject, VALUE rb_relative)
-+{
-+    gobj_holder *holder;
-+    TypedData_Get_Struct(rb_gobject,
-+                         gobj_holder,
-+                         &rg_glib_object_type,
-+                         holder);
-+    if (holder->rb_relatives) {
-+        g_hash_table_insert(holder->rb_relatives,
-+                            (gpointer)(rb_relative),
-+                            (gpointer)(rb_relative));
-+    }
-+}
-+
-+void
-+rbgobj_object_remove_relative(VALUE rb_gobject, VALUE rb_relative)
-+{
-+    gobj_holder *holder;
-+    TypedData_Get_Struct(rb_gobject,
-+                         gobj_holder,
-+                         &rg_glib_object_type,
-+                         holder);
-+    if (holder->rb_relatives) {
-+        g_hash_table_remove(holder->rb_relatives,
-+                            (gpointer)(rb_relative));
-+    }
-+}
-+
-+static gboolean
-+rbgobj_object_remove_relatives_body(gpointer key,
-+                                    gpointer value,
-+                                    gpointer user_data)
-+{
-+    VALUE rb_relative = (VALUE)value;
-+    VALUE rb_relative_class = (VALUE)user_data;
-+
-+    return RVAL2CBOOL(rb_obj_is_kind_of(rb_relative, rb_relative_class));
-+}
-+
-+void
-+rbgobj_object_remove_relatives(VALUE rb_gobject, VALUE rb_relative_class)
-+{
-+    gobj_holder *holder;
-+    TypedData_Get_Struct(rb_gobject,
-+                         gobj_holder,
-+                         &rg_glib_object_type,
-+                         holder);
-+    g_hash_table_foreach_remove(holder->rb_relatives,
-+                                rbgobj_object_remove_relatives_body,
-+                                (gpointer)(rb_relative_class));
-+}
-+
- VALUE
- rbgobj_object_alloc_func(VALUE klass)
- {
-@@ -105,6 +172,7 @@ rbgobj_object_alloc_func(VALUE klass)
-     holder->gobj  = NULL;
-     holder->cinfo = NULL;
-     holder->destroyed = FALSE;
-+    holder->rb_relatives = g_hash_table_new(g_direct_hash, g_direct_equal);
- 
-     return result;
- }
-@@ -686,13 +754,6 @@ static void
- rg_destroy_bind_property_full_data(gpointer user_data)
- {
-     RGBindPropertyCallbackData *data = (RGBindPropertyCallbackData *)user_data;
--
--    if (!NIL_P(data->transform_to_callback))
--        G_CHILD_REMOVE(data->self, data->transform_to_callback);
--
--    if (!NIL_P(data->transform_from_callback))
--        G_CHILD_REMOVE(data->self, data->transform_from_callback);
--
-     xfree(data);
- }
- 
-@@ -715,6 +776,7 @@ rg_bind_property(gint argc, VALUE *argv,
-     GBinding *binding;
-     GBindingTransformFunc transform_to = NULL;
-     GBindingTransformFunc transform_from = NULL;
-+    VALUE rb_binding;
- 
-     rb_scan_args(argc, argv, "41", &rb_source_property, &rb_target,
-                  &rb_target_property, &rb_flags, &rb_options);
-@@ -731,18 +793,16 @@ rg_bind_property(gint argc, VALUE *argv,
-     flags = RVAL2GBINDINGFLAGS(rb_flags);
- 
-     if (!NIL_P(rb_transform_to)) {
--        G_CHILD_ADD(self, rb_transform_to);
-         transform_to = rg_bind_property_transform_to_callback;
-     }
- 
-     if (!NIL_P(rb_transform_from)) {
--        G_CHILD_ADD(self, rb_transform_from);
-         transform_from = rg_bind_property_transform_from_callback;
-     }
- 
-     if (transform_to || transform_from) {
-         RGBindPropertyCallbackData *data;
--        data = (RGBindPropertyCallbackData *)xmalloc(sizeof(RGBindPropertyCallbackData));
-+        data = RB_ALLOC(RGBindPropertyCallbackData);
-         data->self = self;
-         data->transform_to_callback = rb_transform_to;
-         data->transform_from_callback = rb_transform_from;
-@@ -752,13 +812,21 @@ rg_bind_property(gint argc, VALUE *argv,
-                                               transform_from,
-                                               (gpointer)data,
-                                               rg_destroy_bind_property_full_data);
-+        rb_binding = GOBJ2RVAL(binding);
-+        if (!NIL_P(rb_transform_to)) {
-+            rbgobj_object_add_relative(rb_binding, rb_transform_to);
-+        }
-+        if (!NIL_P(rb_transform_from)) {
-+            rbgobj_object_add_relative(rb_binding, rb_transform_from);
-+        }
-     } else {
-         binding = g_object_bind_property(source, source_property,
-                                          target, target_property,
-                                          flags);
-+        rb_binding = GOBJ2RVAL(binding);
-     }
- 
--    return GOBJ2RVAL(binding);
-+    return rb_binding;
- }
- #endif
- 
diff --git a/devel/ruby-gnome2-glib/patches/patch-ext_glib2_rbgobject.c b/devel/ruby-gnome2-glib/patches/patch-ext_glib2_rbgobject.c
deleted file mode 100644
index 13ece725e06..00000000000
--- a/devel/ruby-gnome2-glib/patches/patch-ext_glib2_rbgobject.c
+++ /dev/null
@@ -1,114 +0,0 @@
-$NetBSD: patch-ext_glib2_rbgobject.c,v 1.1 2018/04/29 15:36:44 tsutsui Exp $
-
-- pull upstream fix for issue #1162
-
---- ext/glib2/rbgobject.c.orig	2018-04-29 15:03:30.000000000 +0000
-+++ ext/glib2/rbgobject.c
-@@ -1,6 +1,6 @@
- /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
- /*
-- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
-+ *  Copyright (C) 2011-2018  Ruby-GNOME2 Project Team
-  *  Copyright (C) 2003-2006  Ruby-GNOME2 Project Team
-  *  Copyright (C) 2002,2003  Masahiro Sakai
-  *  Copyright (C) 1998-2000 Yukihiro Matsumoto,
-@@ -183,16 +183,25 @@ rbgobj_ruby_object_from_instance_with_un
- void
- rbgobj_add_relative(VALUE obj, VALUE relative)
- {
--    VALUE hash = Qnil;
-+    static VALUE mGLibObject = Qnil;
-+    if (NIL_P(mGLibObject)) {
-+        mGLibObject = rb_const_get(mGLib, rb_intern("Object"));
-+    }
- 
--    if (RVAL2CBOOL(rb_ivar_defined(obj, id_relatives)))
--        hash = rb_ivar_get(obj, id_relatives);
-+    if (rb_obj_is_kind_of(obj, mGLibObject)) {
-+        rbgobj_object_add_relative(obj, relative);
-+    } else {
-+        VALUE hash = Qnil;
- 
--    if (NIL_P(hash) || TYPE(hash) != RUBY_T_HASH) {
--        hash = rb_hash_new();
--        rb_ivar_set(obj, id_relatives, hash);
-+        if (RVAL2CBOOL(rb_ivar_defined(obj, id_relatives)))
-+            hash = rb_ivar_get(obj, id_relatives);
-+
-+        if (NIL_P(hash) || TYPE(hash) != RUBY_T_HASH) {
-+            hash = rb_hash_new();
-+            rb_ivar_set(obj, id_relatives, hash);
-+        }
-+        rb_hash_aset(hash, relative, Qnil);
-     }
--    rb_hash_aset(hash, relative, Qnil);
- }
- 
- void
-@@ -207,16 +216,26 @@ rbgobj_invalidate_relatives(VALUE obj)
- void
- rbgobj_add_relative_removable(VALUE obj, VALUE relative, ID obj_ivar_id, VALUE hash_key)
- {
--    VALUE hash = Qnil;
-+    static VALUE cGLibObject = Qnil;
-+    if (NIL_P(cGLibObject)) {
-+        cGLibObject = rb_const_get(mGLib, rb_intern("Object"));
-+    }
- 
--    if (RVAL2CBOOL(rb_ivar_defined(obj, obj_ivar_id)))
--        hash = rb_ivar_get(obj, obj_ivar_id);
-+    if (obj_ivar_id == rbgobj_id_children &&
-+        rb_obj_is_kind_of(obj, cGLibObject)) {
-+        rbgobj_object_add_relative(obj, hash_key);
-+    } else {
-+        VALUE hash = Qnil;
- 
--    if (NIL_P(hash) || TYPE(hash) != RUBY_T_HASH) {
--        hash = rb_hash_new();
--        rb_ivar_set(obj, obj_ivar_id, hash);
-+        if (RVAL2CBOOL(rb_ivar_defined(obj, obj_ivar_id)))
-+            hash = rb_ivar_get(obj, obj_ivar_id);
-+
-+        if (NIL_P(hash) || TYPE(hash) != RUBY_T_HASH) {
-+            hash = rb_hash_new();
-+            rb_ivar_set(obj, obj_ivar_id, hash);
-+        }
-+        rb_hash_aset(hash, hash_key, relative);
-     }
--    rb_hash_aset(hash, hash_key, relative);
- }
- 
- VALUE
-@@ -236,15 +255,25 @@ rbgobj_get_relative_removable(VALUE obj,
- void
- rbgobj_remove_relative(VALUE obj, ID obj_ivar_id, VALUE hash_key)
- {
--    VALUE hash = Qnil;
--
--    if (RVAL2CBOOL(rb_ivar_defined(obj, obj_ivar_id)))
--        hash = rb_ivar_get(obj, obj_ivar_id);
-+    static VALUE cGLibObject = Qnil;
-+    if (NIL_P(cGLibObject)) {
-+        cGLibObject = rb_const_get(mGLib, rb_intern("Object"));
-+    }
- 
--    if (NIL_P(hash) || TYPE(hash) != RUBY_T_HASH) {
--        /* should not happen. */
-+    if ((obj_ivar_id == id_relatives || obj_ivar_id == rbgobj_id_children) &&
-+        rb_obj_is_kind_of(obj, cGLibObject)) {
-+        rbgobj_object_remove_relative(obj, hash_key);
-     } else {
--        rb_funcall(hash, id_delete, 1, hash_key);
-+        VALUE hash = Qnil;
-+
-+        if (RVAL2CBOOL(rb_ivar_defined(obj, obj_ivar_id)))
-+            hash = rb_ivar_get(obj, obj_ivar_id);
-+
-+        if (NIL_P(hash) || TYPE(hash) != RUBY_T_HASH) {
-+            /* should not happen. */
-+        } else {
-+            rb_funcall(hash, id_delete, 1, hash_key);
-+        }
-     }
- }
- 
diff --git a/devel/ruby-gnome2-glib/patches/patch-ext_glib2_rbgobject.h b/devel/ruby-gnome2-glib/patches/patch-ext_glib2_rbgobject.h
deleted file mode 100644
index 516c318ecd3..00000000000
--- a/devel/ruby-gnome2-glib/patches/patch-ext_glib2_rbgobject.h
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ext_glib2_rbgobject.h,v 1.1 2018/04/29 15:36:44 tsutsui Exp $
-
-- pull upstream fix for issue #1162
-
---- ext/glib2/rbgobject.h.orig	2018-04-29 15:03:30.000000000 +0000
-+++ ext/glib2/rbgobject.h
-@@ -79,6 +79,7 @@ RUBY_GLIB2_VAR  ID rbgobj_id_children;
-     (rbgobj_add_relative_removable(self, Qnil, rbgobj_id_children, child))
- #define G_CHILD_REMOVE(self, child) \
-     (rbgobj_remove_relative(self, rbgobj_id_children, child))
-+/* Deprecated since 3.2.5. Use rbobj_object_remove_relatives() instead. */
- #define G_CHILD_REMOVE_ALL(self) \
-     (rbgobj_remove_relative_all(self, rbgobj_id_children))
- 
-@@ -147,6 +148,13 @@ extern VALUE rbgobj_ruby_object_from_ins
- extern VALUE rbgobj_ruby_object_from_instance_with_unref(gpointer instance);
- extern void rbgobj_instance_unref(gpointer instance);
- 
-+extern void rbgobj_object_add_relative(VALUE rb_gobject,
-+                                       VALUE rb_relative);
-+extern void rbgobj_object_remove_relative(VALUE rb_gobject,
-+                                          VALUE rb_relative);
-+extern void rbgobj_object_remove_relatives(VALUE rb_gobject,
-+                                           VALUE rb_relative_class);
-+
- extern void rbgobj_add_relative(VALUE obj, VALUE relative);
- extern void rbgobj_invalidate_relatives(VALUE obj);
- extern void rbgobj_add_relative_removable(VALUE obj, VALUE relative,
diff --git a/devel/ruby-gnome2-glib/patches/patch-ext_glib2_rbgprivate.h b/devel/ruby-gnome2-glib/patches/patch-ext_glib2_rbgprivate.h
deleted file mode 100644
index 5c4e0c546fa..00000000000
--- a/devel/ruby-gnome2-glib/patches/patch-ext_glib2_rbgprivate.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ext_glib2_rbgprivate.h,v 1.1 2018/04/29 15:36:44 tsutsui Exp $
-
-- pull upstream fix for issue #1162
-
---- ext/glib2/rbgprivate.h.orig	2018-04-29 15:03:30.000000000 +0000
-+++ ext/glib2/rbgprivate.h
-@@ -1,6 +1,6 @@
- /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
- /*
-- *  Copyright (C) 2007-2017  Ruby-GNOME2 Project Team
-+ *  Copyright (C) 2007-2018  Ruby-GNOME2 Project Team
-  *
-  *  This library is free software; you can redistribute it and/or
-  *  modify it under the terms of the GNU Lesser General Public
-@@ -42,6 +42,7 @@ typedef struct {
-     GObject* gobj;
-     const RGObjClassInfo* cinfo;
-     gboolean destroyed;
-+    GHashTable *rb_relatives;
- } gobj_holder;
- 
- typedef struct {
diff --git a/devel/ruby-gnome2-gobject-introspection/buildlink3.mk b/devel/ruby-gnome2-gobject-introspection/buildlink3.mk
index 6765914639e..306c6c63927 100644
--- a/devel/ruby-gnome2-gobject-introspection/buildlink3.mk
+++ b/devel/ruby-gnome2-gobject-introspection/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2014/03/14 13:05:26 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/05/03 12:04:02 tsutsui Exp $
 
 BUILDLINK_TREE+=	ruby-gnome2-gobject-introspection
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ruby-gnome2-gobject-introspection
 RUBY_GNOME2_GOBJECT_INTROSPECTION_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ruby-gnome2-gobject-introspection+=	${RUBY_PKGPREFIX}-gnome2-gobject-introspection>=1.2.0
-BUILDLINK_ABI_DEPENDS.ruby-gnome2-gobject-introspection+=	${RUBY_PKGPREFIX}-gnome2-gobject-introspection>=2.2.0
+BUILDLINK_ABI_DEPENDS.ruby-gnome2-gobject-introspection+=	${RUBY_PKGPREFIX}-gnome2-gobject-introspection>=3.2.5
 BUILDLINK_PKGSRCDIR.ruby-gnome2-gobject-introspection?=		../../devel/ruby-gnome2-gobject-introspection
 
 .include "../../devel/gobject-introspection/buildlink3.mk"
diff --git a/devel/ruby-gnome2-gobject-introspection/distinfo b/devel/ruby-gnome2-gobject-introspection/distinfo
index 66f314484ba..3307134832c 100644
--- a/devel/ruby-gnome2-gobject-introspection/distinfo
+++ b/devel/ruby-gnome2-gobject-introspection/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.12 2018/04/13 16:31:09 tsutsui Exp $
+$NetBSD: distinfo,v 1.13 2018/05/03 12:04:02 tsutsui Exp $
 
-SHA1 (gobject-introspection-3.2.4.gem) = 2601b8bcc01fc229ed59a8fea3363b3b58e0e411
-RMD160 (gobject-introspection-3.2.4.gem) = 3e4fd5371096539493473cd1c2f1995734c14331
-SHA512 (gobject-introspection-3.2.4.gem) = 861eb5ef6b6f4b6e998307afb1aecc099f55539c661b32bd9c4b0a6901fb287631c59ac6f6aa8f19cc17e6ce03f6cd04e4743c59a19088a9d5f176436c81d551
-Size (gobject-introspection-3.2.4.gem) = 54784 bytes
+SHA1 (gobject-introspection-3.2.5.gem) = 117687a175e431b06c723aa6a55d23bc44afdf9f
+RMD160 (gobject-introspection-3.2.5.gem) = 0f5f312152556cf9fdcd8a2125fb404153cad55b
+SHA512 (gobject-introspection-3.2.5.gem) = 69217fd85ce63e166a9c1b59260a6d7f49234a9ceceb2c006d83c4f8fcfdd8334635d661c184e9701281dc68eca0754aba63d916adddae65db2799a88af10244
+Size (gobject-introspection-3.2.5.gem) = 55296 bytes
 SHA1 (patch-ext_gobject-introspection_rb-gi-function-info.c) = 44bb15af46dcf6aab30bca06095fd5c3979a3ee5
diff --git a/devel/ruby-gnome2-pango/Makefile b/devel/ruby-gnome2-pango/Makefile
index 9f62be08b9e..c0015b5862a 100644
--- a/devel/ruby-gnome2-pango/Makefile
+++ b/devel/ruby-gnome2-pango/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.59 2018/04/16 14:33:49 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2018/05/03 12:04:02 tsutsui Exp $
 #
 
 DISTNAME=		pango-${VERSION}
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-${DISTNAME}
-PKGREVISION=		1
 COMMENT=		Ruby binding of pango-1.x
 CATEGORIES=		devel fonts
 
diff --git a/devel/ruby-gnome2-pango/buildlink3.mk b/devel/ruby-gnome2-pango/buildlink3.mk
index f10e1011b0d..50081d09045 100644
--- a/devel/ruby-gnome2-pango/buildlink3.mk
+++ b/devel/ruby-gnome2-pango/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.47 2018/04/16 14:33:49 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.48 2018/05/03 12:04:02 tsutsui Exp $
 
 BUILDLINK_TREE+=	ruby-gnome2-pango
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ruby-gnome2-pango
 RUBY_GNOME2_PANGO_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ruby-gnome2-pango+=	${RUBY_PKGPREFIX}-gnome2-pango>=0.16.0
-BUILDLINK_ABI_DEPENDS.ruby-gnome2-pango+=	${RUBY_PKGPREFIX}-gnome2-pango>=3.2.4nb1
+BUILDLINK_ABI_DEPENDS.ruby-gnome2-pango+=	${RUBY_PKGPREFIX}-gnome2-pango>=3.2.5
 BUILDLINK_PKGSRCDIR.ruby-gnome2-pango?=		../../devel/ruby-gnome2-pango
 
 .include "../../devel/ruby-gnome2-glib/buildlink3.mk"
diff --git a/devel/ruby-gnome2-pango/distinfo b/devel/ruby-gnome2-pango/distinfo
index f2805822c34..00db0f247bc 100644
--- a/devel/ruby-gnome2-pango/distinfo
+++ b/devel/ruby-gnome2-pango/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.13 2018/04/13 16:31:09 tsutsui Exp $
+$NetBSD: distinfo,v 1.14 2018/05/03 12:04:02 tsutsui Exp $
 
-SHA1 (pango-3.2.4.gem) = 478f2a4388aa3546676a773d17b8696baf9d97d7
-RMD160 (pango-3.2.4.gem) = eaae72a31a56f05d6318f72cb3aa2135ba20e322
-SHA512 (pango-3.2.4.gem) = a0f9532f007b76be3f7d782f5128ac0660a903653c2fb4d533ce0448bc4b6cf796f94a00c1c11c72bc4902436b45e5e82a6d12380c144e3896b2f35365215ef7
-Size (pango-3.2.4.gem) = 18432 bytes
+SHA1 (pango-3.2.5.gem) = 24de32e3e43503b8da9b05636106008479238d1f
+RMD160 (pango-3.2.5.gem) = 97ad87c525ddbda05ed0384a49803d0909ad0f51
+SHA512 (pango-3.2.5.gem) = 1b0e13ab98abc32ce4edeb8b57ca831c0cd71fede967dd52bb88241b051966e929334602193de5f6cb45284b0e1e781996e53e3619c50b2aa18265579c0ed383
+Size (pango-3.2.5.gem) = 18432 bytes