From 30f296cdbe9ccfc18412e4d02030be12ff3e7c32 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Wed, 27 Mar 2013 18:00:00 +0000
Subject: [PATCH] Fix build with glib2>=2.36.0.

---
 audio/clementine/patches/patch-src_main_cpp       | 14 ++++++++++++++
 multimedia/shrip/Makefile                         |  8 ++++----
 multimedia/shrip/patches/patch-src_shrip-ccheck_c | 15 +++++++++++++++
 multimedia/shrip/patches/patch-src_shrip-encode_c | 15 +++++++++++++++
 multimedia/shrip/patches/patch-src_shrip-xchap_c  | 15 +++++++++++++++
 5 files changed, 63 insertions(+), 4 deletions(-)
 create mode 100644 audio/clementine/patches/patch-src_main_cpp
 create mode 100644 multimedia/shrip/patches/patch-src_shrip-ccheck_c
 create mode 100644 multimedia/shrip/patches/patch-src_shrip-encode_c
 create mode 100644 multimedia/shrip/patches/patch-src_shrip-xchap_c

diff --git a/audio/clementine/patches/patch-src_main_cpp b/audio/clementine/patches/patch-src_main_cpp
new file mode 100644
index 00000000000..582982beb1e
--- /dev/null
+++ b/audio/clementine/patches/patch-src_main_cpp
@@ -0,0 +1,14 @@
+$OpenBSD: patch-src_main_cpp,v 1.1 2013/03/27 18:00:00 ajacoutot Exp $
+
+Fix build with glib2>=2.36.0
+
+--- src/main.cpp.orig	Wed Mar 27 09:55:18 2013
++++ src/main.cpp	Wed Mar 27 09:55:29 2013
+@@ -265,7 +265,6 @@ int main(int argc, char *argv[]) {
+ #endif
+ 
+   // This makes us show up nicely in gnome-volume-control
+-  g_type_init();
+   g_set_application_name(QCoreApplication::applicationName().toLocal8Bit());
+ 
+   RegisterMetaTypes();
diff --git a/multimedia/shrip/Makefile b/multimedia/shrip/Makefile
index b219d1f3fa4..5e1d974d686 100644
--- a/multimedia/shrip/Makefile
+++ b/multimedia/shrip/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.3 2013/03/13 17:12:45 pascal Exp $
+# $OpenBSD: Makefile,v 1.4 2013/03/27 18:03:57 ajacoutot Exp $
 
 COMMENT =		shell client for ogmrip
 
 DISTNAME =		shrip-0.6.0
-REVISION =		0
+REVISION =		1
 
 CATEGORIES =		multimedia
 
@@ -12,8 +12,8 @@ MAINTAINER =		Pascal Stumpf <Pascal.Stumpf@cubes.de>
 # GPLv2+
 PERMIT_PACKAGE_CDROM =	Yes
 
-WANTLIB += c dvdread enca ffi gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
-WANTLIB += gthread-2.0 m ogmdvd ogmjob ogmrip ogmrip-lavc ogmrip-mplayer
+WANTLIB += c dvdcss dvdread enca ffi gio-2.0 glib-2.0 gmodule-2.0
+WANTLIB += gobject-2.0 m ogmdvd ogmjob ogmrip ogmrip-lavc ogmrip-mplayer
 WANTLIB += pcre pthread xml2 z
 
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=ogmrip/}
diff --git a/multimedia/shrip/patches/patch-src_shrip-ccheck_c b/multimedia/shrip/patches/patch-src_shrip-ccheck_c
new file mode 100644
index 00000000000..ac573cb7e60
--- /dev/null
+++ b/multimedia/shrip/patches/patch-src_shrip-ccheck_c
@@ -0,0 +1,15 @@
+$OpenBSD: patch-src_shrip-ccheck_c,v 1.1 2013/03/27 18:03:57 ajacoutot Exp $
+
+Fix build with glib2>=2.36.0
+
+--- src/shrip-ccheck.c.orig	Wed Mar 27 18:11:50 2013
++++ src/shrip-ccheck.c	Wed Mar 27 18:12:03 2013
+@@ -210,8 +210,6 @@ init (gint *argc, gchar ***argv)
+   signal (SIGQUIT, sighandler); // Quit from keyboard
+   signal (SIGPIPE, sighandler); // Some window managers cause this
+ 
+-  g_type_init ();
+-
+   ogmrip_plugin_init ();
+ }
+ 
diff --git a/multimedia/shrip/patches/patch-src_shrip-encode_c b/multimedia/shrip/patches/patch-src_shrip-encode_c
new file mode 100644
index 00000000000..6872d481ec4
--- /dev/null
+++ b/multimedia/shrip/patches/patch-src_shrip-encode_c
@@ -0,0 +1,15 @@
+$OpenBSD: patch-src_shrip-encode_c,v 1.1 2013/03/27 18:03:57 ajacoutot Exp $
+
+Fix build with glib2>=2.36.0
+
+--- src/shrip-encode.c.orig	Wed Mar 27 18:11:39 2013
++++ src/shrip-encode.c	Wed Mar 27 18:12:11 2013
+@@ -224,8 +224,6 @@ init (gint *argc, gchar ***argv)
+   signal (SIGQUIT, sighandler); // Quit from keyboard
+   signal (SIGPIPE, sighandler); // Some window managers cause this
+ 
+-  g_type_init ();
+-
+   ogmrip_plugin_init ();
+ }
+ 
diff --git a/multimedia/shrip/patches/patch-src_shrip-xchap_c b/multimedia/shrip/patches/patch-src_shrip-xchap_c
new file mode 100644
index 00000000000..5d596237f27
--- /dev/null
+++ b/multimedia/shrip/patches/patch-src_shrip-xchap_c
@@ -0,0 +1,15 @@
+$OpenBSD: patch-src_shrip-xchap_c,v 1.1 2013/03/27 18:03:57 ajacoutot Exp $
+
+Fix build with glib2>=2.36.0
+
+--- src/shrip-xchap.c.orig	Wed Mar 27 18:11:46 2013
++++ src/shrip-xchap.c	Wed Mar 27 18:12:06 2013
+@@ -229,8 +229,6 @@ static void
+ init (gint *argc, gchar ***argv)
+ {
+   (*argv)[0] = "shrip xchap";
+-
+-  g_type_init ();
+ }
+ 
+ gint