Build fixes for new glib2.

4 files changed, 48 insertions, 5 deletions

diff --git a/multimedia/gxine/distinfo b/multimedia/gxine/distinfo
index f513d80dc24..d31cfa996fe 100644
--- a/multimedia/gxine/distinfo
+++ b/multimedia/gxine/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2010/01/19 20:33:26 drochner Exp $
+$NetBSD: distinfo,v 1.26 2012/05/06 23:13:49 dholland Exp $
 
 SHA1 (gxine-0.5.905.tar.bz2) = dc01b617641d6eac4152259c592f15f31b9d9bf0
 RMD160 (gxine-0.5.905.tar.bz2) = 3dc30ba9f402d20e3ad3f469cc753607ccc3d194
@@ -12,7 +12,9 @@ SHA1 (patch-ah) = 201f42c4043cd2c1e5302d476713080554c02b86
 SHA1 (patch-ai) = 792fabf23d55fac337d6825e5ba28d1a80393ce9
 SHA1 (patch-aj) = 0a9efacd2aa90855bf990944c058028af367c24d
 SHA1 (patch-ak) = d055caed81560d53c922f772dc713bfca8ef5691
-SHA1 (patch-an) = e8fd4c81fad14e907aad2bffc3962c39322ac0e5
+SHA1 (patch-an) = 10789072010e0a2d868a24c21d97f902364f2587
 SHA1 (patch-aq) = 51acfd7107eed0cf73462daa73024ef28964d9eb
 SHA1 (patch-ba) = 7ef029a5bdfa7cf037218ef134b418a2b4f2b03b
 SHA1 (patch-bb) = f4f96102cff0589e3c823b4dd96693668aa16a5f
+SHA1 (patch-src_console_output_h) = 6e0cab99bc57497f52e6d965ffbaa5e18317edbe
+SHA1 (patch-src_engine_c) = 827d08132f8dbe1b88e1d6f8a073643cfdd9ca8c
diff --git a/multimedia/gxine/patches/patch-an b/multimedia/gxine/patches/patch-an
index 264e1193741..985ae60f42c 100644
--- a/multimedia/gxine/patches/patch-an
+++ b/multimedia/gxine/patches/patch-an
@@ -1,8 +1,19 @@
-$NetBSD: patch-an,v 1.1 2006/05/03 12:47:47 drochner Exp $
+$NetBSD: patch-an,v 1.2 2012/05/06 23:13:49 dholland Exp $
 
---- src/main.c.orig	2006-05-03 12:14:19.000000000 +0200
+- fix build with latest glib2
+- threading fix? (?)
+
+--- src/main.c.orig	2009-12-19 16:18:41.000000000 +0000
 +++ src/main.c
-@@ -557,9 +557,9 @@ to the extent permitted by law.\n"));
+@@ -45,7 +45,6 @@
+ #include <gdk/gdkx.h>
+ #include <gdk/gdkkeysyms.h>
+ #include <glib.h>
+-#include <glib/gmessages.h>
+ 
+ #include "desktop_integration.h"
+ #include "engine.h"
+@@ -802,9 +801,9 @@ to the extent permitted by law.\n"),
    if (cmd)
      se_eval (gse, cmd, NULL, NULL, NULL, "--command");
  
diff --git a/multimedia/gxine/patches/patch-src_console_output_h b/multimedia/gxine/patches/patch-src_console_output_h
new file mode 100644
index 00000000000..a4e9d1c01c1
--- /dev/null
+++ b/multimedia/gxine/patches/patch-src_console_output_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_console_output_h,v 1.1 2012/05/06 23:13:49 dholland Exp $
+
+Fix build with latest glib2.
+
+--- src/console_output.h~	2009-12-19 16:18:41.000000000 +0000
++++ src/console_output.h
+@@ -21,7 +21,7 @@
+ #ifndef GXINE_CONSOLE_OUTPUT_H
+ #define GXINE_CONSOLE_OUTPUT_H
+ 
+-#include <glib/gmessages.h>
++#include <glib.h>
+ 
+ void console_output_init (void);
+ 
diff --git a/multimedia/gxine/patches/patch-src_engine_c b/multimedia/gxine/patches/patch-src_engine_c
new file mode 100644
index 00000000000..099d9638c08
--- /dev/null
+++ b/multimedia/gxine/patches/patch-src_engine_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_engine_c,v 1.1 2012/05/06 23:13:49 dholland Exp $
+
+Fix build with latest glib2.
+
+--- src/engine.c~	2009-12-19 16:18:41.000000000 +0000
++++ src/engine.c
+@@ -30,7 +30,7 @@
+ #include <errno.h>
+ #include <unistd.h>
+ 
+-#include <glib/gthread.h>
++#include <glib.h>
+ 
+ #include "engine.h"
+ #include "ui.h"