From d1e4291f2f1485cdd4c67ebb89d657892c0d69b0 Mon Sep 17 00:00:00 2001
From: obache <obache>
Date: Sat, 16 Mar 2013 12:25:47 +0000
Subject: [PATCH] Update ruby-gnome2 to 1.2.2.

== Ruby-GNOME2 1.2.2: 2013-03-11

Ruby 2.0.0 support release!

=== Changes

==== Ruby/GLib2

  * Improvements
    * Supported test on Ruby 2.0.0.
      [GitHub #134] [Reported by mtasaka]

==== Ruby/Poppler

  * Improvements
    * Removed deprecated GDK support.

==== Ruby/GDK3

  * Improvements
    * Supported Ruby 2.0.0.
      [GitHub#129] [Reported by TOMITA Masahiro]

==== Ruby/GObjectIntrospection

  * Improvements
    * Supported not GType based flags.
    * Supported not GType based enum.
    * Supported custom callback function.
    * Supported .h install.
    * Supported .pc install.
    * More Rubyish method names are used.
    * Stopped to raise exception when there are two or more out
      parameters.
    * Added Loader.start_callback_dispatch_thread().
    * Supported arguments validation.
    * Stopped to use array for just one return value.
    * Supported Enumerator.
    * Hide constructor methods.

==== Ruby/GtkSourceView3

  * Fixes
    * Fixed wrong deb package name.

==== Ruby/Clutter

  * Fixes
    * Fixed wrong initialized check.
    * Stopped to override Clutter.init unexpectedly.

==== Ruby/ClutterGTK

  * Fixes
    * Fixed wrong initialized check.

==== Ruby/WebKitGTK

  * Fixes
    * Fixed wrong initialized check.

=== Thanks

  * Vincent Carmona
    (for unreleased GObjectIntrospection based GStreamer bindings)
  * TOMITA Masahiro
  * NAKAJIMA Takashi
    (for unreleased GObjectIntrospection based GStreamer bindings)
  * mtasaka
---
 devel/ruby-gnome2-gobject-introspection/PLIST |  4 ++-
 devel/ruby-gnome2-pango/Makefile              |  3 +-
 graphics/ruby-gnome2-gdk3/Makefile            |  3 +-
 graphics/ruby-gnome2-gdkpixbuf/Makefile       |  3 +-
 graphics/ruby-gnome2-goocanvas/Makefile       |  3 +-
 graphics/ruby-gnome2-rsvg/Makefile            |  3 +-
 meta-pkgs/ruby-gnome2/Makefile.common         |  4 +--
 meta-pkgs/ruby-gnome2/distinfo                | 10 +++----
 .../patches/patch-glib2_ext_glib2_rbglib.h    | 20 -------------
 .../patch-glib2_ext_glib2_rbgprivate.h        | 28 -------------------
 print/ruby-gnome2-poppler/Makefile            |  3 +-
 x11/ruby-gnome2-gtk/Makefile                  |  3 +-
 x11/ruby-gnome2-gtk3/Makefile                 |  3 +-
 x11/ruby-gnome2-gtksourceview2/Makefile       |  3 +-
 x11/ruby-gnome2-gtksourceview3/Makefile       |  3 +-
 x11/ruby-gnome2-vte/Makefile                  |  3 +-
 16 files changed, 20 insertions(+), 79 deletions(-)
 delete mode 100644 meta-pkgs/ruby-gnome2/patches/patch-glib2_ext_glib2_rbglib.h
 delete mode 100644 meta-pkgs/ruby-gnome2/patches/patch-glib2_ext_glib2_rbgprivate.h

diff --git a/devel/ruby-gnome2-gobject-introspection/PLIST b/devel/ruby-gnome2-gobject-introspection/PLIST
index 20772f3b8395d..351a6699206a1 100644
--- a/devel/ruby-gnome2-gobject-introspection/PLIST
+++ b/devel/ruby-gnome2-gobject-introspection/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2013/02/07 13:41:55 obache Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/03/16 12:25:47 obache Exp $
+lib/pkgconfig/ruby-gobject-introspection.pc
 ${RUBY_VENDORLIB}/gobject-introspection.rb
 ${RUBY_VENDORLIB}/gobject-introspection/callable-info.rb
 ${RUBY_VENDORLIB}/gobject-introspection/collection-reader.rb
@@ -9,3 +10,4 @@ ${RUBY_VENDORLIB}/gobject-introspection/repository.rb
 ${RUBY_VENDORLIB}/gobject-introspection/struct-info.rb
 ${RUBY_VENDORLIB}/gobject-introspection/union-info.rb
 ${RUBY_VENDORARCHLIB}/gobject_introspection.${RUBY_DLEXT}
+${RUBY_VENDORARCHLIB}/rb-gobject-introspection.h
diff --git a/devel/ruby-gnome2-pango/Makefile b/devel/ruby-gnome2-pango/Makefile
index 4df95dcf8b43c..e138f280c8c1c 100644
--- a/devel/ruby-gnome2-pango/Makefile
+++ b/devel/ruby-gnome2-pango/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2013/02/16 11:19:40 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2013/03/16 12:25:47 obache Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-pango-${VERSION}
 COMMENT=		Ruby binding of pango-1.x
-PKGREVISION=		1
 CATEGORIES=		devel fonts
 
 CONFLICTS+=		ruby-gnome2-pango-[0-9]*
diff --git a/graphics/ruby-gnome2-gdk3/Makefile b/graphics/ruby-gnome2-gdk3/Makefile
index 85f44f81fd0ab..815f01e73a5ae 100644
--- a/graphics/ruby-gnome2-gdk3/Makefile
+++ b/graphics/ruby-gnome2-gdk3/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2013/02/16 11:18:25 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2013/03/16 12:25:48 obache Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-gdk3-${VERSION}
 COMMENT=		Ruby binding of GDK3
-PKGREVISION=		1
 CATEGORIES=		graphics
 
 CONFLICTS+=		ruby[0-9][0-9]-gnome2-gdk3-[0-9]*
diff --git a/graphics/ruby-gnome2-gdkpixbuf/Makefile b/graphics/ruby-gnome2-gdkpixbuf/Makefile
index 0a534352c6d1d..d8ee23792c09f 100644
--- a/graphics/ruby-gnome2-gdkpixbuf/Makefile
+++ b/graphics/ruby-gnome2-gdkpixbuf/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2013/02/16 11:22:29 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2013/03/16 12:25:48 obache Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-gdkpixbuf-${VERSION}
 COMMENT=		Ruby binding of GdkPixbuf-2.x
-PKGREVISION=		1
 CATEGORIES=		graphics devel
 
 CONFLICTS+=		ruby-gnome2-gdkpixbuf-[0-9]*
diff --git a/graphics/ruby-gnome2-goocanvas/Makefile b/graphics/ruby-gnome2-goocanvas/Makefile
index 4fb0149a8e214..146703cf22146 100644
--- a/graphics/ruby-gnome2-goocanvas/Makefile
+++ b/graphics/ruby-gnome2-goocanvas/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2013/02/16 11:22:29 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2013/03/16 12:25:48 obache Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-goocanvas-${VERSION}
 COMMENT=		Ruby binding of GooCanvas
-PKGREVISION=		1
 CATEGORIES=		graphics gnome
 
 CONFLICTS+=		ruby[0-9][0-9]-gnome2-goocanvas-[0-9]*
diff --git a/graphics/ruby-gnome2-rsvg/Makefile b/graphics/ruby-gnome2-rsvg/Makefile
index e281f4eac12f9..63166adce21e7 100644
--- a/graphics/ruby-gnome2-rsvg/Makefile
+++ b/graphics/ruby-gnome2-rsvg/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2013/02/16 11:22:29 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2013/03/16 12:25:48 obache Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-rsvg-${VERSION}
 COMMENT=		Ruby binding of librsvg
-PKGREVISION=		1
 CATEGORIES=		graphics
 
 CONFLICTS+=		ruby[0-9][0-9]-gnome2-rsvg-[0-9]*
diff --git a/meta-pkgs/ruby-gnome2/Makefile.common b/meta-pkgs/ruby-gnome2/Makefile.common
index da9dd76683f13..1982508019eaf 100644
--- a/meta-pkgs/ruby-gnome2/Makefile.common
+++ b/meta-pkgs/ruby-gnome2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.27 2013/02/07 13:41:54 obache Exp $
+# $NetBSD: Makefile.common,v 1.28 2013/03/16 12:25:47 obache Exp $
 #
 # used by devel/ruby-gnome2-atk/Makefile
 # used by devel/ruby-gnome2-gio/Makefile
@@ -28,7 +28,7 @@ MAINTAINER=		dieter.NetBSD@pandora.be
 HOMEPAGE=		http://ruby-gnome2.sourceforge.jp/
 LICENSE=		gnu-lgpl-v2.1
 
-VERSION=		1.2.1
+VERSION=		1.2.2
 USE_RUBY_EXTCONF?=	yes
 CONFIGURE_ENV+=		RUBYOPT="-Ku"
 
diff --git a/meta-pkgs/ruby-gnome2/distinfo b/meta-pkgs/ruby-gnome2/distinfo
index c538c736bb8b3..15493e08d9487 100644
--- a/meta-pkgs/ruby-gnome2/distinfo
+++ b/meta-pkgs/ruby-gnome2/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.31 2013/02/07 13:41:54 obache Exp $
+$NetBSD: distinfo,v 1.32 2013/03/16 12:25:47 obache Exp $
 
-SHA1 (ruby-gnome2-all-1.2.1.tar.gz) = cbf6cbe574f27582acdb93c9ebed828b0126f553
-RMD160 (ruby-gnome2-all-1.2.1.tar.gz) = 76091e8dfdceb889ff75c6076f665d118765d908
-Size (ruby-gnome2-all-1.2.1.tar.gz) = 1680458 bytes
-SHA1 (patch-glib2_ext_glib2_rbglib.h) = 1a504f24e09acb6e962bde5fd8eace5696572ae4
-SHA1 (patch-glib2_ext_glib2_rbgprivate.h) = 73ce03f3a64c3e2f54247012211fac359eb6ccf2
+SHA1 (ruby-gnome2-all-1.2.2.tar.gz) = b93d427640aaeb6dd0a14ea93257ed9acbafd753
+RMD160 (ruby-gnome2-all-1.2.2.tar.gz) = c2be22d358ae302140ee26b83cf3c1787e467737
+Size (ruby-gnome2-all-1.2.2.tar.gz) = 1678394 bytes
 SHA1 (patch-glib2_lib_mkmf-gnome2.rb) = 7ea9f2066aae905e64d8477f500245e3e3b5df9e
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-glib2_ext_glib2_rbglib.h b/meta-pkgs/ruby-gnome2/patches/patch-glib2_ext_glib2_rbglib.h
deleted file mode 100644
index 0654e873291ff..0000000000000
--- a/meta-pkgs/ruby-gnome2/patches/patch-glib2_ext_glib2_rbglib.h
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-glib2_ext_glib2_rbglib.h,v 1.1 2013/02/07 13:41:54 obache Exp $
-
-* Move rb_str_new_cstr() compatible macro to private header 
-  Because all rbglib.h users should check rb_str_new_cstr() check when
-  it exists in rbglib.h.
-  https://github.com/ruby-gnome2/ruby-gnome2/commit/97e6965c4b4463c5aa687b4827f3ef52e7054571
-
---- glib2/ext/glib2/rbglib.h.orig	2013-01-30 14:00:35.000000000 +0000
-+++ glib2/ext/glib2/rbglib.h
-@@ -63,10 +63,6 @@ typedef int GPid;
- #  define G_SOURCE_CONTINUE TRUE
- #endif
- 
--#ifndef HAVE_RB_STR_NEW_CSTR
--#  define rb_str_new_cstr(c_string) rb_str_new2(c_string)
--#endif
--
- #define RBG_INSPECT(object) (rbg_rval_inspect(object))
- 
- #define RVAL2CSTR(v) (rbg_rval2cstr(&(v)))
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-glib2_ext_glib2_rbgprivate.h b/meta-pkgs/ruby-gnome2/patches/patch-glib2_ext_glib2_rbgprivate.h
deleted file mode 100644
index 35bb80db09ade..0000000000000
--- a/meta-pkgs/ruby-gnome2/patches/patch-glib2_ext_glib2_rbgprivate.h
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-glib2_ext_glib2_rbgprivate.h,v 1.1 2013/02/07 13:41:54 obache Exp $
-
-* Move rb_str_new_cstr() compatible macro to private header 
-  Because all rbglib.h users should check rb_str_new_cstr() check when
-  it exists in rbglib.h.
-  https://github.com/ruby-gnome2/ruby-gnome2/commit/97e6965c4b4463c5aa687b4827f3ef52e7054571
-
---- glib2/ext/glib2/rbgprivate.h.orig	2012-07-21 14:29:19.000000000 +0000
-+++ glib2/ext/glib2/rbgprivate.h
-@@ -1,6 +1,6 @@
- /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
- /*
-- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
-+ *  Copyright (C) 2011-2013  Ruby-GNOME2 Project Team
-  *  Copyright (C) 2007  Ruby-GNOME2 Project Team
-  *
-  *  This library is free software; you can redistribute it and/or
-@@ -29,6 +29,10 @@
- #  define rb_errinfo() (ruby_errinfo)
- #endif
- 
-+#ifndef HAVE_RB_STR_NEW_CSTR
-+#  define rb_str_new_cstr(c_string) rb_str_new2(c_string)
-+#endif
-+
- #ifndef G_VALUE_INIT
- #  define G_VALUE_INIT { 0, { { 0 } } }
- #endif
diff --git a/print/ruby-gnome2-poppler/Makefile b/print/ruby-gnome2-poppler/Makefile
index ecb0bf23575d2..8e08acb857801 100644
--- a/print/ruby-gnome2-poppler/Makefile
+++ b/print/ruby-gnome2-poppler/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2013/02/16 11:24:14 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2013/03/16 12:25:48 obache Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-poppler-${VERSION}
 COMMENT=		Ruby binding of poppler-glib
-PKGREVISION=		1
 CATEGORIES=		print
 
 CONFLICTS+=		ruby[0-9][0-9]-gnome2-poppler-[0-9]*
diff --git a/x11/ruby-gnome2-gtk/Makefile b/x11/ruby-gnome2-gtk/Makefile
index af48bb42262ca..46a81f98e310a 100644
--- a/x11/ruby-gnome2-gtk/Makefile
+++ b/x11/ruby-gnome2-gtk/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2013/02/16 11:18:57 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2013/03/16 12:25:49 obache Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-gtk-${VERSION}
 COMMENT=		Ruby binding of GTK+-2.x
-PKGREVISION=		1
 CATEGORIES=		x11
 
 CONFLICTS+=		ruby-gnome2-gtk-[0-9]*
diff --git a/x11/ruby-gnome2-gtk3/Makefile b/x11/ruby-gnome2-gtk3/Makefile
index 909268d52c2f2..818c2b6aae69e 100644
--- a/x11/ruby-gnome2-gtk3/Makefile
+++ b/x11/ruby-gnome2-gtk3/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2013/02/16 11:18:24 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2013/03/16 12:25:49 obache Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-gtk3-${VERSION}
 COMMENT=		Ruby binding of GTK+-3.x
-PKGREVISION=		1
 CATEGORIES=		x11
 
 CONFLICTS+=		ruby[0-9][0-9]-gnome2-gtk3-[0-9]*
diff --git a/x11/ruby-gnome2-gtksourceview2/Makefile b/x11/ruby-gnome2-gtksourceview2/Makefile
index b36113e97fb68..06f778c103166 100644
--- a/x11/ruby-gnome2-gtksourceview2/Makefile
+++ b/x11/ruby-gnome2-gtksourceview2/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2013/02/16 11:25:27 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2013/03/16 12:25:49 obache Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-gtksourceview2-${VERSION}
 COMMENT=		Ruby binding of gtksourceview2
-PKGREVISION=		1
 CATEGORIES=		x11
 
 CONFLICTS+=		ruby[0-9][0-9]-gnome2-gtksourceview2-[0-9]*
diff --git a/x11/ruby-gnome2-gtksourceview3/Makefile b/x11/ruby-gnome2-gtksourceview3/Makefile
index f3621dcab75dc..e5a3f68565629 100644
--- a/x11/ruby-gnome2-gtksourceview3/Makefile
+++ b/x11/ruby-gnome2-gtksourceview3/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2013/02/16 11:25:28 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2013/03/16 12:25:49 obache Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-gtksourceview3-${VERSION}
 COMMENT=		Ruby binding of gtksourceview3
-PKGREVISION=		1
 CATEGORIES=		x11
 
 CONFLICTS+=		ruby[0-9][0-9]-gnome2-gtksourceview3-[0-9]*
diff --git a/x11/ruby-gnome2-vte/Makefile b/x11/ruby-gnome2-vte/Makefile
index 586f7f733fc81..5f6aae79bf1a4 100644
--- a/x11/ruby-gnome2-vte/Makefile
+++ b/x11/ruby-gnome2-vte/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2013/02/16 11:25:28 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2013/03/16 12:25:49 obache Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-vte-${VERSION}
 COMMENT=		Ruby binding of vte
-PKGREVISION=		1
 CATEGORIES=		x11
 
 CONFLICTS+=		ruby[0-9][0-9]-gnome2-vte-[0-9]*