diff options
author | 2012-05-06 17:33:44 +0000 | |
---|---|---|
committer | 2012-05-06 17:33:44 +0000 | |
commit | fb463e76ffaa28405131e8ad3ee5248c3eb87e46 (patch) | |
tree | 8eb73e87e9b52240dbfb6de22cbb8db91d6dafc8 /media-video | |
parent | ia64/s390/sh/sparc stable wrt #395735 (diff) | |
download | gentoo-2-fb463e76ffaa28405131e8ad3ee5248c3eb87e46.tar.gz gentoo-2-fb463e76ffaa28405131e8ad3ee5248c3eb87e46.tar.bz2 gentoo-2-fb463e76ffaa28405131e8ad3ee5248c3eb87e46.zip |
Fix build with glib-2.32, bug 412747
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)
Diffstat (limited to 'media-video')
-rw-r--r-- | media-video/bombono-dvd/ChangeLog | 7 | ||||
-rw-r--r-- | media-video/bombono-dvd/bombono-dvd-1.0.0.ebuild | 3 | ||||
-rw-r--r-- | media-video/bombono-dvd/bombono-dvd-1.2.1.ebuild | 3 | ||||
-rw-r--r-- | media-video/bombono-dvd/files/bombono-dvd-1.2.1-glib.patch | 13 |
4 files changed, 23 insertions, 3 deletions
diff --git a/media-video/bombono-dvd/ChangeLog b/media-video/bombono-dvd/ChangeLog index be6f4cfd0df7..0035db7902ed 100644 --- a/media-video/bombono-dvd/ChangeLog +++ b/media-video/bombono-dvd/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/bombono-dvd # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/bombono-dvd/ChangeLog,v 1.27 2012/05/05 08:58:58 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/bombono-dvd/ChangeLog,v 1.28 2012/05/06 17:33:43 dilfridge Exp $ + + 06 May 2012; Andreas K. Huettel <dilfridge@gentoo.org> + bombono-dvd-1.0.0.ebuild, bombono-dvd-1.2.1.ebuild, + +files/bombono-dvd-1.2.1-glib.patch: + Fix build with glib-2.32, bug 412747 05 May 2012; Jeff Horelick <jdhore@gentoo.org> bombono-dvd-1.2.1.ebuild: dev-util/pkgconfig -> virtual/pkgconfig diff --git a/media-video/bombono-dvd/bombono-dvd-1.0.0.ebuild b/media-video/bombono-dvd/bombono-dvd-1.0.0.ebuild index 00c8a1061b53..a78d553c00c8 100644 --- a/media-video/bombono-dvd/bombono-dvd-1.0.0.ebuild +++ b/media-video/bombono-dvd/bombono-dvd-1.0.0.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/bombono-dvd/bombono-dvd-1.0.0.ebuild,v 1.9 2012/04/09 19:18:58 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/bombono-dvd/bombono-dvd-1.0.0.ebuild,v 1.10 2012/05/06 17:33:43 dilfridge Exp $ EAPI=2 @@ -23,6 +23,7 @@ RDEPEND=" dev-cpp/gtkmm:2.4 dev-cpp/libxmlpp:2.6 dev-libs/boost + <dev-libs/glib-2.32.1 media-libs/libdvdread media-sound/twolame media-video/dvdauthor diff --git a/media-video/bombono-dvd/bombono-dvd-1.2.1.ebuild b/media-video/bombono-dvd/bombono-dvd-1.2.1.ebuild index 6fd1f87f4b25..b63061a60a11 100644 --- a/media-video/bombono-dvd/bombono-dvd-1.2.1.ebuild +++ b/media-video/bombono-dvd/bombono-dvd-1.2.1.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/bombono-dvd/bombono-dvd-1.2.1.ebuild,v 1.3 2012/05/05 08:58:58 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/bombono-dvd/bombono-dvd-1.2.1.ebuild,v 1.4 2012/05/06 17:33:43 dilfridge Exp $ EAPI=4 SCONS_MIN_VERSION="0.96.1" @@ -42,6 +42,7 @@ DEPEND="${COMMONDEPEND} PATCHES=( "${FILESDIR}/${PN}-1.0.1-cflags.patch" "${FILESDIR}/${PN}-1.2.0-cdrtools.patch" + "${FILESDIR}/${PN}-1.2.1-glib.patch" ) src_configure() { diff --git a/media-video/bombono-dvd/files/bombono-dvd-1.2.1-glib.patch b/media-video/bombono-dvd/files/bombono-dvd-1.2.1-glib.patch new file mode 100644 index 000000000000..9627bfd66051 --- /dev/null +++ b/media-video/bombono-dvd/files/bombono-dvd-1.2.1-glib.patch @@ -0,0 +1,13 @@ +diff -aur src/mgui/author/gb_devices.c src/mgui/author/gb_devices.c +--- src/mgui/author/gb_devices.c 2012-02-08 13:19:21.000000000 +0100 ++++ src/mgui/author/gb_devices.c 2012-04-26 14:32:30.059001909 +0200 +@@ -28,9 +28,6 @@ + + #include "gb_devices.h" + +-#include <glib/gthread.h> +-#include <glib/gmessages.h> +-#include <glib/ghash.h> + /* + #include <glib/gfileutils.h> + */ |