summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sping@gentoo.org>2012-12-02 16:20:10 +0000
committerSebastian Pipping <sping@gentoo.org>2012-12-02 16:20:10 +0000
commitab8ee8e24ed388da4e1759b3ead7781aa5b086ca (patch)
treef82943784a454552cf22f33eb05e855e9b6d02b1 /app-cdr
parentClean up old revision. EAPI bump stable due to pending eclass changes and slo... (diff)
downloadhistorical-ab8ee8e24ed388da4e1759b3ead7781aa5b086ca.tar.gz
historical-ab8ee8e24ed388da4e1759b3ead7781aa5b086ca.tar.bz2
historical-ab8ee8e24ed388da4e1759b3ead7781aa5b086ca.zip
app-cdr/dvd95: Fix linking (bug #402669)
Package-Manager: portage-2.1.11.31/cvs/Linux x86_64 Manifest-Sign-Key: 0x401A1600
Diffstat (limited to 'app-cdr')
-rw-r--r--app-cdr/dvd95/ChangeLog6
-rw-r--r--app-cdr/dvd95/Manifest15
-rw-r--r--app-cdr/dvd95/dvd95-1.6_p0.ebuild8
-rw-r--r--app-cdr/dvd95/files/dvd95-1.6_p0-link-libxml2.patch10
4 files changed, 33 insertions, 6 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/Manifest b/app-cdr/dvd95/Manifest
index 771117293942..dc2bc538ff85 100644
--- a/app-cdr/dvd95/Manifest
+++ b/app-cdr/dvd95/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
AUX dvd95-1.3_p2-desktop-entry.patch 522 SHA256 44e5defe46b5cd613f9de6fa3658e1a7788381b3e7a702024fd99de0b16e2a6e SHA512 7c2e1ddd6366aaded6d23ff8aad6c2f84a7ff4e1aebcd423c03ceb775fa9da45b534d6d7655ee80d9e32db4ca8a787e1f01056f8711e2c88007bb3fb0bcf57e0 WHIRLPOOL 82fcfba487c121837c8668207dc3b0d66098f2208d28e99f250ebfea3f1c9fc59e35e6a05f31d33363cad841532d1d6e46e028e52bdefbbd22724283f5083c57
+AUX dvd95-1.6_p0-link-libxml2.patch 356 SHA256 9a4cefb02d90c8c3166f0c928f4d3c89bccbb808a92bce9c242846fa375cbc1a SHA512 4df0680d6df521958b0a90b26840bbc83105cad73feb2a60d9f4e5e9abedf32bd87d5da983d629d410ad70f1200f7576ae8261acd95913077b2d051433119d02 WHIRLPOOL 7062ab34f7f9b4e57885db27a7e8e91e94905853b0530aebe3a46b759638d313aaf229c6422bca70c4aad338fb6dc3bf385aeb1d917d988ec18ba80f160a9f0e
DIST dvd95-1.5p3.tar.gz 1068766 SHA256 4ef0ed1b122a3688c9ae0737d2658e148318334403fc1ee277b4ff9071ba5ea9 SHA512 8dda54d960066c10f4a2aed6bb74ae62e8cdba5fdb901474eca2589e1ce9abb9a5000cc6110551ac24c31f4189b30302bf5692170e56e117680b9c84c3aba8a6 WHIRLPOOL ee0fa04cfe9472da9f7f3617f879f8f8a8e0a6edd890ed9e6b9d3e2ff0acb8fb5dd5bcdc52e85271163ca945e127e51159e424b6f7d381c0f288b0fd0f1ac837
DIST dvd95-1.6p0.tar.gz 1068210 SHA256 fffa2e45d8f5d9cb9971abd14160b09a7362763fc70b402e016a8876c2c28fea SHA512 bb51c04a6609c986c54a1fd7b7f74dfa0f6b08d4cf1e93bc05271b1aae78881e9a4ffabbe7229ecf043964e039e866ea961b0c7aa72b276e9270d82adfbc24de WHIRLPOOL 7865339ea96446d06cf0829ba56436d6e940d32e9098c439091ecb3099a8f8cdf45f9c337107a6c32717b9f0c410c99d3a902a18f25ea3173da0bef298fedf62
EBUILD dvd95-1.5_p3.ebuild 1250 SHA256 028086e7b04972d291c7b28f8656675910efc867fcba3a69d32bf090bfb8ff7a SHA512 15002a1469741a9e588393d2337441994fccd9f272add374f7e0bf3ca9edbe865be1a3c8aa623c538a6bb3ef826898e123384aa0cedd4c49f0101c10aee90fd4 WHIRLPOOL 77060aa88360c3c1f5384ee57c1924e64fde91e264f682340cb44a74570ac4c6cb6a121569b022cda5fef400cc255db3b3f8c7dce98da20dc60e5bf564ebd14a
-EBUILD dvd95-1.6_p0.ebuild 1250 SHA256 4295356d9e5d17e626a62d7ae0c86fa4c37458f65a5004ede5bff68cf58f76ae SHA512 1232aea27794908149ebeefb19f7f7dfb32c74b7c07485bda291f2b08aaadbcd2c449e912a6158111f83d8645809c205e78701f70a8762275de4428563d32c2a WHIRLPOOL 685386232503e3a3467b9de6598513ff1277f33f970782787888547aa2fc4818c05fb7d610146ab6df91bdfb1f48994a695d327dd45f807d9f0f843d41d6b13b
-MISC ChangeLog 1919 SHA256 cd9f6f2d73c307732884e7baa7370bb3a6c68598e2bb17cbf5ac4165282bcb99 SHA512 979d40a5095f3ee90dc3641104c6a12c1c37fe64b14d8bcbd4b907d28b3e2c6b34f3fbcd9730d17e4395feaec024bbd8b463ea1f2a15bc3cf22b713ff5f0d56b WHIRLPOOL ef48d1d07741ec5043c5b97e2845ba7f1cf3dba020122136ef6bf476f8321f78adc691fc0c96a2cd1907921e38140a4371d0073fd8f67b59daaa499f9db4b59d
+EBUILD dvd95-1.6_p0.ebuild 1321 SHA256 8f23e20c6379a2248dae8304776999573bb6bea06798bc0397ea1e94609b222a SHA512 cf67a65a6453a485c0344a8ae8f039ae9eab4a897520e2ef4bdfb06a187a8d8dc7060651e9422fab222ebafe0a1e1ad286db05fe01a9060486b040dc4306bdb5 WHIRLPOOL e6a239e6f26d98a8a05f278018a325e064efd2150fd57e5ed2ad960ade8c898e3973192bb02b6e94796c467054d6715b544fca8c1e6650dc1f71b2c2c50f93b8
+MISC ChangeLog 2068 SHA256 bc9636e293da446795da5ec7dac03111bc31d96e26be118d5c48db299298ce71 SHA512 20d9e89f169c39e43a31cd4fb9ef6d4b27e89896007235605d13f57918bd0d2752076adec0e24148c1bc4458726bb0ceb3a0bcdafc6166c95e3712d7e9ff1eab WHIRLPOOL f43553619f909a4e57a555edf8b92c28a6b495f0e560489822cb0a54cced36d2ed8fbb7614efe9e5e19b039d43b060a8ab2ffc3fb7457b124556d2f458667b85
MISC metadata.xml 166 SHA256 ce62d1e5b04e01d03a732ee6d33b3d500810de8e55af4a527c970e5b475735d8 SHA512 1534f47fd560004cf8965363536d60529b5f28a58e26bf3459bc062b76ad89b0310bb4d1e339bf271d6d150026db5a4068ac11f9e2a39b075bb8c26e925e4daa WHIRLPOOL 6373ff408cef4ca611267c74d1217a4addf1c03cf069f6855a19204eebed7a2f17561ea98ad62adab2e540dbdb42d030be15b7ddbd864e94a2bc1112aa68d571
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlC7f74ACgkQsAvGakAaFgAragCeK3f247Mhgclcc+vQJ9MxNvxK
+6JIAoI1CaoUumQSb+xtNGyRQCufJkAlU
+=UYsC
+-----END PGP SIGNATURE-----
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
+
+