diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2012-11-30 11:59:44 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2012-11-30 11:59:44 +0000 |
| commit | 918ae51b498c54091fd1fb36323975416712c72f (patch) | |
| tree | d3bdd963034bad560706919c0e299c8a62908d31 | |
| parent | Support all EAPIs. (diff) | |
| download | gentoo-2-918ae51b498c54091fd1fb36323975416712c72f.tar.gz gentoo-2-918ae51b498c54091fd1fb36323975416712c72f.tar.bz2 gentoo-2-918ae51b498c54091fd1fb36323975416712c72f.zip | |
Fix build with USE=-xml and enable xml by default since this is what controls saving and loading sessions. Bug #378041
(Portage version: 2.2.0_alpha143/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
| -rw-r--r-- | media-sound/jack-rack/ChangeLog | 7 | ||||
| -rw-r--r-- | media-sound/jack-rack/files/jack-rack-1.4.8_rc1-noxml.patch | 14 | ||||
| -rw-r--r-- | media-sound/jack-rack/jack-rack-1.4.8_rc1.ebuild | 7 |
3 files changed, 24 insertions, 4 deletions
diff --git a/media-sound/jack-rack/ChangeLog b/media-sound/jack-rack/ChangeLog index 618e9b189102..1387a25a4426 100644 --- a/media-sound/jack-rack/ChangeLog +++ b/media-sound/jack-rack/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-sound/jack-rack # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-rack/ChangeLog,v 1.43 2012/05/05 08:30:51 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-rack/ChangeLog,v 1.44 2012/11/30 11:59:44 aballier Exp $ + + 30 Nov 2012; Alexis Ballier <aballier@gentoo.org> jack-rack-1.4.8_rc1.ebuild, + +files/jack-rack-1.4.8_rc1-noxml.patch: + Fix build with USE=-xml and enable xml by default since this is what controls + saving and loading sessions. Bug #378041 05 May 2012; Michał Górny <mgorny@gentoo.org> jack-rack-1.4.7-r1.ebuild, jack-rack-1.4.8_rc1.ebuild: diff --git a/media-sound/jack-rack/files/jack-rack-1.4.8_rc1-noxml.patch b/media-sound/jack-rack/files/jack-rack-1.4.8_rc1-noxml.patch new file mode 100644 index 000000000000..dd85001c5c77 --- /dev/null +++ b/media-sound/jack-rack/files/jack-rack-1.4.8_rc1-noxml.patch @@ -0,0 +1,14 @@ +Index: jack-rack-1.4.8_rc1/src/ui_callbacks.c +=================================================================== +--- jack-rack-1.4.8_rc1.orig/src/ui_callbacks.c ++++ jack-rack-1.4.8_rc1/src/ui_callbacks.c +@@ -669,7 +669,9 @@ jack_session_cb (gpointer data) + + ui->js_event->command_line = strdup( cmd_buf ); + ++#ifdef HAVE_XML + if (!ui_save_file (ui, fname_buf)) ++#endif + ui->js_event->flags = JackSessionSaveError; + + jack_session_reply( ui->procinfo->jack_client, ui->js_event ); diff --git a/media-sound/jack-rack/jack-rack-1.4.8_rc1.ebuild b/media-sound/jack-rack/jack-rack-1.4.8_rc1.ebuild index 36491a7a1028..cc130a25c158 100644 --- a/media-sound/jack-rack/jack-rack-1.4.8_rc1.ebuild +++ b/media-sound/jack-rack/jack-rack-1.4.8_rc1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-rack/jack-rack-1.4.8_rc1.ebuild,v 1.2 2012/05/05 08:30:51 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-rack/jack-rack-1.4.8_rc1.ebuild,v 1.3 2012/11/30 11:59:44 aballier Exp $ EAPI=4 inherit autotools eutils flag-o-matic toolchain-funcs @@ -15,7 +15,7 @@ SRC_URI="${DEB_URI}/${MY_P}.orig.tar.gz ${DEB_URI}/${MY_P}-1.debian.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="alsa gnome lash xml" +IUSE="alsa gnome lash +xml" RDEPEND=">=x11-libs/gtk+-2.12:2 >=media-libs/ladspa-sdk-1.12 @@ -42,7 +42,8 @@ src_prepare() { epatch \ "${FILESDIR}"/${PN}-1.4.6-noalsa.patch \ - "${FILESDIR}"/${PN}-1.4.7-disable_deprecated.patch + "${FILESDIR}"/${PN}-1.4.7-disable_deprecated.patch \ + "${FILESDIR}"/${P}-noxml.patch sed -i \ -e '/Categories/s:Application:GTK:' \ |