Sun May 6 23:13:49 2012 UTC ()
Build fixes for new glib2.


(dholland)
diff -r1.25 -r1.26 pkgsrc/multimedia/gxine/distinfo
diff -r1.1 -r1.2 pkgsrc/multimedia/gxine/patches/patch-an
diff -r0 -r1.1 pkgsrc/multimedia/gxine/patches/patch-src_console_output_h
diff -r0 -r1.1 pkgsrc/multimedia/gxine/patches/patch-src_engine_c
cvs diff -r1.25 -r1.26 pkgsrc/multimedia/gxine/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/gxine/distinfo 2010/01/19 20:33:26 1.25
+++ pkgsrc/multimedia/gxine/distinfo 2012/05/06 23:13:49 1.26
@@ -1,18 +1,20 @@ @@ -1,18 +1,20 @@
1$NetBSD: distinfo,v 1.25 2010/01/19 20:33:26 drochner Exp $ 1$NetBSD: distinfo,v 1.26 2012/05/06 23:13:49 dholland Exp $
2 2
3SHA1 (gxine-0.5.905.tar.bz2) = dc01b617641d6eac4152259c592f15f31b9d9bf0 3SHA1 (gxine-0.5.905.tar.bz2) = dc01b617641d6eac4152259c592f15f31b9d9bf0
4RMD160 (gxine-0.5.905.tar.bz2) = 3dc30ba9f402d20e3ad3f469cc753607ccc3d194 4RMD160 (gxine-0.5.905.tar.bz2) = 3dc30ba9f402d20e3ad3f469cc753607ccc3d194
5Size (gxine-0.5.905.tar.bz2) = 1203720 bytes 5Size (gxine-0.5.905.tar.bz2) = 1203720 bytes
6SHA1 (patch-aa) = 168f7149dbffd7b191721a30193c6d58320534fc 6SHA1 (patch-aa) = 168f7149dbffd7b191721a30193c6d58320534fc
7SHA1 (patch-ab) = b2488c6febee6bc41be26ab8a36563fed5105a52 7SHA1 (patch-ab) = b2488c6febee6bc41be26ab8a36563fed5105a52
8SHA1 (patch-ad) = 42fa73c04ecbffd900df6f5231519abe38be9852 8SHA1 (patch-ad) = 42fa73c04ecbffd900df6f5231519abe38be9852
9SHA1 (patch-af) = 6d58e572729217ae7a9a3ef2a177fb929f3da453 9SHA1 (patch-af) = 6d58e572729217ae7a9a3ef2a177fb929f3da453
10SHA1 (patch-ag) = 7e7ae5e189e9d315b8993883bd1b51db484f3692 10SHA1 (patch-ag) = 7e7ae5e189e9d315b8993883bd1b51db484f3692
11SHA1 (patch-ah) = 201f42c4043cd2c1e5302d476713080554c02b86 11SHA1 (patch-ah) = 201f42c4043cd2c1e5302d476713080554c02b86
12SHA1 (patch-ai) = 792fabf23d55fac337d6825e5ba28d1a80393ce9 12SHA1 (patch-ai) = 792fabf23d55fac337d6825e5ba28d1a80393ce9
13SHA1 (patch-aj) = 0a9efacd2aa90855bf990944c058028af367c24d 13SHA1 (patch-aj) = 0a9efacd2aa90855bf990944c058028af367c24d
14SHA1 (patch-ak) = d055caed81560d53c922f772dc713bfca8ef5691 14SHA1 (patch-ak) = d055caed81560d53c922f772dc713bfca8ef5691
15SHA1 (patch-an) = e8fd4c81fad14e907aad2bffc3962c39322ac0e5 15SHA1 (patch-an) = 10789072010e0a2d868a24c21d97f902364f2587
16SHA1 (patch-aq) = 51acfd7107eed0cf73462daa73024ef28964d9eb 16SHA1 (patch-aq) = 51acfd7107eed0cf73462daa73024ef28964d9eb
17SHA1 (patch-ba) = 7ef029a5bdfa7cf037218ef134b418a2b4f2b03b 17SHA1 (patch-ba) = 7ef029a5bdfa7cf037218ef134b418a2b4f2b03b
18SHA1 (patch-bb) = f4f96102cff0589e3c823b4dd96693668aa16a5f 18SHA1 (patch-bb) = f4f96102cff0589e3c823b4dd96693668aa16a5f
 19SHA1 (patch-src_console_output_h) = 6e0cab99bc57497f52e6d965ffbaa5e18317edbe
 20SHA1 (patch-src_engine_c) = 827d08132f8dbe1b88e1d6f8a073643cfdd9ca8c
cvs diff -r1.1 -r1.2 pkgsrc/multimedia/gxine/patches/Attic/patch-an (expand / switch to unified diff)

--- pkgsrc/multimedia/gxine/patches/Attic/patch-an 2006/05/03 12:47:47 1.1
+++ pkgsrc/multimedia/gxine/patches/Attic/patch-an 2012/05/06 23:13:49 1.2
@@ -1,16 +1,27 @@ @@ -1,16 +1,27 @@
1$NetBSD: patch-an,v 1.1 2006/05/03 12:47:47 drochner Exp $ 1$NetBSD: patch-an,v 1.2 2012/05/06 23:13:49 dholland Exp $
2 2
3--- src/main.c.orig 2006-05-03 12:14:19.000000000 +0200 3- fix build with latest glib2
 4- threading fix? (?)
 5
 6--- src/main.c.orig 2009-12-19 16:18:41.000000000 +0000
4+++ src/main.c 7+++ src/main.c
5@@ -557,9 +557,9 @@ to the extent permitted by law.\n")); 8@@ -45,7 +45,6 @@
 9 #include <gdk/gdkx.h>
 10 #include <gdk/gdkkeysyms.h>
 11 #include <glib.h>
 12-#include <glib/gmessages.h>
 13
 14 #include "desktop_integration.h"
 15 #include "engine.h"
 16@@ -802,9 +801,9 @@ to the extent permitted by law.\n"),
6 if (cmd) 17 if (cmd)
7 se_eval (gse, cmd, NULL, NULL, NULL, "--command"); 18 se_eval (gse, cmd, NULL, NULL, NULL, "--command");
8  19
9- //gdk_threads_enter(); 20- //gdk_threads_enter();
10+ gdk_threads_enter(); 21+ gdk_threads_enter();
11 gtk_main(); 22 gtk_main();
12- //gdk_threads_leave(); 23- //gdk_threads_leave();
13+ gdk_threads_leave(); 24+ gdk_threads_leave();
14  25
15 return 0; 26 return 0;
16 } 27 }
File Added: pkgsrc/multimedia/gxine/patches/Attic/patch-src_console_output_h
$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);
File Added: pkgsrc/multimedia/gxine/patches/Attic/patch-src_engine_c
$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"