diff --git a/x11/gnome/libgnomecanvasmm/Makefile b/x11/gnome/libgnomecanvasmm/Makefile index db4c40e803b..0f172429bd8 100644 --- a/x11/gnome/libgnomecanvasmm/Makefile +++ b/x11/gnome/libgnomecanvasmm/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.32 2013/05/31 15:35:06 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.33 2013/06/28 09:59:28 ajacoutot Exp $ SHARED_ONLY= Yes @@ -7,7 +7,7 @@ COMMENT= C++ interface to the graphics library for GNOME GNOME_PROJECT= libgnomecanvasmm GNOME_VERSION= 2.26.0 EXTRACT_SUFX= .tar.bz2 -REVISION= 8 +REVISION= 9 SHARED_LIBS += gnomecanvasmm-2.6 1.0 # 1.6 @@ -21,15 +21,15 @@ WANTLIB += Xrandr Xrender art_lgpl_2 atk-1.0 atkmm-1.6 cairo cairomm-1.0 WANTLIB += expat ffi fontconfig freetype gailutil gdk-x11-2.0 WANTLIB += gdk_pixbuf-2.0 gdkmm-2.4 gio-2.0 giomm-2.4 glib-2.0 WANTLIB += glibmm-2.4 gmodule-2.0 gnomecanvas-2 gobject-2.0 graphite2 -WANTLIB += gthread-2.0 gtk-x11-2.0 gtkmm-2.4 harfbuzz -WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 -WANTLIB += pangomm-1.4 pcre pixman-1 png pthread pthread-stubs -WANTLIB += sigc-2.0 stdc++ xcb xcb-render xcb-shm z +WANTLIB += gthread-2.0 gtk-x11-2.0 gtkmm-2.4 harfbuzz m pango-1.0 +WANTLIB += pangocairo-1.0 pangoft2-1.0 pangomm-1.4 pcre pixman-1 +WANTLIB += png pthread pthread-stubs sigc-2.0 stdc++ xcb xcb-render +WANTLIB += xcb-shm z MODULES= devel/gettext \ x11/gnome LIB_DEPENDS= x11/gnome/libgnomecanvas \ - x11/gtk2mm>=2.24.3 + x11/gtk2mm>=2.24.4 .include diff --git a/x11/gnome/libgnomecanvasmm/patches/patch-demos_canvas_cc b/x11/gnome/libgnomecanvasmm/patches/patch-demos_canvas_cc deleted file mode 100644 index c4de79de039..00000000000 --- a/x11/gnome/libgnomecanvasmm/patches/patch-demos_canvas_cc +++ /dev/null @@ -1,17 +0,0 @@ -$OpenBSD: patch-demos_canvas_cc,v 1.1 2013/04/07 13:03:16 ajacoutot Exp $ - -Fix build with gtkmm>=2.24.3 - ---- demos/canvas.cc.orig Sun Apr 7 15:00:13 2013 -+++ demos/canvas.cc Sun Apr 7 15:00:59 2013 -@@ -18,6 +18,10 @@ - */ - - #include -+#include -+#include -+#include -+#include - #include - #include - #include diff --git a/x11/gnome/libgnomecanvasmm/patches/patch-libgnomecanvas_libgnomecanvasmm_init_cc b/x11/gnome/libgnomecanvasmm/patches/patch-libgnomecanvas_libgnomecanvasmm_init_cc deleted file mode 100644 index ef06d381302..00000000000 --- a/x11/gnome/libgnomecanvasmm/patches/patch-libgnomecanvas_libgnomecanvasmm_init_cc +++ /dev/null @@ -1,17 +0,0 @@ -$OpenBSD: patch-libgnomecanvas_libgnomecanvasmm_init_cc,v 1.1 2013/04/07 13:03:16 ajacoutot Exp $ - -Fix build with gtkmm>=2.24.3 - ---- libgnomecanvas/libgnomecanvasmm/init.cc.orig Sun Apr 7 14:56:53 2013 -+++ libgnomecanvas/libgnomecanvasmm/init.cc Sun Apr 7 14:56:57 2013 -@@ -18,6 +18,10 @@ - */ - - #include -+#include -+#include -+#include -+#include - #include - #include - diff --git a/x11/gnome/libgnomecanvasmm/patches/patch-libgnomecanvas_libgnomecanvasmm_properties_h b/x11/gnome/libgnomecanvasmm/patches/patch-libgnomecanvas_libgnomecanvasmm_properties_h deleted file mode 100644 index 8169aa5099e..00000000000 --- a/x11/gnome/libgnomecanvasmm/patches/patch-libgnomecanvas_libgnomecanvasmm_properties_h +++ /dev/null @@ -1,14 +0,0 @@ -$OpenBSD: patch-libgnomecanvas_libgnomecanvasmm_properties_h,v 1.1 2013/04/07 13:03:16 ajacoutot Exp $ - -Fix build with gtkmm>=2.24.3 - ---- libgnomecanvas/libgnomecanvasmm/properties.h.orig Sun Apr 7 14:57:35 2013 -+++ libgnomecanvas/libgnomecanvasmm/properties.h Sun Apr 7 14:57:43 2013 -@@ -27,6 +27,7 @@ - - - #include -+#include - #include - #include - #include