Update to 0.9.8.6

This commit is contained in:
Max Brazhnikov 2011-07-10 10:37:13 +00:00
parent 3847783361
commit 6fed76e566
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=277447
8 changed files with 23 additions and 31 deletions

View File

@ -6,7 +6,7 @@
#
PORTNAME= qtiplot
DISTVERSION= 0.9.8.5
DISTVERSION= 0.9.8.6
CATEGORIES= math
MASTER_SITES= BERLIOS http://soft.proindependent.com/src/
PKGNAMESUFFIX= -doc

View File

@ -1,2 +1,2 @@
SHA256 (qtiplot-0.9.8.5.tar.bz2) = 5bc297e236551a0e8a23719f3f08438700215eb82cf320bbc1d4c037e6d9cf33
SIZE (qtiplot-0.9.8.5.tar.bz2) = 10399116
SHA256 (qtiplot-0.9.8.6.tar.bz2) = 3fef0e8796e6045aad5404b156bf1e125e9732a034cb3e61c58dcebd5079985f
SIZE (qtiplot-0.9.8.6.tar.bz2) = 10415560

View File

@ -5,7 +5,7 @@
%%DATADIR%%/c5768.html
%%DATADIR%%/c6039.html
%%DATADIR%%/c686.html
%%DATADIR%%/c7642.html
%%DATADIR%%/c7646.html
%%DATADIR%%/common/fond-titre-chapitre.png
%%DATADIR%%/common/fond-titre-chapitre.xcf
%%DATADIR%%/common/fond-titre.png
@ -52,6 +52,10 @@
%%DATADIR%%/icons/add_inset_layer.png
%%DATADIR%%/icons/add_zoom_plot.png
%%DATADIR%%/icons/adjust_col_width.png
%%DATADIR%%/icons/align_bottom.png
%%DATADIR%%/icons/align_left.png
%%DATADIR%%/icons/align_right.png
%%DATADIR%%/icons/align_top.png
%%DATADIR%%/icons/append_drag_curves.png
%%DATADIR%%/icons/append_file.png
%%DATADIR%%/icons/area.png

View File

@ -6,8 +6,7 @@
#
PORTNAME= qtiplot
DISTVERSION= 0.9.8.5
PORTREVISION= 1
DISTVERSION= 0.9.8.6
CATEGORIES= math science
MASTER_SITES= BERLIOS http://soft.proindependent.com/src/
@ -15,8 +14,7 @@ MAINTAINER= makc@FreeBSD.org
COMMENT= An Origin clone for data analysis and scientific plotting
BUILD_DEPENDS= ${LOCALBASE}/lib/libmuparser.a:${PORTSDIR}/math/muparser
LIB_DEPENDS= gsl.16:${PORTSDIR}/math/gsl \
boost_date_time:${PORTSDIR}/devel/boost-libs
LIB_DEPENDS= gsl.16:${PORTSDIR}/math/gsl
# use bundled modified libraries
# qwt.5:${PORTSDIR}/x11-toolkits/qwt5 \
# qwtplot3d-qt4:${PORTSDIR}/math/qwtplot3d-qt4
@ -27,7 +25,7 @@ USE_QT_VER= 4
QT_COMPONENTS= gui opengl svg qt3support network assistantclient \
moc_build qmake_build rcc_build
HAS_CONFIGURE= yes
QMAKE_ARGS+= -unix -recursive PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} \
QMAKE_ARGS+= -recursive PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} \
PYTHON_CMD=${PYTHON_CMD}
USE_DOS2UNIX= *.pro
MAKE_JOBS_SAFE= yes

View File

@ -1,2 +1,2 @@
SHA256 (qtiplot-0.9.8.5.tar.bz2) = 5bc297e236551a0e8a23719f3f08438700215eb82cf320bbc1d4c037e6d9cf33
SIZE (qtiplot-0.9.8.5.tar.bz2) = 10399116
SHA256 (qtiplot-0.9.8.6.tar.bz2) = 3fef0e8796e6045aad5404b156bf1e125e9732a034cb3e61c58dcebd5079985f
SIZE (qtiplot-0.9.8.6.tar.bz2) = 10415560

View File

@ -11,9 +11,6 @@ MUPARSER_LIBS = -lmuparser
GSL_INCLUDEPATH =
GSL_LIBS = -lgsl -lgslcblas
BOOST_INCLUDEPATH = $$LOCALBASE/include/boost
BOOST_LIBS = -lboost_date_time -lboost_thread
QWT_INCLUDEPATH = $$QTI_ROOT/3rdparty/qwt/src
QWT_LIBS = $$QTI_ROOT/3rdparty/qwt/lib/libqwt.a

View File

@ -71,20 +71,3 @@
}
win32 {
@@ -228,16 +216,3 @@
RC_FILE = qtiplot.rc
include(../3rdparty/QtSolutions/qtbrowserplugin/src/qtbrowserplugin.pri)
}
-
-QT += sql
-LIBS += src/plugins/libQtiPlotdBasePlugin.a
-LIBS += src/plugins/libQtiPlotDatabasePlugin.a
-LIBS += src/plugins/libQtiPlotCsvPlugin.a
-LIBS += src/plugins/libQtiPlotTexPlugin.a
-LIBS += src/plugins/libQtiPlotOdsPlugin.a
-LIBS += src/plugins/libQtiPlotExcelPlugin.a
-LIBS += src/plugins/libQtiPlotOriginPlugin.a
-LIBS += src/plugins/libQtiPlotEmfExportPlugin.a
-LIBS += ../3rdparty/quazip/lib/libquazip.a
-LIBS += ../3rdparty/EmfEngine/libEmfEngine.a
-LIBS += -lgdiplus

View File

@ -0,0 +1,10 @@
--- ./qtiplot/src/plot2D/Graph.cpp.orig 2011-05-04 12:24:28.000000000 +0400
+++ ./qtiplot/src/plot2D/Graph.cpp 2011-07-09 01:31:13.780302807 +0400
@@ -84,6 +84,7 @@
#include <QMessageBox>
#include <QPixmap>
#include <QPainter>
+#include <QPaintEngine>
#include <QMenu>
#include <QTextStream>
#include <QLocale>