diff options
| author |   Ryan Hill <dirtyepic@gentoo.org> | 2009-07-29 04:13:59 +0000 |
|---|---|---|
| committer | Ryan Hill <dirtyepic@gentoo.org> | 2009-07-29 04:13:59 +0000 |
| commit | 90e55281de1ddaa0538d43564607e97fd6bdf10c (patch) | |
| tree | 247b9ce3ba295f25e6d7ee65152120c50d185722 /sci-visualization/qtiplot | |
| parent | version bump (diff) | |
| download | gentoo-2-90e55281de1ddaa0538d43564607e97fd6bdf10c.tar.gz gentoo-2-90e55281de1ddaa0538d43564607e97fd6bdf10c.tar.bz2 gentoo-2-90e55281de1ddaa0538d43564607e97fd6bdf10c.zip | |
Fix building w/ GCC 4.4. (bug #272375)
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'sci-visualization/qtiplot')
| -rw-r--r-- | sci-visualization/qtiplot/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-visualization/qtiplot/files/qtiplot-0.9.7.7-gcc44.patch | 18 | ||||
| -rw-r--r-- | sci-visualization/qtiplot/qtiplot-0.9.7.7.ebuild | 3 |
3 files changed, 25 insertions, 2 deletions
diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog index e61892f44d14..04f04d60b47a 100644 --- a/sci-visualization/qtiplot/ChangeLog +++ b/sci-visualization/qtiplot/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-visualization/qtiplot # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.44 2009/06/05 17:29:44 grozin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.45 2009/07/29 04:13:59 dirtyepic Exp $ + + 29 Jul 2009; Ryan Hill <dirtyepic@gentoo.org> qtiplot-0.9.7.7.ebuild, + +files/qtiplot-0.9.7.7-gcc44.patch: + Fix building w/ GCC 4.4. (bug #272375) 05 Jun 2009; Andrey Grozin <grozin@gentoo.org> qtiplot-0.9.7.7.ebuild: USE-deps on PyQt4 fixed (bug #272182) diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.7-gcc44.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.7-gcc44.patch new file mode 100644 index 000000000000..1dc99343476e --- /dev/null +++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.7-gcc44.patch @@ -0,0 +1,18 @@ +--- qtiplot-0.9.7.7-orig/3rdparty/qwtplot3d/src/qwt3d_function.cpp ++++ qtiplot-0.9.7.7/3rdparty/qwtplot3d/src/qwt3d_function.cpp +@@ -1,3 +1,4 @@ ++#include <cstdio> + #include "qwt3d_surfaceplot.h" + #include "qwt3d_function.h" + +--- qtiplot-0.9.7.7-orig/qtiplot/src/scripting/ScriptEdit.cpp ++++ qtiplot-0.9.7.7/qtiplot/src/scripting/ScriptEdit.cpp +@@ -291,7 +291,7 @@ void ScriptEdit::insertErrorMsg(const QS + console->setPlainText(err);
+ if (!console->isVisible())
+ ((QDockWidget *)console->parent())->show();
+-#elif
++#else
+ int start = printCursor.position();
+ printCursor.insertText(err);
+ printCursor.setPosition(start, QTextCursor::KeepAnchor);
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.7.7.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.7.7.ebuild index 9af8f55febe1..43d6cbfc5243 100644 --- a/sci-visualization/qtiplot/qtiplot-0.9.7.7.ebuild +++ b/sci-visualization/qtiplot/qtiplot-0.9.7.7.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/sci-visualization/qtiplot/qtiplot-0.9.7.7.ebuild,v 1.4 2009/06/05 17:29:44 grozin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.7.7.ebuild,v 1.5 2009/07/29 04:13:59 dirtyepic Exp $ EAPI=2 inherit eutils qt4 fdo-mime python @@ -47,6 +47,7 @@ RDEPEND="${CDEPEND} src_prepare() { epatch "${FILESDIR}"/${P}-syslibs.patch epatch "${FILESDIR}"/${P}-docbuild.patch + epatch "${FILESDIR}"/${P}-gcc44.patch python_version sed -i \ |