diff options
Diffstat (limited to 'math/qtiplot/files/patch-qtiplot__qtiplot.pro')
| -rw-r--r-- | math/qtiplot/files/patch-qtiplot__qtiplot.pro | 81 |
1 files changed, 62 insertions, 19 deletions
diff --git a/math/qtiplot/files/patch-qtiplot__qtiplot.pro b/math/qtiplot/files/patch-qtiplot__qtiplot.pro index 39ebb1239b5c..f5d3a2447809 100644 --- a/math/qtiplot/files/patch-qtiplot__qtiplot.pro +++ b/math/qtiplot/files/patch-qtiplot__qtiplot.pro @@ -1,6 +1,15 @@ ---- ./qtiplot/qtiplot.pro.orig 2008-03-29 10:43:50.000000000 +0300 -+++ ./qtiplot/qtiplot.pro 2008-03-29 10:46:00.000000000 +0300 -@@ -45,13 +45,9 @@ +--- ./qtiplot/qtiplot.pro.orig 2009-03-27 00:45:43.000000000 +0300 ++++ ./qtiplot/qtiplot.pro 2009-03-27 00:46:10.000000000 +0300 +@@ -18,7 +18,7 @@ + CONFIG += HAVE_LIBPNG + + # Uncomment the following line if you want to perform a custom installation using the *.path variables defined bellow. +-#CONFIG += CustomInstall ++CONFIG += CustomInstall + + CONFIG += release + #CONFIG += debug +@@ -28,13 +28,9 @@ #!!! Warning: You must modify these paths according to your computer settings ############################################################################# @@ -9,7 +18,7 @@ -INCLUDEPATH += ../3rdparty/qwt/src -INCLUDEPATH += ../3rdparty/liborigin -INCLUDEPATH += ../3rdparty/gsl/include --INCLUDEPATH += ../3rdparty/zlib123/include +-INCLUDEPATH += ../3rdparty/zlib -INCLUDEPATH += ../3rdparty/boost_1_36_0 +unix:INCLUDEPATH += $$LOCALBASE/include/qwt +unix:INCLUDEPATH += $$LOCALBASE/include/qwtplot3d-qt4 @@ -17,37 +26,60 @@ ##################### 3rd PARTY LIBRARIES SECTION ########################### #!!! Warning: You must modify these paths according to your computer settings -@@ -59,17 +55,13 @@ +@@ -43,17 +39,14 @@ ##################### Linux (Mac OS X) ###################################### # statically link against libraries in 3rdparty -unix:LIBS += ../3rdparty/muparser/lib/libmuparser.a --unix:LIBS += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a -unix:LIBS += ../3rdparty/qwt/lib/libqwt.a -unix:LIBS += ../3rdparty/gsl/lib/libgsl.a -unix:LIBS += ../3rdparty/gsl/lib/libgslcblas.a +-unix:LIBS += ../3rdparty/boost_1_36_0/lib/libboost_date_time-gcc43-mt-1_36.a +-unix:LIBS += ../3rdparty/boost_1_36_0/lib/libboost_thread-gcc43-mt-1_36.a # dynamically link against dependencies if they are installed system-wide - #unix:LIBS += -lmuparser - #unix:LIBS += -lqwtplot3d +-#unix:LIBS += -lmuparser -#unix:LIBS += -lqwt -#unix:LIBS += -lgsl -lgslcblas ++unix:LIBS += -lmuparser +unix:LIBS += -lqwt +unix:LIBS += -lgsl -lgslcblas -+unix:LIBS += -L$$LOCALBASE/lib -lqwtplot3d-qt4 -lz ++unix:LIBS += -L$$LOCALBASE/lib -lz ++unix:LIBS += -lboost_date_time ++unix:LIBS += -lboost_thread ##################### Windows ############################################### -@@ -435,6 +427,7 @@ - ##################### Default: muParser v1.28 ################# +@@ -80,18 +73,16 @@ + contains(CONFIG, CustomInstall){ + INSTALLS += target + INSTALLS += translations +- INSTALLS += manual +- INSTALLS += documentation + unix:INSTALLS += man - contains(SCRIPTING_LANGS, muParser) { -+ unix:LIBS += -lmuparser - DEFINES += SCRIPTING_MUPARSER +- unix: INSTALLBASE = /usr ++ unix: INSTALLBASE = $$PREFIX + win32: INSTALLBASE = C:/QtiPlot - HEADERS += src/muParserScript.h \ -@@ -461,11 +454,12 @@ - SOURCES += src/PythonScript.cpp src/PythonScripting.cpp + unix: target.path = $$INSTALLBASE/bin + unix: translations.path = $$INSTALLBASE/share/qtiplot/translations + unix: manual.path = $$INSTALLBASE/share/doc/qtiplot/manual + unix: documentation.path = $$INSTALLBASE/share/doc/qtiplot +- unix: man.path = $$INSTALLBASE/share/man/man1/ ++ unix: man.path = $$INSTALLBASE/man/man1/ + + win32: target.path = $$INSTALLBASE + win32: translations.path = $$INSTALLBASE/translations +@@ -186,17 +177,18 @@ + qtiUtil.py \ + qti_wordlist.txt \ + +- unix: pythonconfig.path = /usr/local/qtiplot ++ unix: pythonconfig.path = $$INSTALLBASE/share/qtiplot + win32: pythonconfig.path = $$INSTALLBASE + DEFINES += PYTHON_CONFIG_PATH="\\\"$$replace(pythonconfig.path," ","\ ")\\\" + } unix { - INCLUDEPATH += $$system(python python-includepath.py) @@ -56,9 +88,20 @@ + LIBS += -l$$(PYTHON_VERSION) LIBS += -lm system(mkdir -p $${SIP_DIR}) -- system($$system(python python-sipcmd.py) -c $${SIP_DIR} src/qti.sip) +- system($$system(python python-sipcmd.py) -c $${SIP_DIR} src/scripting/qti.sip) + SIPCMD = $$PYTHON_CMD python-sipcmd.py -+ system($$system($$SIPCMD) -c $${SIP_DIR} src/qti.sip) ++ system($$system($$SIPCMD) -c $${SIP_DIR} src/scripting/qti.sip) } win32 { +@@ -210,8 +202,8 @@ + + contains(CONFIG, HAVE_LIBPNG){ + DEFINES += GL2PS_HAVE_LIBPNG +- INCLUDEPATH += ../3rdparty/libpng/ +- LIBS += ../3rdparty/libpng/libpng.a ++ INCLUDEPATH += $$LOCALBASE/include/libpng ++ LIBS += -lpng + } + + ############################################################### |