diff options
| author |   Sebastian Pipping <sping@gentoo.org> | 2012-12-02 16:19:53 +0000 |
|---|---|---|
| committer | Sebastian Pipping <sping@gentoo.org> | 2012-12-02 16:19:53 +0000 |
| commit | 9570f47af7e77c2bb07d85843e05da49f4a81d7d (patch) | |
| tree | f0aa4f56145ca7602dfa9b7c057b80a67107239b /app-cdr | |
| parent | Clean up old revisions. EAPI bump stable due to pending eclass changes and sl... (diff) | |
| download | gentoo-2-9570f47af7e77c2bb07d85843e05da49f4a81d7d.tar.gz gentoo-2-9570f47af7e77c2bb07d85843e05da49f4a81d7d.tar.bz2 gentoo-2-9570f47af7e77c2bb07d85843e05da49f4a81d7d.zip | |
app-cdr/dvd95: Fix linking (bug #402669)
(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 0x401A1600)
Diffstat (limited to 'app-cdr')
| -rw-r--r-- | app-cdr/dvd95/ChangeLog | 6 | ||||
| -rw-r--r-- | app-cdr/dvd95/dvd95-1.6_p0.ebuild | 8 | ||||
| -rw-r--r-- | app-cdr/dvd95/files/dvd95-1.6_p0-link-libxml2.patch | 10 |
3 files changed, 20 insertions, 4 deletions
diff --git a/app-cdr/dvd95/ChangeLog b/app-cdr/dvd95/ChangeLog index 9f44acf02553..31d98c85f6a9 100644 --- a/app-cdr/dvd95/ChangeLog +++ b/app-cdr/dvd95/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-cdr/dvd95 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvd95/ChangeLog,v 1.10 2012/05/03 07:51:49 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvd95/ChangeLog,v 1.11 2012/12/02 16:19:53 sping Exp $ + + 02 Dec 2012; Sebastian Pipping <sping@gentoo.org> dvd95-1.6_p0.ebuild, + +files/dvd95-1.6_p0-link-libxml2.patch: + Fix linking error (bug #402669) 03 May 2012; Jeff Horelick <jdhore@gentoo.org> dvd95-1.5_p3.ebuild, dvd95-1.6_p0.ebuild: diff --git a/app-cdr/dvd95/dvd95-1.6_p0.ebuild b/app-cdr/dvd95/dvd95-1.6_p0.ebuild index 1dc5c3df9d01..1d5ce6df874c 100644 --- a/app-cdr/dvd95/dvd95-1.6_p0.ebuild +++ b/app-cdr/dvd95/dvd95-1.6_p0.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvd95/dvd95-1.6_p0.ebuild,v 1.2 2012/05/03 07:51:49 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvd95/dvd95-1.6_p0.ebuild,v 1.3 2012/12/02 16:19:53 sping Exp $ EAPI=2 -inherit eutils +inherit eutils autotools DESCRIPTION="DVD95 is a Gnome application to convert DVD9 to DVD5." HOMEPAGE="http://dvd95.sourceforge.net/" @@ -29,8 +29,10 @@ S=${WORKDIR}/${P/_} src_prepare() { epatch "${FILESDIR}"/${PN}-1.3_p2-desktop-entry.patch - sed -i -e "s:-O3:${CFLAGS}:" configure || die "sed failed" + epatch "${FILESDIR}"/${P}-link-libxml2.patch + sed -i -e "s:-O3:${CFLAGS}:" configure.in || die "sed failed" echo "dvd95.glade" >> po/POTFILES.in || die "translation fix failed" + eautoreconf } src_configure() { diff --git a/app-cdr/dvd95/files/dvd95-1.6_p0-link-libxml2.patch b/app-cdr/dvd95/files/dvd95-1.6_p0-link-libxml2.patch new file mode 100644 index 000000000000..0455e00a39b9 --- /dev/null +++ b/app-cdr/dvd95/files/dvd95-1.6_p0-link-libxml2.patch @@ -0,0 +1,10 @@ +--- src/Makefile.am 2012-12-02 16:43:55.667719253 +0100 ++++ src/Makefile.am 2012-12-02 16:44:05.965593153 +0100 +@@ -36,6 +36,6 @@ + badsect.c badsect.h \ + globals.h proto.h const.h vapcontext.h + +-dvd95_LDADD = @PACKAGE_LIBS@ $(LIBAUTHOR_LIBS) $(INTLLIBS) -ldvdread -lm ++dvd95_LDADD = @PACKAGE_LIBS@ $(LIBAUTHOR_LIBS) $(INTLLIBS) -ldvdread -lm -lxml2 + + |