Update goocanvasmm to 0.15.4.

0.15.4 (unstable):

Fix the build with gtkmm 2.22, with deprecations disabled.

7 files changed, 9 insertions, 91 deletions

diff --git a/graphics/goocanvasmm/Makefile b/graphics/goocanvasmm/Makefile
index d2fe8df6081..04ca7735806 100644
--- a/graphics/goocanvasmm/Makefile
+++ b/graphics/goocanvasmm/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2011/01/13 13:38:06 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2011/01/23 08:19:35 obache Exp $
 #
 
-DISTNAME=	goocanvasmm-0.15.3
-PKGREVISION=	4
+DISTNAME=	goocanvasmm-0.15.4
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/goocanvasmm/0.15/}
 
@@ -24,6 +23,6 @@ BUILDLINK_API_DEPENDS.glibmm+=	glibmm>=2.14.2
 .include "../../devel/glibmm/buildlink3.mk"
 BUILDLINK_API_DEPENDS.goocanvas+=	goocanvas>=0.15
 .include "../../graphics/goocanvas/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gtkmm+=	gtkmm>=2.10.9
+BUILDLINK_API_DEPENDS.gtkmm+=	gtkmm>=2.22.0
 .include "../../x11/gtkmm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/goocanvasmm/PLIST b/graphics/goocanvasmm/PLIST
index bbc25c2b21b..f49d031331a 100644
--- a/graphics/goocanvasmm/PLIST
+++ b/graphics/goocanvasmm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2010/08/04 11:58:13 obache Exp $
+@comment $NetBSD: PLIST,v 1.5 2011/01/23 08:19:35 obache Exp $
 include/goocanvasmm-1.0/goocanvasmm.h
 include/goocanvasmm-1.0/goocanvasmm/bounds.h
 include/goocanvasmm-1.0/goocanvasmm/canvas.h
@@ -202,6 +202,7 @@ share/doc/goocanvasmm-1.0/reference/html/inherit__graph__3.png
 share/doc/goocanvasmm-1.0/reference/html/inherit__graph__4.png
 share/doc/goocanvasmm-1.0/reference/html/inherits.html
 share/doc/goocanvasmm-1.0/reference/html/modules.html
+share/doc/goocanvasmm-1.0/reference/html/namespaceAtk.html
 share/doc/goocanvasmm-1.0/reference/html/namespaceGoocanvas.html
 share/doc/goocanvasmm-1.0/reference/html/namespacemembers.html
 share/doc/goocanvasmm-1.0/reference/html/namespacemembers_enum.html
diff --git a/graphics/goocanvasmm/distinfo b/graphics/goocanvasmm/distinfo
index d572ac7640f..f2d248ac796 100644
--- a/graphics/goocanvasmm/distinfo
+++ b/graphics/goocanvasmm/distinfo
@@ -1,9 +1,5 @@
-$NetBSD: distinfo,v 1.5 2011/01/12 11:57:26 obache Exp $
+$NetBSD: distinfo,v 1.6 2011/01/23 08:19:35 obache 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
+SHA1 (goocanvasmm-0.15.4.tar.gz) = 3dc47963f3914e954f12e6682f0a097d50d6e84b
+RMD160 (goocanvasmm-0.15.4.tar.gz) = 92a02b5752e62642ddfa74d9c29abbf5bde58eef
+Size (goocanvasmm-0.15.4.tar.gz) = 1774316 bytes
diff --git a/graphics/goocanvasmm/patches/patch-aa b/graphics/goocanvasmm/patches/patch-aa
deleted file mode 100644
index da86ccde774..00000000000
--- a/graphics/goocanvasmm/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2011/01/12 11:57:27 obache 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
deleted file mode 100644
index 6c23dcb1077..00000000000
--- a/graphics/goocanvasmm/patches/patch-ab
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2011/01/12 11:57:27 obache 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
deleted file mode 100644
index becb0cf0094..00000000000
--- a/graphics/goocanvasmm/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2011/01/12 11:57:27 obache 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
deleted file mode 100644
index 7fe534c3f79..00000000000
--- a/graphics/goocanvasmm/patches/patch-ad
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2011/01/12 11:57:27 obache 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: