Update to ruby-gnome2-0.17.0rc1 to build with newer gnome packages.

10 files changed, 97 insertions, 16 deletions

diff --git a/meta-pkgs/ruby-gnome2/Makefile b/meta-pkgs/ruby-gnome2/Makefile
index 7b0a9d41fbb..85ceccba54e 100644
--- a/meta-pkgs/ruby-gnome2/Makefile
+++ b/meta-pkgs/ruby-gnome2/Makefile
@@ -1,23 +1,22 @@
-# $NetBSD: Makefile,v 1.9 2007/12/19 12:27:30 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2008/06/19 15:10:28 taca Exp $
 #
 
 PKGNAME=	${RUBY_PKGPREFIX}-gnome2-${VERSION}
-PKGREVISION=	2
 COMMENT=	Set of Ruby language bindings for GNOME2
 CATEGORIES=	meta-pkgs gnome
 
+DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-glib>=${VERSION}:../../devel/ruby-gnome2-glib
 DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-atk>=${VERSION}:../../devel/ruby-gnome2-atk
+DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-pango>=${VERSION}:../../devel/ruby-gnome2-pango
 DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gdkpixbuf>=${VERSION}:../../graphics/ruby-gnome2-gdkpixbuf
-DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-glib>=${VERSION}:../../devel/ruby-gnome2-glib
-DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gnome>=${VERSION}:../../x11/ruby-gnome2-gnome
+DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-libart>=${VERSION}:../../graphics/ruby-gnome2-libart
 DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gnomecanvas>=${VERSION}:../../graphics/ruby-gnome2-gnomecanvas
+DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-rsvg>=${VERSION}:../../graphics/ruby-gnome2-rsvg
+DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-poppler>=${VERSION}:../../print/ruby-gnome2-poppler
 DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gnomeprint>=${VERSION}:../../print/ruby-gnome2-gnomeprint
 DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gtk>=${VERSION}:../../x11/ruby-gnome2-gtk
-DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-libart>=${VERSION}:../../graphics/ruby-gnome2-libart
+DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gnome>=${VERSION}:../../x11/ruby-gnome2-gnome
 DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-panelapplet>=${VERSION}:../../x11/ruby-gnome2-panelapplet
-DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-pango>=${VERSION}:../../devel/ruby-gnome2-pango
-DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-poppler>=${VERSION}:../../print/ruby-gnome2-poppler
-DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-rsvg>=${VERSION}:../../graphics/ruby-gnome2-rsvg
 
 META_PACKAGE=	yes
 
diff --git a/meta-pkgs/ruby-gnome2/Makefile.common b/meta-pkgs/ruby-gnome2/Makefile.common
index ce175c3fa35..b8ba7a2ea33 100644
--- a/meta-pkgs/ruby-gnome2/Makefile.common
+++ b/meta-pkgs/ruby-gnome2/Makefile.common
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile.common,v 1.4 2007/08/19 02:59:24 taca Exp $
+# $NetBSD: Makefile.common,v 1.5 2008/06/19 15:10:28 taca Exp $
 #
 
-DISTNAME=		ruby-gnome2-all-${VERSION}
+DISTNAME=		ruby-gnome2-0.17.0-rc1
 CATEGORIES+=		ruby
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=ruby-gnome2/}
 
-DISTINFO_FILE?=		${.CURDIR}/../../meta-pkgs/ruby-gnome2/distinfo
+DISTINFO_FILE=		${.CURDIR}/../../meta-pkgs/ruby-gnome2/distinfo
+PATCHDIR=		${.CURDIR}/../../meta-pkgs/ruby-gnome2/patches
 
 MAINTAINER=		dieter.NetBSD@pandora.be
 HOMEPAGE=		http://ruby-gnome2.sourceforge.jp/
 
-VERSION=		0.16.0
+VERSION=		0.17.0rc1
 RUBY_HAS_ARCHLIB=	yes
 USE_RUBY_EXTCONF=	yes
 
diff --git a/meta-pkgs/ruby-gnome2/distinfo b/meta-pkgs/ruby-gnome2/distinfo
index 08b6d43d827..52647bfbacf 100644
--- a/meta-pkgs/ruby-gnome2/distinfo
+++ b/meta-pkgs/ruby-gnome2/distinfo
@@ -1,5 +1,12 @@
-$NetBSD: distinfo,v 1.3 2007/01/29 06:42:34 minskim Exp $
+$NetBSD: distinfo,v 1.4 2008/06/19 15:10:28 taca 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 (ruby-gnome2-0.17.0-rc1.tar.gz) = 372fb444dc1b05d236176895755a5ac87dcbd1a6
+RMD160 (ruby-gnome2-0.17.0-rc1.tar.gz) = 6cc815e2750f34de6f4104101e6f3a7cfb2a037e
+Size (ruby-gnome2-0.17.0-rc1.tar.gz) = 1444553 bytes
+SHA1 (patch-aa) = 316bf9d583e069e029717c7593b1693ce4bccd3e
+SHA1 (patch-ab) = e0d590165bd7ac8442904824d52f6a372c881697
+SHA1 (patch-ac) = 2ab0a3c86950ffd094bdac4abbde1e4cec2133b0
+SHA1 (patch-ad) = 3744e3a173d17d0a96a2f4209c40d34355fe9054
+SHA1 (patch-ae) = 48006ffe136d4471f074793e2d0f030052615bed
+SHA1 (patch-af) = acc1c071ffbe49b64abf4f4f938b1f96d2b4337d
+SHA1 (patch-ag) = 09d87a68006fbe56773e4b12350fa8a5fc133663
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-aa b/meta-pkgs/ruby-gnome2/patches/patch-aa
new file mode 100644
index 00000000000..e9c652cf86a
--- /dev/null
+++ b/meta-pkgs/ruby-gnome2/patches/patch-aa
@@ -0,0 +1,10 @@
+$NetBSD: patch-aa,v 1.1 2008/06/19 15:10:28 taca Exp $
+
+--- atk/src/depend.orig	2008-06-06 23:03:37.000000000 +0900
++++ atk/src/depend
+@@ -1,3 +1,3 @@
+ install:
+-	@$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbatk.h $(sitearchdir)$(target_prefix)
+-	@$(RUBY) -run -e install -- -m 0644 -v rbatkversion.h $(sitearchdir)$(target_prefix)
++	@$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbatk.h $(vendorarchdir)$(target_prefix)
++	@$(RUBY) -run -e install -- -m 0644 -v rbatkversion.h $(vendorarchdir)$(target_prefix)
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-ab b/meta-pkgs/ruby-gnome2/patches/patch-ab
new file mode 100644
index 00000000000..6620a9ad981
--- /dev/null
+++ b/meta-pkgs/ruby-gnome2/patches/patch-ab
@@ -0,0 +1,14 @@
+$NetBSD: patch-ab,v 1.1 2008/06/19 15:10:28 taca Exp $
+
+--- glib/src/depend.orig	2008-06-06 23:03:39.000000000 +0900
++++ glib/src/depend
+@@ -1,5 +1,5 @@
+ install:
+-	@$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbglib.h $(sitearchdir)$(target_prefix)
+-	@$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbgutil.h $(sitearchdir)$(target_prefix)
+-	@$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbgobject.h $(sitearchdir)$(target_prefix)
+-	@$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbgcompat.h $(sitearchdir)$(target_prefix)
++	@$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbglib.h $(vendorarchdir)$(target_prefix)
++	@$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbgutil.h $(vendorarchdir)$(target_prefix)
++	@$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbgobject.h $(vendorarchdir)$(target_prefix)
++	@$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbgcompat.h $(vendorarchdir)$(target_prefix)
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-ac b/meta-pkgs/ruby-gnome2/patches/patch-ac
new file mode 100644
index 00000000000..c67fb3f10e2
--- /dev/null
+++ b/meta-pkgs/ruby-gnome2/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1 2008/06/19 15:10:28 taca Exp $
+
+--- glib/src/lib/mkmf-gnome2.rb.orig	2008-06-06 23:03:39.000000000 +0900
++++ glib/src/lib/mkmf-gnome2.rb
+@@ -241,6 +241,7 @@ end
+ 
+ def check_ruby_func
+   $CPPFLAGS << " -I$(sitearchdir) "
++  $CPPFLAGS << " -I$(vendorarchdir) "
+ 
+   #Other options
+   have_func("rb_define_alloc_func") # for ruby-1.8
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-ad b/meta-pkgs/ruby-gnome2/patches/patch-ad
new file mode 100644
index 00000000000..42e74581f2c
--- /dev/null
+++ b/meta-pkgs/ruby-gnome2/patches/patch-ad
@@ -0,0 +1,8 @@
+$NetBSD: patch-ad,v 1.1 2008/06/19 15:10:28 taca Exp $
+
+--- gtk/src/depend.orig	2008-06-06 23:03:41.000000000 +0900
++++ gtk/src/depend
+@@ -1,2 +1,2 @@
+ install:
+-	@$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbgtk.h $(sitearchdir)$(target_prefix)
++	@$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbgtk.h $(vendorarchdir)$(target_prefix)
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-ae b/meta-pkgs/ruby-gnome2/patches/patch-ae
new file mode 100644
index 00000000000..88918aa6779
--- /dev/null
+++ b/meta-pkgs/ruby-gnome2/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.1 2008/06/19 15:10:28 taca Exp $
+
+--- gtk/src/rbgtk.h.orig	2008-06-06 14:03:41.000000000 +0000
++++ gtk/src/rbgtk.h
+@@ -18,6 +18,7 @@
+ #include "ruby.h"
+ #include "rubysig.h"
+ #include "rbgobject.h"
++#include "glib-enum-types.h"
+ #include <gtk/gtk.h>
+ 
+ #ifdef GDK_WINDOWING_X11
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-af b/meta-pkgs/ruby-gnome2/patches/patch-af
new file mode 100644
index 00000000000..a40c78408d2
--- /dev/null
+++ b/meta-pkgs/ruby-gnome2/patches/patch-af
@@ -0,0 +1,8 @@
+$NetBSD: patch-af,v 1.1 2008/06/19 15:10:28 taca Exp $
+
+--- libart/src/depend.orig	2008-06-06 23:03:45.000000000 +0900
++++ libart/src/depend
+@@ -1,2 +1,2 @@
+ install:
+-	@$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbart.h $(sitearchdir)$(target_prefix)
++	@$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbart.h $(vendorarchdir)$(target_prefix)
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-ag b/meta-pkgs/ruby-gnome2/patches/patch-ag
new file mode 100644
index 00000000000..1968c9566c4
--- /dev/null
+++ b/meta-pkgs/ruby-gnome2/patches/patch-ag
@@ -0,0 +1,10 @@
+$NetBSD: patch-ag,v 1.1 2008/06/19 15:10:28 taca Exp $
+
+--- pango/src/depend.orig	2008-06-06 23:03:45.000000000 +0900
++++ pango/src/depend
+@@ -1,3 +1,3 @@
+ install:
+-	@$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbpango.h $(sitearchdir)$(target_prefix)
+-	@$(RUBY) -run -e install -- -m 0644 -v rbpangoversion.h $(sitearchdir)$(target_prefix)
++	@$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbpango.h $(vendorarchdir)$(target_prefix)
++	@$(RUBY) -run -e install -- -m 0644 -v rbpangoversion.h $(vendorarchdir)$(target_prefix)