Attachment #79791 for bug #114579

View | Details | Raw Unified | Return to bug 114579
Collapse All | Expand All




#

PORTNAME=	qtiplot
DISTVERSION=	0.9rc3
PORTREVISION=	1
CATEGORIES=	math science
MASTER_SITES=	http://soft.proindependent.com/src/



LIB_DEPENDS=	gsl.10:${PORTSDIR}/math/gsl \
		muparser.0:${PORTSDIR}/math/muparser \
		origin.0:${PORTSDIR}/math/liborigin \
		qwtplot3d-qt4:${PORTSDIR}/math/qwtplot3d-qt4 \
		qwt.5:${PORTSDIR}/x11-toolkits/qwt-devel


USE_DOS2UNIX=	qtiplot/qtiplot.pro

DESKTOP_ENTRIES="QtiPlot" "Data analysis and plotting" \
		"${DATADIR}/qtiplot.png" \
		"qtiplot" "" false

OPTIONS=	DOCS "Install the QtiPlot Handbook" on \

		-e "s/^SCRIPTING_LANGS += Python//" \
		${WRKSRC}/${PORTNAME}/qtiplot.pro
.endif
	@${REINPLACE_CMD} -e \
		's|/usr/share/doc/qtiplot/manual-%1|${DATADIR}/manual|; \
		 s|/usr/lib/qtiplot/plugins|${DATADIR}/fitPlugins|' \
		${WRKSRC}/qtiplot/src/ApplicationWindow.cpp

do-configure:
	cd ${WRKSRC}/qtiplot && ${LOCALBASE}/bin/lrelease-qt4 -verbose qtiplot.pro
.for d in ${QPRO_DIRS}
	(cd ${WRKSRC}/${d} && ${SETENV} ${MAKE_ENV} ${QMAKE})
.endfor

		 s|^LINK .*|LINK=${CXX}|' \
		${WRKSRC}/${d}/Makefile
.endfor
	${REINPLACE_CMD} -e 's|^\(INCPATH.*=\)|\1-I../3rdparty/liborigin|' ${WRKSRC}/qtiplot/Makefile

do-install:
	${MKDIR} ${DATADIR}

				${DATADIR}/fitPlugins/libfitRational0.so
	${INSTALL_PROGRAM} ${WRKSRC}/fitPlugins/libfitRational1.so.1.0.0 \
				${DATADIR}/fitPlugins/libfitRational1.so
	${INSTALL_DATA} ${WRKSRC}/qtiplot_logo.png ${DATADIR}/qtiplot.png
.if defined(WITH_PYTHON)
	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/qtiplotrc.py ${DATADIR}/qtiplotrc.py
	@cd ${WRKSRC}/qtiplot && ${PYTHON_CMD} -c "import py_compile; py_compile.compile('qtiplotrc.py')"

Lines 1-3 Link Here

(-)/home/makc/porting/ports/math/qtiplot/distinfo (-3 / +3 lines)
1	MD5 (qtiplot-0.9rc2.tar.bz2) = e848a4e802d00b8bd972df09b26dff49	1	MD5 (qtiplot-0.9rc3.tar.bz2) = 0a644f72bb1c0a107a64bbf5bae5ca17
2	SHA256 (qtiplot-0.9rc2.tar.bz2) = 75f422372f5ca979316d8db4685d20b1324ca229e981322faff119c4aa2b38f1	2	SHA256 (qtiplot-0.9rc3.tar.bz2) = 44a6300705dca4921c8454e827e8c3d6e01f004b6a8ee3045b0bb02fa17454cc
3	SIZE (qtiplot-0.9rc2.tar.bz2) = 787376	3	SIZE (qtiplot-0.9rc3.tar.bz2) = 874660




--- ./fitPlugins/fitRational0/fitRational0.pro.orig	Wed Jun 13 21:16:56 2007
+++ ./fitPlugins/fitRational0/fitRational0.pro	Sat Jul 14 14:56:13 2007
@@ -12,9 +12,8 @@
 
 DESTDIR           = ../
  
 # statically link against GSL in 3rdparty
-INCLUDEPATH += ../../3rdparty/gsl
-LIBS         += ../3rdparty/gsl/lib/libgsl.a
-LIBS         += ../3rdparty/gsl/lib/libgslcblas.a
+unix:INCLUDEPATH += $$(LOCALBASE)/include
+unix:LIBS         += -lgsl -lgslcblas
 #dynamically link against GSL installed system-wide
 #unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas
 
 #target.path=/usr/lib$${libsuff}
 #INSTALLS += target




--- ./fitPlugins/fitRational1/fitRational1.pro.orig	Wed Jun 13 21:16:56 2007
+++ ./fitPlugins/fitRational1/fitRational1.pro	Sat Jul 14 14:56:13 2007
@@ -12,9 +12,8 @@
 
 DESTDIR           = ../
  
 # statically link against GSL in 3rdparty
-INCLUDEPATH += ../../3rdparty/gsl
-LIBS         += ../3rdparty/gsl/lib/libgsl.a
-LIBS         += ../3rdparty/gsl/lib/libgslcblas.a
+unix:INCLUDEPATH += $$(LOCALBASE)/include
+unix:LIBS         += -lgsl -lgslcblas
 #dynamically link against GSL installed system-wide
 #unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas
 
 target.path=/usr/lib$${libsuff}
 INSTALLS += target




--- ./qtiplot/qtiplot.pro.orig	Sat Jul 14 14:56:13 2007
+++ ./qtiplot/qtiplot.pro	Sat Jul 14 15:01:25 2007
@@ -25,12 +25,8 @@
 
 # what to install and where
 INSTALLS        += target
-INSTALLS        += documentation
-unix: target.path = /usr/bin
+#INSTALLS        += documentation
+unix: target.path = $$(PREFIX)
 unix: documentation.path = /usr/share/doc/qtiplot
 
 ##################### 3rd PARTY HEADER FILES SECTION ########################
 #!!! Warning: You must modify these paths according to your computer settings
 #############################################################################
 
-INCLUDEPATH       += ../3rdparty/muParser
-
-INCLUDEPATH       += ../3rdparty/qwtplot3d/include
-INCLUDEPATH       += ../3rdparty/qwt/src
-#INCLUDEPATH       += /usr/include/qwtplot3d
-#INCLUDEPATH       += /usr/include/qwt5
-
-INCLUDEPATH       += ../3rdparty/liborigin
-INCLUDEPATH       += ../3rdparty/gsl/include
-INCLUDEPATH       += ../3rdparty/zlib123/include
+unix:INCLUDEPATH += $$(LOCALBASE)/include
+unix:INCLUDEPATH += $$(LOCALBASE)/include/qwt
+unix:INCLUDEPATH += $$(LOCALBASE)/include/qwtplot3d-qt4
 
 ##################### 3rd PARTY LIBRARIES SECTION ###########################
 #!!! Warning: You must modify these paths according to your computer settings
@@ -43,18 +39,17 @@
 unix:LIBS         += -L /usr/lib$${libsuff}
 
 # statically link against Qwt(3D) in 3rdparty
-unix:LIBS         += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
-unix:LIBS         += ../3rdparty/qwt/lib/libqwt.a
+unix:LIBS         += -L$$(LOCALBASE)/lib -lqwt -lqwtplot3d-qt4 -lz
+unix:LIBS         += -lz -lmuparser
 # dynamically link against Qwt(3D) installed system-wide
 # WARNING: make sure they are compiled against Qt4
 #unix:LIBS         += -lqwtplot3d

 
 ##################### Windows ###############################################
 
@@ -359,30 +354,12 @@
                   translations/qtiplot_ja.ts \
                   translations/qtiplot_sv.ts
 
-#system(lupdate -verbose qtiplot.pro)
-#system(lrelease -verbose qtiplot.pro)
+system($$(LOCALBASE)/bin/lupdate-qt4 -verbose qtiplot.pro)
+system($$(LOCALBASE)/bin/lrelease-qt4 -verbose qtiplot.pro)
 
 ###################### DOCUMENTATION ########################################
 
@@ -350,8 +343,8 @@
 ################# Origin Import (liborigin) ###################
 ###############################################################
 
-HEADERS += ../3rdparty/liborigin/OPJFile.h
-SOURCES += ../3rdparty/liborigin/OPJFile.cpp
+#HEADERS += ../3rdparty/liborigin/OPJFile.h
+#SOURCES += ../3rdparty/liborigin/OPJFile.cpp
 
 ###############################################################
 ##################### SCRIPTING LANGUAGES SECTION #############
@@ -361,30 +354,32 @@
 
 contains(SCRIPTING_LANGS, muParser) {
   DEFINES += SCRIPTING_MUPARSER
-
+  unix:LIBS         += -lmuparser
+  unix:LIBS +=	-lmuparser
+  
   HEADERS += src/muParserScript.h \
-             src/muParserScripting.h \
-             ../3rdparty/muParser/muParser.h \
-             ../3rdparty/muParser/muParserBase.h \
-             ../3rdparty/muParser/muParserInt.h \

-             ../3rdparty/muParser/muParserTokenReader.h \
-             ../3rdparty/muParser/muParserFixes.h \
-             ../3rdparty/muParser/muParserDef.h \
+             src/muParserScripting.h
+#              ../3rdparty/muParser/muParserBase.h \
+#              ../3rdparty/muParser/muParserInt.h \
+#              ../3rdparty/muParser/muParserError.h \
+#              ../3rdparty/muParser/muParserStack.h \
+#              ../3rdparty/muParser/muParserToken.h \
+#              ../3rdparty/muParser/muParserBytecode.h \
+#              ../3rdparty/muParser/muParserCallback.h \
+#              ../3rdparty/muParser/muParserTokenReader.h \
+#              ../3rdparty/muParser/muParserFixes.h \
+#              ../3rdparty/muParser/muParserDef.h \
 
   SOURCES += src/muParserScript.cpp \
-             src/muParserScripting.cpp \
-             ../3rdparty/muParser/muParser.cpp \
-             ../3rdparty/muParser/muParserBase.cpp \
-             ../3rdparty/muParser/muParserInt.cpp \

-             ../3rdparty/muParser/muParserCallback.cpp \
-             ../3rdparty/muParser/muParserTokenReader.cpp \
-             ../3rdparty/muParser/muParserError.cpp \
+             src/muParserScripting.cpp
+#              ../3rdparty/muParser/muParserBase.cpp \
+#              ../3rdparty/muParser/muParserInt.cpp \
+#              ../3rdparty/muParser/muParserBytecode.cpp \
+#              ../3rdparty/muParser/muParserCallback.cpp \
+#              ../3rdparty/muParser/muParserTokenReader.cpp \
+#              ../3rdparty/muParser/muParserError.cpp \
 
 }
 
@@ -394,11 +371,11 @@
   SOURCES += src/PythonScript.cpp src/PythonScripting.cpp
 
   unix {

-    LIBS        += -lm
-    system(mkdir -p $${SIP_DIR})
-    system($$system(python python-sipcmd.py) -c $${SIP_DIR} src/qti.sip)
-  }
+	INCLUDEPATH += $$(PYTHON_INCLUDEDIR)
+	LIBS +=	-lm -l$$(PYTHON_VERSION)
+	system(mkdir -p $${SIP_DIR})
+	SIPCMD = $$(PYTHON_VERSION) python-sipcmd.py
+	system($$system($$SIPCMD) -c $${SIP_DIR} src/qti.sip)
   }
 
   win32 {
     INCLUDEPATH += $$system(call python-includepath.py)

Lines 2-7 Link Here

(-)/home/makc/porting/ports/math/qtiplot/pkg-plist (+1 lines)
2	%%DATADIR%%/fitPlugins/libfitRational0.so	2	%%DATADIR%%/fitPlugins/libfitRational0.so
3	%%DATADIR%%/fitPlugins/libfitRational1.so	3	%%DATADIR%%/fitPlugins/libfitRational1.so
4	%%DATADIR%%/qtiplot	4	%%DATADIR%%/qtiplot
		5	%%DATADIR%%/qtiplot.png
5	%%PYTHON%%%%DATADIR%%/qtiplotrc.py	6	%%PYTHON%%%%DATADIR%%/qtiplotrc.py
6	%%PYTHON%%%%DATADIR%%/qtiplotrc.pyc	7	%%PYTHON%%%%DATADIR%%/qtiplotrc.pyc
7	%%NLS%%%%DATADIR%%/translations/qtiplot_de.qm	8	%%NLS%%%%DATADIR%%/translations/qtiplot_de.qm

Return to bug 114579

Lines 6-13 Link Here

(-)/home/makc/porting/ports/math/qtiplot/Makefile (-4 / +9 lines)
6	#	6	#
7		7
8	PORTNAME= qtiplot	8	PORTNAME= qtiplot
9	DISTVERSION= 0.9rc2	9	DISTVERSION= 0.9rc3
10	PORTREVISION= 1
11	CATEGORIES= math science	10	CATEGORIES= math science
12	MASTER_SITES= http://soft.proindependent.com/src/	11	MASTER_SITES= http://soft.proindependent.com/src/
13		12
Lines 16-22 Link Here
16		15
17	LIB_DEPENDS= gsl.10:${PORTSDIR}/math/gsl \	16	LIB_DEPENDS= gsl.10:${PORTSDIR}/math/gsl \
18	muparser.0:${PORTSDIR}/math/muparser \	17	muparser.0:${PORTSDIR}/math/muparser \
19	origin.0:${PORTSDIR}/math/liborigin \
20	qwtplot3d-qt4:${PORTSDIR}/math/qwtplot3d-qt4 \	18	qwtplot3d-qt4:${PORTSDIR}/math/qwtplot3d-qt4 \
21	qwt.5:${PORTSDIR}/x11-toolkits/qwt-devel	19	qwt.5:${PORTSDIR}/x11-toolkits/qwt-devel
22		20
Lines 28-34 Link Here
28	USE_DOS2UNIX= qtiplot/qtiplot.pro	26	USE_DOS2UNIX= qtiplot/qtiplot.pro
29		27
30	DESKTOP_ENTRIES="QtiPlot" "Data analysis and plotting" \	28	DESKTOP_ENTRIES="QtiPlot" "Data analysis and plotting" \
31	"${DATADIR}/manual/common/qtiplot_logo.png" \	29	"${DATADIR}/qtiplot.png" \
32	"qtiplot" "" false	30	"qtiplot" "" false
33		31
34	OPTIONS= DOCS "Install the QtiPlot Handbook" on \	32	OPTIONS= DOCS "Install the QtiPlot Handbook" on \
Lines 77-84 Link Here
77	-e "s/^SCRIPTING_LANGS += Python//" \	75	-e "s/^SCRIPTING_LANGS += Python//" \
78	${WRKSRC}/${PORTNAME}/qtiplot.pro	76	${WRKSRC}/${PORTNAME}/qtiplot.pro
79	.endif	77	.endif
		78	@${REINPLACE_CMD} -e \
		79	's\|/usr/share/doc/qtiplot/manual-%1\|${DATADIR}/manual\|; \
		80	s\|/usr/lib/qtiplot/plugins\|${DATADIR}/fitPlugins\|' \
		81	${WRKSRC}/qtiplot/src/ApplicationWindow.cpp
80		82
81	do-configure:	83	do-configure:
		84	cd ${WRKSRC}/qtiplot && ${LOCALBASE}/bin/lrelease-qt4 -verbose qtiplot.pro
82	.for d in ${QPRO_DIRS}	85	.for d in ${QPRO_DIRS}
83	(cd ${WRKSRC}/${d} && ${SETENV} ${MAKE_ENV} ${QMAKE})	86	(cd ${WRKSRC}/${d} && ${SETENV} ${MAKE_ENV} ${QMAKE})
84	.endfor	87	.endfor
Lines 91-96 Link Here
91	s\|^LINK .*\|LINK=${CXX}\|' \	94	s\|^LINK .*\|LINK=${CXX}\|' \
92	${WRKSRC}/${d}/Makefile	95	${WRKSRC}/${d}/Makefile
93	.endfor	96	.endfor
		97	${REINPLACE_CMD} -e 's\|^\(INCPATH.*=\)\|\1-I../3rdparty/liborigin\|' ${WRKSRC}/qtiplot/Makefile
94		98
95	do-install:	99	do-install:
96	${MKDIR} ${DATADIR}	100	${MKDIR} ${DATADIR}
Lines 101-106 Link Here
101	${DATADIR}/fitPlugins/libfitRational0.so	105	${DATADIR}/fitPlugins/libfitRational0.so
102	${INSTALL_PROGRAM} ${WRKSRC}/fitPlugins/libfitRational1.so.1.0.0 \	106	${INSTALL_PROGRAM} ${WRKSRC}/fitPlugins/libfitRational1.so.1.0.0 \
103	${DATADIR}/fitPlugins/libfitRational1.so	107	${DATADIR}/fitPlugins/libfitRational1.so
		108	${INSTALL_DATA} ${WRKSRC}/qtiplot_logo.png ${DATADIR}/qtiplot.png
104	.if defined(WITH_PYTHON)	109	.if defined(WITH_PYTHON)
105	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/qtiplotrc.py ${DATADIR}/qtiplotrc.py	110	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/qtiplotrc.py ${DATADIR}/qtiplotrc.py
106	@cd ${WRKSRC}/qtiplot && ${PYTHON_CMD} -c "import py_compile; py_compile.compile('qtiplotrc.py')"	111	@cd ${WRKSRC}/qtiplot && ${PYTHON_CMD} -c "import py_compile; py_compile.compile('qtiplotrc.py')"

Lines 1-14 Link Here

(-)/home/makc/porting/ports/math/qtiplot/files/patch-fitPlugins__fitRational0__fitRational0.pro (-8 / +8 lines)
1	--- ./fitPlugins/fitRational0/fitRational0.pro.orig Thu Apr 19 15:36:12 2007	1	--- ./fitPlugins/fitRational0/fitRational0.pro.orig Wed Jun 13 21:16:56 2007
2	+++ ./fitPlugins/fitRational0/fitRational0.pro Sat Jun 2 15:33:23 2007	2	+++ ./fitPlugins/fitRational0/fitRational0.pro Sat Jul 14 14:56:13 2007
3	@@ -11,9 +11,8 @@	3	@@ -12,9 +12,8 @@
4
5	DESTDIR = ../	4	DESTDIR = ../
6		5
		6	# statically link against GSL in 3rdparty
7	-INCLUDEPATH += ../../3rdparty/gsl	7	-INCLUDEPATH += ../../3rdparty/gsl
8	-LIBS += ../../3rdparty/gsl/lib/libgsl.a	8	-LIBS += ../3rdparty/gsl/lib/libgsl.a
9	-LIBS += ../../3rdparty/gsl/lib/libgslcblas.a	9	-LIBS += ../3rdparty/gsl/lib/libgslcblas.a
10	+unix:INCLUDEPATH += $$(LOCALBASE)/include	10	+unix:INCLUDEPATH += $$(LOCALBASE)/include
11	+unix:LIBS += -lgsl -lgslcblas	11	+unix:LIBS += -lgsl -lgslcblas
		12	#dynamically link against GSL installed system-wide
		13	#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas
12		14
13	#target.path=/usr/lib$${libsuff}
14	#INSTALLS += target

Lines 1-14 Link Here

(-)/home/makc/porting/ports/math/qtiplot/files/patch-fitPlugins__fitRational1__fitRational1.pro (-9 / +9 lines)
1	--- ./fitPlugins/fitRational1/fitRational1.pro.orig Thu Apr 19 15:36:12 2007	1	--- ./fitPlugins/fitRational1/fitRational1.pro.orig Wed Jun 13 21:16:56 2007
2	+++ ./fitPlugins/fitRational1/fitRational1.pro Sat Jun 2 15:33:23 2007	2	+++ ./fitPlugins/fitRational1/fitRational1.pro Sat Jul 14 14:56:13 2007
3	@@ -11,9 +11,8 @@	3	@@ -12,9 +12,8 @@
4
5	DESTDIR = ../	4	DESTDIR = ../
6		5
		6	# statically link against GSL in 3rdparty
7	-INCLUDEPATH += ../../3rdparty/gsl	7	-INCLUDEPATH += ../../3rdparty/gsl
8	-LIBS += ../../3rdparty/gsl/lib/libgsl.a	8	-LIBS += ../3rdparty/gsl/lib/libgsl.a
9	-LIBS += ../../3rdparty/gsl/lib/libgslcblas.a	9	-LIBS += ../3rdparty/gsl/lib/libgslcblas.a
10	+unix:INCLUDEPATH += $$(LOCALBASE)/include	10	+unix:INCLUDEPATH += $$(LOCALBASE)/include
11	+unix:LIBS += -lgsl -lgslcblas	11	+unix:LIBS += -lgsl -lgslcblas
		12	#dynamically link against GSL installed system-wide
		13	#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas
12		14
13	target.path=/usr/lib$${libsuff}
14	INSTALLS += target

Lines 1-43 Link Here

(-)/home/makc/porting/ports/math/qtiplot/files/patch-qtiplot__qtiplot.pro (-71 / +13 lines)
1	--- ./qtiplot/qtiplot.pro.orig Fri Jun 8 00:55:33 2007	1	--- ./qtiplot/qtiplot.pro.orig Sat Jul 14 14:56:13 2007
2	+++ ./qtiplot/qtiplot.pro Fri Jun 8 00:58:19 2007	2	+++ ./qtiplot/qtiplot.pro Sat Jul 14 15:01:25 2007
3	@@ -17,24 +17,17 @@	3	@@ -25,12 +25,8 @@
4
5	# what to install and where
6	INSTALLS += target
7	-INSTALLS += documentation
8	-unix: target.path = /usr/bin
9	+#INSTALLS += documentation
10	+unix: target.path = $$(PREFIX)
11	unix: documentation.path = /usr/share/doc/qtiplot
12
13	##################### 3rd PARTY HEADER FILES SECTION ########################
14	#!!! Warning: You must modify these paths according to your computer settings	4	#!!! Warning: You must modify these paths according to your computer settings
15	#############################################################################	5	#############################################################################
16		6
17	-INCLUDEPATH += ../3rdparty/muParser	7	-INCLUDEPATH += ../3rdparty/muParser
18	-
19	-INCLUDEPATH += ../3rdparty/qwtplot3d/include	8	-INCLUDEPATH += ../3rdparty/qwtplot3d/include
20	-INCLUDEPATH += ../3rdparty/qwt/src	9	-INCLUDEPATH += ../3rdparty/qwt/src
21	-#INCLUDEPATH += /usr/include/qwtplot3d
22	-#INCLUDEPATH += /usr/include/qwt5
23	-
24	-INCLUDEPATH += ../3rdparty/liborigin	10	-INCLUDEPATH += ../3rdparty/liborigin
25	-INCLUDEPATH += ../3rdparty/gsl/include	11	-INCLUDEPATH += ../3rdparty/gsl/include
26	-INCLUDEPATH += ../3rdparty/zlib123/include	12	-INCLUDEPATH += ../3rdparty/zlib123/include
27	+unix:INCLUDEPATH += $$(LOCALBASE)/include
28	+unix:INCLUDEPATH += $$(LOCALBASE)/include/qwt	13	+unix:INCLUDEPATH += $$(LOCALBASE)/include/qwt
29	+unix:INCLUDEPATH += $$(LOCALBASE)/include/qwtplot3d-qt4	14	+unix:INCLUDEPATH += $$(LOCALBASE)/include/qwtplot3d-qt4
30		15
31	##################### 3rd PARTY LIBRARIES SECTION ###########################	16	##################### 3rd PARTY LIBRARIES SECTION ###########################
32	#!!! Warning: You must modify these paths according to your computer settings	17	#!!! Warning: You must modify these paths according to your computer settings
33	@@ -47,18 +40,18 @@	18	@@ -43,18 +39,17 @@
34	unix:LIBS += -L /usr/lib$${libsuff}	19	unix:LIBS += -L /usr/lib$${libsuff}
35		20
36	# statically link against Qwt(3D) in 3rdparty	21	# statically link against Qwt(3D) in 3rdparty
37	-unix:LIBS += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a	22	-unix:LIBS += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
38	-unix:LIBS += ../3rdparty/qwt/lib/libqwt.a	23	-unix:LIBS += ../3rdparty/qwt/lib/libqwt.a
39	+unix:LIBS += -L$$(LOCALBASE)/lib -lqwt -lqwtplot3d-qt4 -lorigin	24	+unix:LIBS += -L$$(LOCALBASE)/lib -lqwt -lqwtplot3d-qt4 -lz
40	+unix:LIBS += -lz -lmuparser
41	# dynamically link against Qwt(3D) installed system-wide	25	# dynamically link against Qwt(3D) installed system-wide
42	# WARNING: make sure they are compiled against Qt4	26	# WARNING: make sure they are compiled against Qt4
43	#unix:LIBS += -lqwtplot3d	27	#unix:LIBS += -lqwtplot3d
Lines 54-91 Link Here
54		38
55	##################### Windows ###############################################	39	##################### Windows ###############################################
56		40
57	@@ -110,8 +103,8 @@	41	@@ -359,30 +354,12 @@
58	translations/qtiplot_ja.ts \
59	translations/qtiplot_sv.ts
60
61	-#system(lupdate -verbose qtiplot.pro)
62	-#system(lrelease -verbose qtiplot.pro)
63	+system($$(LOCALBASE)/bin/lupdate-qt4 -verbose qtiplot.pro)
64	+system($$(LOCALBASE)/bin/lrelease-qt4 -verbose qtiplot.pro)
65
66	###################### DOCUMENTATION ########################################
67
68	@@ -350,8 +343,8 @@
69	################# Origin Import (liborigin) ###################
70	###############################################################
71
72	-HEADERS += ../3rdparty/liborigin/OPJFile.h
73	-SOURCES += ../3rdparty/liborigin/OPJFile.cpp
74	+#HEADERS += ../3rdparty/liborigin/OPJFile.h
75	+#SOURCES += ../3rdparty/liborigin/OPJFile.cpp
76
77	###############################################################
78	##################### SCRIPTING LANGUAGES SECTION #############
79	@@ -361,30 +354,32 @@
80		42
81	contains(SCRIPTING_LANGS, muParser) {	43	contains(SCRIPTING_LANGS, muParser) {
82	DEFINES += SCRIPTING_MUPARSER	44	DEFINES += SCRIPTING_MUPARSER
83	-	45	-
84	+	46	+ unix:LIBS += -lmuparser
85	+ unix:LIBS += -lmuparser
86	+
87	HEADERS += src/muParserScript.h \	47	HEADERS += src/muParserScript.h \
88	src/muParserScripting.h \	48	- src/muParserScripting.h \
89	- ../3rdparty/muParser/muParser.h \	49	- ../3rdparty/muParser/muParser.h \
90	- ../3rdparty/muParser/muParserBase.h \	50	- ../3rdparty/muParser/muParserBase.h \
91	- ../3rdparty/muParser/muParserInt.h \	51	- ../3rdparty/muParser/muParserInt.h \
Lines 97-116 Link Here
97	- ../3rdparty/muParser/muParserTokenReader.h \	57	- ../3rdparty/muParser/muParserTokenReader.h \
98	- ../3rdparty/muParser/muParserFixes.h \	58	- ../3rdparty/muParser/muParserFixes.h \
99	- ../3rdparty/muParser/muParserDef.h \	59	- ../3rdparty/muParser/muParserDef.h \
100	+# ../3rdparty/muParser/muParser.h \	60	+ src/muParserScripting.h
101	+# ../3rdparty/muParser/muParserBase.h \
102	+# ../3rdparty/muParser/muParserInt.h \
103	+# ../3rdparty/muParser/muParserError.h \
104	+# ../3rdparty/muParser/muParserStack.h \
105	+# ../3rdparty/muParser/muParserToken.h \
106	+# ../3rdparty/muParser/muParserBytecode.h \
107	+# ../3rdparty/muParser/muParserCallback.h \
108	+# ../3rdparty/muParser/muParserTokenReader.h \
109	+# ../3rdparty/muParser/muParserFixes.h \
110	+# ../3rdparty/muParser/muParserDef.h \
111		61
112	SOURCES += src/muParserScript.cpp \	62	SOURCES += src/muParserScript.cpp \
113	src/muParserScripting.cpp \	63	- src/muParserScripting.cpp \
114	- ../3rdparty/muParser/muParser.cpp \	64	- ../3rdparty/muParser/muParser.cpp \
115	- ../3rdparty/muParser/muParserBase.cpp \	65	- ../3rdparty/muParser/muParserBase.cpp \
116	- ../3rdparty/muParser/muParserInt.cpp \	66	- ../3rdparty/muParser/muParserInt.cpp \
Lines 118-134 Link Here
118	- ../3rdparty/muParser/muParserCallback.cpp \	68	- ../3rdparty/muParser/muParserCallback.cpp \
119	- ../3rdparty/muParser/muParserTokenReader.cpp \	69	- ../3rdparty/muParser/muParserTokenReader.cpp \
120	- ../3rdparty/muParser/muParserError.cpp \	70	- ../3rdparty/muParser/muParserError.cpp \
121	+# ../3rdparty/muParser/muParser.cpp \	71	+ src/muParserScripting.cpp
122	+# ../3rdparty/muParser/muParserBase.cpp \
123	+# ../3rdparty/muParser/muParserInt.cpp \
124	+# ../3rdparty/muParser/muParserBytecode.cpp \
125	+# ../3rdparty/muParser/muParserCallback.cpp \
126	+# ../3rdparty/muParser/muParserTokenReader.cpp \
127	+# ../3rdparty/muParser/muParserError.cpp \
128		72
129	}	73	}
130		74
131	@@ -396,12 +391,12 @@	75	@@ -394,11 +371,11 @@
132	SOURCES += src/PythonScript.cpp src/PythonScripting.cpp	76	SOURCES += src/PythonScript.cpp src/PythonScripting.cpp
133		77
134	unix {	78	unix {
Lines 137-149 Link Here
137	- LIBS += -lm	81	- LIBS += -lm
138	- system(mkdir -p $${SIP_DIR})	82	- system(mkdir -p $${SIP_DIR})
139	- system($$system(python python-sipcmd.py) -c $${SIP_DIR} src/qti.sip)	83	- system($$system(python python-sipcmd.py) -c $${SIP_DIR} src/qti.sip)
140	- }
141	+ INCLUDEPATH += $$(PYTHON_INCLUDEDIR)	84	+ INCLUDEPATH += $$(PYTHON_INCLUDEDIR)
142	+ LIBS += -lm -l$$(PYTHON_VERSION)	85	+ LIBS += -lm -l$$(PYTHON_VERSION)
143	+ system(mkdir -p $${SIP_DIR})	86	+ system(mkdir -p $${SIP_DIR})
144	+ SIPCMD = $$(PYTHON_VERSION) python-sipcmd.py	87	+ SIPCMD = $$(PYTHON_VERSION) python-sipcmd.py
145	+ system($$system($$SIPCMD) -c $${SIP_DIR} src/qti.sip)	88	+ system($$system($$SIPCMD) -c $${SIP_DIR} src/qti.sip)
146	+ }	89	}
147		90
148	win32 {	91	win32 {
149	INCLUDEPATH += $$system(call python-includepath.py)