diff options
| author |   Markus Dittrich <markusle@gentoo.org> | 2008-11-14 14:04:46 +0000 |
|---|---|---|
| committer | Markus Dittrich <markusle@gentoo.org> | 2008-11-14 14:04:46 +0000 |
| commit | 938ef7491ece5f4d0a82d2e8a60b70be395cc283 (patch) | |
| tree | c0aae932c14c3fa72e9493e6f1a2a7f68fb74800 /sci-visualization/qtiplot/files | |
| parent | Version bump. (diff) | |
| download | gentoo-2-938ef7491ece5f4d0a82d2e8a60b70be395cc283.tar.gz gentoo-2-938ef7491ece5f4d0a82d2e8a60b70be395cc283.tar.bz2 gentoo-2-938ef7491ece5f4d0a82d2e8a60b70be395cc283.zip | |
Added patch to fix compile problems with python disabled (#246473).
(Portage version: 2.2_rc13/cvs/Linux 2.6.27-SENTINEL-2 i686)
Diffstat (limited to 'sci-visualization/qtiplot/files')
| -rw-r--r-- | sci-visualization/qtiplot/files/qtiplot-0.9.7.3-no-python.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-no-python.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-no-python.patch new file mode 100644 index 000000000000..841ac78df38e --- /dev/null +++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-no-python.patch @@ -0,0 +1,62 @@ +diff -Naur qtiplot-0.9.7.3/qtiplot/src/scripting/ScriptEdit.cpp qtiplot-0.9.7.3.new/qtiplot/src/scripting/ScriptEdit.cpp +--- qtiplot-0.9.7.3/qtiplot/src/scripting/ScriptEdit.cpp 2008-10-20 11:59:25.000000000 -0400 ++++ qtiplot-0.9.7.3.new/qtiplot/src/scripting/ScriptEdit.cpp 2008-11-13 09:10:48.000000000 -0500 +@@ -28,7 +28,11 @@ + ***************************************************************************/ + #include "ScriptEdit.h" + #include "Note.h" ++ ++#ifdef SCRIPTING_PYTHON + #include "PythonSyntaxHighlighter.h" ++#endif ++ + #include "FindReplaceDialog.h" + + #include <QAction> +@@ -58,9 +62,11 @@ + setTextFormat(Qt::PlainText); + setAcceptRichText (false); + ++#ifdef SCRIPTING_PYTHON + if (scriptEnv->name() == QString("Python")) + d_highlighter = new PythonSyntaxHighlighter(this); +- ++#endif ++ + d_fmt_default.setBackground(palette().brush(QPalette::Base)); + d_fmt_failure.setBackground(QBrush(QColor(255,128,128))); + +@@ -142,6 +148,7 @@ + connect(myScript, SIGNAL(error(const QString&, const QString&, int)), this, SLOT(insertErrorMsg(const QString&))); + connect(myScript, SIGNAL(print(const QString&)), this, SLOT(scriptPrint(const QString&))); + ++#ifdef SCRIPTING_PYTHON + if (scriptEnv->name() == QString("Python") && !d_highlighter) + d_highlighter = new PythonSyntaxHighlighter(this); + else { +@@ -149,6 +156,7 @@ + delete d_highlighter; + d_highlighter = 0; + } ++#endif + } + } +
+@@ -585,13 +593,16 @@ + + void ScriptEdit::rehighlight() + { ++#ifdef SCRIPTING_PYTHON + if (scriptEnv->name() != QString("Python")) + return; +- ++#endif + if (d_highlighter) + delete d_highlighter; + ++#ifdef SCRIPTING_PYTHON + d_highlighter = new PythonSyntaxHighlighter(this); ++#endif + } + + void ScriptEdit::showFindDialog(bool replace) |