From 0d17addd579f77a871ed771266aae42c3270feb5 Mon Sep 17 00:00:00 2001 From: Martin Wilke Date: Fri, 16 May 2008 12:27:33 +0000 Subject: - Update to 0.9.6 PR: 123678 Submitted by: Max Brazhnikov --- math/qtiplot/files/patch-qtiplot.pro | 6 +++--- math/qtiplot/files/patch-qtiplot__qtiplot.pro | 17 +++-------------- 2 files changed, 6 insertions(+), 17 deletions(-) (limited to 'math/qtiplot/files') diff --git a/math/qtiplot/files/patch-qtiplot.pro b/math/qtiplot/files/patch-qtiplot.pro index 54be526976aa..3e0e5c8373b6 100644 --- a/math/qtiplot/files/patch-qtiplot.pro +++ b/math/qtiplot/files/patch-qtiplot.pro @@ -1,9 +1,9 @@ ---- ./qtiplot.pro.orig 2008-03-29 10:43:50.000000000 +0300 -+++ ./qtiplot.pro 2008-03-29 10:43:50.000000000 +0300 +--- ./qtiplot.pro.orig 2008-04-20 19:16:15.000000000 +0400 ++++ ./qtiplot.pro 2008-04-20 19:18:10.000000000 +0400 @@ -2,6 +2,4 @@ SUBDIRS = fitPlugins/fitRational0\ fitPlugins/fitRational1\ - 3rdparty/qwt\ -- manual\ +- manual\ qtiplot diff --git a/math/qtiplot/files/patch-qtiplot__qtiplot.pro b/math/qtiplot/files/patch-qtiplot__qtiplot.pro index 95cffabe7050..d390ab26964c 100644 --- a/math/qtiplot/files/patch-qtiplot__qtiplot.pro +++ b/math/qtiplot/files/patch-qtiplot__qtiplot.pro @@ -10,8 +10,8 @@ -INCLUDEPATH += ../3rdparty/liborigin -INCLUDEPATH += ../3rdparty/gsl/include -INCLUDEPATH += ../3rdparty/zlib123/include -+unix:INCLUDEPATH += $$(LOCALBASE)/include/qwt -+unix:INCLUDEPATH += $$(LOCALBASE)/include/qwtplot3d-qt4 ++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 @@ -32,21 +32,10 @@ -#unix:LIBS += -lgsl -lgslcblas +unix:LIBS += -lqwt +unix:LIBS += -lgsl -lgslcblas -+unix:LIBS += -L$$(LOCALBASE)/lib -lqwtplot3d-qt4 -lz ++unix:LIBS += -L$$LOCALBASE/lib -lqwtplot3d-qt4 -lz ##################### Windows ############################################### -@@ -124,8 +116,8 @@ - translations/qtiplot_ja.ts \ - translations/qtiplot_sv.ts - --system(lupdate -verbose qtiplot.pro) --system(lrelease -verbose qtiplot.pro) -+#system(lupdate -verbose qtiplot.pro) -+#system(lrelease -verbose qtiplot.pro) - - translations.files += translations/qtiplot_de.qm \ - translations/qtiplot_es.qm \ @@ -435,6 +427,7 @@ ##################### Default: muParser v1.28 ################# -- cgit v1.2.3