[patch] sdlmame-0.148_p1-no_gconf.patch

sdlmame-0.148_p1-no_gconf.patch (text/plain), 1.61 KB, created by Samuel Bauer on 2013-10-12 12:51:56 UTC

--- src/osd/sdl/dview.c.bak	2013-10-12 01:22:51.375576279 +0200
+++ src/osd/sdl/dview.c	2013-10-12 01:23:48.932856714 +0200
@@ -1,7 +1,6 @@
 
 #include "dview.h"
 #ifndef SDLMAME_WIN32
-#include <gconf/gconf-client.h>
 #endif
 
 G_DEFINE_TYPE(DView, dview, GTK_TYPE_CONTAINER);
@@ -345,22 +344,7 @@
 
 static void dview_class_init(DViewClass *dvc)
 {
-#ifndef SDLMAME_WIN32
-	GConfClient *conf = gconf_client_get_default();
-	char *name = 0;
-	dvc->fixedfont = 0;
-
-	if(conf)
-		name = gconf_client_get_string(conf, "/desktop/gnome/interface/monospace_font_name", 0);
-
-	if(name) {
-		dvc->fixedfont = pango_font_description_from_string(name);
-		g_free(name);
-	}
-
-	if(!dvc->fixedfont)
-#endif
-		dvc->fixedfont = pango_font_description_from_string("Monospace 10");
+	dvc->fixedfont = pango_font_description_from_string("Monospace 10");
 
 	if(!dvc->fixedfont) {
 		mame_printf_error("Couldn't find a monospace font, aborting\n");
--- src/osd/sdl/sdl.mak.bak	2013-10-12 01:27:45.729896343 +0200
+++ src/osd/sdl/sdl.mak	2013-10-12 01:28:17.024505107 +0200
@@ -692,9 +692,9 @@
 
 # the new debugger relies on GTK+ in addition to the base SDLMAME needs
 # Non-X11 builds can not use the debugger
-INCPATH += $(shell $(PKG_CONFIG) --cflags-only-I gtk+-2.0 gconf-2.0)
-CCOMFLAGS += $(shell $(PKG_CONFIG) --cflags-only-other gtk+-2.0 gconf-2.0)
-LIBS += $(shell $(PKG_CONFIG) --libs gtk+-2.0 gconf-2.0)
+INCPATH += $(shell $(PKG_CONFIG) --cflags-only-I gtk+-2.0)
+CCOMFLAGS += $(shell $(PKG_CONFIG) --cflags-only-other gtk+-2.0)
+LIBS += $(shell $(PKG_CONFIG) --libs gtk+-2.0)
 #CCOMFLAGS += -DGTK_DISABLE_DEPRECATED
 
 # The newer debugger uses QT