Fix build problem with recent pango, pango_glyph_item_get_type() was defined.

Patch taken from upstream SVN repository Revision 2839.

5 files changed, 75 insertions, 1 deletions

diff --git a/devel/ruby-gnome2-pango/Makefile b/devel/ruby-gnome2-pango/Makefile
index f4e15f9dd18..3ae4e4d8868 100644
--- a/devel/ruby-gnome2-pango/Makefile
+++ b/devel/ruby-gnome2-pango/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/08/19 14:31:25 obache Exp $
+# $NetBSD: Makefile,v 1.8 2008/04/28 14:38:51 obache Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-pango-${VERSION}
@@ -13,6 +13,7 @@ RUBY_EXTCONF_SUBDIRS=	pango
 DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-glib>=${VERSION}:../../devel/ruby-gnome2-glib
 
 USE_TOOLS+=		pkg-config
+DISTINFO_FILE?=		${.CURDIR}/distinfo
 
 INSTALL_TARGET=		install
 
diff --git a/devel/ruby-gnome2-pango/distinfo b/devel/ruby-gnome2-pango/distinfo
new file mode 100644
index 00000000000..bda9a82ceed
--- /dev/null
+++ b/devel/ruby-gnome2-pango/distinfo
@@ -0,0 +1,8 @@
+$NetBSD: distinfo,v 1.1 2008/04/28 14:38:51 obache Exp $
+
+SHA1 (ruby-gnome2-all-0.16.0.tar.gz) = 488f6c1f139060e005f336c9c854c4dc5b3e6b7c
+RMD160 (ruby-gnome2-all-0.16.0.tar.gz) = c83c7cdcf633ad5cc213180f641a6c8f18002a9c
+Size (ruby-gnome2-all-0.16.0.tar.gz) = 1208856 bytes
+SHA1 (patch-aa) = c07918ae0607fe0a217be65b3b36731f73b0bdc0
+SHA1 (patch-ab) = 74d6b904584d742346fc34e2fe1cb336254d5d40
+SHA1 (patch-ac) = 9be382f637dd8629f51230eedd96af7c03637bc8
diff --git a/devel/ruby-gnome2-pango/patches/patch-aa b/devel/ruby-gnome2-pango/patches/patch-aa
new file mode 100644
index 00000000000..20a1806bacd
--- /dev/null
+++ b/devel/ruby-gnome2-pango/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.1 2008/04/28 14:38:51 obache Exp $
+
+--- pango/extconf.rb.orig	2006-12-29 13:17:28.000000000 +0000
++++ pango/extconf.rb
+@@ -23,6 +23,7 @@ have_func("pango_render_part_get_type")
+ have_func("pango_attr_strikethrough_color_new")
+ have_func("pango_attr_underline_color_new")
+ have_func("pango_glyph_item_free")
++have_func("pango_glyph_item_get_type")
+ have_func("pango_attr_iterator_get_attrs")
+ have_func("pango_itemize_with_base_dir")
+ have_func("pango_font_family_is_monospace")
diff --git a/devel/ruby-gnome2-pango/patches/patch-ab b/devel/ruby-gnome2-pango/patches/patch-ab
new file mode 100644
index 00000000000..ae6c515e1e9
--- /dev/null
+++ b/devel/ruby-gnome2-pango/patches/patch-ab
@@ -0,0 +1,24 @@
+$NetBSD: patch-ab,v 1.1 2008/04/28 14:38:51 obache Exp $
+
+--- pango/src/rbpango.h.orig	2006-12-29 13:17:28.000000000 +0000
++++ pango/src/rbpango.h
+@@ -56,7 +56,9 @@ RUBY_PANGO_VAR VALUE mPango;
+ #define PANGO_TYPE_ATTR_ITERATOR (pango_attr_iter_get_type())
+ #define PANGO_TYPE_COVERAGE (pango_coverage_get_type())
+ #define PANGO_TYPE_GLYPH_INFO (pango_glyph_info_get_type())
++#ifndef PANGO_TYPE_GLYPH_ITEM
+ #define PANGO_TYPE_GLYPH_ITEM (pango_glyph_item_get_type())
++#endif
+ 
+ #if PANGO_CHECK_VERSION(1,4,0)
+ #define PANGO_TYPE_SCRIPT_ITER (pango_script_iter_get_type())
+@@ -79,7 +81,9 @@ extern GType pango_rectangle_get_type();
+ extern GType pango_attr_iter_get_type();
+ extern GType pango_coverage_get_type();
+ extern GType pango_glyph_info_get_type();
++#ifndef HAVE_PANGO_GLYPH_ITEM_GET_TYPE
+ extern GType pango_glyph_item_get_type();
++#endif
+ 
+ #if PANGO_CHECK_VERSION(1,4,0)
+ extern GType pango_script_iter_get_type();
diff --git a/devel/ruby-gnome2-pango/patches/patch-ac b/devel/ruby-gnome2-pango/patches/patch-ac
new file mode 100644
index 00000000000..b25a659e81c
--- /dev/null
+++ b/devel/ruby-gnome2-pango/patches/patch-ac
@@ -0,0 +1,29 @@
+$NetBSD: patch-ac,v 1.1 2008/04/28 14:38:51 obache Exp $
+
+--- pango/src/rbpangoglyphitem.c.orig	2006-12-29 13:17:28.000000000 +0000
++++ pango/src/rbpangoglyphitem.c
+@@ -15,6 +15,7 @@
+ #define _SELF(r) ((PangoGlyphItem*)RVAL2BOXED(r, PANGO_TYPE_GLYPH_ITEM))
+ 
+ /**********************************/
++#ifndef HAVE_PANGO_GLYPH_ITEM_GET_TYPE
+ static PangoGlyphItem*
+ glyph_item_copy(ref)
+     const PangoGlyphItem* ref;
+@@ -26,7 +27,7 @@ glyph_item_copy(ref)
+   return new_ref;
+ }
+ 
+-#if ! HAVE_PANGO_GLYPH_ITEM_FREE
++#  ifndef HAVE_PANGO_GLYPH_ITEM_FREE
+ void
+ pango_glyph_item_free(PangoGlyphItem* glyph_item)
+ {
+@@ -49,6 +50,7 @@ pango_glyph_item_get_type(void)
+                     (GBoxedFreeFunc)pango_glyph_item_free);
+     return our_type;
+ }
++#endif
+ /**********************************/
+ 
+ static VALUE