diff options
| author |   Tobias Scherbaum <dertobi123@gentoo.org> | 2009-06-25 21:06:31 +0000 |
|---|---|---|
| committer | Tobias Scherbaum <dertobi123@gentoo.org> | 2009-06-25 21:06:31 +0000 |
| commit | a08ffec840502ad66204317616a0a5ecb626c897 (patch) | |
| tree | 3161dcf20181011ef4152d6cfadbdcb43f862376 /dev-db/tora | |
| parent | arts is deprecated (diff) | |
| download | gentoo-2-a08ffec840502ad66204317616a0a5ecb626c897.tar.gz gentoo-2-a08ffec840502ad66204317616a0a5ecb626c897.tar.bz2 gentoo-2-a08ffec840502ad66204317616a0a5ecb626c897.zip | |
Fix gcc-4.4 compilation (#274220), always depend on qt-sql (#274743)
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'dev-db/tora')
| -rw-r--r-- | dev-db/tora/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-db/tora/files/tora-2.0.0-gcc44.patch | 40 | ||||
| -rw-r--r-- | dev-db/tora/tora-2.0.0.ebuild | 3 |
3 files changed, 47 insertions, 2 deletions
diff --git a/dev-db/tora/ChangeLog b/dev-db/tora/ChangeLog index ece58dbe6c77..fe5ef6a9e214 100644 --- a/dev-db/tora/ChangeLog +++ b/dev-db/tora/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/tora # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.68 2009/05/04 16:52:32 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.69 2009/06/25 21:06:31 dertobi123 Exp $ + + 25 Jun 2009; Tobias Scherbaum <dertobi123@gentoo.org> + +files/tora-2.0.0-gcc44.patch, tora-2.0.0.ebuild: + Fix gcc-4.4 compilation (#274220), always depend on qt-sql (#274743) 04 May 2009; Tobias Scherbaum <dertobi123@gentoo.org> ChangeLog: Add dep on dev-db/oracle-instantclient-sqlplus for +oci8-instant-client, diff --git a/dev-db/tora/files/tora-2.0.0-gcc44.patch b/dev-db/tora/files/tora-2.0.0-gcc44.patch new file mode 100644 index 000000000000..468e37a033c5 --- /dev/null +++ b/dev-db/tora/files/tora-2.0.0-gcc44.patch @@ -0,0 +1,40 @@ +--- src/toqvalue.cpp.orig 2009-06-25 21:56:21.879870369 +0200 ++++ src/toqvalue.cpp 2009-06-25 21:56:35.759867041 +0200 +@@ -44,6 +44,7 @@ + #include "toconf.h" + #include "toqvalue.h" + ++#include <cstdio> + #include <QVariant> + #include <QApplication> + +--- src/tomodeleditor.cpp.orig 2009-06-25 21:59:49.922104810 +0200 ++++ src/tomodeleditor.cpp 2009-06-25 21:59:59.904863047 +0200 +@@ -48,6 +48,7 @@ + #include "toresultview.h" + #include "tomain.h" + ++#include <cstdio> + #include <qcheckbox.h> + #include <qlayout.h> + #include <qpixmap.h> +--- src/toresultview.cpp.orig 2009-06-25 22:01:53.095862952 +0200 ++++ src/toresultview.cpp 2009-06-25 22:02:06.038862175 +0200 +@@ -54,6 +54,7 @@ + #include "totool.h" + #include "toresultlistformat.h" + ++#include <cstdio> + #include <qapplication.h> + #include <qclipboard.h> + #include <qcombobox.h> +--- src/todebug.cpp.orig 2009-06-25 22:31:27.233110649 +0200 ++++ src/todebug.cpp 2009-06-25 22:31:41.032862675 +0200 +@@ -58,6 +58,7 @@ + #include "totool.h" + #include "tocodemodel.h" + ++#include <cstdio> + #include <stack> + + #include <qcheckbox.h> diff --git a/dev-db/tora/tora-2.0.0.ebuild b/dev-db/tora/tora-2.0.0.ebuild index c12055bd9cc7..cb9a5de94c32 100644 --- a/dev-db/tora/tora-2.0.0.ebuild +++ b/dev-db/tora/tora-2.0.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-2.0.0.ebuild,v 1.3 2009/05/04 16:51:46 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-2.0.0.ebuild,v 1.4 2009/06/25 21:06:31 dertobi123 Exp $ EAPI=2 @@ -17,6 +17,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86" RDEPEND="${DEPEND}" DEPEND="dev-lang/perl + x11-libs/qt-sql mysql? ( x11-libs/qt-sql[mysql] ) postgres? ( x11-libs/qt-sql[postgres] ) >=x11-libs/qscintilla-2.1[qt4] |