diff options
author | Andreas K. Huettel (dilfridge) <mail@akhuettel.de> | 2012-01-29 00:13:31 +0100 |
---|---|---|
committer | Andreas K. Huettel (dilfridge) <mail@akhuettel.de> | 2012-01-29 00:13:31 +0100 |
commit | 84d8f80db6d8dc6f1eafa7dfa4d73dd1d796ddfa (patch) | |
tree | cf93b12221157d000d8869e5ee8607bddf8094b6 /sci-visualization | |
parent | [sci-visualization/spyview] Not needed here anymore (diff) | |
download | dilfridge-84d8f80db6d8dc6f1eafa7dfa4d73dd1d796ddfa.tar.gz dilfridge-84d8f80db6d8dc6f1eafa7dfa4d73dd1d796ddfa.tar.bz2 dilfridge-84d8f80db6d8dc6f1eafa7dfa4d73dd1d796ddfa.zip |
[sci-visualization/qtiplot] Not needed here anymore
Diffstat (limited to 'sci-visualization')
24 files changed, 0 insertions, 1409 deletions
diff --git a/sci-visualization/qtiplot/Manifest b/sci-visualization/qtiplot/Manifest deleted file mode 100644 index 23678b7..0000000 --- a/sci-visualization/qtiplot/Manifest +++ /dev/null @@ -1,45 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 - -AUX qtiplot-0.9.7.10-dont-install-qwt.patch 605 RMD160 e68908d5ca887e64fe99bed21ea7d1d746f5409d SHA1 23089d7955cc15f6e56e3401266421cae24975c3 SHA256 161657d37de71ea58fc0e0af3495dc45082f5c398bd82c70e40968b23d0b898b -AUX qtiplot-0.9.7.12-system-QTeXEngine.patch 2390 RMD160 4e96caac6fe930b27dfd503354417078bfedfe34 SHA1 25f548a4c6e76a39dc72b44c4e975f13897f1d8f SHA256 9bb277a4bee32037067561ac19a1eb4bd8cf4f7b53edcea896c9f0c036dcccff -AUX qtiplot-0.9.7.12-system-gl2ps.patch 1594 RMD160 4ed03493199239a9c3b745132b5aeb202214e025 SHA1 548c1edc50fe96e46f6a676ff9f794ffff7dd7f7 SHA256 b1997f61759e647bfa25f3b926bedd88102a8d56595d515edef2c6988dd97a22 -AUX qtiplot-0.9.7.12-system-liborigin.patch 3242 RMD160 03ea38fe2b26034ad1bc08fb296eabdd76823409 SHA1 17085d3a32281dcac5a594a054265ae5c9d80445 SHA256 cf2595152c23c9c67513a115d9981e03d472c0b93e101d6e9e4e778de97df731 -AUX qtiplot-0.9.7.14-system-2dplot.patch 4757 RMD160 2186cceedd7693c384418cfcd38d874388ab8e88 SHA1 6b38e9273815f11cfffa238faa56d5427dcd8c4b SHA256 08c18a733475d7d9871f5a30b06280781b3102b17f0528431c9eadb68bafd814 -AUX qtiplot-0.9.7.14-system-liborigin.patch 4089 RMD160 1473539c2146766b43f1cfea7e31c3bb0e2602bf SHA1 2280685fb5fe59c300eebfc16c5e2cc08a259833 SHA256 d268297f50bbde162b66c1fd9fff93f54cbc73ce988ee88e25203a5e06b671c9 -AUX qtiplot-0.9.8.2-origin-build-failure.patch 2472 RMD160 a66c6f704ce7227939bb2c790361221294cef5ac SHA1 51ac749b14b5bc5988732841db76c142b61ec940 SHA256 98822a3f784207d205e127b8a37d091f1da2a61476aefe49ec57ae687b1e7f63 -AUX qtiplot-0.9.8.2-syslibs.patch 572 RMD160 98cd19606d7badb89b70d5024c06e2b9a6a81345 SHA1 3a01e6169da7429a67054e1980d4a1b48b1a840d SHA256 5d478fac2785f2b79273fff83dbd5030aa2a376cb277782adeefeb40bb5d536d -AUX qtiplot-0.9.8.3-odf.patch 606 RMD160 e0d07e047fe9e327fba64cf8d4196ea39c7b2694 SHA1 fb9f16558d434caaf541890a3062ada4f3fad33a SHA256 0c8e9803650b618d50dd0420d16ef3d37864a6414240ed8a39341c30588778d1 -AUX qtiplot-0.9.8.3-origin.patch 430 RMD160 7c3bfbea5d1c42cf01a59452a9b8551b50dd25d8 SHA1 be444a01cc8674941036dbdc8df770b6f1d3672c SHA256 2e8627245752583d266207515563c112d29a5e417feb7481a651af9a9d73c871 -AUX qtiplot-0.9.8.3-plot.patch 502 RMD160 e40109ded4a1a9d2b3a95ed71231b8db509f8d3e SHA1 9d1fb8c4ed2717b327e2fe0dcc88ffa0cd9e8255 SHA256 924b973f3f7ab3e7e0a76cb641a7c832401d52f00333c2033ee8980ffc503af5 -AUX qtiplot-0.9.8.3-popup.patch 1892 RMD160 b07794d6b46396ea4df9a7084f01c7c0466dc9e5 SHA1 0bf1d6332e1e2a32880dfd0c753f0ffd8f05e64e SHA256 5c2cebb201408c111494afa7624d0e9d53dcbb2d5dcd2b1f7899af366d73efaf -AUX qtiplot-0.9.8.5-tamuanova.patch 2057 RMD160 2822b0e410bc819e1bc5d0bea7819ba2122117fc SHA1 d46045ac63cdb7735121120054705be5c37f0649 SHA256 ca67848d04c61253ac776adae439a3f1d68095760278d59668900442595eb739 -AUX qtiplot-0.9.8.6-gold.patch 535 RMD160 9153e4a2f83b2f55585ef2aec44f151eb424f7b7 SHA1 b534a609f317cf3117d6495909854cdacea20124 SHA256 601bdea70053618be63f446c7c35fc991587a5ca439260d75bcb84308d116784 -AUX qtiplot-0.9.8.6-kde.patch 425 RMD160 428d0b2304b02e4e70264c4100be604bca0af1db SHA1 a1d4bec744c9b8fe29bf177851e66c97cdd9d975 SHA256 4e67a67c9467290930d21460cc326ac7b5d89322b7b020d32b46a04a77d14f84 -AUX qtiplot-0.9.8.6-tamuanova.patch 894 RMD160 f71ef91129284035e378e55a60e61448ba914e04 SHA1 830b518e3ef63625df84363a8047417124f243b0 SHA256 8c4deccaf3fa09133ac6ae35327a73637dccff0a4edfaa427894a9c6592e7f4c -AUX qtiplot-0.9.8.7-kde.patch 454 RMD160 dd38d3a9e4c1034fff061f7bc4e6ef95aa07ee10 SHA1 cc2734760b55a53c1cc7de89dd8de57ee7611565 SHA256 5cfe122907403ed1f766118934aa42eac05db41efabd0c6618df17af16e3aff1 -AUX qtiplot-0.9.8.8-system-gl2ps.patch 2436 RMD160 4ef13f2ff717759a882e91169bc81a167dc08b9e SHA1 cdbb846d85372720021b52c71f86e5230f913e32 SHA256 0787155b465aa6cdf4b2c12a87dd68e6b5aa2197b041b06a550023c1ca96c81c -AUX qtiplot-0.9.8.9-origin-2.patch 1715 RMD160 15cef2683087f8b4f15dcb9798d7e6d0397ddd0a SHA1 9c0f4ee5c42367f2011826886f775ba1e1b5e5a7 SHA256 31b842536b4bb98e9bbe49cd0a86bae7639f108c09f5d8eecd4e159740b0ce3b -AUX qtiplot-0.9.8.9-unbundle.patch 2815 RMD160 f2bbcbd39a44542e46def73a0de258ee683bb9ca SHA1 8a992e612cb781d012f4e9dbced023adb7214905 SHA256 ce41e2af253a25c49a4cb6394d291cf0d5ec0795620cdaacfe524ea19295d807 -DIST qtiplot-0.9.8.9-origin.patch.bz2 104708 RMD160 cbdd313f6054ecce19987be949b381c6210a3dad SHA1 632fbe607af7d2b1a903ef414ccadc4f425f9058 SHA256 e83d7212be0fadae31b14c8a86b655fdb3b7c7b8fc80b1e2d91eb0a7e96b1e99 -DIST qtiplot-0.9.8.9.tar.bz2 16202943 RMD160 6f78160aabc94fc8f01d4f5fb65f5cb4a718eae2 SHA1 73b17dd9195c3d86750d5f1f5bdd4d5483c5fe30 SHA256 a523ea259516d7581abaf2fe376507d152db32f71d88176cff18f5bc391b9ef0 -EBUILD qtiplot-0.9.8.9-r1.ebuild 5820 RMD160 0296bc303781af28bc5b26a2627607a0dc2d8299 SHA1 9268ae18e7b2f199c54a0081e838c176609a286f SHA256 9c71aa0ee9ec1086ea4840fc2a8e944eb398f4ccb86f30af52501922c912c3c8 -EBUILD qtiplot-0.9.8.9.ebuild 5609 RMD160 e2cd1cbdc865c27ae49edc797e6c0c255be982d8 SHA1 3a1ec5ef3d671d651f869eec0852a1b8a6d87781 SHA256 eb2541d996b2fb1f407a47b16f83152d6022e71808871c23b462901625069c28 -MISC metadata.xml 919 RMD160 d5a42a5872798c2f2f3a0c8ca241a15444a6f8b9 SHA1 1117f722c109e074538193ded0c6a5c5c8334dc7 SHA256 379fdffaca2a9a4769a8bfd3d6c38efca329faf1382b9e9013a2b1f4262a42ec ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iQIcBAEBCgAGBQJPHBp7AAoJENwGBM22xffesUQP/jJAb8AqkxhlGQLkLk18hNNo -eKqoc9PcRQR+eCITA5WSz1WNWNDXKXaSXPAe7sIAShtqnWwktgqnEy2yCNZ1SJXb -TR08+2vO/5XTyXWJgfMWiN9btYvIoDWWtqO7qNJ+1o1RKwru3kFYRl7XfqvZnShq -U9/8Qb8meqhiBQLOhG2tfXTfIZwJu4j4PfafN+wqkRMC2+9smjMdm9RrZS33FghX -WLkZoQqYcIPAtN+ov0oc42AvjfxdvNa+TRLsEiGX4fY50zxAMFpnq5ZCXICvbDby -zO0b1ZXUFb6qtoaWs+6+UtpfHnwCFUsEU2FN0EwfOkmvgsNrhdlrJpLKslWhBWy/ -KcLmYg0+NccAZkMZ3etKEdhdnkFto8lUP43iusz3i2RoaEekZku45utnTe91LUUI -BWNL5tbteUmYed2hL49yqTMFXmvYXhByUTYAXk0kXqPRngJFzGEi+m7kBvdQgsO2 -foGaKBfZ9d+bIQffawxPBlOUsuMcLd7BA7ATVs5SrMlEJdoNjJwm1iiP/zjzMLz6 -AYEf4SH1BN7lruhPtS2Z/3rYSZTtER4Etzeefw8I173Adr52ZAeSUN68Ng+EHgnd -YIssrx9covp+JeqaqZ+D4DxdLicRI4SrWtY5ep/1CbNcuvkcYY9b3HeQthBDQuSf -uTn/Kq6T8pT3jkEnl/UC -=x2Gu ------END PGP SIGNATURE----- diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-dont-install-qwt.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-dont-install-qwt.patch deleted file mode 100644 index 86e4d4c..0000000 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-dont-install-qwt.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/3rdparty/qwt/qwtconfig.pri b/3rdparty/qwt/qwtconfig.pri -index b7d0d0e..e36f131 100755 ---- a/3rdparty/qwt/qwtconfig.pri -+++ b/3rdparty/qwt/qwtconfig.pri -@@ -7,17 +7,6 @@ VER_MIN = 2 - VER_PAT = 0
- VERSION = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}
-
--unix {
-- INSTALLBASE = /usr/local/qwt-5.2.0
--}
--
--win32 {
-- INSTALLBASE = C:/Qwt-5.2.0
--}
--
--target.path = $$INSTALLBASE/lib
--headers.path = $$INSTALLBASE/include
--doc.path = $$INSTALLBASE/doc
-
- ######################################################################
- # qmake internal options
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.12-system-QTeXEngine.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.12-system-QTeXEngine.patch deleted file mode 100644 index 5577ec9..0000000 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.12-system-QTeXEngine.patch +++ /dev/null @@ -1,62 +0,0 @@ -=== modified file 'build.conf.example' ---- build.conf.example 2010-01-21 22:49:21 +0000 -+++ build.conf.example 2010-02-14 15:04:17 +0000 -@@ -69,6 +69,13 @@ - win32:QWT3D_LIBS = $$QTI_ROOT/3rdparty/qwtplot3d/lib/qwtplot3d.dll - unix:QWT3D_LIBS = $$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a - -+########################################################## -+## QTeXEngine - uncomment if you wish to use system copy -+# http://soft.proindependent.com/qtexengine/ -+########################################################## -+# -+# QTEXENGINE_LIBS = -lQTeXEngine -+ - ########################################################### - ## libxls - optional. you don't have to set these variables - # http://libxls.sourceforge.net/ - -=== modified file 'qtiplot/qtiplot.pro' ---- qtiplot/qtiplot.pro 2010-01-21 22:49:21 +0000 -+++ qtiplot/qtiplot.pro 2010-02-14 15:00:58 +0000 -@@ -11,7 +11,6 @@ - # local copy included - INCLUDEPATH += ../3rdparty/liborigin - INCLUDEPATH += ../3rdparty/zlib --INCLUDEPATH += ../3rdparty/QTeXEngine/src - - # configurable - INCLUDEPATH += $$MUPARSER_INCLUDEPATH -@@ -24,6 +23,7 @@ - LIBS += $$MUPARSER_LIBS - LIBS += $$QWT_LIBS - LIBS += $$QWT3D_LIBS -+LIBS += $$QTEXENGINE_LIBS - LIBS += $$GSL_LIBS - LIBS += $$BOOST_LIBS - -@@ -143,14 +143,16 @@ - include(src/table/table.pri) - include(src/scripting/scripting.pri) - --############################################################### --##################### TeX export: QTeXEngine ################## --############################################################### -+isEmpty(QTEXENGINE_LIBS) { -+ ############################################################### -+ ##################### TeX export: QTeXEngine ################## -+ ############################################################### - --INCLUDEPATH += ../3rdparty/QTeXEngine/src --HEADERS += ../3rdparty/QTeXEngine/src/QTeXEngine.h --SOURCES += ../3rdparty/QTeXEngine/src/QTeXPaintEngine.cpp --SOURCES += ../3rdparty/QTeXEngine/src/QTeXPaintDevice.cpp -+ INCLUDEPATH += ../3rdparty/QTeXEngine/src -+ HEADERS += ../3rdparty/QTeXEngine/src/QTeXEngine.h -+ SOURCES += ../3rdparty/QTeXEngine/src/QTeXPaintEngine.cpp -+ SOURCES += ../3rdparty/QTeXEngine/src/QTeXPaintDevice.cpp -+} - - ############################################################### - ##################### Scripting: PYTHON + SIP + PyQT ########## - diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.12-system-gl2ps.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.12-system-gl2ps.patch deleted file mode 100644 index b0419c2..0000000 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.12-system-gl2ps.patch +++ /dev/null @@ -1,56 +0,0 @@ -=== modified file '3rdparty/qwtplot3d/qwtplot3d.pri' ---- 3rdparty/qwtplot3d/qwtplot3d.pri 2010-01-21 22:49:21 +0000 -+++ 3rdparty/qwtplot3d/qwtplot3d.pri 2010-02-14 17:22:07 +0000 -@@ -8,6 +8,8 @@ - 3rdparty\gl2ps - INCLUDEPATH += . - -+LIBS+=-lgl2ps -+ - # Input - HEADERS += include/qwt3d_extglwidget.h \ - include/qwt3d_color.h \ -@@ -37,8 +39,7 @@ - include/qwt3d_volumeplot.h \ - include/qwt3d_graphplot.h \ - include/qwt3d_multiplot.h \ -- include/qwt3d_io_gl2ps.h \ -- 3rdparty/gl2ps/gl2ps.h -+ include/qwt3d_io_gl2ps.h - SOURCES += src/qwt3d_extglwidget.cpp \ - src/qwt3d_axis.cpp \ - src/qwt3d_color.cpp \ -@@ -62,5 +63,4 @@ - src/qwt3d_function.cpp \ - src/qwt3d_gridplot.cpp \ - src/qwt3d_meshplot.cpp \ -- src/qwt3d_io_gl2ps.cpp \ -- 3rdparty/gl2ps/gl2ps.c -+ src/qwt3d_io_gl2ps.cpp - -=== modified file '3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp' ---- 3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp 2010-01-21 22:49:21 +0000 -+++ 3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp 2010-02-14 17:12:09 +0000 -@@ -6,7 +6,7 @@ - #include <locale.h> - - #include "qwt3d_openglhelper.h" --#include "../3rdparty/gl2ps/gl2ps.h" -+#include "gl2ps.h" - #include "qwt3d_io_gl2ps.h" - #include "qwt3d_plot.h" - - -=== modified file '3rdparty/qwtplot3d/src/qwt3d_label.cpp' ---- 3rdparty/qwtplot3d/src/qwt3d_label.cpp 2010-01-21 22:49:21 +0000 -+++ 3rdparty/qwtplot3d/src/qwt3d_label.cpp 2010-02-14 17:13:01 +0000 -@@ -1,7 +1,7 @@ - #include <qbitmap.h> - #include "qwt3d_label.h" - #include "qwt3d_plot.h" --#include "../3rdparty/gl2ps/gl2ps.h" -+#include "gl2ps.h" - - using namespace Qwt3D; - - diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.12-system-liborigin.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.12-system-liborigin.patch deleted file mode 100644 index 3e89b24..0000000 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.12-system-liborigin.patch +++ /dev/null @@ -1,90 +0,0 @@ -=== modified file 'build.conf.example' ---- build.conf.example 2010-02-14 15:07:01 +0000 -+++ build.conf.example 2010-02-14 15:16:08 +0000 -@@ -118,6 +118,14 @@ - EMF_ENGINE_LIBS = $$QTI_ROOT/3rdparty/EmfEngine/libEmfEngine.a - - ########################################################## -+## liborigin - keep commented if you wish to use local copy -+# http://sourceforge.net/projects/liborigin/ -+########################################################## -+ -+# LIB_ORIGIN_INCLUDEPATH = /usr/include/liborigin2 -+# LIB_ORIGIN_LIBS = -lorigin2 -+ -+########################################################## - ## python - only used if python is needed - ########################################################## - - -=== modified file 'qtiplot/qtiplot.pro' ---- qtiplot/qtiplot.pro 2010-02-14 15:07:01 +0000 -+++ qtiplot/qtiplot.pro 2010-02-14 15:13:58 +0000 -@@ -9,7 +9,6 @@ - ############################################################################# - - # local copy included --INCLUDEPATH += ../3rdparty/liborigin - INCLUDEPATH += ../3rdparty/zlib - - # configurable -@@ -18,6 +17,7 @@ - INCLUDEPATH += $$QWT3D_INCLUDEPATH - INCLUDEPATH += $$GSL_INCLUDEPATH - INCLUDEPATH += $$BOOST_INCLUDEPATH -+INCLUDEPATH += $$LIB_ORIGIN_INCLUDEPATH - - # configurable libs - LIBS += $$MUPARSER_LIBS -@@ -26,6 +26,7 @@ - LIBS += $$QTEXENGINE_LIBS - LIBS += $$GSL_LIBS - LIBS += $$BOOST_LIBS -+LIBS += $$LIB_ORIGIN_LIBS - - ############################################################################# - ###################### BASIC PROJECT PROPERTIES ############################# -@@ -154,6 +155,10 @@ - SOURCES += ../3rdparty/QTeXEngine/src/QTeXPaintDevice.cpp - } - -+isEmpty(LIB_ORIGIN_LIBS) { -+ INCLUDEPATH += ../3rdparty/liborigin -+} -+ - ############################################################### - ##################### Scripting: PYTHON + SIP + PyQT ########## - ############################################################### - -=== modified file 'qtiplot/src/origin/origin.pri' ---- qtiplot/src/origin/origin.pri 2009-10-18 01:48:15 +0000 -+++ qtiplot/src/origin/origin.pri 2010-02-14 15:11:15 +0000 -@@ -4,14 +4,17 @@ - INCLUDEPATH += src/origin/ - - HEADERS += src/origin/importOPJ.h --HEADERS += ../3rdparty/liborigin/OriginObj.h --HEADERS += ../3rdparty/liborigin/OriginFile.h --HEADERS += ../3rdparty/liborigin/OriginParser.h --HEADERS += ../3rdparty/liborigin/OriginDefaultParser.h --HEADERS += ../3rdparty/liborigin/Origin750Parser.h -- - SOURCES += src/origin/importOPJ.cpp --SOURCES += ../3rdparty/liborigin/OriginFile.cpp --SOURCES += ../3rdparty/liborigin/OriginParser.cpp --SOURCES += ../3rdparty/liborigin/OriginDefaultParser.cpp --SOURCES += ../3rdparty/liborigin/Origin750Parser.cpp -+ -+isEmpty(LIB_ORIGIN_LIBS) { -+ HEADERS += ../3rdparty/liborigin/OriginObj.h -+ HEADERS += ../3rdparty/liborigin/OriginFile.h -+ HEADERS += ../3rdparty/liborigin/OriginParser.h -+ HEADERS += ../3rdparty/liborigin/OriginDefaultParser.h -+ HEADERS += ../3rdparty/liborigin/Origin750Parser.h -+ -+ SOURCES += ../3rdparty/liborigin/OriginFile.cpp -+ SOURCES += ../3rdparty/liborigin/OriginParser.cpp -+ SOURCES += ../3rdparty/liborigin/OriginDefaultParser.cpp -+ SOURCES += ../3rdparty/liborigin/Origin750Parser.cpp -+} - diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.14-system-2dplot.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.14-system-2dplot.patch deleted file mode 100644 index 88664a1..0000000 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.14-system-2dplot.patch +++ /dev/null @@ -1,125 +0,0 @@ -Index: qtiplot/src/plot2D/dialogs/PlotDialog.cpp -=================================================================== ---- qtiplot/src/plot2D/dialogs/PlotDialog.cpp (revision 1728) -+++ qtiplot/src/plot2D/dialogs/PlotDialog.cpp (revision 1729) -@@ -503,15 +503,19 @@ - gl2->addWidget(new QLabel( tr("width= ")), 0, 0); - gl2->addWidget(boxPlotWidth, 0, 1); - -- gl2->addWidget(new QLabel(tr("height= ")), 2, 0); -- gl2->addWidget(boxPlotHeight, 2, 1); -+ gl2->addWidget(new QLabel(tr("height= ")), 1, 0); -+ gl2->addWidget(boxPlotHeight, 1, 1); - - keepPlotRatioBox = new QCheckBox(tr("Keep aspect ratio")); - keepPlotRatioBox->setChecked(app->d_keep_aspect_ration); -- gl2->addWidget(keepRatioBox, 3, 1); - -- gl2->setRowStretch(4, 1); -+ connect(keepPlotRatioBox, SIGNAL(clicked (bool)), keepRatioBox, SLOT(setChecked(bool))); -+ connect(keepRatioBox, SIGNAL(clicked (bool)), keepPlotRatioBox, SLOT(setChecked(bool))); - -+ gl2->addWidget(keepPlotRatioBox, 2, 1); -+ -+ gl2->setRowStretch(3, 1); -+ - QHBoxLayout *bl2 = new QHBoxLayout(); - bl2->addWidget(gb1); - bl2->addWidget(gb2); -@@ -582,25 +586,25 @@ - gl2->addWidget(new QLabel( tr("width= ")), 0, 0); - gl2->addWidget(boxLayerWidth, 0, 1); - -- gl2->addWidget(new QLabel(tr("height= ")), 2, 0); -- gl2->addWidget(boxLayerHeight, 2, 1); -+ gl2->addWidget(new QLabel(tr("height= ")), 1, 0); -+ gl2->addWidget(boxLayerHeight, 1, 1); - - keepRatioBox = new QCheckBox(tr("Keep aspect ratio")); - keepRatioBox->setChecked(app->d_keep_aspect_ration); -- gl2->addWidget(keepRatioBox, 3, 1); -+ gl2->addWidget(keepRatioBox, 2, 1); - - QLabel *l = new QLabel(tr("Apply &to...")); -- gl2->addWidget(l, 4, 0); -+ gl2->addWidget(l, 3, 0); - - sizeApplyToBox = new QComboBox(); - sizeApplyToBox->insertItem(tr("Layer")); - sizeApplyToBox->insertItem(tr("Window")); - sizeApplyToBox->insertItem(tr("All Windows")); -- gl2->addWidget(sizeApplyToBox, 4, 1); -+ gl2->addWidget(sizeApplyToBox, 3, 1); - - l->setBuddy(sizeApplyToBox); - -- gl2->setRowStretch(5, 1); -+ gl2->setRowStretch(4, 1); - - QBoxLayout *bl2 = new QBoxLayout (QBoxLayout::LeftToRight); - bl2->addWidget(gb1); -Index: qtiplot/src/plot2D/dialogs/ImageExportDialog.cpp -=================================================================== ---- qtiplot/src/plot2D/dialogs/ImageExportDialog.cpp (revision 1728) -+++ qtiplot/src/plot2D/dialogs/ImageExportDialog.cpp (revision 1729) -@@ -240,7 +240,7 @@ - size_layout->addWidget(scaleFontsBox, 3, 1); - - keepRatioBox = new QCheckBox(tr("&Keep aspect ratio")); -- keepRatioBox->setChecked(true); -+ keepRatioBox->setChecked(app->d_keep_aspect_ration); - size_layout->addWidget(keepRatioBox, 4, 1); - - vert_layout->addWidget(d_custom_size_box); -@@ -340,6 +340,7 @@ - - app->d_3D_export_text_mode = d_3D_text_export_mode->currentIndex(); - app->d_3D_export_sort = d_3D_export_sort->currentIndex(); -+ app->d_keep_aspect_ration = keepRatioBox->isChecked(); - } - - e->accept(); -Index: qtiplot/src/plot2D/dialogs/EnrichmentDialog.cpp -=================================================================== ---- qtiplot/src/plot2D/dialogs/EnrichmentDialog.cpp (revision 1728) -+++ qtiplot/src/plot2D/dialogs/EnrichmentDialog.cpp (revision 1729) -@@ -460,6 +460,7 @@ - gl2->addWidget(heightBox, 1, 1); - - keepAspectBox = new QCheckBox(tr("&Keep aspect ratio")); -+ keepAspectBox->setChecked(app->d_keep_aspect_ration); - gl2->addWidget(keepAspectBox, 2, 1); - - bestSizeButton = new QPushButton(tr("&Best size")); -@@ -646,6 +647,10 @@ - FrameWidget *fw = qobject_cast<FrameWidget *>(d_widget); - if (fw) - fw->setAttachPolicy((FrameWidget::AttachPolicy)attachToBox->currentIndex()); -+ -+ ApplicationWindow *app = (ApplicationWindow *)this->parent(); -+ if (app) -+ app->d_keep_aspect_ration = keepAspectBox->isChecked(); - } else if (patternPage && tabWidget->currentPage() == patternPage) - patternApplyTo(); - else if (textPage && tabWidget->currentPage() == textPage){ -Index: qtiplot/src/core/ConfigDialog.cpp -=================================================================== ---- qtiplot/src/core/ConfigDialog.cpp (revision 1728) -+++ qtiplot/src/core/ConfigDialog.cpp (revision 1729) -@@ -1023,7 +1023,7 @@ - gl->addWidget(boxCanvasHeight, 2, 1); - - keepRatioBox = new QCheckBox(tr("&Keep aspect ratio")); -- keepRatioBox->setChecked(true); -+ keepRatioBox->setChecked(app->d_keep_aspect_ration); - gl->addWidget(keepRatioBox, 3, 1); - - gl->setRowStretch(4, 1); -@@ -2097,6 +2097,7 @@ - FrameWidget::Unit unit = (FrameWidget::Unit)unitBox->currentIndex(); - app->d_layer_canvas_width = convertToPixels(boxCanvasWidth->value(), unit, 0); - app->d_layer_canvas_height = convertToPixels(boxCanvasHeight->value(), unit, 1); -+ app->d_keep_aspect_ration = keepRatioBox->isChecked(); - } - - // 2D plots page: ticks tab diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.14-system-liborigin.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.14-system-liborigin.patch deleted file mode 100644 index e8fa4a3..0000000 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.14-system-liborigin.patch +++ /dev/null @@ -1,102 +0,0 @@ -=== modified file 'build.conf.example' ---- build.conf.example 2010-04-22 18:57:40 +0000 -+++ build.conf.example 2010-04-22 18:58:06 +0000 -@@ -118,6 +118,14 @@ - EMF_ENGINE_LIBS = $$QTI_ROOT/3rdparty/EmfEngine/libEmfEngine.a - - ########################################################## -+## liborigin - keep commented if you wish to use local copy -+# http://sourceforge.net/projects/liborigin/ -+########################################################## -+ -+# LIB_ORIGIN_INCLUDEPATH = /usr/include/liborigin2 -+# LIB_ORIGIN_LIBS = -lorigin2 -+ -+########################################################## - ## python - only used if python is needed - ########################################################## - - -=== modified file 'qtiplot/qtiplot.pro' ---- qtiplot/qtiplot.pro 2010-04-22 18:57:40 +0000 -+++ qtiplot/qtiplot.pro 2010-04-22 19:08:57 +0000 -@@ -16,6 +16,7 @@ - INCLUDEPATH += $$QWT_INCLUDEPATH - INCLUDEPATH += $$QWT3D_INCLUDEPATH - INCLUDEPATH += $$GSL_INCLUDEPATH -+INCLUDEPATH += $$LIB_ORIGIN_INCLUDEPATH - - # configurable libs - LIBS += $$MUPARSER_LIBS -@@ -23,6 +24,7 @@ - LIBS += $$QWT3D_LIBS - LIBS += $$QTEXENGINE_LIBS - LIBS += $$GSL_LIBS -+LIBS += $$LIB_ORIGIN_LIBS - - ############################################################################# - ###################### BASIC PROJECT PROPERTIES ############################# -@@ -150,6 +152,10 @@ - SOURCES += ../3rdparty/QTeXEngine/src/QTeXPaintDevice.cpp - } - -+isEmpty(LIB_ORIGIN_LIBS) { -+ INCLUDEPATH += ../3rdparty/liborigin -+} -+ - ############################################################### - ##################### Scripting: PYTHON + SIP + PyQT ########## - ############################################################### - -=== modified file 'qtiplot/src/origin/origin.pri' ---- qtiplot/src/origin/origin.pri 2010-04-22 17:58:49 +0000 -+++ qtiplot/src/origin/origin.pri 2010-04-22 19:08:15 +0000 -@@ -4,24 +4,28 @@ - INCLUDEPATH += src/origin/ - - HEADERS += src/origin/importOPJ.h --HEADERS += ../3rdparty/liborigin/OriginObj.h --HEADERS += ../3rdparty/liborigin/OriginFile.h --HEADERS += ../3rdparty/liborigin/OriginParser.h --HEADERS += ../3rdparty/liborigin/OriginDefaultParser.h --HEADERS += ../3rdparty/liborigin/Origin600Parser.h --HEADERS += ../3rdparty/liborigin/Origin610Parser.h --HEADERS += ../3rdparty/liborigin/Origin700Parser.h --HEADERS += ../3rdparty/liborigin/Origin750Parser.h --HEADERS += ../3rdparty/liborigin/Origin800Parser.h --HEADERS += ../3rdparty/liborigin/Origin810Parser.h - - SOURCES += src/origin/importOPJ.cpp --SOURCES += ../3rdparty/liborigin/OriginFile.cpp --SOURCES += ../3rdparty/liborigin/OriginParser.cpp --SOURCES += ../3rdparty/liborigin/OriginDefaultParser.cpp --SOURCES += ../3rdparty/liborigin/Origin600Parser.cpp --SOURCES += ../3rdparty/liborigin/Origin610Parser.cpp --SOURCES += ../3rdparty/liborigin/Origin700Parser.cpp --SOURCES += ../3rdparty/liborigin/Origin750Parser.cpp --SOURCES += ../3rdparty/liborigin/Origin800Parser.cpp --SOURCES += ../3rdparty/liborigin/Origin810Parser.cpp -+ -+isEmpty(LIB_ORIGIN_LIBS) { -+ HEADERS += ../3rdparty/liborigin/OriginObj.h -+ HEADERS += ../3rdparty/liborigin/OriginFile.h -+ HEADERS += ../3rdparty/liborigin/OriginParser.h -+ HEADERS += ../3rdparty/liborigin/OriginDefaultParser.h -+ HEADERS += ../3rdparty/liborigin/Origin600Parser.h -+ HEADERS += ../3rdparty/liborigin/Origin610Parser.h -+ HEADERS += ../3rdparty/liborigin/Origin700Parser.h -+ HEADERS += ../3rdparty/liborigin/Origin750Parser.h -+ HEADERS += ../3rdparty/liborigin/Origin800Parser.h -+ HEADERS += ../3rdparty/liborigin/Origin810Parser.h -+ -+ SOURCES += ../3rdparty/liborigin/OriginFile.cpp -+ SOURCES += ../3rdparty/liborigin/OriginParser.cpp -+ SOURCES += ../3rdparty/liborigin/OriginDefaultParser.cpp -+ SOURCES += ../3rdparty/liborigin/Origin600Parser.cpp -+ SOURCES += ../3rdparty/liborigin/Origin610Parser.cpp -+ SOURCES += ../3rdparty/liborigin/Origin700Parser.cpp -+ SOURCES += ../3rdparty/liborigin/Origin750Parser.cpp -+ SOURCES += ../3rdparty/liborigin/Origin800Parser.cpp -+ SOURCES += ../3rdparty/liborigin/Origin810Parser.cpp -+} - diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.2-origin-build-failure.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.2-origin-build-failure.patch deleted file mode 100644 index 22e4fbe..0000000 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.2-origin-build-failure.patch +++ /dev/null @@ -1,76 +0,0 @@ -Without this upstream patch qtiplot fails to build with the following error: - -src/origin/importOPJ.cpp: In member function ‘QString ImportOPJ::parseOriginTags(const QString&)’: -src/origin/importOPJ.cpp:2162: ошибка: unknown escape sequence '\p' - ---- qtiplot/src/origin/importOPJ.cpp 2010-09-01 11:07:38 +0000 -+++ qtiplot/src/origin/importOPJ.cpp 2010-09-07 10:12:30 +0000 -@@ -473,6 +473,8 @@ - } - table->setDayFormat(format, j); - break; -+ default: -+ break; - } - table->freeMemory(); - } -@@ -720,7 +722,6 @@ - bkg.setAlpha(0); - graph->setCanvasBackground(bkg); - -- int auto_color = -1; - int style = 0; - bool matrixImage = false; - for(unsigned int c = 0; c < layer.curves.size(); ++c){ -@@ -1461,7 +1462,7 @@ - - if (boxWhiskersPlot){ - QStringList curveNames; -- for (unsigned int i = 0; i < graph->curveCount(); i++){ -+ for (int i = 0; i < graph->curveCount(); i++){ - BoxCurve *box = (BoxCurve *)graph->curve(i); - if (!box || box->type() != Graph::Box) - continue; -@@ -1659,7 +1660,6 @@ - for(unsigned int c = 0; c < layer.curves.size(); ++c){ - Origin::GraphCurve& _curve = layer.curves[c]; - QString data(_curve.dataName.c_str()); -- int color = 0; - double fFontScaleFactor = 2.0; - switch(_curve.type){ - case Origin::GraphCurve::Line3D: -@@ -1809,7 +1809,6 @@ - } - - QStringList formulas; -- double start, end; - - plot->showColorLegend(false); - plot->setFramed(); -@@ -1951,8 +1950,8 @@ - - QList <PieLabel *> pieTexts = p->labelsList(); - QFont font(mw->plotLegendFont); -- unsigned int lsize = layer.pieTexts.size(); -- for(unsigned int i = 0; i < lsize && i < pieTexts.size(); ++i){ -+ int lsize = layer.pieTexts.size(); -+ for(int i = 0; i < lsize && i < pieTexts.size(); ++i){ - Origin::TextBox text = layer.pieTexts[lsize - i - 1]; - font.setPointSizeF(text.fontSize*fFontScaleFactor); - QFontMetrics fm(font, graph); -@@ -2159,12 +2158,12 @@ - line.replace("&lbracket;", "("); - line.replace("&rbracket;", ")"); - -- QRegExp fontModifier("\p(\\d)+\\(.*\\)");//remove \p163(...) like tags -+ QRegExp fontModifier("\\\\p(\\d)+\\(.*\\)");//remove \p163(...) like tags - int index = line.indexOf(fontModifier); - while (index >= 0){ - int pos1 = line.indexOf("(", index + 2) + 1; - int length = fontModifier.matchedLength(); -- line = line.mid(pos1, length - pos1); -+ line = line.mid(pos1, length - pos1 - 1); - index = line.indexOf(fontModifier, index + length); - } - - diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.2-syslibs.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.2-syslibs.patch deleted file mode 100644 index d677277..0000000 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.2-syslibs.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro -index 657ad0b..3655d66 100755 ---- a/qtiplot/qtiplot.pro -+++ b/qtiplot/qtiplot.pro -@@ -235,8 +235,8 @@ win32: contains(CONFIG, Excel) { - ############################################################### - - # At the very end: add global include- and lib path --#unix:INCLUDEPATH += $$SYS_INCLUDEPATH --#unix:LIBS += $$SYS_LIBS -+unix:INCLUDEPATH += $$SYS_INCLUDEPATH -+unix:LIBS += $$SYS_LIBS - - ############################################################### - ############### Building QtiPlot as a browser plugin ########## 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 deleted file mode 100644 index 0ba7cc9..0000000 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.3-odf.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index ebd7ca7..0000000 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.3-origin.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index 4e49da8..0000000 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.3-plot.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index ff01934..0000000 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.3-popup.patch +++ /dev/null @@ -1,47 +0,0 @@ -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){ diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.5-tamuanova.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.5-tamuanova.patch deleted file mode 100644 index 61647be..0000000 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.5-tamuanova.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro -index 95a5f0c..72e99ab 100755 ---- a/qtiplot/qtiplot.pro -+++ b/qtiplot/qtiplot.pro -@@ -205,18 +205,14 @@ contains(SCRIPTING_LANGS, Python) { - !isEmpty(TAMUANOVA_LIBS) { - DEFINES += HAVE_TAMUANOVA - INCLUDEPATH += $$TAMUANOVA_INCLUDEPATH -- #LIBS += $$TAMUANOVA_LIBS -- -- HEADERS += $$TAMUANOVA_INCLUDEPATH/tamu_anova.h -- SOURCES += $$TAMUANOVA_INCLUDEPATH/anova_1.c -- SOURCES += $$TAMUANOVA_INCLUDEPATH/anova_2.c -+ LIBS += $$TAMUANOVA_LIBS - } - - ############################################################### - - # At the very end: add global include- and lib path --#unix:INCLUDEPATH += $$SYS_INCLUDEPATH --#unix:LIBS += $$SYS_LIBS -+unix:INCLUDEPATH += $$SYS_INCLUDEPATH -+unix:LIBS += $$SYS_LIBS - - ############################################################### - ############### Building QtiPlot as a browser plugin ########## -@@ -230,14 +226,15 @@ contains(CONFIG, BrowserPlugin){ - } - - QT += sql --LIBS += src/plugins/libQtiPlotdBasePlugin.a --LIBS += src/plugins/libQtiPlotDatabasePlugin.a --LIBS += src/plugins/libQtiPlotCsvPlugin.a --LIBS += src/plugins/libQtiPlotTexPlugin.a --LIBS += src/plugins/libQtiPlotOdsPlugin.a --LIBS += src/plugins/libQtiPlotExcelPlugin.a --LIBS += src/plugins/libQtiPlotOriginPlugin.a --LIBS += src/plugins/libQtiPlotEmfExportPlugin.a --LIBS += ../3rdparty/quazip/lib/libquazip.a --LIBS += ../3rdparty/EmfEngine/libEmfEngine.a --LIBS += -lgdiplus -+#LIBS += src/plugins/libQtiPlotdBasePlugin.a -+#LIBS += src/plugins/libQtiPlotDatabasePlugin.a -+#LIBS += src/plugins/libQtiPlotCsvPlugin.a -+#LIBS += src/plugins/libQtiPlotTexPlugin.a -+#LIBS += src/plugins/libQtiPlotOdsPlugin.a -+#LIBS += src/plugins/libQtiPlotExcelPlugin.a -+#LIBS += src/plugins/libQtiPlotOriginPlugin.a -+#LIBS += src/plugins/libQtiPlotEmfExportPlugin.a -+#LIBS += -lquazip -+#LIBS += ../3rdparty/EmfEngine/libEmfEngine.a -+#LIBS += -lgdiplus -+ diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.6-gold.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.6-gold.patch deleted file mode 100644 index 3b67575..0000000 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.6-gold.patch +++ /dev/null @@ -1,15 +0,0 @@ - qtiplot/qtiplot.pro | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro -index 99e0e36..b7cf373 100755 ---- a/qtiplot/qtiplot.pro -+++ b/qtiplot/qtiplot.pro -@@ -20,6 +20,7 @@ LIBS += $$MUPARSER_LIBS - LIBS += $$QWT_LIBS - LIBS += $$QWT3D_LIBS - LIBS += $$GSL_LIBS -+LIBS += -lz - - ############################################################################# - ###################### BASIC PROJECT PROPERTIES ############################# diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.6-kde.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.6-kde.patch deleted file mode 100644 index 919ec6c..0000000 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.6-kde.patch +++ /dev/null @@ -1,15 +0,0 @@ - qtiplot/src/plot2D/Graph.cpp | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/qtiplot/src/plot2D/Graph.cpp b/qtiplot/src/plot2D/Graph.cpp -index 626172a..d4eab1b 100755 ---- a/qtiplot/src/plot2D/Graph.cpp -+++ b/qtiplot/src/plot2D/Graph.cpp -@@ -73,6 +73,7 @@ - #include <PatternBox.h> - #include <SymbolBox.h> - -+#include <QPaintEngine> - #include <QApplication> - #include <QBitmap> - #include <QClipboard> diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.6-tamuanova.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.6-tamuanova.patch deleted file mode 100644 index 1644266..0000000 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.6-tamuanova.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro -index 95a5f0c..72e99ab 100755 ---- a/qtiplot/qtiplot.pro -+++ b/qtiplot/qtiplot.pro -@@ -205,18 +205,14 @@ contains(SCRIPTING_LANGS, Python) { - !isEmpty(TAMUANOVA_LIBS) { - DEFINES += HAVE_TAMUANOVA - INCLUDEPATH += $$TAMUANOVA_INCLUDEPATH -- #LIBS += $$TAMUANOVA_LIBS -- -- HEADERS += $$TAMUANOVA_INCLUDEPATH/tamu_anova.h -- SOURCES += $$TAMUANOVA_INCLUDEPATH/anova_1.c -- SOURCES += $$TAMUANOVA_INCLUDEPATH/anova_2.c -+ LIBS += $$TAMUANOVA_LIBS - } - - ############################################################### - - # At the very end: add global include- and lib path --#unix:INCLUDEPATH += $$SYS_INCLUDEPATH --#unix:LIBS += $$SYS_LIBS -+unix:INCLUDEPATH += $$SYS_INCLUDEPATH -+unix:LIBS += $$SYS_LIBS - - ############################################################### - ############### Building QtiPlot as a browser plugin ########## diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.7-kde.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.7-kde.patch deleted file mode 100644 index af1dca4..0000000 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.7-kde.patch +++ /dev/null @@ -1,16 +0,0 @@ - qtiplot/src/plot2D/Graph.cpp | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/qtiplot/src/plot2D/Graph.cpp b/qtiplot/src/plot2D/Graph.cpp -index 626172a..d4eab1b 100755 ---- a/qtiplot/src/plot2D/Graph.cpp -+++ b/qtiplot/src/plot2D/Graph.cpp -@@ -73,7 +73,8 @@ - #include <PatternBox.h> - #include <SymbolBox.h> - #include <LinearColorMap.h> - -+#include <QPaintEngine> - #include <QApplication> - #include <QBitmap> - #include <QClipboard> diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.8-system-gl2ps.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.8-system-gl2ps.patch deleted file mode 100644 index d7b40c4..0000000 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.8-system-gl2ps.patch +++ /dev/null @@ -1,76 +0,0 @@ - 3rdparty/qwtplot3d/qwtplot3d.pri | 8 ++++---- - 3rdparty/qwtplot3d/qwtplot3d.pro | 3 --- - 3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp | 2 +- - 3rdparty/qwtplot3d/src/qwt3d_label.cpp | 2 +- - 4 files changed, 6 insertions(+), 9 deletions(-) - -diff --git a/3rdparty/qwtplot3d/qwtplot3d.pri b/3rdparty/qwtplot3d/qwtplot3d.pri -index 45a0c3e..16bbe53 100755 ---- a/3rdparty/qwtplot3d/qwtplot3d.pri -+++ b/3rdparty/qwtplot3d/qwtplot3d.pri -@@ -8,6 +8,8 @@ DEPENDPATH += src \ - 3rdparty\gl2ps - INCLUDEPATH += . - -+LIBS+=-lgl2ps -+ - # Input - HEADERS += include/qwt3d_extglwidget.h \ - include/qwt3d_color.h \ -@@ -37,8 +39,7 @@ HEADERS += include/qwt3d_extglwidget.h \ - include/qwt3d_volumeplot.h \ - include/qwt3d_graphplot.h \ - include/qwt3d_multiplot.h \ -- include/qwt3d_io_gl2ps.h \ -- 3rdparty/gl2ps/gl2ps.h -+ include/qwt3d_io_gl2ps.h - SOURCES += src/qwt3d_extglwidget.cpp \ - src/qwt3d_axis.cpp \ - src/qwt3d_color.cpp \ -@@ -62,5 +63,4 @@ SOURCES += src/qwt3d_extglwidget.cpp \ - src/qwt3d_function.cpp \ - src/qwt3d_gridplot.cpp \ - src/qwt3d_meshplot.cpp \ -- src/qwt3d_io_gl2ps.cpp \ -- 3rdparty/gl2ps/gl2ps.c -+ src/qwt3d_io_gl2ps.cpp -diff --git a/3rdparty/qwtplot3d/qwtplot3d.pro b/3rdparty/qwtplot3d/qwtplot3d.pro -index 95c8e26..18d03e3 100755 ---- a/3rdparty/qwtplot3d/qwtplot3d.pro -+++ b/3rdparty/qwtplot3d/qwtplot3d.pro -@@ -31,9 +31,6 @@ RCC_DIR = $$DESTDIR/tmp - MOC_DIR = $$DESTDIR/tmp
-
- DEFINES += GL2PS_HAVE_LIBPNG
--INCLUDEPATH += ../zlib/
--INCLUDEPATH += ../libpng/
--LIBS += ../libpng/libpng.a
-
- # install
- target.path = lib
-diff --git a/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp b/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp -index bc7a9d8..589cfd2 100755 ---- a/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp -+++ b/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp -@@ -6,7 +6,7 @@ - #include <locale.h> - - #include "qwt3d_openglhelper.h" --#include "../3rdparty/gl2ps/gl2ps.h" -+#include "gl2ps.h" - #include "qwt3d_io_gl2ps.h" - #include "qwt3d_plot.h" - -diff --git a/3rdparty/qwtplot3d/src/qwt3d_label.cpp b/3rdparty/qwtplot3d/src/qwt3d_label.cpp -index 7e54ad9..cc8bd60 100755 ---- a/3rdparty/qwtplot3d/src/qwt3d_label.cpp -+++ b/3rdparty/qwtplot3d/src/qwt3d_label.cpp -@@ -1,7 +1,7 @@ - #include <qbitmap.h> - #include "qwt3d_label.h" - #include "qwt3d_plot.h" --#include "../3rdparty/gl2ps/gl2ps.h" -+#include "gl2ps.h" - - using namespace Qwt3D; - diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-origin-2.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-origin-2.patch deleted file mode 100644 index 2159977..0000000 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-origin-2.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -ruN qtiplot-0.9.8.9-origin/qtiplot/exportEMF.pro qtiplot-0.9.8.9/qtiplot/exportEMF.pro ---- qtiplot-0.9.8.9-origin/qtiplot/exportEMF.pro 2012-01-21 20:39:03.000000000 +0100 -+++ qtiplot-0.9.8.9/qtiplot/exportEMF.pro 2012-01-21 20:32:45.000000000 +0100 -@@ -5,6 +5,7 @@ - - INCLUDEPATH += $$QWT_INCLUDEPATH - INCLUDEPATH += $$GSL_INCLUDEPATH -+INCLUDEPATH += /usr/include/libEMF - - include(src/core/core.pri) - include(src/lib/libqti.pri) -diff -ruN qtiplot-0.9.8.9-origin/qtiplot/qtiplot.pro qtiplot-0.9.8.9/qtiplot/qtiplot.pro ---- qtiplot-0.9.8.9-origin/qtiplot/qtiplot.pro 2011-11-07 10:17:21.000000000 +0100 -+++ qtiplot-0.9.8.9/qtiplot/qtiplot.pro 2012-01-21 20:44:11.000000000 +0100 -@@ -236,9 +236,9 @@ - ############################################################### - - TARGET = qtiplot --DESTDIR = ../ -+DESTDIR = ./ - LIBS += ../tmp/qtiplot/libFreeSoftwareQtiPlotExportEMF.a \ - ../tmp/qtiplot/libFreeSoftwareQtiPlotImportOPJ.a - - include(src/plugins/exportEMF/exportEMF.pri) --include(src/plugins/OriginPlugin/OriginPlugin.pri) -\ Kein Zeilenumbruch am Dateiende. -+include(src/plugins/OriginPlugin/OriginPlugin.pri) -diff -ruN qtiplot-0.9.8.9-origin/qtiplot/src/plugins/exportEMF/exportEMF.pri qtiplot-0.9.8.9/qtiplot/src/plugins/exportEMF/exportEMF.pri ---- qtiplot-0.9.8.9-origin/qtiplot/src/plugins/exportEMF/exportEMF.pri 2011-10-27 13:44:34.000000000 +0200 -+++ qtiplot-0.9.8.9/qtiplot/src/plugins/exportEMF/exportEMF.pri 2012-01-21 20:51:34.000000000 +0100 -@@ -10,5 +10,5 @@ - SOURCES += src/plugins/exportEMF/exportEMF.cpp \ - src/plugins/exportEMF/3rdparty/EmfEngine/src/EmfEngine.cpp \ - src/plugins/exportEMF/3rdparty/EmfEngine/src/EmfPaintDevice.cpp -- --LIBS += -lgdi32 -+ -+LIBS += -lEMF diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-unbundle.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-unbundle.patch deleted file mode 100644 index 2e85901..0000000 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-unbundle.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff -ruN qtiplot-0.9.8.9-origin-2/qtiplot/importOPJ.pro qtiplot-0.9.8.9/qtiplot/importOPJ.pro ---- qtiplot-0.9.8.9-origin-2/qtiplot/importOPJ.pro 2011-11-06 14:56:52.000000000 +0100 -+++ qtiplot-0.9.8.9/qtiplot/importOPJ.pro 2012-01-21 21:00:06.000000000 +0100 -@@ -7,6 +7,7 @@ - INCLUDEPATH += $$QWT_INCLUDEPATH - INCLUDEPATH += $$QWT3D_INCLUDEPATH - INCLUDEPATH += $$GSL_INCLUDEPATH -+INCLUDEPATH += /usr/include/liborigin2 - - include(src/core/core.pri) - include(src/lib/libqti.pri) -diff -ruN qtiplot-0.9.8.9-origin-2/qtiplot/src/plugins/OriginPlugin/liborigin1/liborigin1.pri qtiplot-0.9.8.9/qtiplot/src/plugins/OriginPlugin/liborigin1/liborigin1.pri ---- qtiplot-0.9.8.9-origin-2/qtiplot/src/plugins/OriginPlugin/liborigin1/liborigin1.pri 2011-11-06 16:10:08.000000000 +0100 -+++ qtiplot-0.9.8.9/qtiplot/src/plugins/OriginPlugin/liborigin1/liborigin1.pri 2012-01-21 21:03:26.000000000 +0100 -@@ -2,33 +2,14 @@ - ################# Origin Import (liborigin) ################### - ############################################################### - INCLUDEPATH += src/plugins/OriginPlugin/liborigin1 \ -- src/plugins/OriginPlugin/liborigin2 \ -+ /usr/include/liborigin2 \ - src/plugins/OriginPlugin/tree.phi-sci.com \ - ../3rdparty/boost - --HEADERS += src/plugins/OriginPlugin/liborigin1/importOPJ.h \ -- src/plugins/OriginPlugin/liborigin2/OriginObj.h \ -- src/plugins/OriginPlugin/liborigin2/OriginFile.h \ -- src/plugins/OriginPlugin/liborigin2/OriginParser.h \ -- src/plugins/OriginPlugin/liborigin2/Origin410Parser.h \ -- src/plugins/OriginPlugin/liborigin2/Origin500Parser.h \ -- src/plugins/OriginPlugin/liborigin2/Origin610Parser.h \ -- src/plugins/OriginPlugin/liborigin2/Origin700Parser.h \ -- src/plugins/OriginPlugin/liborigin2/Origin750Parser.h \ -- src/plugins/OriginPlugin/liborigin2/Origin800Parser.h \ -- src/plugins/OriginPlugin/liborigin2/Origin810Parser.h \ -- src/plugins/OriginPlugin/liborigin2/Origin850Parser.h -+HEADERS += src/plugins/OriginPlugin/liborigin1/importOPJ.h - --SOURCES += src/plugins/OriginPlugin/liborigin1/importOPJ.cpp \ -- src/plugins/OriginPlugin/liborigin2/OriginFile.cpp \ -- src/plugins/OriginPlugin/liborigin2/OriginParser.cpp \ -- src/plugins/OriginPlugin/liborigin2/Origin410Parser.cpp \ -- src/plugins/OriginPlugin/liborigin2/Origin500Parser.cpp \ -- src/plugins/OriginPlugin/liborigin2/Origin610Parser.cpp \ -- src/plugins/OriginPlugin/liborigin2/Origin700Parser.cpp \ -- src/plugins/OriginPlugin/liborigin2/Origin750Parser.cpp \ -- src/plugins/OriginPlugin/liborigin2/Origin800Parser.cpp \ -- src/plugins/OriginPlugin/liborigin2/Origin810Parser.cpp \ -- src/plugins/OriginPlugin/liborigin2/Origin850Parser.cpp -+SOURCES += src/plugins/OriginPlugin/liborigin1/importOPJ.cpp -+ -+LIBS += -lorigin2 - - DEFINES += NO_LOG_FILE diff --git a/sci-visualization/qtiplot/metadata.xml b/sci-visualization/qtiplot/metadata.xml deleted file mode 100644 index 127accf..0000000 --- a/sci-visualization/qtiplot/metadata.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>sci</herd> - <maintainer> - <email>pva@gentoo.org</email> - <name>Peter Volkov</name> - </maintainer> - <use> - <flag name="emf">Export support for Windows Enhanced Metafile</flag> - <flag name="ods">Import support for OpenOffice .ods sheets</flag> - <flag name="origin">Import support for Origin project files</flag> - <flag name="xls">Import support for Microsoft office excel sheets</flag> - </use> - <longdescription> - Data analysis and scientific plotting package. This is a clone of the - popular Origin software available on another well known platform implemented - in Qt with powerful 2D and 3D data plotting, ASCII import and powerful - spreadsheet data manipulation using column logic. Curve fitting and other - statistical tools are also available. - </longdescription> -</pkgmetadata> diff --git a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r1.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.8.9-r1.ebuild deleted file mode 100644 index eee3ec6..0000000 --- a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r1.ebuild +++ /dev/null @@ -1,211 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.8.9.ebuild,v 1.1 2011/12/22 15:45:25 jlec Exp $ - -EAPI=3 - -PYTHON_DEPEND="python? 2" - -inherit eutils qt4-r2 fdo-mime python - -DESCRIPTION="Qt based clone of the Origin plotting package" -HOMEPAGE="http://soft.proindependent.com/qtiplot.html - http://www.staff.science.uu.nl/~zeven101/qtiplot.html" -SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2 - http://dev.gentoo.org/~dilfridge/distfiles/${P}-origin.patch.bz2" - -LICENSE="GPL-2 GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="bindist doc mono latex python" - -LANGS="cn cz de es fr ja ro ru sv" -for l in ${LANGS}; do - lu=${l/cz/cs} - lu=${lu/cn/zh_CN} - IUSE="${IUSE} linguas_${lu}" -done - -# qwtplot3d much modified from original upstream -# >=x11-libs/qwt-5.3 they are using trunk checkouts -CDEPEND=" - media-libs/libemf - x11-libs/qt-assistant - x11-libs/qt-gui - x11-libs/qt-opengl:4 - x11-libs/qt-qt3support:4 - || ( >=x11-libs/qt-assistant-4.7.0:4[compat] <x11-libs/qt-assistant-4.7.0:4 ) - x11-libs/qt-svg:4 - >=x11-libs/gl2ps-1.3.5[png] - >=dev-cpp/muParser-1.32 - >=dev-libs/boost-1.35.0 - dev-libs/quazip - media-libs/libpng - sci-libs/gsl - sci-libs/tamu_anova - latex? ( dev-tex/qtexengine ) - mono? ( dev-dotnet/libgdiplus )" -DEPEND="${CDEPEND} - dev-util/pkgconfig - python? ( >=dev-python/sip-4.9 ) - doc? ( - >=app-text/docbook-sgml-utils-0.6.14-r1 - >=app-text/docbook-xml-dtd-4.4-r2:4.4 )" - -RDEPEND="${CDEPEND} - python? ( dev-python/PyQt4[X] )" - -PATCHES=( - "${DISTDIR}/${P}-origin.patch.bz2" - "${FILESDIR}/${P}-origin-2.patch" - "${FILESDIR}/${PN}-0.9.8.8-system-gl2ps.patch" - "${FILESDIR}/${PN}-0.9.7.10-dont-install-qwt.patch" - "${FILESDIR}/${PN}-0.9.8.6-gold.patch" - "${FILESDIR}/${PN}-0.9.8.7-kde.patch" - ) - -pkg_setup() { - use python && python_set_active_version 2 -} - -src_prepare() { - local mylibs - - qt4-r2_src_prepare - - rm -rf 3rdparty/{liborigin,QTeXEngine,/qwtplot3d/3rdparty/gl2ps/,boost} || die - sed \ - -e "s:dll:static:g" \ - -e "/INSTALLS/d" \ - -i 3rdparty/qwtplot3d/*.pro - - mylibs="${mylibs} -lquazip" - use mono && mylibs="${mylibs} $(pkg-config --libs libgdiplus)" - - # Check build.conf for changes on bump. - cat > build.conf <<-EOF - # Automatically generated by Gentoo ebuild - isEmpty( QTI_ROOT ) { - message( "each file including this config needs to set QTI_ROOT to the dir containing this file!" ) - } - - MUPARSER_LIBS = \$\$system(pkg-config --libs muparser) - GSL_LIBS = \$\$system(pkg-config --libs gsl) - QWT_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwt/src - QWT_LIBS = \$\$QTI_ROOT/3rdparty/qwt/lib/libqwt.a - QWT3D_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwtplot3d/include - QWT3D_LIBS = \$\$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a - SYS_LIBS = -lgl2ps ${mylibs} - - PYTHON = python - LUPDATE = lupdate - LRELEASE = lrelease - - SCRIPTING_LANGS += muParser - - CONFIG += release - CONFIG += CustomInstall - DEFINES += SCRIPTING_CONSOLE - - EOF - - use bindist && echo "DEFINES += QTIPLOT_SUPPORT" >> build.conf - use bindist || echo "DEFINES += QTIPLOT_PRO" >> build.conf - use python && echo "SCRIPTING_LANGS += Python" >> build.conf - use latex && echo "TEX_ENGINE_LIBS = -lQTeXEngine" >> build.conf - echo "LIBPNG_LIBS = -lpng" >> build.conf - echo "TAMUANOVA_LIBS = -ltamuanova" >> build.conf && \ - echo "TAMUANOVA_INCLUDEPATH = \"${EPREFIX}/usr/include/tamu_anova\"" >> build.conf - - sed \ - -e "s:doc/${PN}/manual:doc/${PN}/html:" \ - -e "s:/usr/local/${PN}:${EPREFIX}$(python_get_sitedir)/qtiplot:" \ - -e '/INSTALLS.*documentation/d' \ - -e '/INSTALLS.*manual/d' \ - -e "/INSTALLBASE/s: /usr: ${EPREFIX}/usr:g" \ - -e 's:/usr/local/qtiplot:$$INSTALLBASE:g' \ - -i qtiplot/qtiplot.pro || die - - sed \ - -e "/^target.path/s:/usr:${EPREFIX}/usr:g" \ - -i fitPlugins/*/*.pro || die - - sed -e '/manual/d' -i qtiplot.pro || die - - sed -e "s:QTIPLOT_PRO:QTIPLOT_PROFESSIONAL:g" -i qtiplot/src/core/main.cpp || die - - # Drop langs only if LINGUAS is not empty - if [[ -n ${LINGUAS} ]]; then - for l in ${LANGS}; do - lu=${l/cz/cs} - lu=${lu/cn/zh_CN} - use linguas_${lu} || \ - sed -e "s:translations/qtiplot_${l}.[tq][sm]::" \ - -i qtiplot/qtiplot.pro || die - done - fi - chmod -x qtiplot/qti_wordlist.txt - - # sed out debian paths - sed -e 's:\(/usr/share/sgml/\)docbook/stylesheet/dsssl/modular\(/html/docbook.dsl\):\1stylesheets/dsssl/docbook\2:' \ - -i manual/qtiplot.dsl || die - sed -e 's:\(/usr/share/\)xml/docbook/stylesheet/nwalsh\(/html/chunk.xsl\):\1sgml/docbook/xsl-stylesheets\2:' \ - -i manual/qtiplot_html.xsl || die - - sed \ - -e '1i#define OF(x) x' \ - -i 3rdparty/zlib/minigzip.c || die -} - -src_configure() { - use amd64 && export QMAKESPEC="linux-g++-64" - eqmake4 -} - -src_compile() { - emake || die "emake failed" - lrelease qtiplot/qtiplot.pro || die - if use doc; then - cd manual - emake web || die "html docbook building failed" - fi -} - -src_install() { - qt4-r2_src_install - newicon qtiplot_logo.png qtiplot.png - make_desktop_entry qtiplot "QtiPlot Scientific Plotting" qtiplot - if use doc; then - insinto /usr/share/doc/${PN}/html - doins -r manual/html/* || die "install manual failed" - fi - - if [[ -n ${LINGUAS} ]]; then - insinto /usr/share/${PN}/translations - for l in ${LANGS}; do - lu=${l/cz/cs} - lu=${lu/cn/zh_CN} - use linguas_${lu} && \ - doins qtiplot/translations/qtiplot_${l}.qm - done - fi -} - -pkg_postinst() { - if use python; then - elog "You might want to emerge" - elog "\t dev-python/pygsl" - elog "\t dev-python/rpy" - elog "\t sci-libs/scipy and" - elog "\t dev-python/sympy" - elog "to gain full python support." - fi - - fdo-mime_desktop_database_update - use python && python_mod_optimize ${PN} -} - -pkg_postrm() { - fdo-mime_desktop_database_update - use python && python_mod_cleanup ${PN} -} diff --git a/sci-visualization/qtiplot/qtiplot-0.9.8.9.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.8.9.ebuild deleted file mode 100644 index 2b6d213..0000000 --- a/sci-visualization/qtiplot/qtiplot-0.9.8.9.ebuild +++ /dev/null @@ -1,206 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.8.9.ebuild,v 1.1 2011/12/22 15:45:25 jlec Exp $ - -EAPI=3 - -PYTHON_DEPEND="python? 2" - -inherit eutils qt4-r2 fdo-mime python - -DESCRIPTION="Qt based clone of the Origin plotting package" -HOMEPAGE="http://soft.proindependent.com/qtiplot.html" -SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2" - -LICENSE="GPL-2 GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="bindist doc mono latex python" - -LANGS="cn cz de es fr ja ro ru sv" -for l in ${LANGS}; do - lu=${l/cz/cs} - lu=${lu/cn/zh_CN} - IUSE="${IUSE} linguas_${lu}" -done - -# qwtplot3d much modified from original upstream -# >=x11-libs/qwt-5.3 they are using trunk checkouts -CDEPEND=" - x11-libs/qt-assistant - x11-libs/qt-gui - x11-libs/qt-opengl:4 - x11-libs/qt-qt3support:4 - || ( >=x11-libs/qt-assistant-4.7.0:4[compat] <x11-libs/qt-assistant-4.7.0:4 ) - x11-libs/qt-svg:4 - >=x11-libs/gl2ps-1.3.5[png] - >=dev-cpp/muParser-1.32 - >=dev-libs/boost-1.35.0 - dev-libs/quazip - media-libs/libpng - sci-libs/gsl - sci-libs/tamu_anova - latex? ( dev-tex/qtexengine ) - mono? ( dev-dotnet/libgdiplus )" -DEPEND="${CDEPEND} - dev-util/pkgconfig - python? ( >=dev-python/sip-4.9 ) - doc? ( - >=app-text/docbook-sgml-utils-0.6.14-r1 - >=app-text/docbook-xml-dtd-4.4-r2:4.4 )" - -RDEPEND="${CDEPEND} - python? ( dev-python/PyQt4[X] )" - -PATCHES=( - "${FILESDIR}/${PN}-0.9.8.8-system-gl2ps.patch" - "${FILESDIR}/${PN}-0.9.7.10-dont-install-qwt.patch" - "${FILESDIR}/${PN}-0.9.8.6-gold.patch" - "${FILESDIR}/${PN}-0.9.8.7-kde.patch" - ) - -pkg_setup() { - use python && python_set_active_version 2 -} - -src_prepare() { - local mylibs - - qt4-r2_src_prepare - - rm -rf 3rdparty/{liborigin,QTeXEngine,/qwtplot3d/3rdparty/gl2ps/,boost} || die - sed \ - -e "s:dll:static:g" \ - -e "/INSTALLS/d" \ - -i 3rdparty/qwtplot3d/*.pro - - mylibs="${mylibs} -lquazip" - use mono && mylibs="${mylibs} $(pkg-config --libs libgdiplus)" - - # Check build.conf for changes on bump. - cat > build.conf <<-EOF - # Automatically generated by Gentoo ebuild - isEmpty( QTI_ROOT ) { - message( "each file including this config needs to set QTI_ROOT to the dir containing this file!" ) - } - - MUPARSER_LIBS = \$\$system(pkg-config --libs muparser) - GSL_LIBS = \$\$system(pkg-config --libs gsl) - QWT_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwt/src - QWT_LIBS = \$\$QTI_ROOT/3rdparty/qwt/lib/libqwt.a - QWT3D_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwtplot3d/include - QWT3D_LIBS = \$\$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a - SYS_LIBS = -lgl2ps ${mylibs} - - PYTHON = python - LUPDATE = lupdate - LRELEASE = lrelease - - SCRIPTING_LANGS += muParser - - CONFIG += release - CONFIG += CustomInstall - DEFINES += SCRIPTING_CONSOLE - - EOF - - use bindist && echo "DEFINES += QTIPLOT_SUPPORT" >> build.conf - use bindist || echo "DEFINES += QTIPLOT_PRO" >> build.conf - use python && echo "SCRIPTING_LANGS += Python" >> build.conf - use latex && echo "TEX_ENGINE_LIBS = -lQTeXEngine" >> build.conf - echo "LIBPNG_LIBS = -lpng" >> build.conf - echo "TAMUANOVA_LIBS = -ltamuanova" >> build.conf && \ - echo "TAMUANOVA_INCLUDEPATH = \"${EPREFIX}/usr/include/tamu_anova\"" >> build.conf - - sed \ - -e "s:doc/${PN}/manual:doc/${PN}/html:" \ - -e "s:/usr/local/${PN}:${EPREFIX}$(python_get_sitedir)/qtiplot:" \ - -e '/INSTALLS.*documentation/d' \ - -e '/INSTALLS.*manual/d' \ - -e "/INSTALLBASE/s: /usr: ${EPREFIX}/usr:g" \ - -e 's:/usr/local/qtiplot:$$INSTALLBASE:g' \ - -i qtiplot/qtiplot.pro || die - - sed \ - -e "/^target.path/s:/usr:${EPREFIX}/usr:g" \ - -i fitPlugins/*/*.pro || die - - sed -e '/manual/d' -i qtiplot.pro || die - - sed -e "s:QTIPLOT_PRO:QTIPLOT_PROFESSIONAL:g" -i qtiplot/src/core/main.cpp || die - - # Drop langs only if LINGUAS is not empty - if [[ -n ${LINGUAS} ]]; then - for l in ${LANGS}; do - lu=${l/cz/cs} - lu=${lu/cn/zh_CN} - use linguas_${lu} || \ - sed -e "s:translations/qtiplot_${l}.[tq][sm]::" \ - -i qtiplot/qtiplot.pro || die - done - fi - chmod -x qtiplot/qti_wordlist.txt - - # sed out debian paths - sed -e 's:\(/usr/share/sgml/\)docbook/stylesheet/dsssl/modular\(/html/docbook.dsl\):\1stylesheets/dsssl/docbook\2:' \ - -i manual/qtiplot.dsl || die - sed -e 's:\(/usr/share/\)xml/docbook/stylesheet/nwalsh\(/html/chunk.xsl\):\1sgml/docbook/xsl-stylesheets\2:' \ - -i manual/qtiplot_html.xsl || die - - sed \ - -e '1i#define OF(x) x' \ - -i 3rdparty/zlib/minigzip.c || die -} - -src_configure() { - use amd64 && export QMAKESPEC="linux-g++-64" - eqmake4 -} - -src_compile() { - emake || die "emake failed" - lrelease qtiplot/qtiplot.pro || die - if use doc; then - cd manual - emake web || die "html docbook building failed" - fi -} - -src_install() { - qt4-r2_src_install - newicon qtiplot_logo.png qtiplot.png - make_desktop_entry qtiplot "QtiPlot Scientific Plotting" qtiplot - if use doc; then - insinto /usr/share/doc/${PN}/html - doins -r manual/html/* || die "install manual failed" - fi - - if [[ -n ${LINGUAS} ]]; then - insinto /usr/share/${PN}/translations - for l in ${LANGS}; do - lu=${l/cz/cs} - lu=${lu/cn/zh_CN} - use linguas_${lu} && \ - doins qtiplot/translations/qtiplot_${l}.qm - done - fi -} - -pkg_postinst() { - if use python; then - elog "You might want to emerge" - elog "\t dev-python/pygsl" - elog "\t dev-python/rpy" - elog "\t sci-libs/scipy and" - elog "\t dev-python/sympy" - elog "to gain full python support." - fi - - fdo-mime_desktop_database_update - use python && python_mod_optimize ${PN} -} - -pkg_postrm() { - fdo-mime_desktop_database_update - use python && python_mod_cleanup ${PN} -} |