Fix build with gtkmm>=2.24.3; shoud be the last fallout.

reported by nigel@
This commit is contained in:
ajacoutot 2013-04-09 06:21:22 +00:00
parent cc152a7a94
commit 75a6f18aba
2 changed files with 27 additions and 11 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.7 2013/03/11 11:06:04 espie Exp $ # $OpenBSD: Makefile,v 1.8 2013/04/09 06:21:22 ajacoutot Exp $
COMMENT = emulator for Nintendo Game Boy (Color/Advance) COMMENT = emulator for Nintendo Game Boy (Color/Advance)
DISTNAME = vbam-1.8.0.1054-src DISTNAME = vbam-1.8.0.1054-src
PKGNAME = ${DISTNAME:S/-src//} PKGNAME = ${DISTNAME:S/-src//}
REVISION = 3 REVISION = 4
CATEGORIES = emulators CATEGORIES = emulators
@ -15,15 +15,14 @@ MAINTAINER = Anthony J. Bentley <anthony@cathet.us>
# GPLv2+ (see doc/License.txt) # GPLv2+ (see doc/License.txt)
PERMIT_PACKAGE_CDROM = Yes PERMIT_PACKAGE_CDROM = Yes
WANTLIB += GL GLU ICE SDL SM X11 Xcomposite Xcursor Xdamage Xext WANTLIB += GL GLU ICE SDL SM X11 Xcomposite Xcursor Xdamage Xext
WANTLIB += Xfixes Xi Xinerama Xmu Xrandr Xrender Xt atk-1.0 atkmm-1.6 WANTLIB += Xfixes Xi Xinerama Xmu Xrandr Xrender Xt atk-1.0 atkmm-1.6
WANTLIB += c cairo cairomm-1.0 expat fontconfig freetype gdk-x11-2.0 WANTLIB += c cairo cairomm-1.0 fontconfig freetype gdk-x11-2.0
WANTLIB += gdk_pixbuf-2.0 gdkglext-x11-1.0 gdkglextmm-x11-1.2 WANTLIB += gdk_pixbuf-2.0 gdkglext-x11-1.0 gdkglextmm-x11-1.2
WANTLIB += gdkmm-2.4 gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4 gmodule-2.0 WANTLIB += gdkmm-2.4 gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4 gmodule-2.0
WANTLIB += gobject-2.0 gtk-x11-2.0 gtkglext-x11-1.0 gtkglextmm-x11-1.2 WANTLIB += gobject-2.0 gtk-x11-2.0 gtkglext-x11-1.0 gtkglextmm-x11-1.2
WANTLIB += gtkmm-2.4 m pango-1.0 pangocairo-1.0 pangoft2-1.0 WANTLIB += gtkmm-2.4 m pango-1.0 pangocairo-1.0 pangoft2-1.0 pangomm-1.4
WANTLIB += pangomm-1.4 pangox-1.0 pixman-1 png pthread pthread-stubs WANTLIB += pangox-1.0 png pthread sigc-2.0 stdc++ z
WANTLIB += sigc-2.0 stdc++ xcb xcb-render xcb-shm z
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=vbam/} MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=vbam/}

View File

@ -0,0 +1,17 @@
$OpenBSD: patch-src_gtk_main_cpp,v 1.1 2013/04/09 06:21:22 ajacoutot Exp $
Fix build with gtkmm>=2.24.3
--- src/gtk/main.cpp.orig Tue Apr 9 08:14:52 2013
+++ src/gtk/main.cpp Tue Apr 9 08:15:35 2013
@@ -16,6 +16,10 @@
// along with this program; if not, write to the Free Software Foundation,
// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#include <glibmm/value.h>
+#include <glibmm/arrayhandle.h>
+#include <glibmm/listhandle.h>
+#include <glibmm/optioncontext.h>
#include <gtkmm/main.h>
#include <gtkmm/window.h>
#include <gtkmm/messagedialog.h>