From 0768e4c35685f6bc200b905c1b072846183c5413 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Thu, 18 Nov 2010 10:08:31 +0000
Subject: [PATCH] Fix build with gtk>=2.22.

---
 emulators/sdlmame/distinfo         |  3 ++-
 emulators/sdlmame/patches/patch-ag | 12 ++++++++++++
 emulators/sdlmess/distinfo         |  3 ++-
 emulators/sdlmess/patches/patch-ag | 12 ++++++++++++
 4 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 emulators/sdlmame/patches/patch-ag
 create mode 100644 emulators/sdlmess/patches/patch-ag

diff --git a/emulators/sdlmame/distinfo b/emulators/sdlmame/distinfo
index 7ba7a30dc3a1..c6f4c9e3c704 100644
--- a/emulators/sdlmame/distinfo
+++ b/emulators/sdlmame/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2010/06/05 12:20:07 wiz Exp $
+$NetBSD: distinfo,v 1.12 2010/11/18 10:08:31 wiz Exp $
 
 SHA1 (sdlmame0136.zip) = 19c11abc3b3ab2633df62f3867921b3541bb582e
 RMD160 (sdlmame0136.zip) = 1cb9b24ae6f97c0f223f13ed97a074de14e2892e
@@ -9,4 +9,5 @@ SHA1 (patch-ac) = e97e7b730305aa2d10363cfd65f8e2b30f2fc292
 SHA1 (patch-ad) = 8d6312b593343eb2e5b29f177376c8fa243d8293
 SHA1 (patch-ae) = d110f0338d224823d959c8a2b57026321a3f0a38
 SHA1 (patch-af) = 4e7b4eab76e43feec91e91238d855c70ac43e15b
+SHA1 (patch-ag) = 28a86606c098a0b057029ef9ba9b136b4c223a86
 SHA1 (patch-ah) = f2dbfc44e30857fd9b52ed5d107b5190d5e5f6da
diff --git a/emulators/sdlmame/patches/patch-ag b/emulators/sdlmame/patches/patch-ag
new file mode 100644
index 000000000000..18be8dadcf20
--- /dev/null
+++ b/emulators/sdlmame/patches/patch-ag
@@ -0,0 +1,12 @@
+$NetBSD: patch-ag,v 1.1 2010/11/18 10:08:31 wiz Exp $
+
+--- src/osd/sdl/sdl.mak.orig	2009-12-19 16:18:21.000000000 +0000
++++ src/osd/sdl/sdl.mak
+@@ -300,7 +300,6 @@ ifndef NO_X11
+ OSDCOREOBJS += $(SDLOBJ)/debugwin.o $(SDLOBJ)/dview.o $(SDLOBJ)/debug-sup.o $(SDLOBJ)/debug-intf.o
+ CFLAGS += `pkg-config --cflags gtk+-2.0` `pkg-config --cflags gconf-2.0` 
+ LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0`
+-CFLAGS += -DGTK_DISABLE_DEPRECATED
+ else
+ OSDCOREOBJS += $(SDLOBJ)/debugwin.o
+ endif # NO_X11
diff --git a/emulators/sdlmess/distinfo b/emulators/sdlmess/distinfo
index ac23f6805f9c..e193d06112ce 100644
--- a/emulators/sdlmess/distinfo
+++ b/emulators/sdlmess/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2010/06/05 12:20:07 wiz Exp $
+$NetBSD: distinfo,v 1.11 2010/11/18 10:08:31 wiz Exp $
 
 SHA1 (sdlmess0136.zip) = 54ec2faf96564a86dbe38c4e0666f977d85c4e22
 RMD160 (sdlmess0136.zip) = 9463ad4dd5ed7a898af331709c8aa4d78915d43e
@@ -9,4 +9,5 @@ SHA1 (patch-ac) = 32503c6dcdeb9a0d082375a11f0e23bac53410db
 SHA1 (patch-ad) = 8d6312b593343eb2e5b29f177376c8fa243d8293
 SHA1 (patch-ae) = d110f0338d224823d959c8a2b57026321a3f0a38
 SHA1 (patch-af) = 4e7b4eab76e43feec91e91238d855c70ac43e15b
+SHA1 (patch-ag) = 0f9f2dff7c5e6b74f447e020176224fe8793fb67
 SHA1 (patch-ah) = f2dbfc44e30857fd9b52ed5d107b5190d5e5f6da
diff --git a/emulators/sdlmess/patches/patch-ag b/emulators/sdlmess/patches/patch-ag
new file mode 100644
index 000000000000..f5b66edde1f5
--- /dev/null
+++ b/emulators/sdlmess/patches/patch-ag
@@ -0,0 +1,12 @@
+$NetBSD: patch-ag,v 1.1 2010/11/18 10:08:32 wiz Exp $
+
+--- src/osd/sdl/sdl.mak.orig	2010-11-18 09:39:45.000000000 +0000
++++ src/osd/sdl/sdl.mak
+@@ -300,7 +300,6 @@ ifndef NO_X11
+ OSDCOREOBJS += $(SDLOBJ)/debugwin.o $(SDLOBJ)/dview.o $(SDLOBJ)/debug-sup.o $(SDLOBJ)/debug-intf.o
+ CFLAGS += `pkg-config --cflags gtk+-2.0` `pkg-config --cflags gconf-2.0` 
+ LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0`
+-CFLAGS += -DGTK_DISABLE_DEPRECATED
+ else
+ OSDCOREOBJS += $(SDLOBJ)/debugwin.o
+ endif # NO_X11