Pullup ticket #3321 - requested by obache

graphics/goocanvasmm: build fix

Revisions pulled up:
- graphics/goocanvasmm/Makefile			1.11
- graphics/goocanvasmm/distinfo			1.5
- graphics/goocanvasmm/patches/patch-aa		1.1
- graphics/goocanvasmm/patches/patch-ab		1.1
- graphics/goocanvasmm/patches/patch-ac		1.1
- graphics/goocanvasmm/patches/patch-ad		1.1
---
Module Name:	pkgsrc
Committed By:	obache
Date:		Wed Jan 12 11:57:27 UTC 2011

Modified Files:
	pkgsrc/graphics/goocanvasmm: Makefile distinfo
Added Files:
	pkgsrc/graphics/goocanvasmm/patches: patch-aa patch-ab patch-ac
	    patch-ad

Log Message:
Fix the build with the latest cairomm.
* goocanvas/src/enums.[hg|ccg]: Remove the (unused) Value<Cairo::Pattern>
   specialization. Pattern should always (and is always) used via RefPtr
   anyway.
http://git.gnome.org/browse/goocanvasmm/commit/?h=goocanvasmm-1.0&id=30edcb72c89c0f97d11d9f88c6da82f6ae78d4bf

Installed header file is changed, so bump PKGREVISION.

6 files changed, 85 insertions, 3 deletions

diff --git a/graphics/goocanvasmm/Makefile b/graphics/goocanvasmm/Makefile
index 05d23aa40f9..1d386bf5cb5 100644
--- a/graphics/goocanvasmm/Makefile
+++ b/graphics/goocanvasmm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2010/11/18 11:54:56 obache Exp $
+# $NetBSD: Makefile,v 1.10.2.1 2011/01/12 18:57:00 tron Exp $
 #
 
 DISTNAME=	goocanvasmm-0.15.3
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/goocanvasmm/0.15/}
 
diff --git a/graphics/goocanvasmm/distinfo b/graphics/goocanvasmm/distinfo
index cb006ca5633..593edfdbdff 100644
--- a/graphics/goocanvasmm/distinfo
+++ b/graphics/goocanvasmm/distinfo
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.4 2010/08/04 11:58:13 obache Exp $
+$NetBSD: distinfo,v 1.4.4.1 2011/01/12 18:57:00 tron Exp $
 
 SHA1 (goocanvasmm-0.15.3.tar.gz) = b21676c9590f86186d4784537aefda119127f906
 RMD160 (goocanvasmm-0.15.3.tar.gz) = bf5aec04c917ff1f20013e6e561f4a3accb99a24
 Size (goocanvasmm-0.15.3.tar.gz) = 1799421 bytes
+SHA1 (patch-aa) = 791778d3cf273b0c97c2185588478e27a38992ea
+SHA1 (patch-ab) = 040e8b02b3f36d6f2c68b4eda4f8382013c50842
+SHA1 (patch-ac) = 62de86486fea8a8d267fd9ce5526514fca1c7342
+SHA1 (patch-ad) = 2e540457d8bdebb854409afc226c92722f079e9d
diff --git a/graphics/goocanvasmm/patches/patch-aa b/graphics/goocanvasmm/patches/patch-aa
new file mode 100644
index 00000000000..b608639e5f2
--- /dev/null
+++ b/graphics/goocanvasmm/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.1.2.2 2011/01/12 18:57:00 tron Exp $
+
+Fix the build with the latest cairomm.
+http://git.gnome.org/browse/goocanvasmm/commit/?h=goocanvasmm-1.0&id=30edcb72c89c0f97d11d9f88c6da82f6ae78d4bf
+
+--- goocanvas/goocanvasmm/enums.cc.orig	2009-09-03 08:30:17.000000000 +0000
++++ goocanvas/goocanvasmm/enums.cc
+@@ -31,7 +31,6 @@ namespace Glib
+ 
+ // We can't simply derive from Glib::ValueBoxed<> because these have no
+ // gobj() function to return the underlying boxed C object.
+-GType Value<Cairo::Pattern>::value_type() { return goo_cairo_pattern_get_type(); }
+ GType Value<Cairo::Matrix*>::value_type() { return goo_cairo_matrix_get_type(); }
+ 
+ // Normally, _WRAP_ENUM does generate this code for us, but we can't use
diff --git a/graphics/goocanvasmm/patches/patch-ab b/graphics/goocanvasmm/patches/patch-ab
new file mode 100644
index 00000000000..81a51e7a7ad
--- /dev/null
+++ b/graphics/goocanvasmm/patches/patch-ab
@@ -0,0 +1,24 @@
+$NetBSD: patch-ab,v 1.1.2.2 2011/01/12 18:57:00 tron Exp $
+
+Fix the build with the latest cairomm.
+http://git.gnome.org/browse/goocanvasmm/commit/?h=goocanvasmm-1.0&id=30edcb72c89c0f97d11d9f88c6da82f6ae78d4bf
+
+--- goocanvas/goocanvasmm/enums.h.orig	2009-09-03 08:30:17.000000000 +0000
++++ goocanvas/goocanvasmm/enums.h
+@@ -193,16 +193,6 @@ namespace Glib
+ // GTypes goocanvas defines for them in goocanvasutil.h
+ 
+ template<>
+-class Value<Cairo::Pattern> : public Glib::ValueBase_Boxed
+-{
+-public:
+-  static GType value_type() G_GNUC_CONST;
+-
+-  void set(const Cairo::Pattern& data) { set_boxed(data.cobj()); }
+-  Cairo::Pattern get() const { return Cairo::Pattern(static_cast<cairo_pattern_t*>(get_boxed())); }
+-};
+-
+-template<>
+ class Value<Cairo::Matrix*> : public Glib::ValueBase_Boxed
+ {
+ public:
diff --git a/graphics/goocanvasmm/patches/patch-ac b/graphics/goocanvasmm/patches/patch-ac
new file mode 100644
index 00000000000..e0c7c15115f
--- /dev/null
+++ b/graphics/goocanvasmm/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1.2.2 2011/01/12 18:57:00 tron Exp $
+
+Fix the build with the latest cairomm.
+http://git.gnome.org/browse/goocanvasmm/commit/?h=goocanvasmm-1.0&id=30edcb72c89c0f97d11d9f88c6da82f6ae78d4bf
+
+--- goocanvas/src/enums.ccg.orig	2009-09-03 08:28:35.000000000 +0000
++++ goocanvas/src/enums.ccg
+@@ -25,7 +25,6 @@ namespace Glib
+ 
+ // We can't simply derive from Glib::ValueBoxed<> because these have no
+ // gobj() function to return the underlying boxed C object.
+-GType Value<Cairo::Pattern>::value_type() { return goo_cairo_pattern_get_type(); }
+ GType Value<Cairo::Matrix*>::value_type() { return goo_cairo_matrix_get_type(); }
+ 
+ // Normally, _WRAP_ENUM does generate this code for us, but we can't use
diff --git a/graphics/goocanvasmm/patches/patch-ad b/graphics/goocanvasmm/patches/patch-ad
new file mode 100644
index 00000000000..96eb88c9116
--- /dev/null
+++ b/graphics/goocanvasmm/patches/patch-ad
@@ -0,0 +1,24 @@
+$NetBSD: patch-ad,v 1.1.2.2 2011/01/12 18:57:00 tron Exp $
+
+Fix the build with the latest cairomm.
+http://git.gnome.org/browse/goocanvasmm/commit/?h=goocanvasmm-1.0&id=30edcb72c89c0f97d11d9f88c6da82f6ae78d4bf
+
+--- goocanvas/src/enums.hg.orig	2009-09-03 08:28:35.000000000 +0000
++++ goocanvas/src/enums.hg
+@@ -40,16 +40,6 @@ namespace Glib
+ // GTypes goocanvas defines for them in goocanvasutil.h
+ 
+ template<>
+-class Value<Cairo::Pattern> : public Glib::ValueBase_Boxed
+-{
+-public:
+-  static GType value_type() G_GNUC_CONST;
+-
+-  void set(const Cairo::Pattern& data) { set_boxed(data.cobj()); }
+-  Cairo::Pattern get() const { return Cairo::Pattern(static_cast<cairo_pattern_t*>(get_boxed())); }
+-};
+-
+-template<>
+ class Value<Cairo::Matrix*> : public Glib::ValueBase_Boxed
+ {
+ public: