diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-10-28 01:55:17 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-10-28 01:55:17 +0000 |
| commit | 279a8cddfc68183cc15de16449c26f626272af61 (patch) | |
| tree | 7fd7f66c85017cc4ca62d7658a8a890156b49113 /media-sound/kaconnect | |
| parent | Add missing pkgconfig dependency, thanks to Patrick Lauer in bug #153043. (diff) | |
| download | gentoo-2-279a8cddfc68183cc15de16449c26f626272af61.tar.gz gentoo-2-279a8cddfc68183cc15de16449c26f626272af61.tar.bz2 gentoo-2-279a8cddfc68183cc15de16449c26f626272af61.zip | |
Fix building with GCC 4.1 and respect compiler, CFLAGS and LDFLAGS. Thanks to Patrick Lauer in bug #153097.
(Portage version: 2.1.2_pre3-r9)
Diffstat (limited to 'media-sound/kaconnect')
| -rw-r--r-- | media-sound/kaconnect/ChangeLog | 9 | ||||
| -rw-r--r-- | media-sound/kaconnect/files/digest-kaconnect-1.1.1 | 2 | ||||
| -rw-r--r-- | media-sound/kaconnect/files/kaconnect-1.1.1-gcc41.patch | 13 | ||||
| -rw-r--r-- | media-sound/kaconnect/kaconnect-1.1.1.ebuild | 14 |
4 files changed, 31 insertions, 7 deletions
diff --git a/media-sound/kaconnect/ChangeLog b/media-sound/kaconnect/ChangeLog index 4fb49632ff40..af20caec8ccf 100644 --- a/media-sound/kaconnect/ChangeLog +++ b/media-sound/kaconnect/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-sound/kaconnect -# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/kaconnect/ChangeLog,v 1.9 2005/07/25 15:55:24 caleb Exp $ +# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/kaconnect/ChangeLog,v 1.10 2006/10/28 01:55:17 flameeyes Exp $ + + 28 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> + +files/kaconnect-1.1.1-gcc41.patch, kaconnect-1.1.1.ebuild: + Fix building with GCC 4.1 and respect compiler, CFLAGS and LDFLAGS. Thanks + to Patrick Lauer in bug #153097. 25 Jul 2005; Caleb Tennis <caleb@gentoo.org> kaconnect-1.1.1.ebuild: Change dep per bug #100235 diff --git a/media-sound/kaconnect/files/digest-kaconnect-1.1.1 b/media-sound/kaconnect/files/digest-kaconnect-1.1.1 index e7ace5a3bf02..33788ee5b047 100644 --- a/media-sound/kaconnect/files/digest-kaconnect-1.1.1 +++ b/media-sound/kaconnect/files/digest-kaconnect-1.1.1 @@ -1 +1,3 @@ MD5 df012e2d7062f9055a031e74fb10f217 kaconnect-1.1.1.tar.bz2 14178 +RMD160 4a38c843c2de9ac4611c496a18addcff6657f80b kaconnect-1.1.1.tar.bz2 14178 +SHA256 4b6254aaa2dd2457053cf4d6790bb1aca72f778474defd2d07f430d9396b9e8b kaconnect-1.1.1.tar.bz2 14178 diff --git a/media-sound/kaconnect/files/kaconnect-1.1.1-gcc41.patch b/media-sound/kaconnect/files/kaconnect-1.1.1-gcc41.patch new file mode 100644 index 000000000000..bbf0d8088a8c --- /dev/null +++ b/media-sound/kaconnect/files/kaconnect-1.1.1-gcc41.patch @@ -0,0 +1,13 @@ +Index: kaconnect-1.1.1/connector.h +=================================================================== +--- kaconnect-1.1.1.orig/connector.h ++++ kaconnect-1.1.1/connector.h +@@ -24,7 +24,7 @@ class ConnectorWidget : public QWidget { + void arrow(int x1, int y1, int x2, int y2); + + public: +- ConnectorWidget::ConnectorWidget(QWidget *parent, snd_seq_t *pseq); ++ ConnectorWidget(QWidget *parent, snd_seq_t *pseq); + void set_r_listBox(PortListBox *p_r_portlist); + void set_w_listBox(PortListBox *p_w_portlist); + diff --git a/media-sound/kaconnect/kaconnect-1.1.1.ebuild b/media-sound/kaconnect/kaconnect-1.1.1.ebuild index 8176bce1047f..33fc797ce1ee 100644 --- a/media-sound/kaconnect/kaconnect-1.1.1.ebuild +++ b/media-sound/kaconnect/kaconnect-1.1.1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/kaconnect/kaconnect-1.1.1.ebuild,v 1.10 2005/07/25 15:55:24 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/kaconnect/kaconnect-1.1.1.ebuild,v 1.11 2006/10/28 01:55:17 flameeyes Exp $ -inherit qt3 +inherit qt3 toolchain-funcs eutils IUSE="" @@ -23,11 +23,15 @@ DEPEND="${RDEPEND} src_unpack() { unpack ${A} || die - sed -i 's:/usr/lib/qt3:/usr/qt/3:g' ${S}/make_kaconnect + sed -i -e 's:/usr/lib/qt3:/usr/qt/3:g' \ + 's:gcc:${CC} ${CFLAGS} ${LDFLAGS}:g' \ + "${S}/make_kaconnect" + + epatch "${FILESDIR}/${P}-gcc41.patch" } src_compile() { - make -f make_kaconnect || die "Make failed." + emake CC="$(tc-getCC)" -f make_kaconnect || die "Make failed." } src_install () { |