| 1 |
commit: 84d8f80db6d8dc6f1eafa7dfa4d73dd1d796ddfa |
| 2 |
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de> |
| 3 |
AuthorDate: Sat Jan 28 23:13:31 2012 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 28 23:13:31 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=84d8f80d |
| 7 |
|
| 8 |
[sci-visualization/qtiplot] Not needed here anymore |
| 9 |
|
| 10 |
--- |
| 11 |
sci-visualization/qtiplot/Manifest | 45 ---- |
| 12 |
.../files/qtiplot-0.9.7.10-dont-install-qwt.patch | 22 -- |
| 13 |
.../files/qtiplot-0.9.7.12-system-QTeXEngine.patch | 62 ------ |
| 14 |
.../files/qtiplot-0.9.7.12-system-gl2ps.patch | 56 ----- |
| 15 |
.../files/qtiplot-0.9.7.12-system-liborigin.patch | 90 --------- |
| 16 |
.../files/qtiplot-0.9.7.14-system-2dplot.patch | 125 ------------ |
| 17 |
.../files/qtiplot-0.9.7.14-system-liborigin.patch | 102 ---------- |
| 18 |
.../qtiplot-0.9.8.2-origin-build-failure.patch | 76 ------- |
| 19 |
.../qtiplot/files/qtiplot-0.9.8.2-syslibs.patch | 15 -- |
| 20 |
.../qtiplot/files/qtiplot-0.9.8.3-odf.patch | 13 -- |
| 21 |
.../qtiplot/files/qtiplot-0.9.8.3-origin.patch | 13 -- |
| 22 |
.../qtiplot/files/qtiplot-0.9.8.3-plot.patch | 12 - |
| 23 |
.../qtiplot/files/qtiplot-0.9.8.3-popup.patch | 47 ----- |
| 24 |
.../qtiplot/files/qtiplot-0.9.8.5-tamuanova.patch | 53 ----- |
| 25 |
.../qtiplot/files/qtiplot-0.9.8.6-gold.patch | 15 -- |
| 26 |
.../qtiplot/files/qtiplot-0.9.8.6-kde.patch | 15 -- |
| 27 |
.../qtiplot/files/qtiplot-0.9.8.6-tamuanova.patch | 26 --- |
| 28 |
.../qtiplot/files/qtiplot-0.9.8.7-kde.patch | 16 -- |
| 29 |
.../files/qtiplot-0.9.8.8-system-gl2ps.patch | 76 ------- |
| 30 |
.../qtiplot/files/qtiplot-0.9.8.9-origin-2.patch | 38 ---- |
| 31 |
.../qtiplot/files/qtiplot-0.9.8.9-unbundle.patch | 53 ----- |
| 32 |
sci-visualization/qtiplot/metadata.xml | 22 -- |
| 33 |
.../qtiplot/qtiplot-0.9.8.9-r1.ebuild | 211 -------------------- |
| 34 |
sci-visualization/qtiplot/qtiplot-0.9.8.9.ebuild | 206 ------------------- |
| 35 |
24 files changed, 0 insertions(+), 1409 deletions(-) |
| 36 |
|
| 37 |
diff --git a/sci-visualization/qtiplot/Manifest b/sci-visualization/qtiplot/Manifest |
| 38 |
deleted file mode 100644 |
| 39 |
index 23678b7..0000000 |
| 40 |
--- a/sci-visualization/qtiplot/Manifest |
| 41 |
+++ /dev/null |
| 42 |
@@ -1,45 +0,0 @@ |
| 43 |
------BEGIN PGP SIGNED MESSAGE----- |
| 44 |
-Hash: SHA512 |
| 45 |
- |
| 46 |
-AUX qtiplot-0.9.7.10-dont-install-qwt.patch 605 RMD160 e68908d5ca887e64fe99bed21ea7d1d746f5409d SHA1 23089d7955cc15f6e56e3401266421cae24975c3 SHA256 161657d37de71ea58fc0e0af3495dc45082f5c398bd82c70e40968b23d0b898b |
| 47 |
-AUX qtiplot-0.9.7.12-system-QTeXEngine.patch 2390 RMD160 4e96caac6fe930b27dfd503354417078bfedfe34 SHA1 25f548a4c6e76a39dc72b44c4e975f13897f1d8f SHA256 9bb277a4bee32037067561ac19a1eb4bd8cf4f7b53edcea896c9f0c036dcccff |
| 48 |
-AUX qtiplot-0.9.7.12-system-gl2ps.patch 1594 RMD160 4ed03493199239a9c3b745132b5aeb202214e025 SHA1 548c1edc50fe96e46f6a676ff9f794ffff7dd7f7 SHA256 b1997f61759e647bfa25f3b926bedd88102a8d56595d515edef2c6988dd97a22 |
| 49 |
-AUX qtiplot-0.9.7.12-system-liborigin.patch 3242 RMD160 03ea38fe2b26034ad1bc08fb296eabdd76823409 SHA1 17085d3a32281dcac5a594a054265ae5c9d80445 SHA256 cf2595152c23c9c67513a115d9981e03d472c0b93e101d6e9e4e778de97df731 |
| 50 |
-AUX qtiplot-0.9.7.14-system-2dplot.patch 4757 RMD160 2186cceedd7693c384418cfcd38d874388ab8e88 SHA1 6b38e9273815f11cfffa238faa56d5427dcd8c4b SHA256 08c18a733475d7d9871f5a30b06280781b3102b17f0528431c9eadb68bafd814 |
| 51 |
-AUX qtiplot-0.9.7.14-system-liborigin.patch 4089 RMD160 1473539c2146766b43f1cfea7e31c3bb0e2602bf SHA1 2280685fb5fe59c300eebfc16c5e2cc08a259833 SHA256 d268297f50bbde162b66c1fd9fff93f54cbc73ce988ee88e25203a5e06b671c9 |
| 52 |
-AUX qtiplot-0.9.8.2-origin-build-failure.patch 2472 RMD160 a66c6f704ce7227939bb2c790361221294cef5ac SHA1 51ac749b14b5bc5988732841db76c142b61ec940 SHA256 98822a3f784207d205e127b8a37d091f1da2a61476aefe49ec57ae687b1e7f63 |
| 53 |
-AUX qtiplot-0.9.8.2-syslibs.patch 572 RMD160 98cd19606d7badb89b70d5024c06e2b9a6a81345 SHA1 3a01e6169da7429a67054e1980d4a1b48b1a840d SHA256 5d478fac2785f2b79273fff83dbd5030aa2a376cb277782adeefeb40bb5d536d |
| 54 |
-AUX qtiplot-0.9.8.3-odf.patch 606 RMD160 e0d07e047fe9e327fba64cf8d4196ea39c7b2694 SHA1 fb9f16558d434caaf541890a3062ada4f3fad33a SHA256 0c8e9803650b618d50dd0420d16ef3d37864a6414240ed8a39341c30588778d1 |
| 55 |
-AUX qtiplot-0.9.8.3-origin.patch 430 RMD160 7c3bfbea5d1c42cf01a59452a9b8551b50dd25d8 SHA1 be444a01cc8674941036dbdc8df770b6f1d3672c SHA256 2e8627245752583d266207515563c112d29a5e417feb7481a651af9a9d73c871 |
| 56 |
-AUX qtiplot-0.9.8.3-plot.patch 502 RMD160 e40109ded4a1a9d2b3a95ed71231b8db509f8d3e SHA1 9d1fb8c4ed2717b327e2fe0dcc88ffa0cd9e8255 SHA256 924b973f3f7ab3e7e0a76cb641a7c832401d52f00333c2033ee8980ffc503af5 |
| 57 |
-AUX qtiplot-0.9.8.3-popup.patch 1892 RMD160 b07794d6b46396ea4df9a7084f01c7c0466dc9e5 SHA1 0bf1d6332e1e2a32880dfd0c753f0ffd8f05e64e SHA256 5c2cebb201408c111494afa7624d0e9d53dcbb2d5dcd2b1f7899af366d73efaf |
| 58 |
-AUX qtiplot-0.9.8.5-tamuanova.patch 2057 RMD160 2822b0e410bc819e1bc5d0bea7819ba2122117fc SHA1 d46045ac63cdb7735121120054705be5c37f0649 SHA256 ca67848d04c61253ac776adae439a3f1d68095760278d59668900442595eb739 |
| 59 |
-AUX qtiplot-0.9.8.6-gold.patch 535 RMD160 9153e4a2f83b2f55585ef2aec44f151eb424f7b7 SHA1 b534a609f317cf3117d6495909854cdacea20124 SHA256 601bdea70053618be63f446c7c35fc991587a5ca439260d75bcb84308d116784 |
| 60 |
-AUX qtiplot-0.9.8.6-kde.patch 425 RMD160 428d0b2304b02e4e70264c4100be604bca0af1db SHA1 a1d4bec744c9b8fe29bf177851e66c97cdd9d975 SHA256 4e67a67c9467290930d21460cc326ac7b5d89322b7b020d32b46a04a77d14f84 |
| 61 |
-AUX qtiplot-0.9.8.6-tamuanova.patch 894 RMD160 f71ef91129284035e378e55a60e61448ba914e04 SHA1 830b518e3ef63625df84363a8047417124f243b0 SHA256 8c4deccaf3fa09133ac6ae35327a73637dccff0a4edfaa427894a9c6592e7f4c |
| 62 |
-AUX qtiplot-0.9.8.7-kde.patch 454 RMD160 dd38d3a9e4c1034fff061f7bc4e6ef95aa07ee10 SHA1 cc2734760b55a53c1cc7de89dd8de57ee7611565 SHA256 5cfe122907403ed1f766118934aa42eac05db41efabd0c6618df17af16e3aff1 |
| 63 |
-AUX qtiplot-0.9.8.8-system-gl2ps.patch 2436 RMD160 4ef13f2ff717759a882e91169bc81a167dc08b9e SHA1 cdbb846d85372720021b52c71f86e5230f913e32 SHA256 0787155b465aa6cdf4b2c12a87dd68e6b5aa2197b041b06a550023c1ca96c81c |
| 64 |
-AUX qtiplot-0.9.8.9-origin-2.patch 1715 RMD160 15cef2683087f8b4f15dcb9798d7e6d0397ddd0a SHA1 9c0f4ee5c42367f2011826886f775ba1e1b5e5a7 SHA256 31b842536b4bb98e9bbe49cd0a86bae7639f108c09f5d8eecd4e159740b0ce3b |
| 65 |
-AUX qtiplot-0.9.8.9-unbundle.patch 2815 RMD160 f2bbcbd39a44542e46def73a0de258ee683bb9ca SHA1 8a992e612cb781d012f4e9dbced023adb7214905 SHA256 ce41e2af253a25c49a4cb6394d291cf0d5ec0795620cdaacfe524ea19295d807 |
| 66 |
-DIST qtiplot-0.9.8.9-origin.patch.bz2 104708 RMD160 cbdd313f6054ecce19987be949b381c6210a3dad SHA1 632fbe607af7d2b1a903ef414ccadc4f425f9058 SHA256 e83d7212be0fadae31b14c8a86b655fdb3b7c7b8fc80b1e2d91eb0a7e96b1e99 |
| 67 |
-DIST qtiplot-0.9.8.9.tar.bz2 16202943 RMD160 6f78160aabc94fc8f01d4f5fb65f5cb4a718eae2 SHA1 73b17dd9195c3d86750d5f1f5bdd4d5483c5fe30 SHA256 a523ea259516d7581abaf2fe376507d152db32f71d88176cff18f5bc391b9ef0 |
| 68 |
-EBUILD qtiplot-0.9.8.9-r1.ebuild 5820 RMD160 0296bc303781af28bc5b26a2627607a0dc2d8299 SHA1 9268ae18e7b2f199c54a0081e838c176609a286f SHA256 9c71aa0ee9ec1086ea4840fc2a8e944eb398f4ccb86f30af52501922c912c3c8 |
| 69 |
-EBUILD qtiplot-0.9.8.9.ebuild 5609 RMD160 e2cd1cbdc865c27ae49edc797e6c0c255be982d8 SHA1 3a1ec5ef3d671d651f869eec0852a1b8a6d87781 SHA256 eb2541d996b2fb1f407a47b16f83152d6022e71808871c23b462901625069c28 |
| 70 |
-MISC metadata.xml 919 RMD160 d5a42a5872798c2f2f3a0c8ca241a15444a6f8b9 SHA1 1117f722c109e074538193ded0c6a5c5c8334dc7 SHA256 379fdffaca2a9a4769a8bfd3d6c38efca329faf1382b9e9013a2b1f4262a42ec |
| 71 |
------BEGIN PGP SIGNATURE----- |
| 72 |
-Version: GnuPG v2.0.17 (GNU/Linux) |
| 73 |
- |
| 74 |
-iQIcBAEBCgAGBQJPHBp7AAoJENwGBM22xffesUQP/jJAb8AqkxhlGQLkLk18hNNo |
| 75 |
-eKqoc9PcRQR+eCITA5WSz1WNWNDXKXaSXPAe7sIAShtqnWwktgqnEy2yCNZ1SJXb |
| 76 |
-TR08+2vO/5XTyXWJgfMWiN9btYvIoDWWtqO7qNJ+1o1RKwru3kFYRl7XfqvZnShq |
| 77 |
-U9/8Qb8meqhiBQLOhG2tfXTfIZwJu4j4PfafN+wqkRMC2+9smjMdm9RrZS33FghX |
| 78 |
-WLkZoQqYcIPAtN+ov0oc42AvjfxdvNa+TRLsEiGX4fY50zxAMFpnq5ZCXICvbDby |
| 79 |
-zO0b1ZXUFb6qtoaWs+6+UtpfHnwCFUsEU2FN0EwfOkmvgsNrhdlrJpLKslWhBWy/ |
| 80 |
-KcLmYg0+NccAZkMZ3etKEdhdnkFto8lUP43iusz3i2RoaEekZku45utnTe91LUUI |
| 81 |
-BWNL5tbteUmYed2hL49yqTMFXmvYXhByUTYAXk0kXqPRngJFzGEi+m7kBvdQgsO2 |
| 82 |
-foGaKBfZ9d+bIQffawxPBlOUsuMcLd7BA7ATVs5SrMlEJdoNjJwm1iiP/zjzMLz6 |
| 83 |
-AYEf4SH1BN7lruhPtS2Z/3rYSZTtER4Etzeefw8I173Adr52ZAeSUN68Ng+EHgnd |
| 84 |
-YIssrx9covp+JeqaqZ+D4DxdLicRI4SrWtY5ep/1CbNcuvkcYY9b3HeQthBDQuSf |
| 85 |
-uTn/Kq6T8pT3jkEnl/UC |
| 86 |
-=x2Gu |
| 87 |
------END PGP SIGNATURE----- |
| 88 |
|
| 89 |
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 |
| 90 |
deleted file mode 100644 |
| 91 |
index 86e4d4c..0000000 |
| 92 |
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-dont-install-qwt.patch |
| 93 |
+++ /dev/null |
| 94 |
@@ -1,22 +0,0 @@ |
| 95 |
-diff --git a/3rdparty/qwt/qwtconfig.pri b/3rdparty/qwt/qwtconfig.pri |
| 96 |
-index b7d0d0e..e36f131 100755 |
| 97 |
---- a/3rdparty/qwt/qwtconfig.pri |
| 98 |
-+++ b/3rdparty/qwt/qwtconfig.pri |
| 99 |
-@@ -7,17 +7,6 @@ VER_MIN = 2 |
| 100 |
- VER_PAT = 0 |
| 101 |
- VERSION = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT} |
| 102 |
- |
| 103 |
--unix { |
| 104 |
-- INSTALLBASE = /usr/local/qwt-5.2.0 |
| 105 |
--} |
| 106 |
-- |
| 107 |
--win32 { |
| 108 |
-- INSTALLBASE = C:/Qwt-5.2.0 |
| 109 |
--} |
| 110 |
-- |
| 111 |
--target.path = $$INSTALLBASE/lib |
| 112 |
--headers.path = $$INSTALLBASE/include |
| 113 |
--doc.path = $$INSTALLBASE/doc |
| 114 |
- |
| 115 |
- ###################################################################### |
| 116 |
- # qmake internal options |
| 117 |
|
| 118 |
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 |
| 119 |
deleted file mode 100644 |
| 120 |
index 5577ec9..0000000 |
| 121 |
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.12-system-QTeXEngine.patch |
| 122 |
+++ /dev/null |
| 123 |
@@ -1,62 +0,0 @@ |
| 124 |
-=== modified file 'build.conf.example' |
| 125 |
---- build.conf.example 2010-01-21 22:49:21 +0000 |
| 126 |
-+++ build.conf.example 2010-02-14 15:04:17 +0000 |
| 127 |
-@@ -69,6 +69,13 @@ |
| 128 |
- win32:QWT3D_LIBS = $$QTI_ROOT/3rdparty/qwtplot3d/lib/qwtplot3d.dll |
| 129 |
- unix:QWT3D_LIBS = $$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a |
| 130 |
- |
| 131 |
-+########################################################## |
| 132 |
-+## QTeXEngine - uncomment if you wish to use system copy |
| 133 |
-+# http://soft.proindependent.com/qtexengine/ |
| 134 |
-+########################################################## |
| 135 |
-+# |
| 136 |
-+# QTEXENGINE_LIBS = -lQTeXEngine |
| 137 |
-+ |
| 138 |
- ########################################################### |
| 139 |
- ## libxls - optional. you don't have to set these variables |
| 140 |
- # http://libxls.sourceforge.net/ |
| 141 |
- |
| 142 |
-=== modified file 'qtiplot/qtiplot.pro' |
| 143 |
---- qtiplot/qtiplot.pro 2010-01-21 22:49:21 +0000 |
| 144 |
-+++ qtiplot/qtiplot.pro 2010-02-14 15:00:58 +0000 |
| 145 |
-@@ -11,7 +11,6 @@ |
| 146 |
- # local copy included |
| 147 |
- INCLUDEPATH += ../3rdparty/liborigin |
| 148 |
- INCLUDEPATH += ../3rdparty/zlib |
| 149 |
--INCLUDEPATH += ../3rdparty/QTeXEngine/src |
| 150 |
- |
| 151 |
- # configurable |
| 152 |
- INCLUDEPATH += $$MUPARSER_INCLUDEPATH |
| 153 |
-@@ -24,6 +23,7 @@ |
| 154 |
- LIBS += $$MUPARSER_LIBS |
| 155 |
- LIBS += $$QWT_LIBS |
| 156 |
- LIBS += $$QWT3D_LIBS |
| 157 |
-+LIBS += $$QTEXENGINE_LIBS |
| 158 |
- LIBS += $$GSL_LIBS |
| 159 |
- LIBS += $$BOOST_LIBS |
| 160 |
- |
| 161 |
-@@ -143,14 +143,16 @@ |
| 162 |
- include(src/table/table.pri) |
| 163 |
- include(src/scripting/scripting.pri) |
| 164 |
- |
| 165 |
--############################################################### |
| 166 |
--##################### TeX export: QTeXEngine ################## |
| 167 |
--############################################################### |
| 168 |
-+isEmpty(QTEXENGINE_LIBS) { |
| 169 |
-+ ############################################################### |
| 170 |
-+ ##################### TeX export: QTeXEngine ################## |
| 171 |
-+ ############################################################### |
| 172 |
- |
| 173 |
--INCLUDEPATH += ../3rdparty/QTeXEngine/src |
| 174 |
--HEADERS += ../3rdparty/QTeXEngine/src/QTeXEngine.h |
| 175 |
--SOURCES += ../3rdparty/QTeXEngine/src/QTeXPaintEngine.cpp |
| 176 |
--SOURCES += ../3rdparty/QTeXEngine/src/QTeXPaintDevice.cpp |
| 177 |
-+ INCLUDEPATH += ../3rdparty/QTeXEngine/src |
| 178 |
-+ HEADERS += ../3rdparty/QTeXEngine/src/QTeXEngine.h |
| 179 |
-+ SOURCES += ../3rdparty/QTeXEngine/src/QTeXPaintEngine.cpp |
| 180 |
-+ SOURCES += ../3rdparty/QTeXEngine/src/QTeXPaintDevice.cpp |
| 181 |
-+} |
| 182 |
- |
| 183 |
- ############################################################### |
| 184 |
- ##################### Scripting: PYTHON + SIP + PyQT ########## |
| 185 |
- |
| 186 |
|
| 187 |
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 |
| 188 |
deleted file mode 100644 |
| 189 |
index b0419c2..0000000 |
| 190 |
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.12-system-gl2ps.patch |
| 191 |
+++ /dev/null |
| 192 |
@@ -1,56 +0,0 @@ |
| 193 |
-=== modified file '3rdparty/qwtplot3d/qwtplot3d.pri' |
| 194 |
---- 3rdparty/qwtplot3d/qwtplot3d.pri 2010-01-21 22:49:21 +0000 |
| 195 |
-+++ 3rdparty/qwtplot3d/qwtplot3d.pri 2010-02-14 17:22:07 +0000 |
| 196 |
-@@ -8,6 +8,8 @@ |
| 197 |
- 3rdparty\gl2ps |
| 198 |
- INCLUDEPATH += . |
| 199 |
- |
| 200 |
-+LIBS+=-lgl2ps |
| 201 |
-+ |
| 202 |
- # Input |
| 203 |
- HEADERS += include/qwt3d_extglwidget.h \ |
| 204 |
- include/qwt3d_color.h \ |
| 205 |
-@@ -37,8 +39,7 @@ |
| 206 |
- include/qwt3d_volumeplot.h \ |
| 207 |
- include/qwt3d_graphplot.h \ |
| 208 |
- include/qwt3d_multiplot.h \ |
| 209 |
-- include/qwt3d_io_gl2ps.h \ |
| 210 |
-- 3rdparty/gl2ps/gl2ps.h |
| 211 |
-+ include/qwt3d_io_gl2ps.h |
| 212 |
- SOURCES += src/qwt3d_extglwidget.cpp \ |
| 213 |
- src/qwt3d_axis.cpp \ |
| 214 |
- src/qwt3d_color.cpp \ |
| 215 |
-@@ -62,5 +63,4 @@ |
| 216 |
- src/qwt3d_function.cpp \ |
| 217 |
- src/qwt3d_gridplot.cpp \ |
| 218 |
- src/qwt3d_meshplot.cpp \ |
| 219 |
-- src/qwt3d_io_gl2ps.cpp \ |
| 220 |
-- 3rdparty/gl2ps/gl2ps.c |
| 221 |
-+ src/qwt3d_io_gl2ps.cpp |
| 222 |
- |
| 223 |
-=== modified file '3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp' |
| 224 |
---- 3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp 2010-01-21 22:49:21 +0000 |
| 225 |
-+++ 3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp 2010-02-14 17:12:09 +0000 |
| 226 |
-@@ -6,7 +6,7 @@ |
| 227 |
- #include <locale.h> |
| 228 |
- |
| 229 |
- #include "qwt3d_openglhelper.h" |
| 230 |
--#include "../3rdparty/gl2ps/gl2ps.h" |
| 231 |
-+#include "gl2ps.h" |
| 232 |
- #include "qwt3d_io_gl2ps.h" |
| 233 |
- #include "qwt3d_plot.h" |
| 234 |
- |
| 235 |
- |
| 236 |
-=== modified file '3rdparty/qwtplot3d/src/qwt3d_label.cpp' |
| 237 |
---- 3rdparty/qwtplot3d/src/qwt3d_label.cpp 2010-01-21 22:49:21 +0000 |
| 238 |
-+++ 3rdparty/qwtplot3d/src/qwt3d_label.cpp 2010-02-14 17:13:01 +0000 |
| 239 |
-@@ -1,7 +1,7 @@ |
| 240 |
- #include <qbitmap.h> |
| 241 |
- #include "qwt3d_label.h" |
| 242 |
- #include "qwt3d_plot.h" |
| 243 |
--#include "../3rdparty/gl2ps/gl2ps.h" |
| 244 |
-+#include "gl2ps.h" |
| 245 |
- |
| 246 |
- using namespace Qwt3D; |
| 247 |
- |
| 248 |
- |
| 249 |
|
| 250 |
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 |
| 251 |
deleted file mode 100644 |
| 252 |
index 3e89b24..0000000 |
| 253 |
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.12-system-liborigin.patch |
| 254 |
+++ /dev/null |
| 255 |
@@ -1,90 +0,0 @@ |
| 256 |
-=== modified file 'build.conf.example' |
| 257 |
---- build.conf.example 2010-02-14 15:07:01 +0000 |
| 258 |
-+++ build.conf.example 2010-02-14 15:16:08 +0000 |
| 259 |
-@@ -118,6 +118,14 @@ |
| 260 |
- EMF_ENGINE_LIBS = $$QTI_ROOT/3rdparty/EmfEngine/libEmfEngine.a |
| 261 |
- |
| 262 |
- ########################################################## |
| 263 |
-+## liborigin - keep commented if you wish to use local copy |
| 264 |
-+# http://sourceforge.net/projects/liborigin/ |
| 265 |
-+########################################################## |
| 266 |
-+ |
| 267 |
-+# LIB_ORIGIN_INCLUDEPATH = /usr/include/liborigin2 |
| 268 |
-+# LIB_ORIGIN_LIBS = -lorigin2 |
| 269 |
-+ |
| 270 |
-+########################################################## |
| 271 |
- ## python - only used if python is needed |
| 272 |
- ########################################################## |
| 273 |
- |
| 274 |
- |
| 275 |
-=== modified file 'qtiplot/qtiplot.pro' |
| 276 |
---- qtiplot/qtiplot.pro 2010-02-14 15:07:01 +0000 |
| 277 |
-+++ qtiplot/qtiplot.pro 2010-02-14 15:13:58 +0000 |
| 278 |
-@@ -9,7 +9,6 @@ |
| 279 |
- ############################################################################# |
| 280 |
- |
| 281 |
- # local copy included |
| 282 |
--INCLUDEPATH += ../3rdparty/liborigin |
| 283 |
- INCLUDEPATH += ../3rdparty/zlib |
| 284 |
- |
| 285 |
- # configurable |
| 286 |
-@@ -18,6 +17,7 @@ |
| 287 |
- INCLUDEPATH += $$QWT3D_INCLUDEPATH |
| 288 |
- INCLUDEPATH += $$GSL_INCLUDEPATH |
| 289 |
- INCLUDEPATH += $$BOOST_INCLUDEPATH |
| 290 |
-+INCLUDEPATH += $$LIB_ORIGIN_INCLUDEPATH |
| 291 |
- |
| 292 |
- # configurable libs |
| 293 |
- LIBS += $$MUPARSER_LIBS |
| 294 |
-@@ -26,6 +26,7 @@ |
| 295 |
- LIBS += $$QTEXENGINE_LIBS |
| 296 |
- LIBS += $$GSL_LIBS |
| 297 |
- LIBS += $$BOOST_LIBS |
| 298 |
-+LIBS += $$LIB_ORIGIN_LIBS |
| 299 |
- |
| 300 |
- ############################################################################# |
| 301 |
- ###################### BASIC PROJECT PROPERTIES ############################# |
| 302 |
-@@ -154,6 +155,10 @@ |
| 303 |
- SOURCES += ../3rdparty/QTeXEngine/src/QTeXPaintDevice.cpp |
| 304 |
- } |
| 305 |
- |
| 306 |
-+isEmpty(LIB_ORIGIN_LIBS) { |
| 307 |
-+ INCLUDEPATH += ../3rdparty/liborigin |
| 308 |
-+} |
| 309 |
-+ |
| 310 |
- ############################################################### |
| 311 |
- ##################### Scripting: PYTHON + SIP + PyQT ########## |
| 312 |
- ############################################################### |
| 313 |
- |
| 314 |
-=== modified file 'qtiplot/src/origin/origin.pri' |
| 315 |
---- qtiplot/src/origin/origin.pri 2009-10-18 01:48:15 +0000 |
| 316 |
-+++ qtiplot/src/origin/origin.pri 2010-02-14 15:11:15 +0000 |
| 317 |
-@@ -4,14 +4,17 @@ |
| 318 |
- INCLUDEPATH += src/origin/ |
| 319 |
- |
| 320 |
- HEADERS += src/origin/importOPJ.h |
| 321 |
--HEADERS += ../3rdparty/liborigin/OriginObj.h |
| 322 |
--HEADERS += ../3rdparty/liborigin/OriginFile.h |
| 323 |
--HEADERS += ../3rdparty/liborigin/OriginParser.h |
| 324 |
--HEADERS += ../3rdparty/liborigin/OriginDefaultParser.h |
| 325 |
--HEADERS += ../3rdparty/liborigin/Origin750Parser.h |
| 326 |
-- |
| 327 |
- SOURCES += src/origin/importOPJ.cpp |
| 328 |
--SOURCES += ../3rdparty/liborigin/OriginFile.cpp |
| 329 |
--SOURCES += ../3rdparty/liborigin/OriginParser.cpp |
| 330 |
--SOURCES += ../3rdparty/liborigin/OriginDefaultParser.cpp |
| 331 |
--SOURCES += ../3rdparty/liborigin/Origin750Parser.cpp |
| 332 |
-+ |
| 333 |
-+isEmpty(LIB_ORIGIN_LIBS) { |
| 334 |
-+ HEADERS += ../3rdparty/liborigin/OriginObj.h |
| 335 |
-+ HEADERS += ../3rdparty/liborigin/OriginFile.h |
| 336 |
-+ HEADERS += ../3rdparty/liborigin/OriginParser.h |
| 337 |
-+ HEADERS += ../3rdparty/liborigin/OriginDefaultParser.h |
| 338 |
-+ HEADERS += ../3rdparty/liborigin/Origin750Parser.h |
| 339 |
-+ |
| 340 |
-+ SOURCES += ../3rdparty/liborigin/OriginFile.cpp |
| 341 |
-+ SOURCES += ../3rdparty/liborigin/OriginParser.cpp |
| 342 |
-+ SOURCES += ../3rdparty/liborigin/OriginDefaultParser.cpp |
| 343 |
-+ SOURCES += ../3rdparty/liborigin/Origin750Parser.cpp |
| 344 |
-+} |
| 345 |
- |
| 346 |
|
| 347 |
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 |
| 348 |
deleted file mode 100644 |
| 349 |
index 88664a1..0000000 |
| 350 |
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.14-system-2dplot.patch |
| 351 |
+++ /dev/null |
| 352 |
@@ -1,125 +0,0 @@ |
| 353 |
-Index: qtiplot/src/plot2D/dialogs/PlotDialog.cpp |
| 354 |
-=================================================================== |
| 355 |
---- qtiplot/src/plot2D/dialogs/PlotDialog.cpp (revision 1728) |
| 356 |
-+++ qtiplot/src/plot2D/dialogs/PlotDialog.cpp (revision 1729) |
| 357 |
-@@ -503,15 +503,19 @@ |
| 358 |
- gl2->addWidget(new QLabel( tr("width= ")), 0, 0); |
| 359 |
- gl2->addWidget(boxPlotWidth, 0, 1); |
| 360 |
- |
| 361 |
-- gl2->addWidget(new QLabel(tr("height= ")), 2, 0); |
| 362 |
-- gl2->addWidget(boxPlotHeight, 2, 1); |
| 363 |
-+ gl2->addWidget(new QLabel(tr("height= ")), 1, 0); |
| 364 |
-+ gl2->addWidget(boxPlotHeight, 1, 1); |
| 365 |
- |
| 366 |
- keepPlotRatioBox = new QCheckBox(tr("Keep aspect ratio")); |
| 367 |
- keepPlotRatioBox->setChecked(app->d_keep_aspect_ration); |
| 368 |
-- gl2->addWidget(keepRatioBox, 3, 1); |
| 369 |
- |
| 370 |
-- gl2->setRowStretch(4, 1); |
| 371 |
-+ connect(keepPlotRatioBox, SIGNAL(clicked (bool)), keepRatioBox, SLOT(setChecked(bool))); |
| 372 |
-+ connect(keepRatioBox, SIGNAL(clicked (bool)), keepPlotRatioBox, SLOT(setChecked(bool))); |
| 373 |
- |
| 374 |
-+ gl2->addWidget(keepPlotRatioBox, 2, 1); |
| 375 |
-+ |
| 376 |
-+ gl2->setRowStretch(3, 1); |
| 377 |
-+ |
| 378 |
- QHBoxLayout *bl2 = new QHBoxLayout(); |
| 379 |
- bl2->addWidget(gb1); |
| 380 |
- bl2->addWidget(gb2); |
| 381 |
-@@ -582,25 +586,25 @@ |
| 382 |
- gl2->addWidget(new QLabel( tr("width= ")), 0, 0); |
| 383 |
- gl2->addWidget(boxLayerWidth, 0, 1); |
| 384 |
- |
| 385 |
-- gl2->addWidget(new QLabel(tr("height= ")), 2, 0); |
| 386 |
-- gl2->addWidget(boxLayerHeight, 2, 1); |
| 387 |
-+ gl2->addWidget(new QLabel(tr("height= ")), 1, 0); |
| 388 |
-+ gl2->addWidget(boxLayerHeight, 1, 1); |
| 389 |
- |
| 390 |
- keepRatioBox = new QCheckBox(tr("Keep aspect ratio")); |
| 391 |
- keepRatioBox->setChecked(app->d_keep_aspect_ration); |
| 392 |
-- gl2->addWidget(keepRatioBox, 3, 1); |
| 393 |
-+ gl2->addWidget(keepRatioBox, 2, 1); |
| 394 |
- |
| 395 |
- QLabel *l = new QLabel(tr("Apply &to...")); |
| 396 |
-- gl2->addWidget(l, 4, 0); |
| 397 |
-+ gl2->addWidget(l, 3, 0); |
| 398 |
- |
| 399 |
- sizeApplyToBox = new QComboBox(); |
| 400 |
- sizeApplyToBox->insertItem(tr("Layer")); |
| 401 |
- sizeApplyToBox->insertItem(tr("Window")); |
| 402 |
- sizeApplyToBox->insertItem(tr("All Windows")); |
| 403 |
-- gl2->addWidget(sizeApplyToBox, 4, 1); |
| 404 |
-+ gl2->addWidget(sizeApplyToBox, 3, 1); |
| 405 |
- |
| 406 |
- l->setBuddy(sizeApplyToBox); |
| 407 |
- |
| 408 |
-- gl2->setRowStretch(5, 1); |
| 409 |
-+ gl2->setRowStretch(4, 1); |
| 410 |
- |
| 411 |
- QBoxLayout *bl2 = new QBoxLayout (QBoxLayout::LeftToRight); |
| 412 |
- bl2->addWidget(gb1); |
| 413 |
-Index: qtiplot/src/plot2D/dialogs/ImageExportDialog.cpp |
| 414 |
-=================================================================== |
| 415 |
---- qtiplot/src/plot2D/dialogs/ImageExportDialog.cpp (revision 1728) |
| 416 |
-+++ qtiplot/src/plot2D/dialogs/ImageExportDialog.cpp (revision 1729) |
| 417 |
-@@ -240,7 +240,7 @@ |
| 418 |
- size_layout->addWidget(scaleFontsBox, 3, 1); |
| 419 |
- |
| 420 |
- keepRatioBox = new QCheckBox(tr("&Keep aspect ratio")); |
| 421 |
-- keepRatioBox->setChecked(true); |
| 422 |
-+ keepRatioBox->setChecked(app->d_keep_aspect_ration); |
| 423 |
- size_layout->addWidget(keepRatioBox, 4, 1); |
| 424 |
- |
| 425 |
- vert_layout->addWidget(d_custom_size_box); |
| 426 |
-@@ -340,6 +340,7 @@ |
| 427 |
- |
| 428 |
- app->d_3D_export_text_mode = d_3D_text_export_mode->currentIndex(); |
| 429 |
- app->d_3D_export_sort = d_3D_export_sort->currentIndex(); |
| 430 |
-+ app->d_keep_aspect_ration = keepRatioBox->isChecked(); |
| 431 |
- } |
| 432 |
- |
| 433 |
- e->accept(); |
| 434 |
-Index: qtiplot/src/plot2D/dialogs/EnrichmentDialog.cpp |
| 435 |
-=================================================================== |
| 436 |
---- qtiplot/src/plot2D/dialogs/EnrichmentDialog.cpp (revision 1728) |
| 437 |
-+++ qtiplot/src/plot2D/dialogs/EnrichmentDialog.cpp (revision 1729) |
| 438 |
-@@ -460,6 +460,7 @@ |
| 439 |
- gl2->addWidget(heightBox, 1, 1); |
| 440 |
- |
| 441 |
- keepAspectBox = new QCheckBox(tr("&Keep aspect ratio")); |
| 442 |
-+ keepAspectBox->setChecked(app->d_keep_aspect_ration); |
| 443 |
- gl2->addWidget(keepAspectBox, 2, 1); |
| 444 |
- |
| 445 |
- bestSizeButton = new QPushButton(tr("&Best size")); |
| 446 |
-@@ -646,6 +647,10 @@ |
| 447 |
- FrameWidget *fw = qobject_cast<FrameWidget *>(d_widget); |
| 448 |
- if (fw) |
| 449 |
- fw->setAttachPolicy((FrameWidget::AttachPolicy)attachToBox->currentIndex()); |
| 450 |
-+ |
| 451 |
-+ ApplicationWindow *app = (ApplicationWindow *)this->parent(); |
| 452 |
-+ if (app) |
| 453 |
-+ app->d_keep_aspect_ration = keepAspectBox->isChecked(); |
| 454 |
- } else if (patternPage && tabWidget->currentPage() == patternPage) |
| 455 |
- patternApplyTo(); |
| 456 |
- else if (textPage && tabWidget->currentPage() == textPage){ |
| 457 |
-Index: qtiplot/src/core/ConfigDialog.cpp |
| 458 |
-=================================================================== |
| 459 |
---- qtiplot/src/core/ConfigDialog.cpp (revision 1728) |
| 460 |
-+++ qtiplot/src/core/ConfigDialog.cpp (revision 1729) |
| 461 |
-@@ -1023,7 +1023,7 @@ |
| 462 |
- gl->addWidget(boxCanvasHeight, 2, 1); |
| 463 |
- |
| 464 |
- keepRatioBox = new QCheckBox(tr("&Keep aspect ratio")); |
| 465 |
-- keepRatioBox->setChecked(true); |
| 466 |
-+ keepRatioBox->setChecked(app->d_keep_aspect_ration); |
| 467 |
- gl->addWidget(keepRatioBox, 3, 1); |
| 468 |
- |
| 469 |
- gl->setRowStretch(4, 1); |
| 470 |
-@@ -2097,6 +2097,7 @@ |
| 471 |
- FrameWidget::Unit unit = (FrameWidget::Unit)unitBox->currentIndex(); |
| 472 |
- app->d_layer_canvas_width = convertToPixels(boxCanvasWidth->value(), unit, 0); |
| 473 |
- app->d_layer_canvas_height = convertToPixels(boxCanvasHeight->value(), unit, 1); |
| 474 |
-+ app->d_keep_aspect_ration = keepRatioBox->isChecked(); |
| 475 |
- } |
| 476 |
- |
| 477 |
- // 2D plots page: ticks tab |
| 478 |
|
| 479 |
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 |
| 480 |
deleted file mode 100644 |
| 481 |
index e8fa4a3..0000000 |
| 482 |
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.14-system-liborigin.patch |
| 483 |
+++ /dev/null |
| 484 |
@@ -1,102 +0,0 @@ |
| 485 |
-=== modified file 'build.conf.example' |
| 486 |
---- build.conf.example 2010-04-22 18:57:40 +0000 |
| 487 |
-+++ build.conf.example 2010-04-22 18:58:06 +0000 |
| 488 |
-@@ -118,6 +118,14 @@ |
| 489 |
- EMF_ENGINE_LIBS = $$QTI_ROOT/3rdparty/EmfEngine/libEmfEngine.a |
| 490 |
- |
| 491 |
- ########################################################## |
| 492 |
-+## liborigin - keep commented if you wish to use local copy |
| 493 |
-+# http://sourceforge.net/projects/liborigin/ |
| 494 |
-+########################################################## |
| 495 |
-+ |
| 496 |
-+# LIB_ORIGIN_INCLUDEPATH = /usr/include/liborigin2 |
| 497 |
-+# LIB_ORIGIN_LIBS = -lorigin2 |
| 498 |
-+ |
| 499 |
-+########################################################## |
| 500 |
- ## python - only used if python is needed |
| 501 |
- ########################################################## |
| 502 |
- |
| 503 |
- |
| 504 |
-=== modified file 'qtiplot/qtiplot.pro' |
| 505 |
---- qtiplot/qtiplot.pro 2010-04-22 18:57:40 +0000 |
| 506 |
-+++ qtiplot/qtiplot.pro 2010-04-22 19:08:57 +0000 |
| 507 |
-@@ -16,6 +16,7 @@ |
| 508 |
- INCLUDEPATH += $$QWT_INCLUDEPATH |
| 509 |
- INCLUDEPATH += $$QWT3D_INCLUDEPATH |
| 510 |
- INCLUDEPATH += $$GSL_INCLUDEPATH |
| 511 |
-+INCLUDEPATH += $$LIB_ORIGIN_INCLUDEPATH |
| 512 |
- |
| 513 |
- # configurable libs |
| 514 |
- LIBS += $$MUPARSER_LIBS |
| 515 |
-@@ -23,6 +24,7 @@ |
| 516 |
- LIBS += $$QWT3D_LIBS |
| 517 |
- LIBS += $$QTEXENGINE_LIBS |
| 518 |
- LIBS += $$GSL_LIBS |
| 519 |
-+LIBS += $$LIB_ORIGIN_LIBS |
| 520 |
- |
| 521 |
- ############################################################################# |
| 522 |
- ###################### BASIC PROJECT PROPERTIES ############################# |
| 523 |
-@@ -150,6 +152,10 @@ |
| 524 |
- SOURCES += ../3rdparty/QTeXEngine/src/QTeXPaintDevice.cpp |
| 525 |
- } |
| 526 |
- |
| 527 |
-+isEmpty(LIB_ORIGIN_LIBS) { |
| 528 |
-+ INCLUDEPATH += ../3rdparty/liborigin |
| 529 |
-+} |
| 530 |
-+ |
| 531 |
- ############################################################### |
| 532 |
- ##################### Scripting: PYTHON + SIP + PyQT ########## |
| 533 |
- ############################################################### |
| 534 |
- |
| 535 |
-=== modified file 'qtiplot/src/origin/origin.pri' |
| 536 |
---- qtiplot/src/origin/origin.pri 2010-04-22 17:58:49 +0000 |
| 537 |
-+++ qtiplot/src/origin/origin.pri 2010-04-22 19:08:15 +0000 |
| 538 |
-@@ -4,24 +4,28 @@ |
| 539 |
- INCLUDEPATH += src/origin/ |
| 540 |
- |
| 541 |
- HEADERS += src/origin/importOPJ.h |
| 542 |
--HEADERS += ../3rdparty/liborigin/OriginObj.h |
| 543 |
--HEADERS += ../3rdparty/liborigin/OriginFile.h |
| 544 |
--HEADERS += ../3rdparty/liborigin/OriginParser.h |
| 545 |
--HEADERS += ../3rdparty/liborigin/OriginDefaultParser.h |
| 546 |
--HEADERS += ../3rdparty/liborigin/Origin600Parser.h |
| 547 |
--HEADERS += ../3rdparty/liborigin/Origin610Parser.h |
| 548 |
--HEADERS += ../3rdparty/liborigin/Origin700Parser.h |
| 549 |
--HEADERS += ../3rdparty/liborigin/Origin750Parser.h |
| 550 |
--HEADERS += ../3rdparty/liborigin/Origin800Parser.h |
| 551 |
--HEADERS += ../3rdparty/liborigin/Origin810Parser.h |
| 552 |
- |
| 553 |
- SOURCES += src/origin/importOPJ.cpp |
| 554 |
--SOURCES += ../3rdparty/liborigin/OriginFile.cpp |
| 555 |
--SOURCES += ../3rdparty/liborigin/OriginParser.cpp |
| 556 |
--SOURCES += ../3rdparty/liborigin/OriginDefaultParser.cpp |
| 557 |
--SOURCES += ../3rdparty/liborigin/Origin600Parser.cpp |
| 558 |
--SOURCES += ../3rdparty/liborigin/Origin610Parser.cpp |
| 559 |
--SOURCES += ../3rdparty/liborigin/Origin700Parser.cpp |
| 560 |
--SOURCES += ../3rdparty/liborigin/Origin750Parser.cpp |
| 561 |
--SOURCES += ../3rdparty/liborigin/Origin800Parser.cpp |
| 562 |
--SOURCES += ../3rdparty/liborigin/Origin810Parser.cpp |
| 563 |
-+ |
| 564 |
-+isEmpty(LIB_ORIGIN_LIBS) { |
| 565 |
-+ HEADERS += ../3rdparty/liborigin/OriginObj.h |
| 566 |
-+ HEADERS += ../3rdparty/liborigin/OriginFile.h |
| 567 |
-+ HEADERS += ../3rdparty/liborigin/OriginParser.h |
| 568 |
-+ HEADERS += ../3rdparty/liborigin/OriginDefaultParser.h |
| 569 |
-+ HEADERS += ../3rdparty/liborigin/Origin600Parser.h |
| 570 |
-+ HEADERS += ../3rdparty/liborigin/Origin610Parser.h |
| 571 |
-+ HEADERS += ../3rdparty/liborigin/Origin700Parser.h |
| 572 |
-+ HEADERS += ../3rdparty/liborigin/Origin750Parser.h |
| 573 |
-+ HEADERS += ../3rdparty/liborigin/Origin800Parser.h |
| 574 |
-+ HEADERS += ../3rdparty/liborigin/Origin810Parser.h |
| 575 |
-+ |
| 576 |
-+ SOURCES += ../3rdparty/liborigin/OriginFile.cpp |
| 577 |
-+ SOURCES += ../3rdparty/liborigin/OriginParser.cpp |
| 578 |
-+ SOURCES += ../3rdparty/liborigin/OriginDefaultParser.cpp |
| 579 |
-+ SOURCES += ../3rdparty/liborigin/Origin600Parser.cpp |
| 580 |
-+ SOURCES += ../3rdparty/liborigin/Origin610Parser.cpp |
| 581 |
-+ SOURCES += ../3rdparty/liborigin/Origin700Parser.cpp |
| 582 |
-+ SOURCES += ../3rdparty/liborigin/Origin750Parser.cpp |
| 583 |
-+ SOURCES += ../3rdparty/liborigin/Origin800Parser.cpp |
| 584 |
-+ SOURCES += ../3rdparty/liborigin/Origin810Parser.cpp |
| 585 |
-+} |
| 586 |
- |
| 587 |
|
| 588 |
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 |
| 589 |
deleted file mode 100644 |
| 590 |
index 22e4fbe..0000000 |
| 591 |
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.2-origin-build-failure.patch |
| 592 |
+++ /dev/null |
| 593 |
@@ -1,76 +0,0 @@ |
| 594 |
-Without this upstream patch qtiplot fails to build with the following error: |
| 595 |
- |
| 596 |
-src/origin/importOPJ.cpp: In member function ‘QString ImportOPJ::parseOriginTags(const QString&)’: |
| 597 |
-src/origin/importOPJ.cpp:2162: ошибка: unknown escape sequence '\p' |
| 598 |
- |
| 599 |
---- qtiplot/src/origin/importOPJ.cpp 2010-09-01 11:07:38 +0000 |
| 600 |
-+++ qtiplot/src/origin/importOPJ.cpp 2010-09-07 10:12:30 +0000 |
| 601 |
-@@ -473,6 +473,8 @@ |
| 602 |
- } |
| 603 |
- table->setDayFormat(format, j); |
| 604 |
- break; |
| 605 |
-+ default: |
| 606 |
-+ break; |
| 607 |
- } |
| 608 |
- table->freeMemory(); |
| 609 |
- } |
| 610 |
-@@ -720,7 +722,6 @@ |
| 611 |
- bkg.setAlpha(0); |
| 612 |
- graph->setCanvasBackground(bkg); |
| 613 |
- |
| 614 |
-- int auto_color = -1; |
| 615 |
- int style = 0; |
| 616 |
- bool matrixImage = false; |
| 617 |
- for(unsigned int c = 0; c < layer.curves.size(); ++c){ |
| 618 |
-@@ -1461,7 +1462,7 @@ |
| 619 |
- |
| 620 |
- if (boxWhiskersPlot){ |
| 621 |
- QStringList curveNames; |
| 622 |
-- for (unsigned int i = 0; i < graph->curveCount(); i++){ |
| 623 |
-+ for (int i = 0; i < graph->curveCount(); i++){ |
| 624 |
- BoxCurve *box = (BoxCurve *)graph->curve(i); |
| 625 |
- if (!box || box->type() != Graph::Box) |
| 626 |
- continue; |
| 627 |
-@@ -1659,7 +1660,6 @@ |
| 628 |
- for(unsigned int c = 0; c < layer.curves.size(); ++c){ |
| 629 |
- Origin::GraphCurve& _curve = layer.curves[c]; |
| 630 |
- QString data(_curve.dataName.c_str()); |
| 631 |
-- int color = 0; |
| 632 |
- double fFontScaleFactor = 2.0; |
| 633 |
- switch(_curve.type){ |
| 634 |
- case Origin::GraphCurve::Line3D: |
| 635 |
-@@ -1809,7 +1809,6 @@ |
| 636 |
- } |
| 637 |
- |
| 638 |
- QStringList formulas; |
| 639 |
-- double start, end; |
| 640 |
- |
| 641 |
- plot->showColorLegend(false); |
| 642 |
- plot->setFramed(); |
| 643 |
-@@ -1951,8 +1950,8 @@ |
| 644 |
- |
| 645 |
- QList <PieLabel *> pieTexts = p->labelsList(); |
| 646 |
- QFont font(mw->plotLegendFont); |
| 647 |
-- unsigned int lsize = layer.pieTexts.size(); |
| 648 |
-- for(unsigned int i = 0; i < lsize && i < pieTexts.size(); ++i){ |
| 649 |
-+ int lsize = layer.pieTexts.size(); |
| 650 |
-+ for(int i = 0; i < lsize && i < pieTexts.size(); ++i){ |
| 651 |
- Origin::TextBox text = layer.pieTexts[lsize - i - 1]; |
| 652 |
- font.setPointSizeF(text.fontSize*fFontScaleFactor); |
| 653 |
- QFontMetrics fm(font, graph); |
| 654 |
-@@ -2159,12 +2158,12 @@ |
| 655 |
- line.replace("&lbracket;", "("); |
| 656 |
- line.replace("&rbracket;", ")"); |
| 657 |
- |
| 658 |
-- QRegExp fontModifier("\p(\\d)+\\(.*\\)");//remove \p163(...) like tags |
| 659 |
-+ QRegExp fontModifier("\\\\p(\\d)+\\(.*\\)");//remove \p163(...) like tags |
| 660 |
- int index = line.indexOf(fontModifier); |
| 661 |
- while (index >= 0){ |
| 662 |
- int pos1 = line.indexOf("(", index + 2) + 1; |
| 663 |
- int length = fontModifier.matchedLength(); |
| 664 |
-- line = line.mid(pos1, length - pos1); |
| 665 |
-+ line = line.mid(pos1, length - pos1 - 1); |
| 666 |
- index = line.indexOf(fontModifier, index + length); |
| 667 |
- } |
| 668 |
- |
| 669 |
- |
| 670 |
|
| 671 |
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 |
| 672 |
deleted file mode 100644 |
| 673 |
index d677277..0000000 |
| 674 |
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.2-syslibs.patch |
| 675 |
+++ /dev/null |
| 676 |
@@ -1,15 +0,0 @@ |
| 677 |
-diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro |
| 678 |
-index 657ad0b..3655d66 100755 |
| 679 |
---- a/qtiplot/qtiplot.pro |
| 680 |
-+++ b/qtiplot/qtiplot.pro |
| 681 |
-@@ -235,8 +235,8 @@ win32: contains(CONFIG, Excel) { |
| 682 |
- ############################################################### |
| 683 |
- |
| 684 |
- # At the very end: add global include- and lib path |
| 685 |
--#unix:INCLUDEPATH += $$SYS_INCLUDEPATH |
| 686 |
--#unix:LIBS += $$SYS_LIBS |
| 687 |
-+unix:INCLUDEPATH += $$SYS_INCLUDEPATH |
| 688 |
-+unix:LIBS += $$SYS_LIBS |
| 689 |
- |
| 690 |
- ############################################################### |
| 691 |
- ############### Building QtiPlot as a browser plugin ########## |
| 692 |
|
| 693 |
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 |
| 694 |
deleted file mode 100644 |
| 695 |
index 0ba7cc9..0000000 |
| 696 |
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.3-odf.patch |
| 697 |
+++ /dev/null |
| 698 |
@@ -1,13 +0,0 @@ |
| 699 |
-diff --git a/qtiplot/src/core/ApplicationWindow.cpp b/qtiplot/src/core/ApplicationWindow.cpp |
| 700 |
-index 56c52a7..b643e50 100755 |
| 701 |
---- a/qtiplot/src/core/ApplicationWindow.cpp |
| 702 |
-+++ b/qtiplot/src/core/ApplicationWindow.cpp |
| 703 |
-@@ -4326,7 +4326,7 @@ Table * ApplicationWindow::importExcelCrossplatform(const QString& fn, int sheet |
| 704 |
- |
| 705 |
- int rows = sh->GetTotalRows(); |
| 706 |
- int cols = sh->GetTotalCols(); |
| 707 |
-- if (rows == 1 && !cols){ |
| 708 |
-+ if (!rows && !cols){ |
| 709 |
- if (sheet > 0 && sheet == currentSheet){ |
| 710 |
- QMessageBox::critical(this, tr("QtiPlot"), tr("Sheet %1 is empty, operation aborted!").arg(sheet)); |
| 711 |
- return NULL; |
| 712 |
|
| 713 |
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 |
| 714 |
deleted file mode 100644 |
| 715 |
index ebd7ca7..0000000 |
| 716 |
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.3-origin.patch |
| 717 |
+++ /dev/null |
| 718 |
@@ -1,13 +0,0 @@ |
| 719 |
-diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro |
| 720 |
-index bf133ca..f3d0994 100755 |
| 721 |
---- a/qtiplot/qtiplot.pro |
| 722 |
-+++ b/qtiplot/qtiplot.pro |
| 723 |
-@@ -226,7 +226,7 @@ contains(SCRIPTING_LANGS, Python) { |
| 724 |
- DEFINES += OPJ_IMPORT |
| 725 |
- INCLUDEPATH += $$LIBORIGIN_INCLUDEPATH |
| 726 |
- INCLUDEPATH += $$BOOST_INCLUDEPATH |
| 727 |
-- #LIBS += $$LIBORIGIN_LIBS |
| 728 |
-+ LIBS += $$LIBORIGIN_LIBS |
| 729 |
- LIBS += $$BOOST_LIBS |
| 730 |
- include(src/origin/origin.pri) |
| 731 |
- } |
| 732 |
|
| 733 |
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 |
| 734 |
deleted file mode 100644 |
| 735 |
index 4e49da8..0000000 |
| 736 |
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.3-plot.patch |
| 737 |
+++ /dev/null |
| 738 |
@@ -1,12 +0,0 @@ |
| 739 |
-diff --git a/qtiplot/src/origin/importOPJ.cpp b/qtiplot/src/origin/importOPJ.cpp |
| 740 |
-index 5abb0be..b9c1408 100755 |
| 741 |
---- a/qtiplot/src/origin/importOPJ.cpp |
| 742 |
-+++ b/qtiplot/src/origin/importOPJ.cpp |
| 743 |
-@@ -790,7 +790,6 @@ bool ImportOPJ::importGraphs(const OriginFile& opj) |
| 744 |
- case Origin::GraphCurve::TextPlot: |
| 745 |
- style = Origin::GraphCurve::TextPlot; |
| 746 |
- break; |
| 747 |
-- case Origin::GraphCurve::XYZContour: |
| 748 |
- case Origin::GraphCurve::Contour: |
| 749 |
- style = Origin::GraphCurve::Contour; |
| 750 |
- break; |
| 751 |
|
| 752 |
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 |
| 753 |
deleted file mode 100644 |
| 754 |
index ff01934..0000000 |
| 755 |
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.3-popup.patch |
| 756 |
+++ /dev/null |
| 757 |
@@ -1,47 +0,0 @@ |
| 758 |
-diff --git a/qtiplot/src/core/ApplicationWindow.cpp b/qtiplot/src/core/ApplicationWindow.cpp |
| 759 |
-index 56c52a7..5422c0a 100755 |
| 760 |
---- a/qtiplot/src/core/ApplicationWindow.cpp |
| 761 |
-+++ b/qtiplot/src/core/ApplicationWindow.cpp |
| 762 |
-@@ -15912,6 +15912,7 @@ void ApplicationWindow::showBugTracker() |
| 763 |
- QDesktopServices::openUrl(QUrl("https://developer.berlios.de/bugs/?group_id=6626")); |
| 764 |
- } |
| 765 |
- |
| 766 |
-+#ifdef QTIPLOT_SUPPORT |
| 767 |
- void ApplicationWindow::showDonationDialog() |
| 768 |
- { |
| 769 |
- 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>\ |
| 770 |
-@@ -15927,6 +15928,7 @@ void ApplicationWindow::showDonationDialog() |
| 771 |
- if (msg->clickedButton() == btn) |
| 772 |
- showDonationsPage(); |
| 773 |
- } |
| 774 |
-+#endif |
| 775 |
- |
| 776 |
- void ApplicationWindow::parseCommandLineArguments(const QStringList& args) |
| 777 |
- { |
| 778 |
-diff --git a/qtiplot/src/core/ApplicationWindow.h b/qtiplot/src/core/ApplicationWindow.h |
| 779 |
-index 5c479f9..f973557 100755 |
| 780 |
---- a/qtiplot/src/core/ApplicationWindow.h |
| 781 |
-+++ b/qtiplot/src/core/ApplicationWindow.h |
| 782 |
-@@ -908,7 +908,9 @@ public slots: |
| 783 |
- void receivedVersionFile(bool error); |
| 784 |
- //! called when the user presses the actionCheckUpdates |
| 785 |
- void searchForUpdates(); |
| 786 |
-+#ifdef QTIPLOT_SUPPORT |
| 787 |
- void showDonationDialog(); |
| 788 |
-+#endif |
| 789 |
- //! Open support page in external browser |
| 790 |
- void showSupportPage(); |
| 791 |
- //! Open donation page in external browser |
| 792 |
-diff --git a/qtiplot/src/core/QtiPlotApplication.cpp b/qtiplot/src/core/QtiPlotApplication.cpp |
| 793 |
-index 69a5b0f..8c3637a 100755 |
| 794 |
---- a/qtiplot/src/core/QtiPlotApplication.cpp |
| 795 |
-+++ b/qtiplot/src/core/QtiPlotApplication.cpp |
| 796 |
-@@ -57,7 +57,7 @@ QtiPlotApplication::QtiPlotApplication( int & argc, char ** argv) : QApplication |
| 797 |
- |
| 798 |
- ApplicationWindow *mw = new ApplicationWindow(factorySettings); |
| 799 |
- mw->restoreApplicationGeometry(); |
| 800 |
-- #ifndef QTIPLOT_PRO |
| 801 |
-+ #ifdef QTIPLOT_SUPPORT |
| 802 |
- mw->showDonationDialog(); |
| 803 |
- #endif |
| 804 |
- if (mw->autoSearchUpdates){ |
| 805 |
|
| 806 |
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 |
| 807 |
deleted file mode 100644 |
| 808 |
index 61647be..0000000 |
| 809 |
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.5-tamuanova.patch |
| 810 |
+++ /dev/null |
| 811 |
@@ -1,53 +0,0 @@ |
| 812 |
-diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro |
| 813 |
-index 95a5f0c..72e99ab 100755 |
| 814 |
---- a/qtiplot/qtiplot.pro |
| 815 |
-+++ b/qtiplot/qtiplot.pro |
| 816 |
-@@ -205,18 +205,14 @@ contains(SCRIPTING_LANGS, Python) { |
| 817 |
- !isEmpty(TAMUANOVA_LIBS) { |
| 818 |
- DEFINES += HAVE_TAMUANOVA |
| 819 |
- INCLUDEPATH += $$TAMUANOVA_INCLUDEPATH |
| 820 |
-- #LIBS += $$TAMUANOVA_LIBS |
| 821 |
-- |
| 822 |
-- HEADERS += $$TAMUANOVA_INCLUDEPATH/tamu_anova.h |
| 823 |
-- SOURCES += $$TAMUANOVA_INCLUDEPATH/anova_1.c |
| 824 |
-- SOURCES += $$TAMUANOVA_INCLUDEPATH/anova_2.c |
| 825 |
-+ LIBS += $$TAMUANOVA_LIBS |
| 826 |
- } |
| 827 |
- |
| 828 |
- ############################################################### |
| 829 |
- |
| 830 |
- # At the very end: add global include- and lib path |
| 831 |
--#unix:INCLUDEPATH += $$SYS_INCLUDEPATH |
| 832 |
--#unix:LIBS += $$SYS_LIBS |
| 833 |
-+unix:INCLUDEPATH += $$SYS_INCLUDEPATH |
| 834 |
-+unix:LIBS += $$SYS_LIBS |
| 835 |
- |
| 836 |
- ############################################################### |
| 837 |
- ############### Building QtiPlot as a browser plugin ########## |
| 838 |
-@@ -230,14 +226,15 @@ contains(CONFIG, BrowserPlugin){ |
| 839 |
- } |
| 840 |
- |
| 841 |
- QT += sql |
| 842 |
--LIBS += src/plugins/libQtiPlotdBasePlugin.a |
| 843 |
--LIBS += src/plugins/libQtiPlotDatabasePlugin.a |
| 844 |
--LIBS += src/plugins/libQtiPlotCsvPlugin.a |
| 845 |
--LIBS += src/plugins/libQtiPlotTexPlugin.a |
| 846 |
--LIBS += src/plugins/libQtiPlotOdsPlugin.a |
| 847 |
--LIBS += src/plugins/libQtiPlotExcelPlugin.a |
| 848 |
--LIBS += src/plugins/libQtiPlotOriginPlugin.a |
| 849 |
--LIBS += src/plugins/libQtiPlotEmfExportPlugin.a |
| 850 |
--LIBS += ../3rdparty/quazip/lib/libquazip.a |
| 851 |
--LIBS += ../3rdparty/EmfEngine/libEmfEngine.a |
| 852 |
--LIBS += -lgdiplus |
| 853 |
-+#LIBS += src/plugins/libQtiPlotdBasePlugin.a |
| 854 |
-+#LIBS += src/plugins/libQtiPlotDatabasePlugin.a |
| 855 |
-+#LIBS += src/plugins/libQtiPlotCsvPlugin.a |
| 856 |
-+#LIBS += src/plugins/libQtiPlotTexPlugin.a |
| 857 |
-+#LIBS += src/plugins/libQtiPlotOdsPlugin.a |
| 858 |
-+#LIBS += src/plugins/libQtiPlotExcelPlugin.a |
| 859 |
-+#LIBS += src/plugins/libQtiPlotOriginPlugin.a |
| 860 |
-+#LIBS += src/plugins/libQtiPlotEmfExportPlugin.a |
| 861 |
-+#LIBS += -lquazip |
| 862 |
-+#LIBS += ../3rdparty/EmfEngine/libEmfEngine.a |
| 863 |
-+#LIBS += -lgdiplus |
| 864 |
-+ |
| 865 |
|
| 866 |
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 |
| 867 |
deleted file mode 100644 |
| 868 |
index 3b67575..0000000 |
| 869 |
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.6-gold.patch |
| 870 |
+++ /dev/null |
| 871 |
@@ -1,15 +0,0 @@ |
| 872 |
- qtiplot/qtiplot.pro | 1 + |
| 873 |
- 1 files changed, 1 insertions(+), 0 deletions(-) |
| 874 |
- |
| 875 |
-diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro |
| 876 |
-index 99e0e36..b7cf373 100755 |
| 877 |
---- a/qtiplot/qtiplot.pro |
| 878 |
-+++ b/qtiplot/qtiplot.pro |
| 879 |
-@@ -20,6 +20,7 @@ LIBS += $$MUPARSER_LIBS |
| 880 |
- LIBS += $$QWT_LIBS |
| 881 |
- LIBS += $$QWT3D_LIBS |
| 882 |
- LIBS += $$GSL_LIBS |
| 883 |
-+LIBS += -lz |
| 884 |
- |
| 885 |
- ############################################################################# |
| 886 |
- ###################### BASIC PROJECT PROPERTIES ############################# |
| 887 |
|
| 888 |
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 |
| 889 |
deleted file mode 100644 |
| 890 |
index 919ec6c..0000000 |
| 891 |
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.6-kde.patch |
| 892 |
+++ /dev/null |
| 893 |
@@ -1,15 +0,0 @@ |
| 894 |
- qtiplot/src/plot2D/Graph.cpp | 1 + |
| 895 |
- 1 files changed, 1 insertions(+), 0 deletions(-) |
| 896 |
- |
| 897 |
-diff --git a/qtiplot/src/plot2D/Graph.cpp b/qtiplot/src/plot2D/Graph.cpp |
| 898 |
-index 626172a..d4eab1b 100755 |
| 899 |
---- a/qtiplot/src/plot2D/Graph.cpp |
| 900 |
-+++ b/qtiplot/src/plot2D/Graph.cpp |
| 901 |
-@@ -73,6 +73,7 @@ |
| 902 |
- #include <PatternBox.h> |
| 903 |
- #include <SymbolBox.h> |
| 904 |
- |
| 905 |
-+#include <QPaintEngine> |
| 906 |
- #include <QApplication> |
| 907 |
- #include <QBitmap> |
| 908 |
- #include <QClipboard> |
| 909 |
|
| 910 |
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 |
| 911 |
deleted file mode 100644 |
| 912 |
index 1644266..0000000 |
| 913 |
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.6-tamuanova.patch |
| 914 |
+++ /dev/null |
| 915 |
@@ -1,26 +0,0 @@ |
| 916 |
-diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro |
| 917 |
-index 95a5f0c..72e99ab 100755 |
| 918 |
---- a/qtiplot/qtiplot.pro |
| 919 |
-+++ b/qtiplot/qtiplot.pro |
| 920 |
-@@ -205,18 +205,14 @@ contains(SCRIPTING_LANGS, Python) { |
| 921 |
- !isEmpty(TAMUANOVA_LIBS) { |
| 922 |
- DEFINES += HAVE_TAMUANOVA |
| 923 |
- INCLUDEPATH += $$TAMUANOVA_INCLUDEPATH |
| 924 |
-- #LIBS += $$TAMUANOVA_LIBS |
| 925 |
-- |
| 926 |
-- HEADERS += $$TAMUANOVA_INCLUDEPATH/tamu_anova.h |
| 927 |
-- SOURCES += $$TAMUANOVA_INCLUDEPATH/anova_1.c |
| 928 |
-- SOURCES += $$TAMUANOVA_INCLUDEPATH/anova_2.c |
| 929 |
-+ LIBS += $$TAMUANOVA_LIBS |
| 930 |
- } |
| 931 |
- |
| 932 |
- ############################################################### |
| 933 |
- |
| 934 |
- # At the very end: add global include- and lib path |
| 935 |
--#unix:INCLUDEPATH += $$SYS_INCLUDEPATH |
| 936 |
--#unix:LIBS += $$SYS_LIBS |
| 937 |
-+unix:INCLUDEPATH += $$SYS_INCLUDEPATH |
| 938 |
-+unix:LIBS += $$SYS_LIBS |
| 939 |
- |
| 940 |
- ############################################################### |
| 941 |
- ############### Building QtiPlot as a browser plugin ########## |
| 942 |
|
| 943 |
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 |
| 944 |
deleted file mode 100644 |
| 945 |
index af1dca4..0000000 |
| 946 |
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.7-kde.patch |
| 947 |
+++ /dev/null |
| 948 |
@@ -1,16 +0,0 @@ |
| 949 |
- qtiplot/src/plot2D/Graph.cpp | 1 + |
| 950 |
- 1 files changed, 1 insertions(+), 0 deletions(-) |
| 951 |
- |
| 952 |
-diff --git a/qtiplot/src/plot2D/Graph.cpp b/qtiplot/src/plot2D/Graph.cpp |
| 953 |
-index 626172a..d4eab1b 100755 |
| 954 |
---- a/qtiplot/src/plot2D/Graph.cpp |
| 955 |
-+++ b/qtiplot/src/plot2D/Graph.cpp |
| 956 |
-@@ -73,7 +73,8 @@ |
| 957 |
- #include <PatternBox.h> |
| 958 |
- #include <SymbolBox.h> |
| 959 |
- #include <LinearColorMap.h> |
| 960 |
- |
| 961 |
-+#include <QPaintEngine> |
| 962 |
- #include <QApplication> |
| 963 |
- #include <QBitmap> |
| 964 |
- #include <QClipboard> |
| 965 |
|
| 966 |
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 |
| 967 |
deleted file mode 100644 |
| 968 |
index d7b40c4..0000000 |
| 969 |
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.8-system-gl2ps.patch |
| 970 |
+++ /dev/null |
| 971 |
@@ -1,76 +0,0 @@ |
| 972 |
- 3rdparty/qwtplot3d/qwtplot3d.pri | 8 ++++---- |
| 973 |
- 3rdparty/qwtplot3d/qwtplot3d.pro | 3 --- |
| 974 |
- 3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp | 2 +- |
| 975 |
- 3rdparty/qwtplot3d/src/qwt3d_label.cpp | 2 +- |
| 976 |
- 4 files changed, 6 insertions(+), 9 deletions(-) |
| 977 |
- |
| 978 |
-diff --git a/3rdparty/qwtplot3d/qwtplot3d.pri b/3rdparty/qwtplot3d/qwtplot3d.pri |
| 979 |
-index 45a0c3e..16bbe53 100755 |
| 980 |
---- a/3rdparty/qwtplot3d/qwtplot3d.pri |
| 981 |
-+++ b/3rdparty/qwtplot3d/qwtplot3d.pri |
| 982 |
-@@ -8,6 +8,8 @@ DEPENDPATH += src \ |
| 983 |
- 3rdparty\gl2ps |
| 984 |
- INCLUDEPATH += . |
| 985 |
- |
| 986 |
-+LIBS+=-lgl2ps |
| 987 |
-+ |
| 988 |
- # Input |
| 989 |
- HEADERS += include/qwt3d_extglwidget.h \ |
| 990 |
- include/qwt3d_color.h \ |
| 991 |
-@@ -37,8 +39,7 @@ HEADERS += include/qwt3d_extglwidget.h \ |
| 992 |
- include/qwt3d_volumeplot.h \ |
| 993 |
- include/qwt3d_graphplot.h \ |
| 994 |
- include/qwt3d_multiplot.h \ |
| 995 |
-- include/qwt3d_io_gl2ps.h \ |
| 996 |
-- 3rdparty/gl2ps/gl2ps.h |
| 997 |
-+ include/qwt3d_io_gl2ps.h |
| 998 |
- SOURCES += src/qwt3d_extglwidget.cpp \ |
| 999 |
- src/qwt3d_axis.cpp \ |
| 1000 |
- src/qwt3d_color.cpp \ |
| 1001 |
-@@ -62,5 +63,4 @@ SOURCES += src/qwt3d_extglwidget.cpp \ |
| 1002 |
- src/qwt3d_function.cpp \ |
| 1003 |
- src/qwt3d_gridplot.cpp \ |
| 1004 |
- src/qwt3d_meshplot.cpp \ |
| 1005 |
-- src/qwt3d_io_gl2ps.cpp \ |
| 1006 |
-- 3rdparty/gl2ps/gl2ps.c |
| 1007 |
-+ src/qwt3d_io_gl2ps.cpp |
| 1008 |
-diff --git a/3rdparty/qwtplot3d/qwtplot3d.pro b/3rdparty/qwtplot3d/qwtplot3d.pro |
| 1009 |
-index 95c8e26..18d03e3 100755 |
| 1010 |
---- a/3rdparty/qwtplot3d/qwtplot3d.pro |
| 1011 |
-+++ b/3rdparty/qwtplot3d/qwtplot3d.pro |
| 1012 |
-@@ -31,9 +31,6 @@ RCC_DIR = $$DESTDIR/tmp |
| 1013 |
- MOC_DIR = $$DESTDIR/tmp |
| 1014 |
- |
| 1015 |
- DEFINES += GL2PS_HAVE_LIBPNG |
| 1016 |
--INCLUDEPATH += ../zlib/ |
| 1017 |
--INCLUDEPATH += ../libpng/ |
| 1018 |
--LIBS += ../libpng/libpng.a |
| 1019 |
- |
| 1020 |
- # install |
| 1021 |
- target.path = lib |
| 1022 |
-diff --git a/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp b/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp |
| 1023 |
-index bc7a9d8..589cfd2 100755 |
| 1024 |
---- a/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp |
| 1025 |
-+++ b/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp |
| 1026 |
-@@ -6,7 +6,7 @@ |
| 1027 |
- #include <locale.h> |
| 1028 |
- |
| 1029 |
- #include "qwt3d_openglhelper.h" |
| 1030 |
--#include "../3rdparty/gl2ps/gl2ps.h" |
| 1031 |
-+#include "gl2ps.h" |
| 1032 |
- #include "qwt3d_io_gl2ps.h" |
| 1033 |
- #include "qwt3d_plot.h" |
| 1034 |
- |
| 1035 |
-diff --git a/3rdparty/qwtplot3d/src/qwt3d_label.cpp b/3rdparty/qwtplot3d/src/qwt3d_label.cpp |
| 1036 |
-index 7e54ad9..cc8bd60 100755 |
| 1037 |
---- a/3rdparty/qwtplot3d/src/qwt3d_label.cpp |
| 1038 |
-+++ b/3rdparty/qwtplot3d/src/qwt3d_label.cpp |
| 1039 |
-@@ -1,7 +1,7 @@ |
| 1040 |
- #include <qbitmap.h> |
| 1041 |
- #include "qwt3d_label.h" |
| 1042 |
- #include "qwt3d_plot.h" |
| 1043 |
--#include "../3rdparty/gl2ps/gl2ps.h" |
| 1044 |
-+#include "gl2ps.h" |
| 1045 |
- |
| 1046 |
- using namespace Qwt3D; |
| 1047 |
- |
| 1048 |
|
| 1049 |
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 |
| 1050 |
deleted file mode 100644 |
| 1051 |
index 2159977..0000000 |
| 1052 |
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-origin-2.patch |
| 1053 |
+++ /dev/null |
| 1054 |
@@ -1,38 +0,0 @@ |
| 1055 |
-diff -ruN qtiplot-0.9.8.9-origin/qtiplot/exportEMF.pro qtiplot-0.9.8.9/qtiplot/exportEMF.pro |
| 1056 |
---- qtiplot-0.9.8.9-origin/qtiplot/exportEMF.pro 2012-01-21 20:39:03.000000000 +0100 |
| 1057 |
-+++ qtiplot-0.9.8.9/qtiplot/exportEMF.pro 2012-01-21 20:32:45.000000000 +0100 |
| 1058 |
-@@ -5,6 +5,7 @@ |
| 1059 |
- |
| 1060 |
- INCLUDEPATH += $$QWT_INCLUDEPATH |
| 1061 |
- INCLUDEPATH += $$GSL_INCLUDEPATH |
| 1062 |
-+INCLUDEPATH += /usr/include/libEMF |
| 1063 |
- |
| 1064 |
- include(src/core/core.pri) |
| 1065 |
- include(src/lib/libqti.pri) |
| 1066 |
-diff -ruN qtiplot-0.9.8.9-origin/qtiplot/qtiplot.pro qtiplot-0.9.8.9/qtiplot/qtiplot.pro |
| 1067 |
---- qtiplot-0.9.8.9-origin/qtiplot/qtiplot.pro 2011-11-07 10:17:21.000000000 +0100 |
| 1068 |
-+++ qtiplot-0.9.8.9/qtiplot/qtiplot.pro 2012-01-21 20:44:11.000000000 +0100 |
| 1069 |
-@@ -236,9 +236,9 @@ |
| 1070 |
- ############################################################### |
| 1071 |
- |
| 1072 |
- TARGET = qtiplot |
| 1073 |
--DESTDIR = ../ |
| 1074 |
-+DESTDIR = ./ |
| 1075 |
- LIBS += ../tmp/qtiplot/libFreeSoftwareQtiPlotExportEMF.a \ |
| 1076 |
- ../tmp/qtiplot/libFreeSoftwareQtiPlotImportOPJ.a |
| 1077 |
- |
| 1078 |
- include(src/plugins/exportEMF/exportEMF.pri) |
| 1079 |
--include(src/plugins/OriginPlugin/OriginPlugin.pri) |
| 1080 |
-\ Kein Zeilenumbruch am Dateiende. |
| 1081 |
-+include(src/plugins/OriginPlugin/OriginPlugin.pri) |
| 1082 |
-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 |
| 1083 |
---- qtiplot-0.9.8.9-origin/qtiplot/src/plugins/exportEMF/exportEMF.pri 2011-10-27 13:44:34.000000000 +0200 |
| 1084 |
-+++ qtiplot-0.9.8.9/qtiplot/src/plugins/exportEMF/exportEMF.pri 2012-01-21 20:51:34.000000000 +0100 |
| 1085 |
-@@ -10,5 +10,5 @@ |
| 1086 |
- SOURCES += src/plugins/exportEMF/exportEMF.cpp \ |
| 1087 |
- src/plugins/exportEMF/3rdparty/EmfEngine/src/EmfEngine.cpp \ |
| 1088 |
- src/plugins/exportEMF/3rdparty/EmfEngine/src/EmfPaintDevice.cpp |
| 1089 |
-- |
| 1090 |
--LIBS += -lgdi32 |
| 1091 |
-+ |
| 1092 |
-+LIBS += -lEMF |
| 1093 |
|
| 1094 |
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 |
| 1095 |
deleted file mode 100644 |
| 1096 |
index 2e85901..0000000 |
| 1097 |
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.8.9-unbundle.patch |
| 1098 |
+++ /dev/null |
| 1099 |
@@ -1,53 +0,0 @@ |
| 1100 |
-diff -ruN qtiplot-0.9.8.9-origin-2/qtiplot/importOPJ.pro qtiplot-0.9.8.9/qtiplot/importOPJ.pro |
| 1101 |
---- qtiplot-0.9.8.9-origin-2/qtiplot/importOPJ.pro 2011-11-06 14:56:52.000000000 +0100 |
| 1102 |
-+++ qtiplot-0.9.8.9/qtiplot/importOPJ.pro 2012-01-21 21:00:06.000000000 +0100 |
| 1103 |
-@@ -7,6 +7,7 @@ |
| 1104 |
- INCLUDEPATH += $$QWT_INCLUDEPATH |
| 1105 |
- INCLUDEPATH += $$QWT3D_INCLUDEPATH |
| 1106 |
- INCLUDEPATH += $$GSL_INCLUDEPATH |
| 1107 |
-+INCLUDEPATH += /usr/include/liborigin2 |
| 1108 |
- |
| 1109 |
- include(src/core/core.pri) |
| 1110 |
- include(src/lib/libqti.pri) |
| 1111 |
-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 |
| 1112 |
---- qtiplot-0.9.8.9-origin-2/qtiplot/src/plugins/OriginPlugin/liborigin1/liborigin1.pri 2011-11-06 16:10:08.000000000 +0100 |
| 1113 |
-+++ qtiplot-0.9.8.9/qtiplot/src/plugins/OriginPlugin/liborigin1/liborigin1.pri 2012-01-21 21:03:26.000000000 +0100 |
| 1114 |
-@@ -2,33 +2,14 @@ |
| 1115 |
- ################# Origin Import (liborigin) ################### |
| 1116 |
- ############################################################### |
| 1117 |
- INCLUDEPATH += src/plugins/OriginPlugin/liborigin1 \ |
| 1118 |
-- src/plugins/OriginPlugin/liborigin2 \ |
| 1119 |
-+ /usr/include/liborigin2 \ |
| 1120 |
- src/plugins/OriginPlugin/tree.phi-sci.com \ |
| 1121 |
- ../3rdparty/boost |
| 1122 |
- |
| 1123 |
--HEADERS += src/plugins/OriginPlugin/liborigin1/importOPJ.h \ |
| 1124 |
-- src/plugins/OriginPlugin/liborigin2/OriginObj.h \ |
| 1125 |
-- src/plugins/OriginPlugin/liborigin2/OriginFile.h \ |
| 1126 |
-- src/plugins/OriginPlugin/liborigin2/OriginParser.h \ |
| 1127 |
-- src/plugins/OriginPlugin/liborigin2/Origin410Parser.h \ |
| 1128 |
-- src/plugins/OriginPlugin/liborigin2/Origin500Parser.h \ |
| 1129 |
-- src/plugins/OriginPlugin/liborigin2/Origin610Parser.h \ |
| 1130 |
-- src/plugins/OriginPlugin/liborigin2/Origin700Parser.h \ |
| 1131 |
-- src/plugins/OriginPlugin/liborigin2/Origin750Parser.h \ |
| 1132 |
-- src/plugins/OriginPlugin/liborigin2/Origin800Parser.h \ |
| 1133 |
-- src/plugins/OriginPlugin/liborigin2/Origin810Parser.h \ |
| 1134 |
-- src/plugins/OriginPlugin/liborigin2/Origin850Parser.h |
| 1135 |
-+HEADERS += src/plugins/OriginPlugin/liborigin1/importOPJ.h |
| 1136 |
- |
| 1137 |
--SOURCES += src/plugins/OriginPlugin/liborigin1/importOPJ.cpp \ |
| 1138 |
-- src/plugins/OriginPlugin/liborigin2/OriginFile.cpp \ |
| 1139 |
-- src/plugins/OriginPlugin/liborigin2/OriginParser.cpp \ |
| 1140 |
-- src/plugins/OriginPlugin/liborigin2/Origin410Parser.cpp \ |
| 1141 |
-- src/plugins/OriginPlugin/liborigin2/Origin500Parser.cpp \ |
| 1142 |
-- src/plugins/OriginPlugin/liborigin2/Origin610Parser.cpp \ |
| 1143 |
-- src/plugins/OriginPlugin/liborigin2/Origin700Parser.cpp \ |
| 1144 |
-- src/plugins/OriginPlugin/liborigin2/Origin750Parser.cpp \ |
| 1145 |
-- src/plugins/OriginPlugin/liborigin2/Origin800Parser.cpp \ |
| 1146 |
-- src/plugins/OriginPlugin/liborigin2/Origin810Parser.cpp \ |
| 1147 |
-- src/plugins/OriginPlugin/liborigin2/Origin850Parser.cpp |
| 1148 |
-+SOURCES += src/plugins/OriginPlugin/liborigin1/importOPJ.cpp |
| 1149 |
-+ |
| 1150 |
-+LIBS += -lorigin2 |
| 1151 |
- |
| 1152 |
- DEFINES += NO_LOG_FILE |
| 1153 |
|
| 1154 |
diff --git a/sci-visualization/qtiplot/metadata.xml b/sci-visualization/qtiplot/metadata.xml |
| 1155 |
deleted file mode 100644 |
| 1156 |
index 127accf..0000000 |
| 1157 |
--- a/sci-visualization/qtiplot/metadata.xml |
| 1158 |
+++ /dev/null |
| 1159 |
@@ -1,22 +0,0 @@ |
| 1160 |
-<?xml version="1.0" encoding="UTF-8"?> |
| 1161 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 1162 |
-<pkgmetadata> |
| 1163 |
- <herd>sci</herd> |
| 1164 |
- <maintainer> |
| 1165 |
- <email>pva@g.o</email> |
| 1166 |
- <name>Peter Volkov</name> |
| 1167 |
- </maintainer> |
| 1168 |
- <use> |
| 1169 |
- <flag name="emf">Export support for Windows Enhanced Metafile</flag> |
| 1170 |
- <flag name="ods">Import support for OpenOffice .ods sheets</flag> |
| 1171 |
- <flag name="origin">Import support for Origin project files</flag> |
| 1172 |
- <flag name="xls">Import support for Microsoft office excel sheets</flag> |
| 1173 |
- </use> |
| 1174 |
- <longdescription> |
| 1175 |
- Data analysis and scientific plotting package. This is a clone of the |
| 1176 |
- popular Origin software available on another well known platform implemented |
| 1177 |
- in Qt with powerful 2D and 3D data plotting, ASCII import and powerful |
| 1178 |
- spreadsheet data manipulation using column logic. Curve fitting and other |
| 1179 |
- statistical tools are also available. |
| 1180 |
- </longdescription> |
| 1181 |
-</pkgmetadata> |
| 1182 |
|
| 1183 |
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r1.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.8.9-r1.ebuild |
| 1184 |
deleted file mode 100644 |
| 1185 |
index eee3ec6..0000000 |
| 1186 |
--- a/sci-visualization/qtiplot/qtiplot-0.9.8.9-r1.ebuild |
| 1187 |
+++ /dev/null |
| 1188 |
@@ -1,211 +0,0 @@ |
| 1189 |
-# Copyright 1999-2011 Gentoo Foundation |
| 1190 |
-# Distributed under the terms of the GNU General Public License v2 |
| 1191 |
-# $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 $ |
| 1192 |
- |
| 1193 |
-EAPI=3 |
| 1194 |
- |
| 1195 |
-PYTHON_DEPEND="python? 2" |
| 1196 |
- |
| 1197 |
-inherit eutils qt4-r2 fdo-mime python |
| 1198 |
- |
| 1199 |
-DESCRIPTION="Qt based clone of the Origin plotting package" |
| 1200 |
-HOMEPAGE="http://soft.proindependent.com/qtiplot.html |
| 1201 |
- http://www.staff.science.uu.nl/~zeven101/qtiplot.html" |
| 1202 |
-SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2 |
| 1203 |
- http://dev.gentoo.org/~dilfridge/distfiles/${P}-origin.patch.bz2" |
| 1204 |
- |
| 1205 |
-LICENSE="GPL-2 GPL-3" |
| 1206 |
-SLOT="0" |
| 1207 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
| 1208 |
-IUSE="bindist doc mono latex python" |
| 1209 |
- |
| 1210 |
-LANGS="cn cz de es fr ja ro ru sv" |
| 1211 |
-for l in ${LANGS}; do |
| 1212 |
- lu=${l/cz/cs} |
| 1213 |
- lu=${lu/cn/zh_CN} |
| 1214 |
- IUSE="${IUSE} linguas_${lu}" |
| 1215 |
-done |
| 1216 |
- |
| 1217 |
-# qwtplot3d much modified from original upstream |
| 1218 |
-# >=x11-libs/qwt-5.3 they are using trunk checkouts |
| 1219 |
-CDEPEND=" |
| 1220 |
- media-libs/libemf |
| 1221 |
- x11-libs/qt-assistant |
| 1222 |
- x11-libs/qt-gui |
| 1223 |
- x11-libs/qt-opengl:4 |
| 1224 |
- x11-libs/qt-qt3support:4 |
| 1225 |
- || ( >=x11-libs/qt-assistant-4.7.0:4[compat] <x11-libs/qt-assistant-4.7.0:4 ) |
| 1226 |
- x11-libs/qt-svg:4 |
| 1227 |
- >=x11-libs/gl2ps-1.3.5[png] |
| 1228 |
- >=dev-cpp/muParser-1.32 |
| 1229 |
- >=dev-libs/boost-1.35.0 |
| 1230 |
- dev-libs/quazip |
| 1231 |
- media-libs/libpng |
| 1232 |
- sci-libs/gsl |
| 1233 |
- sci-libs/tamu_anova |
| 1234 |
- latex? ( dev-tex/qtexengine ) |
| 1235 |
- mono? ( dev-dotnet/libgdiplus )" |
| 1236 |
-DEPEND="${CDEPEND} |
| 1237 |
- dev-util/pkgconfig |
| 1238 |
- python? ( >=dev-python/sip-4.9 ) |
| 1239 |
- doc? ( |
| 1240 |
- >=app-text/docbook-sgml-utils-0.6.14-r1 |
| 1241 |
- >=app-text/docbook-xml-dtd-4.4-r2:4.4 )" |
| 1242 |
- |
| 1243 |
-RDEPEND="${CDEPEND} |
| 1244 |
- python? ( dev-python/PyQt4[X] )" |
| 1245 |
- |
| 1246 |
-PATCHES=( |
| 1247 |
- "${DISTDIR}/${P}-origin.patch.bz2" |
| 1248 |
- "${FILESDIR}/${P}-origin-2.patch" |
| 1249 |
- "${FILESDIR}/${PN}-0.9.8.8-system-gl2ps.patch" |
| 1250 |
- "${FILESDIR}/${PN}-0.9.7.10-dont-install-qwt.patch" |
| 1251 |
- "${FILESDIR}/${PN}-0.9.8.6-gold.patch" |
| 1252 |
- "${FILESDIR}/${PN}-0.9.8.7-kde.patch" |
| 1253 |
- ) |
| 1254 |
- |
| 1255 |
-pkg_setup() { |
| 1256 |
- use python && python_set_active_version 2 |
| 1257 |
-} |
| 1258 |
- |
| 1259 |
-src_prepare() { |
| 1260 |
- local mylibs |
| 1261 |
- |
| 1262 |
- qt4-r2_src_prepare |
| 1263 |
- |
| 1264 |
- rm -rf 3rdparty/{liborigin,QTeXEngine,/qwtplot3d/3rdparty/gl2ps/,boost} || die |
| 1265 |
- sed \ |
| 1266 |
- -e "s:dll:static:g" \ |
| 1267 |
- -e "/INSTALLS/d" \ |
| 1268 |
- -i 3rdparty/qwtplot3d/*.pro |
| 1269 |
- |
| 1270 |
- mylibs="${mylibs} -lquazip" |
| 1271 |
- use mono && mylibs="${mylibs} $(pkg-config --libs libgdiplus)" |
| 1272 |
- |
| 1273 |
- # Check build.conf for changes on bump. |
| 1274 |
- cat > build.conf <<-EOF |
| 1275 |
- # Automatically generated by Gentoo ebuild |
| 1276 |
- isEmpty( QTI_ROOT ) { |
| 1277 |
- message( "each file including this config needs to set QTI_ROOT to the dir containing this file!" ) |
| 1278 |
- } |
| 1279 |
- |
| 1280 |
- MUPARSER_LIBS = \$\$system(pkg-config --libs muparser) |
| 1281 |
- GSL_LIBS = \$\$system(pkg-config --libs gsl) |
| 1282 |
- QWT_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwt/src |
| 1283 |
- QWT_LIBS = \$\$QTI_ROOT/3rdparty/qwt/lib/libqwt.a |
| 1284 |
- QWT3D_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwtplot3d/include |
| 1285 |
- QWT3D_LIBS = \$\$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a |
| 1286 |
- SYS_LIBS = -lgl2ps ${mylibs} |
| 1287 |
- |
| 1288 |
- PYTHON = python |
| 1289 |
- LUPDATE = lupdate |
| 1290 |
- LRELEASE = lrelease |
| 1291 |
- |
| 1292 |
- SCRIPTING_LANGS += muParser |
| 1293 |
- |
| 1294 |
- CONFIG += release |
| 1295 |
- CONFIG += CustomInstall |
| 1296 |
- DEFINES += SCRIPTING_CONSOLE |
| 1297 |
- |
| 1298 |
- EOF |
| 1299 |
- |
| 1300 |
- use bindist && echo "DEFINES += QTIPLOT_SUPPORT" >> build.conf |
| 1301 |
- use bindist || echo "DEFINES += QTIPLOT_PRO" >> build.conf |
| 1302 |
- use python && echo "SCRIPTING_LANGS += Python" >> build.conf |
| 1303 |
- use latex && echo "TEX_ENGINE_LIBS = -lQTeXEngine" >> build.conf |
| 1304 |
- echo "LIBPNG_LIBS = -lpng" >> build.conf |
| 1305 |
- echo "TAMUANOVA_LIBS = -ltamuanova" >> build.conf && \ |
| 1306 |
- echo "TAMUANOVA_INCLUDEPATH = \"${EPREFIX}/usr/include/tamu_anova\"" >> build.conf |
| 1307 |
- |
| 1308 |
- sed \ |
| 1309 |
- -e "s:doc/${PN}/manual:doc/${PN}/html:" \ |
| 1310 |
- -e "s:/usr/local/${PN}:${EPREFIX}$(python_get_sitedir)/qtiplot:" \ |
| 1311 |
- -e '/INSTALLS.*documentation/d' \ |
| 1312 |
- -e '/INSTALLS.*manual/d' \ |
| 1313 |
- -e "/INSTALLBASE/s: /usr: ${EPREFIX}/usr:g" \ |
| 1314 |
- -e 's:/usr/local/qtiplot:$$INSTALLBASE:g' \ |
| 1315 |
- -i qtiplot/qtiplot.pro || die |
| 1316 |
- |
| 1317 |
- sed \ |
| 1318 |
- -e "/^target.path/s:/usr:${EPREFIX}/usr:g" \ |
| 1319 |
- -i fitPlugins/*/*.pro || die |
| 1320 |
- |
| 1321 |
- sed -e '/manual/d' -i qtiplot.pro || die |
| 1322 |
- |
| 1323 |
- sed -e "s:QTIPLOT_PRO:QTIPLOT_PROFESSIONAL:g" -i qtiplot/src/core/main.cpp || die |
| 1324 |
- |
| 1325 |
- # Drop langs only if LINGUAS is not empty |
| 1326 |
- if [[ -n ${LINGUAS} ]]; then |
| 1327 |
- for l in ${LANGS}; do |
| 1328 |
- lu=${l/cz/cs} |
| 1329 |
- lu=${lu/cn/zh_CN} |
| 1330 |
- use linguas_${lu} || \ |
| 1331 |
- sed -e "s:translations/qtiplot_${l}.[tq][sm]::" \ |
| 1332 |
- -i qtiplot/qtiplot.pro || die |
| 1333 |
- done |
| 1334 |
- fi |
| 1335 |
- chmod -x qtiplot/qti_wordlist.txt |
| 1336 |
- |
| 1337 |
- # sed out debian paths |
| 1338 |
- sed -e 's:\(/usr/share/sgml/\)docbook/stylesheet/dsssl/modular\(/html/docbook.dsl\):\1stylesheets/dsssl/docbook\2:' \ |
| 1339 |
- -i manual/qtiplot.dsl || die |
| 1340 |
- sed -e 's:\(/usr/share/\)xml/docbook/stylesheet/nwalsh\(/html/chunk.xsl\):\1sgml/docbook/xsl-stylesheets\2:' \ |
| 1341 |
- -i manual/qtiplot_html.xsl || die |
| 1342 |
- |
| 1343 |
- sed \ |
| 1344 |
- -e '1i#define OF(x) x' \ |
| 1345 |
- -i 3rdparty/zlib/minigzip.c || die |
| 1346 |
-} |
| 1347 |
- |
| 1348 |
-src_configure() { |
| 1349 |
- use amd64 && export QMAKESPEC="linux-g++-64" |
| 1350 |
- eqmake4 |
| 1351 |
-} |
| 1352 |
- |
| 1353 |
-src_compile() { |
| 1354 |
- emake || die "emake failed" |
| 1355 |
- lrelease qtiplot/qtiplot.pro || die |
| 1356 |
- if use doc; then |
| 1357 |
- cd manual |
| 1358 |
- emake web || die "html docbook building failed" |
| 1359 |
- fi |
| 1360 |
-} |
| 1361 |
- |
| 1362 |
-src_install() { |
| 1363 |
- qt4-r2_src_install |
| 1364 |
- newicon qtiplot_logo.png qtiplot.png |
| 1365 |
- make_desktop_entry qtiplot "QtiPlot Scientific Plotting" qtiplot |
| 1366 |
- if use doc; then |
| 1367 |
- insinto /usr/share/doc/${PN}/html |
| 1368 |
- doins -r manual/html/* || die "install manual failed" |
| 1369 |
- fi |
| 1370 |
- |
| 1371 |
- if [[ -n ${LINGUAS} ]]; then |
| 1372 |
- insinto /usr/share/${PN}/translations |
| 1373 |
- for l in ${LANGS}; do |
| 1374 |
- lu=${l/cz/cs} |
| 1375 |
- lu=${lu/cn/zh_CN} |
| 1376 |
- use linguas_${lu} && \ |
| 1377 |
- doins qtiplot/translations/qtiplot_${l}.qm |
| 1378 |
- done |
| 1379 |
- fi |
| 1380 |
-} |
| 1381 |
- |
| 1382 |
-pkg_postinst() { |
| 1383 |
- if use python; then |
| 1384 |
- elog "You might want to emerge" |
| 1385 |
- elog "\t dev-python/pygsl" |
| 1386 |
- elog "\t dev-python/rpy" |
| 1387 |
- elog "\t sci-libs/scipy and" |
| 1388 |
- elog "\t dev-python/sympy" |
| 1389 |
- elog "to gain full python support." |
| 1390 |
- fi |
| 1391 |
- |
| 1392 |
- fdo-mime_desktop_database_update |
| 1393 |
- use python && python_mod_optimize ${PN} |
| 1394 |
-} |
| 1395 |
- |
| 1396 |
-pkg_postrm() { |
| 1397 |
- fdo-mime_desktop_database_update |
| 1398 |
- use python && python_mod_cleanup ${PN} |
| 1399 |
-} |
| 1400 |
|
| 1401 |
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.8.9.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.8.9.ebuild |
| 1402 |
deleted file mode 100644 |
| 1403 |
index 2b6d213..0000000 |
| 1404 |
--- a/sci-visualization/qtiplot/qtiplot-0.9.8.9.ebuild |
| 1405 |
+++ /dev/null |
| 1406 |
@@ -1,206 +0,0 @@ |
| 1407 |
-# Copyright 1999-2011 Gentoo Foundation |
| 1408 |
-# Distributed under the terms of the GNU General Public License v2 |
| 1409 |
-# $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 $ |
| 1410 |
- |
| 1411 |
-EAPI=3 |
| 1412 |
- |
| 1413 |
-PYTHON_DEPEND="python? 2" |
| 1414 |
- |
| 1415 |
-inherit eutils qt4-r2 fdo-mime python |
| 1416 |
- |
| 1417 |
-DESCRIPTION="Qt based clone of the Origin plotting package" |
| 1418 |
-HOMEPAGE="http://soft.proindependent.com/qtiplot.html" |
| 1419 |
-SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2" |
| 1420 |
- |
| 1421 |
-LICENSE="GPL-2 GPL-3" |
| 1422 |
-SLOT="0" |
| 1423 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
| 1424 |
-IUSE="bindist doc mono latex python" |
| 1425 |
- |
| 1426 |
-LANGS="cn cz de es fr ja ro ru sv" |
| 1427 |
-for l in ${LANGS}; do |
| 1428 |
- lu=${l/cz/cs} |
| 1429 |
- lu=${lu/cn/zh_CN} |
| 1430 |
- IUSE="${IUSE} linguas_${lu}" |
| 1431 |
-done |
| 1432 |
- |
| 1433 |
-# qwtplot3d much modified from original upstream |
| 1434 |
-# >=x11-libs/qwt-5.3 they are using trunk checkouts |
| 1435 |
-CDEPEND=" |
| 1436 |
- x11-libs/qt-assistant |
| 1437 |
- x11-libs/qt-gui |
| 1438 |
- x11-libs/qt-opengl:4 |
| 1439 |
- x11-libs/qt-qt3support:4 |
| 1440 |
- || ( >=x11-libs/qt-assistant-4.7.0:4[compat] <x11-libs/qt-assistant-4.7.0:4 ) |
| 1441 |
- x11-libs/qt-svg:4 |
| 1442 |
- >=x11-libs/gl2ps-1.3.5[png] |
| 1443 |
- >=dev-cpp/muParser-1.32 |
| 1444 |
- >=dev-libs/boost-1.35.0 |
| 1445 |
- dev-libs/quazip |
| 1446 |
- media-libs/libpng |
| 1447 |
- sci-libs/gsl |
| 1448 |
- sci-libs/tamu_anova |
| 1449 |
- latex? ( dev-tex/qtexengine ) |
| 1450 |
- mono? ( dev-dotnet/libgdiplus )" |
| 1451 |
-DEPEND="${CDEPEND} |
| 1452 |
- dev-util/pkgconfig |
| 1453 |
- python? ( >=dev-python/sip-4.9 ) |
| 1454 |
- doc? ( |
| 1455 |
- >=app-text/docbook-sgml-utils-0.6.14-r1 |
| 1456 |
- >=app-text/docbook-xml-dtd-4.4-r2:4.4 )" |
| 1457 |
- |
| 1458 |
-RDEPEND="${CDEPEND} |
| 1459 |
- python? ( dev-python/PyQt4[X] )" |
| 1460 |
- |
| 1461 |
-PATCHES=( |
| 1462 |
- "${FILESDIR}/${PN}-0.9.8.8-system-gl2ps.patch" |
| 1463 |
- "${FILESDIR}/${PN}-0.9.7.10-dont-install-qwt.patch" |
| 1464 |
- "${FILESDIR}/${PN}-0.9.8.6-gold.patch" |
| 1465 |
- "${FILESDIR}/${PN}-0.9.8.7-kde.patch" |
| 1466 |
- ) |
| 1467 |
- |
| 1468 |
-pkg_setup() { |
| 1469 |
- use python && python_set_active_version 2 |
| 1470 |
-} |
| 1471 |
- |
| 1472 |
-src_prepare() { |
| 1473 |
- local mylibs |
| 1474 |
- |
| 1475 |
- qt4-r2_src_prepare |
| 1476 |
- |
| 1477 |
- rm -rf 3rdparty/{liborigin,QTeXEngine,/qwtplot3d/3rdparty/gl2ps/,boost} || die |
| 1478 |
- sed \ |
| 1479 |
- -e "s:dll:static:g" \ |
| 1480 |
- -e "/INSTALLS/d" \ |
| 1481 |
- -i 3rdparty/qwtplot3d/*.pro |
| 1482 |
- |
| 1483 |
- mylibs="${mylibs} -lquazip" |
| 1484 |
- use mono && mylibs="${mylibs} $(pkg-config --libs libgdiplus)" |
| 1485 |
- |
| 1486 |
- # Check build.conf for changes on bump. |
| 1487 |
- cat > build.conf <<-EOF |
| 1488 |
- # Automatically generated by Gentoo ebuild |
| 1489 |
- isEmpty( QTI_ROOT ) { |
| 1490 |
- message( "each file including this config needs to set QTI_ROOT to the dir containing this file!" ) |
| 1491 |
- } |
| 1492 |
- |
| 1493 |
- MUPARSER_LIBS = \$\$system(pkg-config --libs muparser) |
| 1494 |
- GSL_LIBS = \$\$system(pkg-config --libs gsl) |
| 1495 |
- QWT_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwt/src |
| 1496 |
- QWT_LIBS = \$\$QTI_ROOT/3rdparty/qwt/lib/libqwt.a |
| 1497 |
- QWT3D_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwtplot3d/include |
| 1498 |
- QWT3D_LIBS = \$\$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a |
| 1499 |
- SYS_LIBS = -lgl2ps ${mylibs} |
| 1500 |
- |
| 1501 |
- PYTHON = python |
| 1502 |
- LUPDATE = lupdate |
| 1503 |
- LRELEASE = lrelease |
| 1504 |
- |
| 1505 |
- SCRIPTING_LANGS += muParser |
| 1506 |
- |
| 1507 |
- CONFIG += release |
| 1508 |
- CONFIG += CustomInstall |
| 1509 |
- DEFINES += SCRIPTING_CONSOLE |
| 1510 |
- |
| 1511 |
- EOF |
| 1512 |
- |
| 1513 |
- use bindist && echo "DEFINES += QTIPLOT_SUPPORT" >> build.conf |
| 1514 |
- use bindist || echo "DEFINES += QTIPLOT_PRO" >> build.conf |
| 1515 |
- use python && echo "SCRIPTING_LANGS += Python" >> build.conf |
| 1516 |
- use latex && echo "TEX_ENGINE_LIBS = -lQTeXEngine" >> build.conf |
| 1517 |
- echo "LIBPNG_LIBS = -lpng" >> build.conf |
| 1518 |
- echo "TAMUANOVA_LIBS = -ltamuanova" >> build.conf && \ |
| 1519 |
- echo "TAMUANOVA_INCLUDEPATH = \"${EPREFIX}/usr/include/tamu_anova\"" >> build.conf |
| 1520 |
- |
| 1521 |
- sed \ |
| 1522 |
- -e "s:doc/${PN}/manual:doc/${PN}/html:" \ |
| 1523 |
- -e "s:/usr/local/${PN}:${EPREFIX}$(python_get_sitedir)/qtiplot:" \ |
| 1524 |
- -e '/INSTALLS.*documentation/d' \ |
| 1525 |
- -e '/INSTALLS.*manual/d' \ |
| 1526 |
- -e "/INSTALLBASE/s: /usr: ${EPREFIX}/usr:g" \ |
| 1527 |
- -e 's:/usr/local/qtiplot:$$INSTALLBASE:g' \ |
| 1528 |
- -i qtiplot/qtiplot.pro || die |
| 1529 |
- |
| 1530 |
- sed \ |
| 1531 |
- -e "/^target.path/s:/usr:${EPREFIX}/usr:g" \ |
| 1532 |
- -i fitPlugins/*/*.pro || die |
| 1533 |
- |
| 1534 |
- sed -e '/manual/d' -i qtiplot.pro || die |
| 1535 |
- |
| 1536 |
- sed -e "s:QTIPLOT_PRO:QTIPLOT_PROFESSIONAL:g" -i qtiplot/src/core/main.cpp || die |
| 1537 |
- |
| 1538 |
- # Drop langs only if LINGUAS is not empty |
| 1539 |
- if [[ -n ${LINGUAS} ]]; then |
| 1540 |
- for l in ${LANGS}; do |
| 1541 |
- lu=${l/cz/cs} |
| 1542 |
- lu=${lu/cn/zh_CN} |
| 1543 |
- use linguas_${lu} || \ |
| 1544 |
- sed -e "s:translations/qtiplot_${l}.[tq][sm]::" \ |
| 1545 |
- -i qtiplot/qtiplot.pro || die |
| 1546 |
- done |
| 1547 |
- fi |
| 1548 |
- chmod -x qtiplot/qti_wordlist.txt |
| 1549 |
- |
| 1550 |
- # sed out debian paths |
| 1551 |
- sed -e 's:\(/usr/share/sgml/\)docbook/stylesheet/dsssl/modular\(/html/docbook.dsl\):\1stylesheets/dsssl/docbook\2:' \ |
| 1552 |
- -i manual/qtiplot.dsl || die |
| 1553 |
- sed -e 's:\(/usr/share/\)xml/docbook/stylesheet/nwalsh\(/html/chunk.xsl\):\1sgml/docbook/xsl-stylesheets\2:' \ |
| 1554 |
- -i manual/qtiplot_html.xsl || die |
| 1555 |
- |
| 1556 |
- sed \ |
| 1557 |
- -e '1i#define OF(x) x' \ |
| 1558 |
- -i 3rdparty/zlib/minigzip.c || die |
| 1559 |
-} |
| 1560 |
- |
| 1561 |
-src_configure() { |
| 1562 |
- use amd64 && export QMAKESPEC="linux-g++-64" |
| 1563 |
- eqmake4 |
| 1564 |
-} |
| 1565 |
- |
| 1566 |
-src_compile() { |
| 1567 |
- emake || die "emake failed" |
| 1568 |
- lrelease qtiplot/qtiplot.pro || die |
| 1569 |
- if use doc; then |
| 1570 |
- cd manual |
| 1571 |
- emake web || die "html docbook building failed" |
| 1572 |
- fi |
| 1573 |
-} |
| 1574 |
- |
| 1575 |
-src_install() { |
| 1576 |
- qt4-r2_src_install |
| 1577 |
- newicon qtiplot_logo.png qtiplot.png |
| 1578 |
- make_desktop_entry qtiplot "QtiPlot Scientific Plotting" qtiplot |
| 1579 |
- if use doc; then |
| 1580 |
- insinto /usr/share/doc/${PN}/html |
| 1581 |
- doins -r manual/html/* || die "install manual failed" |
| 1582 |
- fi |
| 1583 |
- |
| 1584 |
- if [[ -n ${LINGUAS} ]]; then |
| 1585 |
- insinto /usr/share/${PN}/translations |
| 1586 |
- for l in ${LANGS}; do |
| 1587 |
- lu=${l/cz/cs} |
| 1588 |
- lu=${lu/cn/zh_CN} |
| 1589 |
- use linguas_${lu} && \ |
| 1590 |
- doins qtiplot/translations/qtiplot_${l}.qm |
| 1591 |
- done |
| 1592 |
- fi |
| 1593 |
-} |
| 1594 |
- |
| 1595 |
-pkg_postinst() { |
| 1596 |
- if use python; then |
| 1597 |
- elog "You might want to emerge" |
| 1598 |
- elog "\t dev-python/pygsl" |
| 1599 |
- elog "\t dev-python/rpy" |
| 1600 |
- elog "\t sci-libs/scipy and" |
| 1601 |
- elog "\t dev-python/sympy" |
| 1602 |
- elog "to gain full python support." |
| 1603 |
- fi |
| 1604 |
- |
| 1605 |
- fdo-mime_desktop_database_update |
| 1606 |
- use python && python_mod_optimize ${PN} |
| 1607 |
-} |
| 1608 |
- |
| 1609 |
-pkg_postrm() { |
| 1610 |
- fdo-mime_desktop_database_update |
| 1611 |
- use python && python_mod_cleanup ${PN} |
| 1612 |
-} |
Archives