diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2010-10-10 20:04:05 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2010-10-10 20:04:05 +0000 |
| commit | 8c6d119abc145b0d940b708aec60fb051425a83b (patch) | |
| tree | 302246530c62ccf8695eeb5610d1ae1cca7aab42 /media-sound/solfege | |
| parent | Fix openmotif dependency. Change EAPI to 1. (diff) | |
| download | gentoo-2-8c6d119abc145b0d940b708aec60fb051425a83b.tar.gz gentoo-2-8c6d119abc145b0d940b708aec60fb051425a83b.tar.bz2 gentoo-2-8c6d119abc145b0d940b708aec60fb051425a83b.zip | |
Fix compile with swig-2.
(Portage version: 2.2_rc90/cvs/Linux x86_64)
Diffstat (limited to 'media-sound/solfege')
| -rw-r--r-- | media-sound/solfege/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/solfege/files/solfege-3.18.3-swig2.patch | 16 | ||||
| -rw-r--r-- | media-sound/solfege/solfege-3.18.3.ebuild | 6 |
3 files changed, 25 insertions, 3 deletions
diff --git a/media-sound/solfege/ChangeLog b/media-sound/solfege/ChangeLog index ec74558cfc8e..ec56dd9e8db7 100644 --- a/media-sound/solfege/ChangeLog +++ b/media-sound/solfege/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/solfege # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/ChangeLog,v 1.42 2010/10/10 19:48:19 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/ChangeLog,v 1.43 2010/10/10 20:04:05 radhermit Exp $ + + 10 Oct 2010; Tim Harder <radhermit@gentoo.org> solfege-3.18.3.ebuild, + +files/solfege-3.18.3-swig2.patch: + Fix compile with swig-2. 10 Oct 2010; Tim Harder <radhermit@gentoo.org> solfege-3.16.4.ebuild, +files/solfege-3.16.4-ldflags.patch: diff --git a/media-sound/solfege/files/solfege-3.18.3-swig2.patch b/media-sound/solfege/files/solfege-3.18.3-swig2.patch new file mode 100644 index 000000000000..297bffdf8f3e --- /dev/null +++ b/media-sound/solfege/files/solfege-3.18.3-swig2.patch @@ -0,0 +1,16 @@ +diff -ur solfege-3.18.3.orig/solfege/soundcard/Makefile solfege-3.18.3/solfege/soundcard/Makefile +--- solfege-3.18.3.orig/solfege/soundcard/Makefile 2010-10-08 02:31:36.000000000 -0700 ++++ solfege-3.18.3/solfege/soundcard/Makefile 2010-10-10 12:29:39.636698327 -0700 +@@ -30,11 +30,7 @@ + ifdef SWIG + ifeq ($(SWIG_VERSION),1.1) + TARGETS += solfege/soundcard/solfege_c_midimodule.so +- endif +- ifeq ($(SWIG_VERSION),1.3) +- TARGETS += solfege/soundcard/_solfege_c_midi.so +- endif +- ifeq ($(SWIG_VERSION),unknown) ++ else + TARGETS += solfege/soundcard/_solfege_c_midi.so + endif + endif diff --git a/media-sound/solfege/solfege-3.18.3.ebuild b/media-sound/solfege/solfege-3.18.3.ebuild index 9402afa88a52..090c3d9561c8 100644 --- a/media-sound/solfege/solfege-3.18.3.ebuild +++ b/media-sound/solfege/solfege-3.18.3.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/solfege-3.18.3.ebuild,v 1.1 2010/10/10 01:37:43 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/solfege-3.18.3.ebuild,v 1.2 2010/10/10 20:04:05 radhermit Exp $ EAPI=2 PYTHON_DEPEND="2:2.6" PYTHON_USE_WITH="sqlite" -inherit python +inherit python eutils DESCRIPTION="GNU Solfege is a program written to help you practice ear training." HOMEPAGE="http://www.solfege.org" @@ -37,6 +37,8 @@ src_prepare() { sed -i \ -e '/^CFLAGS/s:-I/usr/src/linux/include::' \ solfege/soundcard/Makefile || die + + epatch "${FILESDIR}"/${P}-swig2.patch } src_configure() { |