Fix build with glib2>=2.36.0.

This commit is contained in:
ajacoutot 2013-03-27 18:00:00 +00:00
parent 24fd88be33
commit 30f296cdbe
5 changed files with 63 additions and 4 deletions

View File

@ -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();

View File

@ -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/}

View File

@ -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 ();
}

View File

@ -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 ();
}

View File

@ -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