| 1 |
markusle 08/10/24 22:50:43 |
| 2 |
|
| 3 |
Added: qtiplot-0.9.7.3-qwt3d.patch |
| 4 |
qtiplot-0.9.7.3-pro.patch |
| 5 |
Log: |
| 6 |
Version bump (fixes bug #243430). |
| 7 |
(Portage version: 2.2_rc12/cvs/Linux 2.6.26-SENTINEL-3 i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-visualization/qtiplot/files/qtiplot-0.9.7.3-qwt3d.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-qwt3d.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-qwt3d.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: qtiplot-0.9.7.3-qwt3d.patch |
| 16 |
=================================================================== |
| 17 |
diff -Naur qtiplot-0.9.7.3/qtiplot/src/plot3D/Graph3D.cpp qtiplot-0.9.7.3.new/qtiplot/src/plot3D/Graph3D.cpp |
| 18 |
--- qtiplot-0.9.7.3/qtiplot/src/plot3D/Graph3D.cpp 2008-10-20 06:32:35.000000000 -0400 |
| 19 |
+++ qtiplot-0.9.7.3.new/qtiplot/src/plot3D/Graph3D.cpp 2008-10-24 11:04:56.000000000 -0400 |
| 20 |
@@ -777,7 +777,7 @@ |
| 21 |
void Graph3D::setNumbersFont(const QFont& font) |
| 22 |
{ |
| 23 |
sp->coordinates()->setNumberFont (font); |
| 24 |
- sp->legend()->axis()->setNumberFont (font); |
| 25 |
+ //sp->legend()->axis()->setNumberFont (font); |
| 26 |
sp->makeCurrent(); |
| 27 |
sp->updateGL(); |
| 28 |
} |
| 29 |
@@ -1570,7 +1570,7 @@ |
| 30 |
void Graph3D::setNumbersColor(const QColor& numColor) |
| 31 |
{ |
| 32 |
if(numCol != numColor){ |
| 33 |
- sp->legend()->axis()->setNumberColor(Qt2GL(numColor)); |
| 34 |
+ //sp->legend()->axis()->setNumberColor(Qt2GL(numColor)); |
| 35 |
sp->coordinates()->setNumberColor(Qt2GL(numColor)); |
| 36 |
numCol = numColor; |
| 37 |
} |
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
1.1 sci-visualization/qtiplot/files/qtiplot-0.9.7.3-pro.patch |
| 42 |
|
| 43 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-pro.patch?rev=1.1&view=markup |
| 44 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-pro.patch?rev=1.1&content-type=text/plain |
| 45 |
|
| 46 |
Index: qtiplot-0.9.7.3-pro.patch |
| 47 |
=================================================================== |
| 48 |
diff -Naur qtiplot-0.9.7.3/fitPlugins/exp_saturation/exp_saturation.pro qtiplot-0.9.7.3.new/fitPlugins/exp_saturation/exp_saturation.pro |
| 49 |
--- qtiplot-0.9.7.3/fitPlugins/exp_saturation/exp_saturation.pro 2008-10-13 03:43:31.000000000 -0400 |
| 50 |
+++ qtiplot-0.9.7.3.new/fitPlugins/exp_saturation/exp_saturation.pro 2008-10-24 10:15:30.000000000 -0400 |
| 51 |
@@ -12,12 +12,12 @@ |
| 52 |
DESTDIR = ../ |
| 53 |
|
| 54 |
# statically link against GSL in 3rdparty |
| 55 |
-INCLUDEPATH += ../../3rdparty/gsl/include/ |
| 56 |
-LIBS += ../../3rdparty/gsl/lib/libgsl.a |
| 57 |
-LIBS += ../../3rdparty/gsl/lib/libgslcblas.a |
| 58 |
+#LIBS += ../../3rdparty/gsl/lib/libgsl.a |
| 59 |
+#LIBS += ../../3rdparty/gsl/lib/libgslcblas.a |
| 60 |
|
| 61 |
#dynamically link against GSL installed system-wide |
| 62 |
-#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas |
| 63 |
+INCLUDEPATH += /usr/include/gsl |
| 64 |
+unix:LIBS += $$system(pkg-config --libs gsl) |
| 65 |
|
| 66 |
target.path=/usr/lib$${libsuff}/qtiplot/plugins |
| 67 |
INSTALLS += target |
| 68 |
diff -Naur qtiplot-0.9.7.3/fitPlugins/explin/explin.pro qtiplot-0.9.7.3.new/fitPlugins/explin/explin.pro |
| 69 |
--- qtiplot-0.9.7.3/fitPlugins/explin/explin.pro 2008-10-13 03:43:31.000000000 -0400 |
| 70 |
+++ qtiplot-0.9.7.3.new/fitPlugins/explin/explin.pro 2008-10-24 10:15:49.000000000 -0400 |
| 71 |
@@ -12,12 +12,13 @@ |
| 72 |
DESTDIR = ../ |
| 73 |
|
| 74 |
# statically link against GSL in 3rdparty |
| 75 |
-INCLUDEPATH += ../../3rdparty/gsl/include/ |
| 76 |
-LIBS += ../../3rdparty/gsl/lib/libgsl.a |
| 77 |
-LIBS += ../../3rdparty/gsl/lib/libgslcblas.a |
| 78 |
+#INCLUDEPATH += ../../3rdparty/gsl/include/ |
| 79 |
+#LIBS += ../../3rdparty/gsl/lib/libgsl.a |
| 80 |
+#LIBS += ../../3rdparty/gsl/lib/libgslcblas.a |
| 81 |
|
| 82 |
#dynamically link against GSL installed system-wide |
| 83 |
-#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas |
| 84 |
+INCLUDEPATH += /usr/include/gsl |
| 85 |
+unix:LIBS += $$system(pkg-config --libs gsl) |
| 86 |
|
| 87 |
target.path=/usr/lib$${libsuff}/qtiplot/plugins |
| 88 |
INSTALLS += target |
| 89 |
diff -Naur qtiplot-0.9.7.3/fitPlugins/fitRational0/fitRational0.pro qtiplot-0.9.7.3.new/fitPlugins/fitRational0/fitRational0.pro |
| 90 |
--- qtiplot-0.9.7.3/fitPlugins/fitRational0/fitRational0.pro 2008-10-13 12:14:52.000000000 -0400 |
| 91 |
+++ qtiplot-0.9.7.3.new/fitPlugins/fitRational0/fitRational0.pro 2008-10-24 10:16:08.000000000 -0400 |
| 92 |
@@ -12,12 +12,13 @@ |
| 93 |
DESTDIR = ../ |
| 94 |
|
| 95 |
# statically link against GSL in 3rdparty |
| 96 |
-INCLUDEPATH += ../../3rdparty/gsl/include/ |
| 97 |
-LIBS += ../../3rdparty/gsl/lib/libgsl.a |
| 98 |
-LIBS += ../../3rdparty/gsl/lib/libgslcblas.a |
| 99 |
+#INCLUDEPATH += ../../3rdparty/gsl/include/ |
| 100 |
+#LIBS += ../../3rdparty/gsl/lib/libgsl.a |
| 101 |
+#LIBS += ../../3rdparty/gsl/lib/libgslcblas.a |
| 102 |
|
| 103 |
#dynamically link against GSL installed system-wide |
| 104 |
-#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas |
| 105 |
+INCLUDEPATH += /usr/include/gsl |
| 106 |
+unix:LIBS += $$system(pkg-config --libs gsl) |
| 107 |
|
| 108 |
target.path=/usr/lib$${libsuff}/qtiplot/plugins |
| 109 |
INSTALLS += target |
| 110 |
diff -Naur qtiplot-0.9.7.3/fitPlugins/fitRational1/fitRational1.pro qtiplot-0.9.7.3.new/fitPlugins/fitRational1/fitRational1.pro |
| 111 |
--- qtiplot-0.9.7.3/fitPlugins/fitRational1/fitRational1.pro 2007-10-28 19:44:06.000000000 -0400 |
| 112 |
+++ qtiplot-0.9.7.3.new/fitPlugins/fitRational1/fitRational1.pro 2008-10-24 10:16:25.000000000 -0400 |
| 113 |
@@ -12,12 +12,13 @@ |
| 114 |
DESTDIR = ../ |
| 115 |
|
| 116 |
# statically link against GSL in 3rdparty |
| 117 |
-INCLUDEPATH += ../../3rdparty/gsl/include/ |
| 118 |
-LIBS += ../../3rdparty/gsl/lib/libgsl.a |
| 119 |
-LIBS += ../../3rdparty/gsl/lib/libgslcblas.a |
| 120 |
+#INCLUDEPATH += ../../3rdparty/gsl/include/ |
| 121 |
+#LIBS += ../../3rdparty/gsl/lib/libgsl.a |
| 122 |
+#LIBS += ../../3rdparty/gsl/lib/libgslcblas.a |
| 123 |
|
| 124 |
#dynamically link against GSL installed system-wide |
| 125 |
-#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas |
| 126 |
+INCLUDEPATH += /usr/include/gsl |
| 127 |
+unix:LIBS += $$system(pkg-config --libs gsl) |
| 128 |
|
| 129 |
target.path=/usr/lib$${libsuff}/qtiplot/plugins |
| 130 |
INSTALLS += target |
| 131 |
diff -Naur qtiplot-0.9.7.3/qtiplot/qtiplot.pro qtiplot-0.9.7.3.new/qtiplot/qtiplot.pro |
| 132 |
--- qtiplot-0.9.7.3/qtiplot/qtiplot.pro 2008-10-22 13:57:19.000000000 -0400 |
| 133 |
+++ qtiplot-0.9.7.3.new/qtiplot/qtiplot.pro 2008-10-24 11:03:21.000000000 -0400 |
| 134 |
@@ -23,7 +23,7 @@ |
| 135 |
win32:LIBS += ../3rdparty/libpng/libpng.a |
| 136 |
|
| 137 |
# Uncomment the following line if you want to perform a custom installation using the *.path variables defined bellow. |
| 138 |
-#CONFIG += CustomInstall |
| 139 |
+CONFIG += CustomInstall |
| 140 |
|
| 141 |
CONFIG += release |
| 142 |
#CONFIG += debug |
| 143 |
@@ -33,13 +33,12 @@ |
| 144 |
#!!! Warning: You must modify these paths according to your computer settings |
| 145 |
############################################################################# |
| 146 |
|
| 147 |
-INCLUDEPATH += ../3rdparty/muparser/include |
| 148 |
-INCLUDEPATH += ../3rdparty/qwtplot3d/include |
| 149 |
-INCLUDEPATH += ../3rdparty/qwt/src |
| 150 |
-INCLUDEPATH += ../3rdparty/liborigin |
| 151 |
-INCLUDEPATH += ../3rdparty/gsl/include |
| 152 |
-INCLUDEPATH += ../3rdparty/zlib123/include |
| 153 |
-INCLUDEPATH += ../3rdparty/boost_1_36_0 |
| 154 |
+INCLUDEPATH += /usr/include/muparser |
| 155 |
+INCLUDEPATH += /usr/include/qwtplot3d |
| 156 |
+INCLUDEPATH += /usr/include/qwt5 |
| 157 |
+INCLUDEPATH += ../3rdparty/liborigin |
| 158 |
+INCLUDEPATH += /usr/include/gsl |
| 159 |
+INCLUDEPATH += /usr/include/boost |
| 160 |
|
| 161 |
##################### 3rd PARTY LIBRARIES SECTION ########################### |
| 162 |
#!!! Warning: You must modify these paths according to your computer settings |
| 163 |
@@ -48,15 +47,15 @@ |
| 164 |
##################### Linux (Mac OS X) ###################################### |
| 165 |
|
| 166 |
# statically link against libraries in 3rdparty |
| 167 |
-unix:LIBS += ../3rdparty/muparser/lib/libmuparser.a |
| 168 |
-unix:LIBS += ../3rdparty/qwt/lib/libqwt.a |
| 169 |
-unix:LIBS += ../3rdparty/gsl/lib/libgsl.a |
| 170 |
-unix:LIBS += ../3rdparty/gsl/lib/libgslcblas.a |
| 171 |
-unix:LIBS += /usr/local/lib/libboost_date_time-gcc41-mt.a |
| 172 |
-unix:LIBS += /usr/local/lib/libboost_thread-gcc41-mt.a |
| 173 |
+#unix:LIBS += ../3rdparty/muparser/lib/libmuparser.a |
| 174 |
+#unix:LIBS += ../3rdparty/qwt/lib/libqwt.a |
| 175 |
+#unix:LIBS += ../3rdparty/gsl/lib/libgsl.a |
| 176 |
+#unix:LIBS += ../3rdparty/gsl/lib/libgslcblas.a |
| 177 |
+#unix:LIBS += /usr/local/lib/libboost_date_time-gcc41-mt.a |
| 178 |
+#unix:LIBS += /usr/local/lib/libboost_thread-gcc41-mt.a |
| 179 |
|
| 180 |
# dynamically link against dependencies if they are installed system-wide |
| 181 |
-#unix:LIBS += -lmuparser |
| 182 |
+unix:LIBS += -lmuparser -lqwtplot3d -lqwt $$system(pkg-config --libs gsl) -lz -lboost_date_time -lboost_thread |
| 183 |
#unix:LIBS += -lqwt |
| 184 |
#unix:LIBS += -lgsl -lgslcblas |
| 185 |
|
| 186 |
@@ -184,7 +183,7 @@ |
| 187 |
################# Default Modules ############################# |
| 188 |
############################################################### |
| 189 |
|
| 190 |
-include(../3rdparty/qwtplot3d/qwtplot3d.pri) |
| 191 |
+#include(../3rdparty/qwtplot3d/qwtplot3d.pri) |
| 192 |
include(src/analysis/analysis.pri) |
| 193 |
include(src/core/core.pri) |
| 194 |
include(src/lib/libqti.pri) |
Archives