diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-04-17 11:39:45 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-04-17 11:39:45 +0000 |
| commit | ef69ed4ce6bec98511034ce0ded53fc350c51950 (patch) | |
| tree | 24cec58c4ea2e49cfb2c2d8b6441adf288e198ea /media-video | |
| parent | Adding hostapd 1.0_rc3 (diff) | |
| download | gentoo-2-ef69ed4ce6bec98511034ce0ded53fc350c51950.tar.gz gentoo-2-ef69ed4ce6bec98511034ce0ded53fc350c51950.tar.bz2 gentoo-2-ef69ed4ce6bec98511034ce0ded53fc350c51950.zip | |
Fix building with dev-libs/glib >= 2.31 wrt #412323 by Andre Reinke
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/gxine/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/gxine/files/gxine-0.5.907-glib-2.31.patch | 34 | ||||
| -rw-r--r-- | media-video/gxine/gxine-0.5.907.ebuild | 5 |
3 files changed, 42 insertions, 3 deletions
diff --git a/media-video/gxine/ChangeLog b/media-video/gxine/ChangeLog index b511fec40d9e..0815097b6f96 100644 --- a/media-video/gxine/ChangeLog +++ b/media-video/gxine/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/gxine # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/ChangeLog,v 1.118 2012/02/24 22:27:11 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/ChangeLog,v 1.119 2012/04/17 11:39:45 ssuominen Exp $ + + 17 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> gxine-0.5.907.ebuild, + +files/gxine-0.5.907-glib-2.31.patch: + Fix building with dev-libs/glib >= 2.31 wrt #412323 by Andre Reinke *gxine-0.5.907 (24 Feb 2012) diff --git a/media-video/gxine/files/gxine-0.5.907-glib-2.31.patch b/media-video/gxine/files/gxine-0.5.907-glib-2.31.patch new file mode 100644 index 000000000000..9edea6c84af6 --- /dev/null +++ b/media-video/gxine/files/gxine-0.5.907-glib-2.31.patch @@ -0,0 +1,34 @@ +http://bugs.gentoo.org/412323 + +--- src/console_output.h ++++ 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); + +--- src/engine.c ++++ 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" +--- src/main.c ++++ src/main.c +@@ -46,7 +46,6 @@ + #include <gdk/gdk.h> + #include <gdk/gdkkeysyms.h> + #include <glib.h> +-#include <glib/gmessages.h> + + #include "desktop_integration.h" + #include "engine.h" diff --git a/media-video/gxine/gxine-0.5.907.ebuild b/media-video/gxine/gxine-0.5.907.ebuild index 7c157f9b5bc0..ec97fb5c8356 100644 --- a/media-video/gxine/gxine-0.5.907.ebuild +++ b/media-video/gxine/gxine-0.5.907.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.5.907.ebuild,v 1.1 2012/02/24 22:27:11 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.5.907.ebuild,v 1.2 2012/04/17 11:39:45 ssuominen Exp $ EAPI=4 inherit autotools eutils fdo-mime gnome2-utils multilib nsplugins @@ -43,7 +43,8 @@ src_prepare() { epatch \ "${FILESDIR}"/${PN}-0.5.905-desktop.patch \ "${FILESDIR}"/${PN}-0.5.905-fix-nspr-useage.patch \ - "${FILESDIR}"/${PN}-0.5.906-endif.patch + "${FILESDIR}"/${PN}-0.5.906-endif.patch \ + "${FILESDIR}"/${PN}-0.5.907-glib-2.31.patch # need to disable calling of xine-list when running without # userpriv, otherwise we get sandbox violations (bug #233847) |