diff options
Diffstat (limited to 'sci-visualization/qtiplot')
| -rw-r--r-- | sci-visualization/qtiplot/ChangeLog | 7 | ||||
| -rw-r--r-- | sci-visualization/qtiplot/Manifest | 15 | ||||
| -rw-r--r-- | sci-visualization/qtiplot/files/qtiplot-0.9.8.2-origin-build-failure.patch | 76 | ||||
| -rw-r--r-- | sci-visualization/qtiplot/qtiplot-0.9.8.2.ebuild | 3 |
4 files changed, 87 insertions, 14 deletions
diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog index 08e32e3aa3b7..c0abafc5fb0d 100644 --- a/sci-visualization/qtiplot/ChangeLog +++ b/sci-visualization/qtiplot/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-visualization/qtiplot # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.66 2010/09/03 06:12:37 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.67 2010/09/17 07:50:37 pva Exp $ + + 17 Sep 2010; Peter Volkov <pva@gentoo.org> qtiplot-0.9.8.2.ebuild, + +files/qtiplot-0.9.8.2-origin-build-failure.patch: + Fix build failure: src/origin/importOPJ.cpp:2162: error: unknown escape + sequence '\p' *qtiplot-0.9.8.2 (03 Sep 2010) diff --git a/sci-visualization/qtiplot/Manifest b/sci-visualization/qtiplot/Manifest index 85a6222c57f4..da09d5b2de3d 100644 --- a/sci-visualization/qtiplot/Manifest +++ b/sci-visualization/qtiplot/Manifest @@ -1,12 +1,10 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - 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 DIST qtiplot-0.9.7.12.tar.bz2 8221079 RMD160 af04944a1a6671e3133d0a8caec0f4c430f452ff SHA1 fe54f737ac857a470f7f00a53a73270d20f203a9 SHA256 29cf8e3dbd5539019b3351893c8b2fafa1e1283333d4b055b711b3a7ea85d935 DIST qtiplot-0.9.7.14.tar.bz2 8119824 RMD160 09bf50211c77159dad674fcab4f9772fe4267947 SHA1 3e31b2c3fea827a573da96fb50118e6d9cc33f4b SHA256 10edfe55651d0e82f87b10b53fe068cee54782d1df2cbf482a7bafcc27eb3d18 @@ -14,14 +12,7 @@ DIST qtiplot-0.9.8.2.tar.bz2 8244887 RMD160 0ee5e9f5eb50c44b2666cf904ef7ff23850c DIST qtiplot-0.9.8.tar.bz2 8142801 RMD160 0e56a5b156c4f8b571732bd94bda03be2915305a SHA1 c843de346e35b7566e95060dc1d6d395ee34be96 SHA256 21998c27afc76e5185c727223910c5107c9590d3fa0eefbdab3af2dee1e5cc44 EBUILD qtiplot-0.9.7.12.ebuild 5066 RMD160 f480906116b250db12db84575373f323c86a5390 SHA1 f89f3d6363e481162c0b3572e1fe97d4fcaae386 SHA256 52525b5e0906b2faf834ce026ac26ddf4c9ff9e20d938d1932dfdf09e39808a3 EBUILD qtiplot-0.9.7.14-r1.ebuild 5216 RMD160 0d7e921ebc68affb37ba1cddab6fe0cbff8d1fc0 SHA1 a7a5ae1be9708349f736a06e845671adcf17c48b SHA256 9bb984990c75c6321a0b67fd79046aa9aab33e2643a1d54f535a2de4156fb707 -EBUILD qtiplot-0.9.8.2.ebuild 5104 RMD160 52df0270490108cec713452954e0ab3d99a436da SHA1 9df1ba314c8254ca67edafeab0af31e45280bc24 SHA256 5c4d848882b2eab1bf093f911a0e34e9e7f0192235bb48db29721fe4e97cc9c2 +EBUILD qtiplot-0.9.8.2.ebuild 5159 RMD160 669ae5c78ade5fa47644e8535b71e3e54aff2cc0 SHA1 1070836766bcddb96536e3cc20ded148dd8a9d0d SHA256 b22582ceef64b78d0023fe210349f87b864e6a187462c2bd350eae7a5862e6be EBUILD qtiplot-0.9.8.ebuild 5059 RMD160 c44951012c2203bbc0c17f43c61314446d56cc2b SHA1 3c8fae446010f7bb344cd3648d53bde7a2d07a91 SHA256 f55305a0612f40c2665dd9b62621c738b933c0147474731580b909b8ba12924d -MISC ChangeLog 17390 RMD160 330f308907f825fa40ecfce7434edd3da255180a SHA1 15fe58c13d466a7021298b51917964dc384e8b72 SHA256 c3199b5846ab33206c2ec896db837905153a400b61b05946b744186051de0f17 +MISC ChangeLog 17602 RMD160 0d59d64afa5e733bca8a2f01bad267c117ce6445 SHA1 b77adf318afc34b8bf498247062554f2b775483d SHA256 c5d427af0478dd32b31723b7b644838167653f6dd7d4230b2a58c654607bc6e0 MISC metadata.xml 857 RMD160 f0b19f02132816e5a98dade3c25c17b578ef5f33 SHA1 1a7a0769a7989384e15a2d098441966630652866 SHA256 d001c7b867a7bbc14047fc029821afe1dde7a65e2e8d146c3f467c57da26d24a ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) - -iEYEARECAAYFAkyAkdoACgkQgAnW8HDreRaMOgCglH1hBn0R1C3DT4RuLoRTleIh -rGcAoKMkh4oJlkbW2HSXegqQWVfMecoh -=kF+f ------END PGP SIGNATURE----- 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 new file mode 100644 index 000000000000..22e4fbe15d65 --- /dev/null +++ b/sci-visualization/qtiplot/files/qtiplot-0.9.8.2-origin-build-failure.patch @@ -0,0 +1,76 @@ +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/qtiplot-0.9.8.2.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.8.2.ebuild index 0f1d718ee1f4..228553688318 100644 --- a/sci-visualization/qtiplot/qtiplot-0.9.8.2.ebuild +++ b/sci-visualization/qtiplot/qtiplot-0.9.8.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 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.2.ebuild,v 1.1 2010/09/03 06:12:37 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.8.2.ebuild,v 1.2 2010/09/17 07:50:37 pva Exp $ EAPI=3 @@ -62,6 +62,7 @@ PATCHES=( "${FILESDIR}/${PN}-0.9.7.12-system-gl2ps.patch" "${FILESDIR}/${PN}-0.9.7.10-dont-install-qwt.patch" "${FILESDIR}/${PN}-0.9.8.2-syslibs.patch" + "${FILESDIR}/${PN}-0.9.8.2-origin-build-failure.patch" ) pkg_setup() { |