summaryrefslogtreecommitdiff
path: root/math/qtiplot/files
diff options
context:
space:
mode:
Diffstat (limited to 'math/qtiplot/files')
-rw-r--r--math/qtiplot/files/patch-fitPlugins__exp_saturation__exp_saturation.pro20
-rw-r--r--math/qtiplot/files/patch-fitPlugins__explin__explin.pro20
-rw-r--r--math/qtiplot/files/patch-fitPlugins__fitRational0__fitRational0.pro12
-rw-r--r--math/qtiplot/files/patch-fitPlugins__fitRational1__fitRational1.pro14
-rw-r--r--math/qtiplot/files/patch-qtiplot.pro14
-rw-r--r--math/qtiplot/files/patch-qtiplot__qtiplot.pro81
-rw-r--r--math/qtiplot/files/patch-qtiplot__src__analysis__dialogs__FitDialog.cpp11
7 files changed, 139 insertions, 33 deletions
diff --git a/math/qtiplot/files/patch-fitPlugins__exp_saturation__exp_saturation.pro b/math/qtiplot/files/patch-fitPlugins__exp_saturation__exp_saturation.pro
new file mode 100644
index 000000000000..991efca2f86e
--- /dev/null
+++ b/math/qtiplot/files/patch-fitPlugins__exp_saturation__exp_saturation.pro
@@ -0,0 +1,20 @@
+--- ./fitPlugins/exp_saturation/exp_saturation.pro.orig 2009-03-05 15:56:56.000000000 +0300
++++ ./fitPlugins/exp_saturation/exp_saturation.pro 2009-03-26 23:10:24.000000000 +0300
+@@ -12,14 +12,13 @@
+ DESTDIR = ../
+
+ # statically link against GSL in 3rdparty
+-INCLUDEPATH += ../../3rdparty/gsl/include/
+-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}/qtiplot/plugins
++target.path=$$PREFIX/share/qtiplot/fitPlugins
+ INSTALLS += target
+
+ SOURCES += exp_saturation.c
diff --git a/math/qtiplot/files/patch-fitPlugins__explin__explin.pro b/math/qtiplot/files/patch-fitPlugins__explin__explin.pro
new file mode 100644
index 000000000000..1613e2e50c69
--- /dev/null
+++ b/math/qtiplot/files/patch-fitPlugins__explin__explin.pro
@@ -0,0 +1,20 @@
+--- ./fitPlugins/explin/explin.pro.orig 2009-03-05 15:56:56.000000000 +0300
++++ ./fitPlugins/explin/explin.pro 2009-03-26 23:10:01.000000000 +0300
+@@ -12,14 +12,13 @@
+ DESTDIR = ../
+
+ # statically link against GSL in 3rdparty
+-INCLUDEPATH += ../../3rdparty/gsl/include/
+-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}/qtiplot/plugins
++target.path=$$PREFIX/share/qtiplot/fitPlugins
+ INSTALLS += target
+
+ SOURCES += explin.c
diff --git a/math/qtiplot/files/patch-fitPlugins__fitRational0__fitRational0.pro b/math/qtiplot/files/patch-fitPlugins__fitRational0__fitRational0.pro
index 0ffbc3335d20..a9aef9e6c738 100644
--- a/math/qtiplot/files/patch-fitPlugins__fitRational0__fitRational0.pro
+++ b/math/qtiplot/files/patch-fitPlugins__fitRational0__fitRational0.pro
@@ -1,6 +1,6 @@
---- fitPlugins/fitRational0/fitRational0.pro.orig 2007-10-27 00:15:32.000000000 +0200
-+++ fitPlugins/fitRational0/fitRational0.pro 2007-12-15 12:14:56.000000000 +0100
-@@ -12,9 +12,8 @@
+--- ./fitPlugins/fitRational0/fitRational0.pro.orig 2009-03-05 15:56:56.000000000 +0300
++++ ./fitPlugins/fitRational0/fitRational0.pro 2009-03-26 23:11:59.000000000 +0300
+@@ -12,14 +12,13 @@
DESTDIR = ../
# statically link against GSL in 3rdparty
@@ -12,3 +12,9 @@
#dynamically link against GSL installed system-wide
#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas
+
+-target.path=/usr/lib$${libsuff}/qtiplot/plugins
++target.path=$$PREFIX/share/qtiplot/fitPlugins
+ INSTALLS += target
+
+ SOURCES += fitRational0.cpp
diff --git a/math/qtiplot/files/patch-fitPlugins__fitRational1__fitRational1.pro b/math/qtiplot/files/patch-fitPlugins__fitRational1__fitRational1.pro
index f8859274de00..87e4d8cbe4d7 100644
--- a/math/qtiplot/files/patch-fitPlugins__fitRational1__fitRational1.pro
+++ b/math/qtiplot/files/patch-fitPlugins__fitRational1__fitRational1.pro
@@ -1,6 +1,6 @@
---- ./fitPlugins/fitRational1/fitRational1.pro.orig 2007-10-27 02:15:18.000000000 +0400
-+++ ./fitPlugins/fitRational1/fitRational1.pro 2007-11-14 20:19:55.000000000 +0300
-@@ -12,9 +12,8 @@
+--- ./fitPlugins/fitRational1/fitRational1.pro.orig 2009-03-05 15:56:56.000000000 +0300
++++ ./fitPlugins/fitRational1/fitRational1.pro 2009-03-26 23:09:59.000000000 +0300
+@@ -12,14 +12,13 @@
DESTDIR = ../
# statically link against GSL in 3rdparty
@@ -8,7 +8,13 @@
-LIBS += ../../3rdparty/gsl/lib/libgsl.a
-LIBS += ../../3rdparty/gsl/lib/libgslcblas.a
+unix:INCLUDEPATH += $$(LOCALBASE)/include
-+unix:LIBS += -lgsl -lgslcblas
++unix:LIBS += -lgsl -lgslcblas
#dynamically link against GSL installed system-wide
#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas
+
+-target.path=/usr/lib$${libsuff}/qtiplot/plugins
++target.path=$$PREFIX/share/qtiplot/fitPlugins
+ INSTALLS += target
+
+ SOURCES += fitRational1.cpp
diff --git a/math/qtiplot/files/patch-qtiplot.pro b/math/qtiplot/files/patch-qtiplot.pro
index 3e0e5c8373b6..7350271662ef 100644
--- a/math/qtiplot/files/patch-qtiplot.pro
+++ b/math/qtiplot/files/patch-qtiplot.pro
@@ -1,9 +1,9 @@
---- ./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 @@
+--- ./qtiplot.pro.orig 2009-03-05 15:57:29.000000000 +0300
++++ ./qtiplot.pro 2009-03-26 22:57:57.000000000 +0300
+@@ -1,6 +1,4 @@
+ TEMPLATE = subdirs
- SUBDIRS = fitPlugins/fitRational0\
- fitPlugins/fitRational1\
-- 3rdparty/qwt\
-- manual\
+ SUBDIRS = fitPlugins \
+- manual \
+- 3rdparty/qwt \
qtiplot
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
+ }
+
+ ###############################################################
diff --git a/math/qtiplot/files/patch-qtiplot__src__analysis__dialogs__FitDialog.cpp b/math/qtiplot/files/patch-qtiplot__src__analysis__dialogs__FitDialog.cpp
new file mode 100644
index 000000000000..e3158a561415
--- /dev/null
+++ b/math/qtiplot/files/patch-qtiplot__src__analysis__dialogs__FitDialog.cpp
@@ -0,0 +1,11 @@
+--- ./qtiplot/src/analysis/dialogs/FitDialog.cpp.orig 2009-03-05 15:57:04.000000000 +0300
++++ ./qtiplot/src/analysis/dialogs/FitDialog.cpp 2009-03-27 14:20:44.000000000 +0300
+@@ -119,7 +119,7 @@
+ ApplicationWindow *app = (ApplicationWindow *)parent;
+ QString pluginsPath = app->fitPluginsPath;
+ QFileInfo fi(pluginsPath);
+- if (pluginsPath.isEmpty() || !fi.isDir() || !fi.isWritable())
++ if (pluginsPath.isEmpty() || !fi.isDir())
+ choosePluginsFolder();
+ else
+ loadPlugins();
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-06 21:30:30 +0000