diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2005-12-13 09:36:41 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2005-12-13 09:36:41 +0000 |
| commit | 75f902c30344aa3e50e743a048486d5d9355dfae (patch) | |
| tree | 5d8023b9fe7e23cd48a2c314bdceac30f09b3945 /app-cdr | |
| parent | Adding license for Sun Web Services Developer Pack (diff) | |
| download | gentoo-2-75f902c30344aa3e50e743a048486d5d9355dfae.tar.gz gentoo-2-75f902c30344aa3e50e743a048486d5d9355dfae.tar.bz2 gentoo-2-75f902c30344aa3e50e743a048486d5d9355dfae.zip | |
Add patch to fix ALSA conditional, see bug #115379. Issue fixed in upstream SVN.
(Portage version: 2.0.53)
Diffstat (limited to 'app-cdr')
| -rw-r--r-- | app-cdr/k3b/ChangeLog | 7 | ||||
| -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 |
3 files changed, 37 insertions, 2 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/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() { |