# 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.60 2010/06/30 13:52:55 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.61 2010/07/05 17:04:08 jlec Exp $
+
+*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)
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
DIST qtiplot-0.9.7.12.tar.bz2 8221079 RMD160 af04944a1a6671e3133d0a8caec0f4c430f452ff SHA1 fe54f737ac857a470f7f00a53a73270d20f203a9 SHA256 29cf8e3dbd5539019b3351893c8b2fafa1e1283333d4b055b711b3a7ea85d935
DIST qtiplot-0.9.7.13.tar.bz2 8093399 RMD160 db226c26e923268424d4d0a834a8917306798ca1 SHA1 739418ea39f063f723d8b04aed508844996b1ad4 SHA256 02be55dee70cb79165b18ac22e1cf041435168eda16a1d10c5a9aba1a2143053
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.13.ebuild 5098 RMD160 6507dec3e503a5fd2b1149dd20af9d80db90f246 SHA1 90ea1a5670cc5398f1eed790226c69cc708ac76e SHA256 c32f92baf6e97d1ea152cf9fd4fabc1464eb1f76e7ae19381cf8d69d0cccbb11
+EBUILD qtiplot-0.9.7.14-r1.ebuild 5214 RMD160 587e53f7a7cc246413cd8047e6c6f62f05d4103c SHA1 cc6acaf82a4cb21874882342ddaef6711bc17893 SHA256 a02132742dcd4c58322bcd1db4bfc70ff3d329911e39e3c5bbf07fe8b002062a
EBUILD qtiplot-0.9.7.14.ebuild 5161 RMD160 dbc61fed03ee4a466d5583823b18a1eccd978769 SHA1 0e7f66a2eeb7beabc470df7d30266f3bd247bae3 SHA256 6412fef43aec10788e922eb854a6f23c92ed9d5167844990095dcb97d5eb0002
EBUILD qtiplot-0.9.8.ebuild 5252 RMD160 b16fd0334bd7a5c155632eff4bd1748c5ee161bd SHA1 7f8a2722fd452bb877021d2c2b88b81f0ccf9539 SHA256 2748a07e756a31a865a4b5202903d573371de7969e9cdd0cba727f101540a02c
-MISC ChangeLog 16515 RMD160 b599cf844b5bfa73ac9814efc0ff6e50e0f3ee33 SHA1 62e76d4f82ca1763ad526cee7a39c1435abb6025 SHA256 6c9faf1e067124b73897baecf4bd455dadf120c7ee35ebaa0a8bb013bbf7d8ca
+MISC ChangeLog 16719 RMD160 f5dda077a2a75559d0881bb13a56205e57bf8874 SHA1 5a589a1e42a2f976dcb30f8eb43132157cb464fa SHA256 9ecc6cbc7e587ecaa6c4b8bdc7ed0f04456530c27f3dd4dc3a12f09e51aa0a41
MISC metadata.xml 857 RMD160 f0b19f02132816e5a98dade3c25c17b578ef5f33 SHA1 1a7a0769a7989384e15a2d098441966630652866 SHA256 d001c7b867a7bbc14047fc029821afe1dde7a65e2e8d146c3f467c57da26d24a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.15 (GNU/Linux)
-iEYEARECAAYFAkwrTD0ACgkQgAnW8HDreRY65wCgtyvz7MGZ9MW5BIw+0hclHmnK
-KAcAn3+AcBvybb5z6AssdOOQh6ZzLF8D
-=Ce/+
+iEYEARECAAYFAkwyEI0ACgkQgAnW8HDreRae6gCfe3EzP5TUcw5Vsvfot5rLcXvj
+1mYAnjp45vzXZ5vgt0F+pAo8QjThh3EM
+=DX1u
-----END PGP SIGNATURE-----
--- /dev/null
+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
--- /dev/null
+# 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.7.14-r1.ebuild,v 1.1 2010/07/05 17:04:08 jlec Exp $
+
+EAPI=2
+
+PYTHON_DEPEND="python? 2"
+
+inherit eutils qt4 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 xls"
+
+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-20100420:2
+ sci-libs/gsl
+ dev-libs/boost
+ dev-tex/qtexengine
+ xls? ( dev-libs/libxls )
+ 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.14-system-2dplot.patch"
+ "${FILESDIR}/${PN}-0.9.7.12-system-gl2ps.patch"
+ "${FILESDIR}/${PN}-0.9.7.10-dont-install-qwt.patch"
+ )
+
+pkg_setup() {
+ python_set_active_version 2
+ qt4_pkg_setup
+}
+
+src_prepare() {
+ qt4_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 = /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 = /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
+ use xls && echo "XLS_LIBS = -lxlsreader" >> build.conf
+ if use ods; then
+ echo "QUAZIP_INCLUDEPATH = /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 "$(python_get_sitedir)/qtiplot"
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+ python_mod_cleanup "$(python_get_sitedir)/qtiplot"
+}
projects / gentoo.git / commitdiff