diff options
author | Peter Volkov <pva@gentoo.org> | 2010-09-17 07:34:00 +0000 |
---|---|---|
committer | Peter Volkov <pva@gentoo.org> | 2010-09-17 07:34:00 +0000 |
commit | 2e24d1e3ee6dbaddd72d991015559f1bff2f87f8 (patch) | |
tree | fd7a4416eed97b142c5df9b9992a3ccb58e95fa8 | |
parent | mail-client/roundcube: version bump. (diff) | |
download | pva-2e24d1e3ee6dbaddd72d991015559f1bff2f87f8.tar.gz pva-2e24d1e3ee6dbaddd72d991015559f1bff2f87f8.tar.bz2 pva-2e24d1e3ee6dbaddd72d991015559f1bff2f87f8.zip |
sci-visualization/qtiplot: fix build issue.
svn path=/; revision=459
11 files changed, 1203 insertions, 0 deletions
diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog new file mode 100644 index 0000000..fde884d --- /dev/null +++ b/sci-visualization/qtiplot/ChangeLog @@ -0,0 +1,443 @@ +# 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.63 2010/07/12 20:12:23 hwoarang Exp $ + + 12 Jul 2010; Markos Chandras <hwoarang@gentoo.org> + qtiplot-0.9.7.14-r1.ebuild: + Stable on amd64 wrt bug #321205 + + 10 Jul 2010; Christian Faulhammer <fauli@gentoo.org> + qtiplot-0.9.7.14-r1.ebuild: + stable x86, bug 321205 + +*qtiplot-0.9.7.14-r1 (05 Jul 2010) + + 05 Jul 2010; Justin Lecher <jlec@gentoo.org> +qtiplot-0.9.7.14-r1.ebuild, + +files/qtiplot-0.9.7.14-system-2dplot.patch: + Fix for bug 321547, upstream svn rev 1729 + +*qtiplot-0.9.8 (30 Jun 2010) + + 30 Jun 2010; Justin Lecher <jlec@gentoo.org> +qtiplot-0.9.8.ebuild: + Version Bump + + 18 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + qtiplot-0.9.7.12.ebuild, qtiplot-0.9.7.13.ebuild: + Delete calls to deprecated python_version(). + + 18 May 2010; Justin Lecher <jlec@gentoo.org> qtiplot-0.9.7.14.ebuild: + Fix for new python ABIs, #316259 + + 26 Apr 2010; Markus Meier <maekke@gentoo.org> qtiplot-0.9.7.12.ebuild: + amd64/x86 stable, bug #309717 + +*qtiplot-0.9.7.14 (23 Apr 2010) + + 23 Apr 2010; Peter Volkov <pva@gentoo.org> +qtiplot-0.9.7.14.ebuild, + +files/qtiplot-0.9.7.14-system-liborigin.patch: + Version bump, bug #316661, thank Justin Lecher for report. + +*qtiplot-0.9.7.13 (17 Mar 2010) + + 17 Mar 2010; Peter Volkov <pva@gentoo.org> -qtiplot-0.9.7.10.ebuild, + -files/qtiplot-0.9.7.10-build.conf.patch, + -files/qtiplot-0.9.7.10-docbuild.patch, + -files/qtiplot-0.9.7.10-gcc44.patch, -files/qtiplot-0.9.7.10-gl2ps.patch, + -files/qtiplot-0.9.7.10-qtiplot.pro.patch, + -files/qtiplot-0.9.7.10-sip.patch, -files/qtiplot-0.9.7.10-syslibs.patch, + -qtiplot-0.9.7.11-r4.ebuild, + -files/qtiplot-0.9.7.11-system-QTeXEngine.patch, + -files/qtiplot-0.9.7.11-system-gl2ps.patch, + -files/qtiplot-0.9.7.11-system-liborigin.patch, + -files/qtiplot-0.9.7.11-transparency.patch, +qtiplot-0.9.7.13.ebuild: + Version bump, #309925 thank Samuli Suominen for report. Drop old. + +*qtiplot-0.9.7.12 (14 Feb 2010) + + 14 Feb 2010; Peter Volkov <pva@gentoo.org> -qtiplot-0.9.7.11-r2.ebuild, + -qtiplot-0.9.7.11-r3.ebuild, +qtiplot-0.9.7.12.ebuild, + +files/qtiplot-0.9.7.12-system-QTeXEngine.patch, + +files/qtiplot-0.9.7.12-system-gl2ps.patch, + +files/qtiplot-0.9.7.12-system-liborigin.patch: + Version bump, bug #304533, thank Samuli Suominen for report. + +*qtiplot-0.9.7.11-r4 (12 Jan 2010) + + 12 Jan 2010; Peter Volkov <pva@gentoo.org> +qtiplot-0.9.7.11-r4.ebuild: + Get view->console back, bug #300689, thank urcindalo for report. Set + constant path for manual. Move into separated dir and optimize python + modules. + +*qtiplot-0.9.7.11-r3 (12 Jan 2010) + + 12 Jan 2010; Peter Volkov <pva@gentoo.org> +qtiplot-0.9.7.11-r3.ebuild, + +files/qtiplot-0.9.7.11-transparency.patch: + Added upstream patch to fix transparency export, bug #300692, thank + urcindalo for report. + +*qtiplot-0.9.7.11-r2 (11 Jan 2010) + + 11 Jan 2010; Peter Volkov <pva@gentoo.org> -qtiplot-0.9.7.11-r1.ebuild, + +qtiplot-0.9.7.11-r2.ebuild: + Fixed multilib issue and install icons, bug #299769, thank Justin Lecher + (jlec) for help. + +*qtiplot-0.9.7.11-r1 (10 Jan 2010) + + 10 Jan 2010; Peter Volkov <pva@gentoo.org> + -files/qtiplot-0.9.7.10-sip2.patch, -qtiplot-0.9.7.11.ebuild, + +qtiplot-0.9.7.11-r1.ebuild, -files/qtiplot-0.9.7.11-build.conf.patch, + -files/qtiplot-0.9.7.11-docbuild.patch, + -files/qtiplot-0.9.7.11-dont-install-qwt.patch, + -files/qtiplot-0.9.7.11-gl2ps.patch, + -files/qtiplot-0.9.7.11-qtiplot.pro.patch, + -files/qtiplot-0.9.7.11-sip48.patch, + -files/qtiplot-0.9.7.11-syslibs.patch, + +files/qtiplot-0.9.7.11-system-QTeXEngine.patch, + +files/qtiplot-0.9.7.11-system-gl2ps.patch, + +files/qtiplot-0.9.7.11-system-liborigin.patch: + Revision bump: dropped USE bindist, see bug #199451; python USE flag back; + Fixed path to manual (no need for elog), fixed installation of languages. + +*qtiplot-0.9.7.11 (09 Jan 2010) + + 09 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> + +qtiplot-0.9.7.11.ebuild, +files/qtiplot-0.9.7.11-build.conf.patch, + +files/qtiplot-0.9.7.11-docbuild.patch, + +files/qtiplot-0.9.7.11-dont-install-qwt.patch, + +files/qtiplot-0.9.7.11-gl2ps.patch, + +files/qtiplot-0.9.7.11-qtiplot.pro.patch, + +files/qtiplot-0.9.7.11-sip48.patch, + +files/qtiplot-0.9.7.11-syslibs.patch: + Version bump wrt #299769 by Justin Lecher. + + 05 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> + qtiplot-0.9.7.10.ebuild: + Remove USE="python" since it doesn't compile without wrt #299696, thanks + to Peter Volkov for reporting. + +*qtiplot-0.9.7.10 (01 Jan 2010) + + 01 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> + +qtiplot-0.9.7.10.ebuild, +files/qtiplot-0.9.7.10-build.conf.patch, + +files/qtiplot-0.9.7.10-docbuild.patch, + +files/qtiplot-0.9.7.10-dont-install-qwt.patch, + +files/qtiplot-0.9.7.10-gcc44.patch, +files/qtiplot-0.9.7.10-gl2ps.patch, + +files/qtiplot-0.9.7.10-qtiplot.pro.patch, + +files/qtiplot-0.9.7.10-sip.patch, +files/qtiplot-0.9.7.10-sip2.patch, + +files/qtiplot-0.9.7.10-syslibs.patch: + Version bump wrt #275167, #292884 and 293095. Thanks to Justin Lecher for + ebuild. + +*qtiplot-0.9.7.7-r1 (18 Sep 2009) + + 18 Sep 2009; Sébastien Fabbro <bicatali@gentoo.org> + -qtiplot-0.9.7.7.ebuild, +qtiplot-0.9.7.7-r1.ebuild, + +files/qtiplot-0.9.7.7-sip.patch, files/qtiplot-0.9.7.7-syslibs.patch: + Fixed for more recent versions of sip, and re-introduced minigzip since it + is not distributed by zlib. Closing bug #274633 + + 29 Jul 2009; Ryan Hill <dirtyepic@gentoo.org> qtiplot-0.9.7.7.ebuild, + +files/qtiplot-0.9.7.7-gcc44.patch: + Fix building w/ GCC 4.4. (bug #272375) + + 05 Jun 2009; Andrey Grozin <grozin@gentoo.org> qtiplot-0.9.7.7.ebuild: + USE-deps on PyQt4 fixed (bug #272182) + + 18 May 2009; Andrey Grozin <grozin@gentoo.org> qtiplot-0.9.7.7.ebuild: + Fixed missing dependency on qt-opengl (bug #270339) + +*qtiplot-0.9.7.7 (14 Apr 2009) + + 14 Apr 2009; Sébastien Fabbro <bicatali@gentoo.org> + -files/qtiplot-0.9.7.4-gcc4.3.patch, + -files/qtiplot-0.9.7.4-liborigin-gcc4.3.patch, + -files/qtiplot-0.9.7.4-no-python.patch, -files/qtiplot-0.9.7.4-pro.patch, + -files/qtiplot-0.9.7.4-sip.patch, +files/qtiplot-0.9.7.7-docbuild.patch, + +files/qtiplot-0.9.7.7-syslibs.patch, -qtiplot-0.9.7.4.ebuild, + +qtiplot-0.9.7.7.ebuild: + Version bump, fixing bug #256543, bug #262939, bug #263675, bug #265623. + Removed old version. + + 08 Apr 2009; Sébastien Fabbro <bicatali@gentoo.org> + -qtiplot-0.8.5.ebuild, -qtiplot-0.9.7.2.ebuild, -qtiplot-0.9.7.3.ebuild: + Removed old versions + + 06 Apr 2009; Brent Baude <ranger@gentoo.org> qtiplot-0.9.7.4.ebuild: + Marking qtiplot-0.9.7.4 ~ppc for bug 215830 + +*qtiplot-0.9.7.4 (20 Dec 2008) + + 20 Dec 2008; Andrey Grozin <grozin@gentoo.org> + +files/qtiplot-0.9.7.4-gcc4.3.patch, + +files/qtiplot-0.9.7.4-liborigin-gcc4.3.patch, + +files/qtiplot-0.9.7.4-no-python.patch, +files/qtiplot-0.9.7.4-pro.patch, + +files/qtiplot-0.9.7.4-sip.patch, +qtiplot-0.9.7.4.ebuild: + Version bump + + 18 Dec 2008; Markus Dittrich <markusle@gentoo.org> + +files/qtiplot-0.9.7.3-sip.patch, qtiplot-0.9.7.3.ebuild: + Added patch to fix problem with sip-4.7.9 and qtiplot's sip files + (see bug #250014). + + 13 Nov 2008; Markus Dittrich <markusle@gentoo.org> + +files/qtiplot-0.9.7.3-no-python.patch, qtiplot-0.9.7.3.ebuild: + Added patch to fix compile problems with python disabled (#246473). + +*qtiplot-0.9.7.3 (24 Oct 2008) + + 24 Oct 2008; Markus Dittrich <markusle@gentoo.org> + +files/qtiplot-0.9.7.3-pro.patch, +files/qtiplot-0.9.7.3-qwt3d.patch, + +qtiplot-0.9.7.3.ebuild: + Version bump (fixes bug #243430). + + 13 Oct 2008; Sébastien Fabbro <bicatali@gentoo.org> + qtiplot-0.9.7.2.ebuild: + Fixed SRC_URI for mirrors, bug #218657. + + 28 Sep 2008; Markus Dittrich <markusle@gentoo.org> qtiplot-0.9.7.2.ebuild: + Changed boost dependency to >=1.35.0 since compile fails otherwise + (see bug 238632). + +*qtiplot-0.9.7.2 (25 Sep 2008) + + 25 Sep 2008; Markus Dittrich <markusle@gentoo.org> + -qtiplot-0.9.6.2.ebuild, + +files/qtiplot-0.9.7.2-liborigin-gcc4.3.patch, + +files/qtiplot-0.9.7.2-pro.patch, +qtiplot-0.9.7.2.ebuild: + Version bump. Fixes bug #238632. + NOTE: This version uses an improved liborigin file parser + and is not compatible any more with sci-libs/liborigin. Hence, + we use the included liborigin sources for now until upstream + hopefully updates liborigin as well. + +*qtiplot-0.9.7 (26 Aug 2008) + + 26 Aug 2008; Markus Dittrich <markusle@gentoo.org> + -files/qtiplot-0.9.2-systemlibs.patch, + -files/qtiplot-0.9.4-systemlibs.patch, + -files/qtiplot-0.9.5-fitplugins.patch, -files/qtiplot-0.9.5-profile.patch, + -files/qtiplot-0.9.6-fitplugins.patch, -files/qtiplot-0.9.6-profile.patch, + +files/qtiplot-0.9.7-gcc4.3.patch, -qtiplot-0.9.4.ebuild, + -qtiplot-0.9.5-r1.ebuild, -qtiplot-0.9.6.ebuild, +qtiplot-0.9.7.ebuild: + Version bump (fixes #233610) and removed old ebuilds. Thanks much to + Alexey Shvetsov <alexxyum@gmail.com> for his patches. + + 25 Aug 2008; Markus Dittrich <markusle@gentoo.org> qtiplot-0.9.6.2.ebuild: + Added missing dependency on x11-libs/qt-assistant:4 (fixes bug #235618). + + 11 Aug 2008; Markus Dittrich <markusle@gentoo.org> qtiplot-0.9.6.2.ebuild: + Added dependencies/check for qt3support (fixes bug #234316). + + 27 Jul 2008; Carsten Lohrke <carlo@gentoo.org> qtiplot-0.7.7.ebuild, + qtiplot-0.8.5.ebuild: + QA: Get rid of deprecated qt_min_version(). + + 29 May 2008; Ali Polatel <hawking@gentoo.org> qtiplot-0.9.6.2.ebuild: + python_mod_compile is ROOT aware and can take multiple files as argument. + + 28 May 2008; Andrey Grozin <grozin@gentoo.org> + files/qtiplot-0.9.6.2-pro.patch, qtiplot-0.9.6.2.ebuild: + Python files are now installed to the proper place and compiled (bugs + #223671, #223673) + + 25 May 2008; Andrey Grozin <grozin@gentoo.org> + files/qtiplot-0.9.6.2-pro.patch: + Python files are now installed to /usr/share/qtiplot (bug #223313) + + 24 May 2008; Andrey Grozin <grozin@gentoo.org> qtiplot-0.9.6.2.ebuild: + A minor ebuild fix + +*qtiplot-0.9.6.2 (21 May 2008) + + 21 May 2008; Andrey Grozin <grozin@gentoo.org> + +files/qtiplot-0.9.6.2-fitplugins.patch, +files/qtiplot-0.9.6.2-pro.patch, + +qtiplot-0.9.6.2.ebuild: + Version bump. fdo-mime_desktop_database_update added + +*qtiplot-0.9.6 (19 May 2008) + + 19 May 2008; Andrey Grozin <grozin@gentoo.org> + +files/qtiplot-0.9.6-fitplugins.patch, +files/qtiplot-0.9.6-profile.patch, + +qtiplot-0.9.6.ebuild: + Version bump. Translations are now handled correctly. + +*qtiplot-0.9.5-r1 (30 Apr 2008) + + 30 Apr 2008; Sébastien Fabbro <bicatali@gentoo.org> + files/qtiplot-0.9.5-profile.patch, +qtiplot-0.9.5-r1.ebuild: + Fixed installation for binary and translations, closing bug #219845 + +*qtiplot-0.9.5 (29 Apr 2008) + + 29 Apr 2008; Sébastien Fabbro <bicatali@gentoo.org> + -files/qtiplot-0.9.3-homepage.patch, + -files/qtiplot-0.9.3-systemlibs.patch, + +files/qtiplot-0.9.5-fitplugins.patch, +files/qtiplot-0.9.5-profile.patch, + qtiplot-0.7.7.ebuild, -qtiplot-0.9.3.ebuild, qtiplot-0.9.4.ebuild, + +qtiplot-0.9.5.ebuild: + Version bump. Separated patches for fit plugins and qtiplot.pro for better + re-usability + +*qtiplot-0.9.4 (28 Mar 2008) + + 28 Mar 2008; Sébastien Fabbro <bicatali@gentoo.org> + +files/qtiplot-0.9.4-systemlibs.patch, -qtiplot-0.9.2.ebuild, + -qtiplot-0.9.2-r1.ebuild, +qtiplot-0.9.4.ebuild: + Version bump. Thanks Dieter Ries for the update (closing bug #215192). + Removed older versions. + + 15 Mar 2008; Markus Rothe <corsair@gentoo.org> qtiplot-0.9.3.ebuild: + Added ~ppc64 + + 10 Mar 2008; Sébastien Fabbro <bicatali@gentoo.org> Manifest: + Fixed doc file on mirror, bug #212599 + +*qtiplot-0.9.3 (07 Mar 2008) + + 07 Mar 2008; Sébastien Fabbro <bicatali@gentoo.org> + +files/qtiplot-0.9.3-homepage.patch, + +files/qtiplot-0.9.3-systemlibs.patch, qtiplot-0.9.2.ebuild, + +qtiplot-0.9.3.ebuild: + Version bump + + 13 Feb 2008; Markus Dittrich <markusle@gentoo.org> qtiplot-0.7.7.ebuild, + qtiplot-0.8.5.ebuild, qtiplot-0.9.2.ebuild, qtiplot-0.9.2-r1.ebuild: + Fixed QA issues and added bindist for >=gsl-1.10 (see bug #199451). + +*qtiplot-0.9.2-r1 (12 Feb 2008) + + 12 Feb 2008; Sébastien Fabbro <bicatali@gentoo.org> + files/qtiplot-0.9.2-systemlibs.patch, +qtiplot-0.9.2-r1.ebuild: + Fixed installation of plugins, fixed non-installation of python scripts, + translations, some cleanup + + 14 Jan 2008; Sébastien Fabbro <bicatali@gentoo.org> + files/qtiplot-0.9.2-systemlibs.patch, qtiplot-0.9.2.ebuild: + Removed spanish manual (incomplete), added english one on mirror (closing + bug #205366), fixed patch to use pkg-config for gsl, therefore possibly using + external cblas library. + +*qtiplot-0.9.2 (03 Dec 2007) + + 03 Dec 2007; Sébastien Fabbro <bicatali@gentoo.org> + -files/qtiplot-0.9.1-systemlibs.patch, + +files/qtiplot-0.9.2-systemlibs.patch, -qtiplot-0.9.1.ebuild, + +qtiplot-0.9.2.ebuild: + Version bump. Removed 0.9.1 because many issues and missing doc upstream. + python-2.5 now only needed if python flag set. + +*qtiplot-0.9.1 (28 Nov 2007) + + 28 Nov 2007; Sébastien Fabbro <bicatali@gentoo.org> + -files/qtiplot-0.8.2-qmake.patch, +files/qtiplot-0.9.1-systemlibs.patch, + qtiplot-0.7.7.ebuild, -qtiplot-0.8.2.ebuild, qtiplot-0.8.5.ebuild, + +qtiplot-0.9.1.ebuild: + Version bump. Now uses qt4. Closing bug #144286, thanks everyone and + especially Andrey Grozin for maintaining in the science overlay. + Dropped ppc and ppc64, untested for now. + + 22 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog: + Redigest for Manifest2 + +*qtiplot-0.8.5 (26 May 2006) + + 26 May 2006; Marcus D. Hanwell <cryos@gentoo.org> + -files/qtiplot-0.8.4-qmake.patch, +files/qtiplot-0.8.5-qmake.patch, + -qtiplot-0.8.4.ebuild, +qtiplot-0.8.5.ebuild: + Version bump, thanks to Andrey Grozin <A.G.Grozin@inp.nsk.su> for ebuild + imrpovements first implemented in the sci overlay. + +*qtiplot-0.8.4 (18 May 2006) + + 18 May 2006; Marcus D. Hanwell <cryos@gentoo.org> + +files/qtiplot-0.8.4-qmake.patch, +qtiplot-0.8.4.ebuild: + Version bump. + + 07 May 2006; Markus Rothe <corsair@gentoo.org> qtiplot-0.8.2.ebuild: + Added ~ppc64 + + 05 May 2006; Caleb Tennis <caleb@gentoo.org> qtiplot-0.8.2.ebuild: + Change qwt dep to 4.2 so that it doesn't try and build against 5 + +*qtiplot-0.8.2 (09 Apr 2006) + + 09 Apr 2006; Marcus D. Hanwell <cryos@gentoo.org> + -files/qtiplot-0.8.1-qmake.patch, +files/qtiplot-0.8.2-qmake.patch, + -qtiplot-0.8.1.ebuild, +qtiplot-0.8.2.ebuild: + Version bump, pruned old version. + + 08 Apr 2006; <nixnut@gentoo.org> qtiplot-0.8.1.ebuild: + Added ~ppc. bug #129071 + +*qtiplot-0.8.1 (27 Mar 2006) + + 27 Mar 2006; Marcus D. Hanwell <cryos@gentoo.org> + -files/qtiplot-0.7.4-qmake.patch, -files/qtiplot-0.7.6-qmake.patch, + +files/qtiplot-0.8.1-qmake.patch, -qtiplot-0.7.4.ebuild, + -qtiplot-0.7.6.ebuild, qtiplot-0.7.7.ebuild, +qtiplot-0.8.1.ebuild: + Version bump, closes bug 124109. Also cleaned up old versions and marked + newer version stable on amd64. + +*qtiplot-0.7.7 (30 Jan 2006) + + 30 Jan 2006; Marcus D. Hanwell <cryos@gentoo.org> + +files/qtiplot-0.7.7-qmake.patch, +qtiplot-0.7.7.ebuild: + Version bump. + + 29 Jan 2006; Marcus D. Hanwell <cryos@gentoo.org> + +files/qtiplot-0.7.4-qmake.patch, +files/qtiplot-0.7.6-qmake.patch, + +metadata.xml, +qtiplot-0.7.4.ebuild, +qtiplot-0.7.6.ebuild: + Moved from sci-mathematics/qtiplot to sci-visualization/qtiplot. + + 18 Jan 2006; Marcus D. Hanwell <cryos@gentoo.org> qtiplot-0.7.4.ebuild, + qtiplot-0.7.6.ebuild: + Stable on amd64, addition of app-arch/unzip to the deps. + +*qtiplot-0.7.6 (16 Jan 2006) + + 16 Jan 2006; Marcus D. Hanwell <cryos@gentoo.org> + -files/qtiplot-0.7.5-qmake.patch, +files/qtiplot-0.7.6-qmake.patch, + -qtiplot-0.7.5.ebuild, +qtiplot-0.7.6.ebuild: + Version bump. + +*qtiplot-0.7.5 (12 Jan 2006) + + 12 Jan 2006; Marcus D. Hanwell <cryos@gentoo.org> + -files/qtiplot-0.7.3-qmake.patch, +files/qtiplot-0.7.5-qmake.patch, + -qtiplot-0.7.3.ebuild, +qtiplot-0.7.5.ebuild: + Version bump. + + 09 Jan 2006; Caleb Tennis <caleb@gentoo.org> qtiplot-0.7.3.ebuild, + qtiplot-0.7.4.ebuild: + Fix qmake call + +*qtiplot-0.7.4 (17 Dec 2005) + + 17 Dec 2005; Marcus D. Hanwell <cryos@gentoo.org> + +files/qtiplot-0.7.4-qmake.patch, +qtiplot-0.7.4.ebuild: + Version bump, bug 115497. + + 09 Dec 2005; Marcus D. Hanwell <cryos@gentoo.org> qtiplot-0.7.3.ebuild: + Small cleanup for the Qt path. + +*qtiplot-0.7.3 (29 Nov 2005) + + 29 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> + +files/qtiplot-0.7.3-qmake.patch, -qtiplot-0.7.ebuild, + +qtiplot-0.7.3.ebuild: + Version bump, closes bug 112952. + +*qtiplot-0.7 (23 Oct 2005) + + 23 Oct 2005; Marcus D. Hanwell <cryos@gentoo.org> -qtiplot-0.6.9.ebuild, + +qtiplot-0.7.ebuild: + Version bump, bug 109968. + +*qtiplot-0.6.9 (14 Oct 2005) + + 14 Oct 2005; Marcus D. Hanwell <cryos@gentoo.org> +metadata.xml, + +qtiplot-0.6.9.ebuild: + Initial import, thanks to Martin Corley <Martin.Corley@ed.ac.uk> for the + ebuild, closes bug 83293. + diff --git a/sci-visualization/qtiplot/Manifest b/sci-visualization/qtiplot/Manifest new file mode 100644 index 0000000..dc39406 --- /dev/null +++ b/sci-visualization/qtiplot/Manifest @@ -0,0 +1,11 @@ +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 +DIST qtiplot-0.9.8.2.tar.bz2 8244887 RMD160 0ee5e9f5eb50c44b2666cf904ef7ff23850c4c0b SHA1 dd8d1003cee8767d4ba9e616e5263da1302c290d SHA256 f544a42a1b103c1fb8cf28f00313fc984fac6ed5d7748a511e726410612e2c02 +EBUILD qtiplot-0.9.8.2.ebuild 5160 RMD160 6348dd25b7ce44f762562b1dbcf587f11d8dd9a2 SHA1 70dbac00a2d7c904a84a67a3ef760666c1351791 SHA256 c838a01e372db2ca3714941fe5d5b29cd7d4339b289cfc6982a8183d52eae56d +MISC ChangeLog 16952 RMD160 ac58ca541cf4fb8f455c195f26259e58761c6a1f SHA1 6a2afc4baa79b305bd8865bdda6c352a03fb153f SHA256 f8b1c75219f84acafa2e6508021057946f82e538c08dda327ed81878357ce64e +MISC metadata.xml 857 RMD160 f0b19f02132816e5a98dade3c25c17b578ef5f33 SHA1 1a7a0769a7989384e15a2d098441966630652866 SHA256 d001c7b867a7bbc14047fc029821afe1dde7a65e2e8d146c3f467c57da26d24a 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 new file mode 100644 index 0000000..86e4d4c --- /dev/null +++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-dont-install-qwt.patch @@ -0,0 +1,22 @@ +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 new file mode 100644 index 0000000..5577ec9 --- /dev/null +++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.12-system-QTeXEngine.patch @@ -0,0 +1,62 @@ +=== 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 new file mode 100644 index 0000000..b0419c2 --- /dev/null +++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.12-system-gl2ps.patch @@ -0,0 +1,56 @@ +=== 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 new file mode 100644 index 0000000..3e89b24 --- /dev/null +++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.12-system-liborigin.patch @@ -0,0 +1,90 @@ +=== 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 new file mode 100644 index 0000000..88664a1 --- /dev/null +++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.14-system-2dplot.patch @@ -0,0 +1,125 @@ +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 new file mode 100644 index 0000000..e8fa4a3 --- /dev/null +++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.14-system-liborigin.patch @@ -0,0 +1,102 @@ +=== 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 new file mode 100644 index 0000000..22e4fbe --- /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/metadata.xml b/sci-visualization/qtiplot/metadata.xml new file mode 100644 index 0000000..b46f12f --- /dev/null +++ b/sci-visualization/qtiplot/metadata.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>sci</herd> + <maintainer> + <email>cryos@gentoo.org</email> + </maintainer> + <maintainer> + <email>pva@gentoo.org</email> + <name>Peter Volkov</name> +</maintainer> + <use> + <flag name="xls">Import support for Microsoft office excel sheets</flag> + <flag name="ods">Import support for OpenOffice .ods 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.2.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.8.2.ebuild new file mode 100644 index 0000000..beac19c --- /dev/null +++ b/sci-visualization/qtiplot/qtiplot-0.9.8.2.ebuild @@ -0,0 +1,193 @@ +# 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 $ + +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="mirror://berlios/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2 GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc python ods" + +LANGS="cn cz de es fr ro ru ja 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-opengl:4 + x11-libs/qt-qt3support:4 + x11-libs/qt-assistant:4 + x11-libs/qt-svg:4 + >=x11-libs/gl2ps-1.3.5 + >=dev-cpp/muParser-1.32 + >=dev-libs/boost-1.35.0 + >=sci-libs/liborigin-20100903:2 + sci-libs/gsl + dev-libs/boost + dev-tex/qtexengine + ods? ( dev-libs/quazip )" +# Still unable to build +# emf? ( media-libs/libemf +# media-libs/emfengine ) + +DEPEND="${CDEPEND} + dev-util/pkgconfig + python? ( >=dev-python/sip-4.9 ) + doc? ( app-text/docbook-sgml-utils + >=app-text/docbook-xml-dtd-4.4-r2:4.4 )" + +RDEPEND="${CDEPEND} + python? ( + dev-python/PyQt4[X] + dev-python/pygsl + dev-python/rpy + sci-libs/scipy )" + +PATCHES=( + "${FILESDIR}/${PN}-0.9.7.12-system-QTeXEngine.patch" + "${FILESDIR}/${PN}-0.9.7.14-system-liborigin.patch" + "${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() { + use python && python_set_active_version 2 +} + +src_prepare() { + qt4-r2_src_prepare + + rm -rf 3rdparty/{liborigin,QTeXEngine,/qwtplot3d/3rdparty/gl2ps/} + + # 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) + BOOST_INCLUDEPATH = "${EPREFIX}/usr/include/boost" + BOOST_LIBS = -lboost_date_time-mt -lboost_thread-mt + 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 + LIB_ORIGIN_INCLUDEPATH = "${EPREFIX}/usr/include/liborigin2" + LIB_ORIGIN_LIBS = -lorigin2 + QTEXENGINE_LIBS = -lQTeXEngine + SYS_LIBS = -lgl2ps + + PYTHON = python + LUPDATE = lupdate + LRELEASE = lrelease + + SCRIPTING_LANGS += muParser + + CONFIG += release + CONFIG += CustomInstall + DEFINES += SCRIPTING_CONSOLE + + EOF + + use python && echo "SCRIPTING_LANGS += Python" >> build.conf + if use ods; then + echo "QUAZIP_INCLUDEPATH = ${EPREFIX}/usr/include/quazip" >> build.conf + echo "QUAZIP_LIBS = -lquazip" >> build.conf + fi + + sed '/^INSTALLS/d;' -i 3rdparty/qwtplot3d/qwtplot3d.pro || die + + # Fails to build... + #if use emf; then + # echo "EMF_ENGINE_INCLUDEPATH = /usr/include/libEMF" >> build.conf + # echo "EMF_ENGINE_LIBS = -lEMF" >> build.conf + #fi + + sed -e "s:doc/${PN}/manual:doc/${PN}/html:" \ + -e "s:/usr/local/${PN}:$(python_get_sitedir)/qtiplot:" \ + -i qtiplot/qtiplot.pro || die + + sed -e '/INSTALLS.*documentation/d' \ + -e '/INSTALLS.*manual/d' \ + -i qtiplot/qtiplot.pro || die + sed -e '/manual/d' -i qtiplot.pro || 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 +} + +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() { + emake INSTALL_ROOT="${D}" install || die 'emake install failed' + 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() { + fdo-mime_desktop_database_update + python_mod_optimize ${PN} +} + +pkg_postrm() { + fdo-mime_desktop_database_update + python_mod_cleanup ${PN} +} |