diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2010-10-18 06:53:04 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2010-10-18 06:53:04 +0000 |
| commit | 1787057016ab5db384d5fcd9022edfe7a62f1369 (patch) | |
| tree | 7549e2b137830e0144dd622ea2d9cb54442b1619 /sci-visualization/qtiplot/files | |
| parent | Initial Commit (diff) | |
| download | gentoo-2-1787057016ab5db384d5fcd9022edfe7a62f1369.tar.gz gentoo-2-1787057016ab5db384d5fcd9022edfe7a62f1369.tar.bz2 gentoo-2-1787057016ab5db384d5fcd9022edfe7a62f1369.zip | |
Version Bump, new USE for emf png latex xls added, prefix ready
(Portage version: 2.2_rc97/cvs/Linux x86_64)
Diffstat (limited to 'sci-visualization/qtiplot/files')
4 files changed, 85 insertions, 0 deletions
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.3-odf.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.3-odf.patch new file mode 100644 index 000000000000..0ba7cc96a605 --- /dev/null +++ b/sci-visualization/qtiplot/files/qtiplot-0.9.8.3-odf.patch @@ -0,0 +1,13 @@ +diff --git a/qtiplot/src/core/ApplicationWindow.cpp b/qtiplot/src/core/ApplicationWindow.cpp +index 56c52a7..b643e50 100755 +--- a/qtiplot/src/core/ApplicationWindow.cpp ++++ b/qtiplot/src/core/ApplicationWindow.cpp +@@ -4326,7 +4326,7 @@ Table * ApplicationWindow::importExcelCrossplatform(const QString& fn, int sheet + + int rows = sh->GetTotalRows(); + int cols = sh->GetTotalCols(); +- if (rows == 1 && !cols){ ++ if (!rows && !cols){ + if (sheet > 0 && sheet == currentSheet){ + QMessageBox::critical(this, tr("QtiPlot"), tr("Sheet %1 is empty, operation aborted!").arg(sheet)); + return NULL; diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.3-origin.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.3-origin.patch new file mode 100644 index 000000000000..ebd7ca7342de --- /dev/null +++ b/sci-visualization/qtiplot/files/qtiplot-0.9.8.3-origin.patch @@ -0,0 +1,13 @@ +diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro +index bf133ca..f3d0994 100755 +--- a/qtiplot/qtiplot.pro ++++ b/qtiplot/qtiplot.pro +@@ -226,7 +226,7 @@ contains(SCRIPTING_LANGS, Python) { + DEFINES += OPJ_IMPORT + INCLUDEPATH += $$LIBORIGIN_INCLUDEPATH + INCLUDEPATH += $$BOOST_INCLUDEPATH +- #LIBS += $$LIBORIGIN_LIBS ++ LIBS += $$LIBORIGIN_LIBS + LIBS += $$BOOST_LIBS + include(src/origin/origin.pri) + } diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.3-plot.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.3-plot.patch new file mode 100644 index 000000000000..4e49da837bf0 --- /dev/null +++ b/sci-visualization/qtiplot/files/qtiplot-0.9.8.3-plot.patch @@ -0,0 +1,12 @@ +diff --git a/qtiplot/src/origin/importOPJ.cpp b/qtiplot/src/origin/importOPJ.cpp +index 5abb0be..b9c1408 100755 +--- a/qtiplot/src/origin/importOPJ.cpp ++++ b/qtiplot/src/origin/importOPJ.cpp +@@ -790,7 +790,6 @@ bool ImportOPJ::importGraphs(const OriginFile& opj) + case Origin::GraphCurve::TextPlot: + style = Origin::GraphCurve::TextPlot; + break; +- case Origin::GraphCurve::XYZContour: + case Origin::GraphCurve::Contour: + style = Origin::GraphCurve::Contour; + break; diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.3-popup.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.3-popup.patch new file mode 100644 index 000000000000..ff01934c302c --- /dev/null +++ b/sci-visualization/qtiplot/files/qtiplot-0.9.8.3-popup.patch @@ -0,0 +1,47 @@ +diff --git a/qtiplot/src/core/ApplicationWindow.cpp b/qtiplot/src/core/ApplicationWindow.cpp +index 56c52a7..5422c0a 100755 +--- a/qtiplot/src/core/ApplicationWindow.cpp ++++ b/qtiplot/src/core/ApplicationWindow.cpp +@@ -15912,6 +15912,7 @@ void ApplicationWindow::showBugTracker() + QDesktopServices::openUrl(QUrl("https://developer.berlios.de/bugs/?group_id=6626")); + } + ++#ifdef QTIPLOT_SUPPORT + void ApplicationWindow::showDonationDialog() + { + QString s = tr("<font size=+2, color = darkBlue><b>QtiPlot is open-source software and its development required hundreds of hours of work.<br><br>\ +@@ -15927,6 +15928,7 @@ void ApplicationWindow::showDonationDialog() + if (msg->clickedButton() == btn) + showDonationsPage(); + } ++#endif + + void ApplicationWindow::parseCommandLineArguments(const QStringList& args) + { +diff --git a/qtiplot/src/core/ApplicationWindow.h b/qtiplot/src/core/ApplicationWindow.h +index 5c479f9..f973557 100755 +--- a/qtiplot/src/core/ApplicationWindow.h ++++ b/qtiplot/src/core/ApplicationWindow.h +@@ -908,7 +908,9 @@ public slots: + void receivedVersionFile(bool error); + //! called when the user presses the actionCheckUpdates + void searchForUpdates(); ++#ifdef QTIPLOT_SUPPORT + void showDonationDialog(); ++#endif + //! Open support page in external browser + void showSupportPage(); + //! Open donation page in external browser +diff --git a/qtiplot/src/core/QtiPlotApplication.cpp b/qtiplot/src/core/QtiPlotApplication.cpp +index 69a5b0f..8c3637a 100755 +--- a/qtiplot/src/core/QtiPlotApplication.cpp ++++ b/qtiplot/src/core/QtiPlotApplication.cpp +@@ -57,7 +57,7 @@ QtiPlotApplication::QtiPlotApplication( int & argc, char ** argv) : QApplication + + ApplicationWindow *mw = new ApplicationWindow(factorySettings); + mw->restoreApplicationGeometry(); +- #ifndef QTIPLOT_PRO ++ #ifdef QTIPLOT_SUPPORT + mw->showDonationDialog(); + #endif + if (mw->autoSearchUpdates){ |