diff options
| -rw-r--r-- | app-cdr/k3b/ChangeLog | 7 | ||||
| -rw-r--r-- | app-cdr/k3b/Manifest | 15 | ||||
| -rw-r--r-- | app-cdr/k3b/files/k3b-0.12.9-conditional.patch | 26 | ||||
| -rw-r--r-- | app-cdr/k3b/k3b-0.12.9.ebuild | 6 |
4 files changed, 50 insertions, 4 deletions
diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog index d78e239071c5..fef184bb30a8 100644 --- a/app-cdr/k3b/ChangeLog +++ b/app-cdr/k3b/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-cdr/k3b # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.133 2005/12/13 02:28:46 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.134 2005/12/13 09:36:41 flameeyes Exp $ + + 13 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> + +files/k3b-0.12.9-conditional.patch, k3b-0.12.9.ebuild: + Add patch to fix ALSA conditional, see bug #115379. Issue fixed in upstream + SVN. *k3b-0.12.9 (13 Dec 2005) diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest index 4af1a5a671ea..c36e165002ad 100644 --- a/app-cdr/k3b/Manifest +++ b/app-cdr/k3b/Manifest @@ -1,4 +1,7 @@ -MD5 3a0de478e63147582f2534eafe1665f3 ChangeLog 18566 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 25559b771937a70b8ab82d1cd014a274 ChangeLog 18767 MD5 a1b5a05a8513587c957d81f2f7eb44c0 files/digest-k3b-0.11.24 133 MD5 384b07ebe51023847a4cbdb756c9e867 files/digest-k3b-0.12.4a 135 MD5 8bdf1530c459d3f1a176f6c1a93ad6ea files/digest-k3b-0.12.5 133 @@ -8,6 +11,7 @@ MD5 10958f68b572978b06e6700672716464 files/digest-k3b-0.12.8 133 MD5 553e5686662798da155e0632c8b35deb files/digest-k3b-0.12.9 133 MD5 513df86e2c91f7c1209b63cea7d41b84 files/k3b-0.11.17-noarts.patch 893 MD5 49d32c38a705809a2646228a8d0b71d4 files/k3b-0.12.4a-qt-3.3.5.patch 574 +MD5 05b0752bbeda2fa5179d6c1933e5efb5 files/k3b-0.12.9-conditional.patch 774 MD5 5f469d8bb9067596d861b4a9a0a450a1 files/k3b-dvdrip-transcode.patch 1999 MD5 c58ebf198d19232866dd5ca596a2b147 k3b-0.11.24.ebuild 3108 MD5 d1b3e1189286fb4f434e42a935ab9ee4 k3b-0.12.4a.ebuild 3343 @@ -15,5 +19,12 @@ MD5 07519615ce63b52b1fec22f11ce8b6c6 k3b-0.12.5.ebuild 3209 MD5 29fd37eefbdf691fefa5212bc6d4f3d5 k3b-0.12.6.ebuild 3208 MD5 5369e74b32bdfe1461c6f5f4b4de118d k3b-0.12.7.ebuild 3208 MD5 70d918394e46b765db2f14e1d4d0d6f1 k3b-0.12.8.ebuild 3208 -MD5 a81341a0c29494f3e7384505bb48795d k3b-0.12.9.ebuild 3269 +MD5 7f6ce5ba021d698dab797583646af804 k3b-0.12.9.ebuild 3374 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.2 (GNU/Linux) + +iD8DBQFDnpZGAiZjviIA2XgRAr/xAKDUKYFUyIy5+HA2c+U3br5IMg0PywCdFtQv +yoTSvRVh9n5rrNnFYF937pg= +=33ac +-----END PGP SIGNATURE----- diff --git a/app-cdr/k3b/files/k3b-0.12.9-conditional.patch b/app-cdr/k3b/files/k3b-0.12.9-conditional.patch new file mode 100644 index 000000000000..01f2fda363f1 --- /dev/null +++ b/app-cdr/k3b/files/k3b-0.12.9-conditional.patch @@ -0,0 +1,26 @@ +AM_CONDITIONAL should be always called unconditionally, or automake +conditionals make ./configure step fail. + +Move AM_CONDITIONAL for include_ALSA in global scope. + +See Gentoo Bug #115379. + +Index: plugins/audiooutput/alsa/configure.in.in +=================================================================== +--- plugins/audiooutput/alsa/configure.in.in (revision 488109) ++++ plugins/audiooutput/alsa/configure.in.in (revision 488116) +@@ -55,7 +55,6 @@ + fi + + AC_SUBST(LIBASOUND) +- AM_CONDITIONAL(include_ALSA, [test "x$have_alsa_0_9" = xyes || test "x$have_alsa_1" = xyes]) + ]) + + AC_ARG_WITH(alsa, +@@ -72,4 +71,6 @@ + fi + fi + ++AM_CONDITIONAL(include_ALSA, [test "x$have_alsa_0_9" = xyes || test "x$have_alsa_1" = xyes]) ++ + dnl --------- ALSA CHECK END --------------- diff --git a/app-cdr/k3b/k3b-0.12.9.ebuild b/app-cdr/k3b/k3b-0.12.9.ebuild index 2b5dd523d371..e31017080d54 100644 --- a/app-cdr/k3b/k3b-0.12.9.ebuild +++ b/app-cdr/k3b/k3b-0.12.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.12.9.ebuild,v 1.1 2005/12/13 02:28:46 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.12.9.ebuild,v 1.2 2005/12/13 09:36:41 flameeyes Exp $ inherit kde eutils @@ -76,6 +76,10 @@ src_unpack() { cd "${WORKDIR}/${I18N}" sed -i -e "s,^SUBDIRS = .*,SUBDIRS = ${MAKE_LANGS}," Makefile.in fi + + cd ${S} + epatch "${FILESDIR}/${P}-conditional.patch" + rm configure # Force rebuilding of autotools } src_compile() { |