diff options
| author |   Tobias Scherbaum <dertobi123@gentoo.org> | 2006-07-04 19:59:46 +0000 |
|---|---|---|
| committer | Tobias Scherbaum <dertobi123@gentoo.org> | 2006-07-04 19:59:46 +0000 |
| commit | 5cab5e541c5c9fb1e14df78248f82d619764e448 (patch) | |
| tree | fa3b56510a7455136ff1f0024f8d5b54ec1038de | |
| parent | Fixed RDEPEND wrt bug #134781 (diff) | |
| download | gentoo-2-5cab5e541c5c9fb1e14df78248f82d619764e448.tar.gz gentoo-2-5cab5e541c5c9fb1e14df78248f82d619764e448.tar.bz2 gentoo-2-5cab5e541c5c9fb1e14df78248f82d619764e448.zip | |
Add patch to allow building with gcc-4.1, bug #137060
(Portage version: 2.1-r1)
| -rw-r--r-- | dev-db/tora/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-db/tora/files/gcc41.patch | 11 | ||||
| -rw-r--r-- | dev-db/tora/tora-1.3.18.ebuild | 9 | ||||
| -rw-r--r-- | dev-db/tora/tora-1.3.21.ebuild | 8 |
4 files changed, 31 insertions, 3 deletions
diff --git a/dev-db/tora/ChangeLog b/dev-db/tora/ChangeLog index 461120748c7d..6887d7b7e4db 100644 --- a/dev-db/tora/ChangeLog +++ b/dev-db/tora/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/tora # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.51 2006/05/21 08:45:22 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.52 2006/07/04 19:59:46 dertobi123 Exp $ + + 04 Jul 2006; Tobias Scherbaum <dertobi123@gentoo.org> +files/gcc41.patch, + tora-1.3.18.ebuild, tora-1.3.21.ebuild: + Add patch to allow building with gcc-4.1, bug #137060 21 May 2006; Tobias Scherbaum <dertobi123@gentoo.org> tora-1.3.21.ebuild: Disable parallel builds for now, see bug #133326. The bug has been reported diff --git a/dev-db/tora/files/gcc41.patch b/dev-db/tora/files/gcc41.patch new file mode 100644 index 000000000000..a205dd235bc0 --- /dev/null +++ b/dev-db/tora/files/gcc41.patch @@ -0,0 +1,11 @@ +--- tora-1.3.21/tothread.cpp.wiget 2006-05-22 16:29:32.000000000 +0200 ++++ tora-1.3.21/tothread.cpp 2006-05-22 16:31:40.000000000 +0200 +@@ -156,6 +156,8 @@ + #define THREAD_ASSERT(x) if((x)!=0) { \ + throw (qApp->translate("toThread","Thread function \"%1\" failed.").arg(QString::fromLatin1( #x ))); } + ++void *toThreadStartWrapper(void *t); ++ + void toThread::initAttr() + { + //create the thread detached, so everything is cleaned up diff --git a/dev-db/tora/tora-1.3.18.ebuild b/dev-db/tora/tora-1.3.18.ebuild index ab7f5dfec2a0..a8e75c5a566b 100644 --- a/dev-db/tora/tora-1.3.18.ebuild +++ b/dev-db/tora/tora-1.3.18.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-1.3.18.ebuild,v 1.5 2006/02/06 18:21:18 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-1.3.18.ebuild,v 1.6 2006/07/04 19:59:46 dertobi123 Exp $ inherit debug eutils kde-functions @@ -33,6 +33,13 @@ pkg_setup() { fi } +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/gcc41.patch +} + + src_compile() { set-qtdir 3 set-kdedir 3 diff --git a/dev-db/tora/tora-1.3.21.ebuild b/dev-db/tora/tora-1.3.21.ebuild index 324b30722111..f45fbb86b684 100644 --- a/dev-db/tora/tora-1.3.21.ebuild +++ b/dev-db/tora/tora-1.3.21.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-1.3.21.ebuild,v 1.3 2006/05/21 08:45:22 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-1.3.21.ebuild,v 1.4 2006/07/04 19:59:46 dertobi123 Exp $ inherit debug eutils kde-functions @@ -34,6 +34,12 @@ pkg_setup() { fi } +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/gcc41.patch +} + src_compile() { set-qtdir 3 set-kdedir 3 |