diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2014-01-20 11:14:04 +0000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2014-01-20 11:14:04 +0000 |
| commit | c2f9e1db92bca4969ae310035f97576c8c92dc44 (patch) | |
| tree | de0a5b08ce087590e1e5dc2c28ab22d159dba505 /media-video/subtitlecomposer | |
| parent | Remove unused patch. (diff) | |
| download | gentoo-2-c2f9e1db92bca4969ae310035f97576c8c92dc44.tar.gz gentoo-2-c2f9e1db92bca4969ae310035f97576c8c92dc44.tar.bz2 gentoo-2-c2f9e1db92bca4969ae310035f97576c8c92dc44.zip | |
Add patch from Debian fixing linking with gold and USE="gstreamer", wrt bug #418037.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)
Diffstat (limited to 'media-video/subtitlecomposer')
3 files changed, 26 insertions, 4 deletions
diff --git a/media-video/subtitlecomposer/ChangeLog b/media-video/subtitlecomposer/ChangeLog index 63f38183427c..5935b72a518c 100644 --- a/media-video/subtitlecomposer/ChangeLog +++ b/media-video/subtitlecomposer/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-video/subtitlecomposer -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/subtitlecomposer/ChangeLog,v 1.16 2013/06/25 18:30:50 johu Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/subtitlecomposer/ChangeLog,v 1.17 2014/01/20 11:14:04 kensington Exp $ + + 20 Jan 2014; Michael Palimaka <kensington@gentoo.org> + +files/subtitlecomposer-0.5.3-gold-gstreamer.patch, + subtitlecomposer-0.5.3-r2.ebuild: + Add patch from Debian fixing linking with gold and USE="gstreamer", wrt bug + #418037. *subtitlecomposer-0.5.3-r2 (25 Jun 2013) diff --git a/media-video/subtitlecomposer/files/subtitlecomposer-0.5.3-gold-gstreamer.patch b/media-video/subtitlecomposer/files/subtitlecomposer-0.5.3-gold-gstreamer.patch new file mode 100644 index 000000000000..091c00540a86 --- /dev/null +++ b/media-video/subtitlecomposer/files/subtitlecomposer-0.5.3-gold-gstreamer.patch @@ -0,0 +1,15 @@ +# Description: This pacth adds a missing find_package for GObject. +# Without this patch the package will FTBFS with binutils-gold. +# Forwarded: http://sourceforge.net/tracker/?func=detail&aid=2897376&group_id=208427&atid=1005654 +# Author: José Manuel Santamaría Lema <panfaust@gmail.com> +# +--- subtitlecomposer-0.5.3.orig/src/player/gstreamer/CMakeLists.txt ++++ subtitlecomposer-0.5.3/src/player/gstreamer/CMakeLists.txt +@@ -1,6 +1,7 @@ + # TODO WHY AREN'T THESE INCLUDED BY MACRO_OPTIONAL_FIND_PACKAGE( GStreamer )? + FIND_PACKAGE( GLIB2 REQUIRED ) + FIND_PACKAGE( LibXml2 REQUIRED ) ++FIND_PACKAGE( GObject REQUIRED ) + + SET( players_gstreamer_INCLUDE_DIR + ${GLIB2_INCLUDE_DIR} diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.5.3-r2.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.5.3-r2.ebuild index e624a761fb00..c0f870ee259c 100644 --- a/media-video/subtitlecomposer/subtitlecomposer-0.5.3-r2.ebuild +++ b/media-video/subtitlecomposer/subtitlecomposer-0.5.3-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/subtitlecomposer/subtitlecomposer-0.5.3-r2.ebuild,v 1.1 2013/06/25 18:30:50 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/subtitlecomposer/subtitlecomposer-0.5.3-r2.ebuild,v 1.2 2014/01/20 11:14:04 kensington Exp $ EAPI=5 @@ -27,6 +27,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${PN}-linkage-patch.patch" "${FILESDIR}/${P}-gcc45.patch" + "${FILESDIR}/${P}-gold-gstreamer.patch" "${FILESDIR}/${P}-gold-xine.patch" ) |