| 1 |
ssuominen 10/01/09 08:45:38 |
| 2 |
|
| 3 |
Added: qtiplot-0.9.7.11-docbuild.patch |
| 4 |
qtiplot-0.9.7.11-build.conf.patch |
| 5 |
qtiplot-0.9.7.11-qtiplot.pro.patch |
| 6 |
qtiplot-0.9.7.11-syslibs.patch |
| 7 |
qtiplot-0.9.7.11-gl2ps.patch |
| 8 |
qtiplot-0.9.7.11-sip48.patch |
| 9 |
qtiplot-0.9.7.11-dont-install-qwt.patch |
| 10 |
Log: |
| 11 |
Version bump wrt #299769 by Justin Lecher. |
| 12 |
(Portage version: 2.2_rc61/cvs/Linux x86_64) |
| 13 |
|
| 14 |
Revision Changes Path |
| 15 |
1.1 sci-visualization/qtiplot/files/qtiplot-0.9.7.11-docbuild.patch |
| 16 |
|
| 17 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-docbuild.patch?rev=1.1&view=markup |
| 18 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-docbuild.patch?rev=1.1&content-type=text/plain |
| 19 |
|
| 20 |
Index: qtiplot-0.9.7.11-docbuild.patch |
| 21 |
=================================================================== |
| 22 |
diff --git a/manual/docbook-en/index.docbook b/manual/docbook-en/index.docbook |
| 23 |
index 4dd6c09..452dc86 100755 |
| 24 |
--- a/manual/docbook-en/index.docbook |
| 25 |
+++ b/manual/docbook-en/index.docbook |
| 26 |
@@ -1,5 +1,5 @@ |
| 27 |
<?xml version="1.0" encoding="UTF-8"?> |
| 28 |
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "/usr/share/xml/docbook/schema/dtd/4.4/docbookx.dtd" [ |
| 29 |
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "/usr/share/sgml/docbook/dtd/4.4/docbookx.dtd" [ |
| 30 |
|
| 31 |
<!ENTITY appname "QtiPlot"> |
| 32 |
<!ENTITY kappname "&appname;"> |
| 33 |
diff --git a/manual/qtiplot.dsl b/manual/qtiplot.dsl |
| 34 |
index 16a160f..a596c2e 100755 |
| 35 |
--- a/manual/qtiplot.dsl |
| 36 |
+++ b/manual/qtiplot.dsl |
| 37 |
@@ -6,7 +6,7 @@ |
| 38 |
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [ |
| 39 |
|
| 40 |
<!-- Path to main Docbook->html stylesheet. You have to adapt this to your installation. --> |
| 41 |
-<!ENTITY docbook-html-stylesheet SYSTEM "/usr/share/sgml/docbook/stylesheet/dsssl/modular/html/docbook.dsl" CDATA DSSSL> |
| 42 |
+<!ENTITY docbook-html-stylesheet SYSTEM "/usr/share/sgml/stylesheet/dsssl/modular/html/docbook.dsl" CDATA DSSSL> |
| 43 |
|
| 44 |
<!-- Stylesheet function library for creating Windows HTML help and Qt Assistant profiles. --> |
| 45 |
<!ENTITY docbook-help-stylesheet SYSTEM "./help.dsl" CDATA DSSSL> |
| 46 |
diff --git a/manual/qtiplot_html.xsl b/manual/qtiplot_html.xsl |
| 47 |
index 593bf6f..3f4d31c 100755 |
| 48 |
--- a/manual/qtiplot_html.xsl |
| 49 |
+++ b/manual/qtiplot_html.xsl |
| 50 |
@@ -1,5 +1,5 @@ |
| 51 |
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'> |
| 52 |
-<xsl:import href="file:////usr/share/xml/docbook/stylesheet/nwalsh/html/chunk.xsl"/> |
| 53 |
+<xsl:import href="file:////usr/share/sgml/docbook/xsl-stylesheet/nwalsh/html/chunk.xsl"/> |
| 54 |
|
| 55 |
<!-- html.stylesheet |
| 56 |
The html.stylesheet parameter is either empty, indicating that no |
| 57 |
|
| 58 |
|
| 59 |
|
| 60 |
1.1 sci-visualization/qtiplot/files/qtiplot-0.9.7.11-build.conf.patch |
| 61 |
|
| 62 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-build.conf.patch?rev=1.1&view=markup |
| 63 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-build.conf.patch?rev=1.1&content-type=text/plain |
| 64 |
|
| 65 |
Index: qtiplot-0.9.7.11-build.conf.patch |
| 66 |
=================================================================== |
| 67 |
diff --git a/build.conf.example b/build.conf.example |
| 68 |
index 2afcee7..2dd7e05 100755 |
| 69 |
--- a/build.conf.example |
| 70 |
+++ b/build.conf.example |
| 71 |
@@ -7,30 +7,29 @@ isEmpty( QTI_ROOT ) { |
| 72 |
########################################################## |
| 73 |
|
| 74 |
# Global include path which is always added at the end of the INCLUDEPATH |
| 75 |
-SYS_INCLUDEPATH = /opt/local/include |
| 76 |
+SYS_INCLUDEPATH = /usr/include |
| 77 |
# Global lib path and libs which is ls always added at the end of LIBS |
| 78 |
-SYS_LIBS = -L/opt/local/lib |
| 79 |
+SYS_LIBS = -L/usr/GENTOOLIB |
| 80 |
|
| 81 |
########################################################## |
| 82 |
## muParser (http://muparser.sourceforge.net/) |
| 83 |
########################################################## |
| 84 |
|
| 85 |
# include path. leave it blank to use SYS_INCLUDE |
| 86 |
-MUPARSER_INCLUDEPATH = $$QTI_ROOT/3rdparty/muparser/include |
| 87 |
+MUPARSER_INCLUDEPATH = $$system(pkg-config --cflags muparser) |
| 88 |
# link statically against a copy in 3rdparty/ |
| 89 |
-MUPARSER_LIBS = $$QTI_ROOT/3rdparty/muparser/lib/libmuparser.a |
| 90 |
+#MUPARSER_LIBS = $$QTI_ROOT/3rdparty/muparser/lib/libmuparser.a |
| 91 |
# or dynamically against a system-wide installation |
| 92 |
-#MUPARSER_LIBS = -lmuparser |
| 93 |
+MUPARSER_LIBS = $$system(pkg-config --libs muparser) |
| 94 |
|
| 95 |
########################################################## |
| 96 |
## GNU Sientific Library (http://www.gnu.org/software/gsl/) |
| 97 |
########################################################## |
| 98 |
|
| 99 |
# include path. leave it blank to use SYS_INCLUDE |
| 100 |
-GSL_INCLUDEPATH = $$QTI_ROOT/3rdparty/gsl/include |
| 101 |
+GSL_INCLUDEPATH = $$system(pkg-config --cflags gsl) |
| 102 |
# link statically against a copy in 3rdparty/ |
| 103 |
-GSL_LIBS = $$QTI_ROOT/3rdparty/gsl/lib/libgsl.a \ |
| 104 |
- $$QTI_ROOT/3rdparty/gsl/lib/libgslcblas.a |
| 105 |
+GSL_LIBS = $$system(pkg-config --libs gsl) |
| 106 |
# or dynamically against a system-wide installation |
| 107 |
#GSL_LIBS = -lgsl -lgslcblas |
| 108 |
|
| 109 |
@@ -39,14 +38,14 @@ GSL_LIBS = $$QTI_ROOT/3rdparty/gsl/lib/libgsl.a \ |
| 110 |
########################################################## |
| 111 |
|
| 112 |
# include path. leave it blank to use SYS_INCLUDE |
| 113 |
-BOOST_INCLUDEPATH = $$QTI_ROOT/3rdparty/boost |
| 114 |
+BOOST_INCLUDEPATH = /usr/include/boost |
| 115 |
# link statically against a copy in 3rdparty/ |
| 116 |
-unix: BOOST_LIBS = $$QTI_ROOT/3rdparty/boost/lib/libboost_date_time-gcc43-mt-1_38.a \ |
| 117 |
- $$QTI_ROOT/3rdparty/boost/lib/libboost_thread-gcc43-mt-1_38.a |
| 118 |
-win32:BOOST_LIBS = $$QTI_ROOT/3rdparty/boost/lib/libboost_date_time-mgw34-mt.lib \ |
| 119 |
- $$QTI_ROOT/3rdparty/boost/lib/libboost_thread-mgw34-mt.lib |
| 120 |
+#unix: BOOST_LIBS = $$QTI_ROOT/3rdparty/boost/lib/libboost_date_time-gcc43-mt-1_38.a \ |
| 121 |
+# $$QTI_ROOT/3rdparty/boost/lib/libboost_thread-gcc43-mt-1_38.a |
| 122 |
+#win32:BOOST_LIBS = $$QTI_ROOT/3rdparty/boost/lib/libboost_date_time-mgw34-mt.lib \ |
| 123 |
+# $$QTI_ROOT/3rdparty/boost/lib/libboost_thread-mgw34-mt.lib |
| 124 |
# or dynamically against a system-wide installation |
| 125 |
-#BOOST_LIBS = -lboost_date_time-mt -lboost_thread-mt |
| 126 |
+BOOST_LIBS = -lboost_date_time-mt -lboost_thread-mt |
| 127 |
|
| 128 |
########################################################## |
| 129 |
## QWT - use local copy till upstream catches up |
| 130 |
@@ -55,8 +54,10 @@ win32:BOOST_LIBS = $$QTI_ROOT/3rdparty/boost/lib/libboost_date_time-mgw34-mt.lib |
| 131 |
|
| 132 |
# include path. |
| 133 |
QWT_INCLUDEPATH = $$QTI_ROOT/3rdparty/qwt/src |
| 134 |
+#QWT_INCLUDEPATH = /usr/include/qwt5 |
| 135 |
# link locally against a copy in 3rdparty/ |
| 136 |
QWT_LIBS = $$QTI_ROOT/3rdparty/qwt/lib/libqwt.a |
| 137 |
+#QWT_LIBS = -lqwt |
| 138 |
|
| 139 |
########################################################### |
| 140 |
## libxls - optional. you don't have to set these variables |
| 141 |
@@ -64,9 +65,9 @@ QWT_LIBS = $$QTI_ROOT/3rdparty/qwt/lib/libqwt.a |
| 142 |
########################################################### |
| 143 |
|
| 144 |
# include path. |
| 145 |
-XLS_INCLUDEPATH = $$QTI_ROOT/3rdparty/libxls/include/ |
| 146 |
+XLS_INCLUDEPATH = /usr/include/libxls/ |
| 147 |
# link locally against a copy in 3rdparty/ |
| 148 |
-XLS_LIBS = $$QTI_ROOT/3rdparty/libxls/lib/libxlsreader.a |
| 149 |
+#XLS_LIBS = -lxlsreader |
| 150 |
|
| 151 |
########################################################### |
| 152 |
## QuaZIP - optional. you don't have to set these variables |
| 153 |
@@ -74,20 +75,20 @@ XLS_LIBS = $$QTI_ROOT/3rdparty/libxls/lib/libxlsreader.a |
| 154 |
########################################################### |
| 155 |
|
| 156 |
# include path. |
| 157 |
-QUAZIP_INCLUDEPATH = $$QTI_ROOT/3rdparty/quazip/quazip/ |
| 158 |
+QUAZIP_INCLUDEPATH = /usr/include/quazip/ |
| 159 |
# link locally against a copy in 3rdparty/ |
| 160 |
-QUAZIP_LIBS = $$QTI_ROOT/3rdparty/quazip/lib/libquazip.a |
| 161 |
+#QUAZIP_LIBS = -lquazip |
| 162 |
|
| 163 |
########################################################## |
| 164 |
## libpng - optional. you don't have to set these variables |
| 165 |
########################################################## |
| 166 |
|
| 167 |
# include path. leave it blank to use SYS_INCLUDE |
| 168 |
-LIBPNG_INCLUDEPATH = $$QTI_ROOT/3rdparty/libpng/ |
| 169 |
+LIBPNG_INCLUDEPATH = /usr/include/libpng12 |
| 170 |
# link statically against a copy in 3rdparty/ |
| 171 |
-LIBPNG_LIBS = $$QTI_ROOT/3rdparty/libpng/libpng.a |
| 172 |
+#LIBPNG_LIBS = $$QTI_ROOT/3rdparty/libpng/libpng.a |
| 173 |
# or dynamically against a system-wide installation |
| 174 |
-#LIBPNG_LIBS = -lpng |
| 175 |
+LIBPNG_LIBS = $$system(pkg-config --libs libpng) |
| 176 |
|
| 177 |
########################################################## |
| 178 |
## EmfEngine - optional. you don't have to set these variables |
| 179 |
@@ -95,9 +96,17 @@ LIBPNG_LIBS = $$QTI_ROOT/3rdparty/libpng/libpng.a |
| 180 |
########################################################## |
| 181 |
|
| 182 |
# include path. |
| 183 |
-EMF_ENGINE_INCLUDEPATH = $$QTI_ROOT/3rdparty/EmfEngine/src |
| 184 |
+EMF_ENGINE_INCLUDEPATH = /usr/include/ |
| 185 |
# link locally against a copy in 3rdparty/ |
| 186 |
-EMF_ENGINE_LIBS = $$QTI_ROOT/3rdparty/EmfEngine/libEmfEngine.a |
| 187 |
+#EMF_ENGINE_LIBS = -lEmfEngine |
| 188 |
+ |
| 189 |
+############################################################ |
| 190 |
+## liborigin |
| 191 |
+############################################################ |
| 192 |
+ |
| 193 |
+LIB_ORIGIN_INCLUDEPATH = /usr/include/liborigin2 |
| 194 |
+ |
| 195 |
+LIB_ORIGIN_LIBS = -lorigin2 |
| 196 |
|
| 197 |
########################################################## |
| 198 |
## python - only used if python is needed |
| 199 |
@@ -133,7 +142,7 @@ contains( TARGET, qtiplot ) { |
| 200 |
#DEFINES += QTIPLOT_SUPPORT |
| 201 |
|
| 202 |
# Uncomment the following line if you want to perform a custom installation using the *.path variables defined in ./qtiplot.pro. |
| 203 |
- #CONFIG += CustomInstall |
| 204 |
+ CONFIG += CustomInstall |
| 205 |
|
| 206 |
# Uncomment the following line if you want to build QtiPlot as a browser plugin (not working on Internet Explorer). |
| 207 |
#CONFIG += BrowserPlugin |
| 208 |
|
| 209 |
|
| 210 |
|
| 211 |
1.1 sci-visualization/qtiplot/files/qtiplot-0.9.7.11-qtiplot.pro.patch |
| 212 |
|
| 213 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-qtiplot.pro.patch?rev=1.1&view=markup |
| 214 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-qtiplot.pro.patch?rev=1.1&content-type=text/plain |
| 215 |
|
| 216 |
Index: qtiplot-0.9.7.11-qtiplot.pro.patch |
| 217 |
=================================================================== |
| 218 |
diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro |
| 219 |
index 9af5187..add4fdb 100755 |
| 220 |
--- a/qtiplot/qtiplot.pro |
| 221 |
+++ b/qtiplot/qtiplot.pro |
| 222 |
@@ -10,21 +10,23 @@ QTI_ROOT = .. |
| 223 |
|
| 224 |
# local copy included |
| 225 |
INCLUDEPATH += ../3rdparty/qwtplot3d/include |
| 226 |
-INCLUDEPATH += ../3rdparty/liborigin |
| 227 |
-INCLUDEPATH += ../3rdparty/zlib |
| 228 |
-INCLUDEPATH += ../3rdparty/QTeXEngine/src |
| 229 |
+INCLUDEPATH += /usr/include |
| 230 |
|
| 231 |
# configurable |
| 232 |
INCLUDEPATH += $$MUPARSER_INCLUDEPATH |
| 233 |
INCLUDEPATH += $$QWT_INCLUDEPATH |
| 234 |
INCLUDEPATH += $$GSL_INCLUDEPATH |
| 235 |
INCLUDEPATH += $$BOOST_INCLUDEPATH |
| 236 |
+INCLUDEPATH += $$LIB_ORIGIN_INCLUDEPATH |
| 237 |
|
| 238 |
# configurable libs |
| 239 |
LIBS += $$MUPARSER_LIBS |
| 240 |
LIBS += $$QWT_LIBS |
| 241 |
LIBS += $$GSL_LIBS |
| 242 |
LIBS += $$BOOST_LIBS |
| 243 |
+LIBS += $$LIB_ORIGIN_LIBS |
| 244 |
+LIBS += -lQTeXEngine |
| 245 |
+LIBS += -lgl2ps |
| 246 |
|
| 247 |
############################################################################# |
| 248 |
###################### BASIC PROJECT PROPERTIES ############################# |
| 249 |
@@ -148,10 +150,8 @@ include(src/scripting/scripting.pri) |
| 250 |
##################### TeX export: QTeXEngine ################## |
| 251 |
############################################################### |
| 252 |
|
| 253 |
-INCLUDEPATH += ../3rdparty/QTeXEngine/src |
| 254 |
-HEADERS += ../3rdparty/QTeXEngine/src/QTeXEngine.h |
| 255 |
-SOURCES += ../3rdparty/QTeXEngine/src/QTeXPaintEngine.cpp |
| 256 |
-SOURCES += ../3rdparty/QTeXEngine/src/QTeXPaintDevice.cpp |
| 257 |
+INCLUDEPATH += /usr/include |
| 258 |
+HEADERS += /usr/include/QTeXEngine.h |
| 259 |
|
| 260 |
############################################################### |
| 261 |
##################### Scripting: PYTHON + SIP + PyQT ########## |
| 262 |
|
| 263 |
|
| 264 |
|
| 265 |
1.1 sci-visualization/qtiplot/files/qtiplot-0.9.7.11-syslibs.patch |
| 266 |
|
| 267 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-syslibs.patch?rev=1.1&view=markup |
| 268 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-syslibs.patch?rev=1.1&content-type=text/plain |
| 269 |
|
| 270 |
Index: qtiplot-0.9.7.11-syslibs.patch |
| 271 |
=================================================================== |
| 272 |
diff --git a/3rdparty/qwtplot3d/qwtplot3d.pri b/3rdparty/qwtplot3d/qwtplot3d.pri |
| 273 |
index 60a1f9c..65b420e 100755 |
| 274 |
--- a/3rdparty/qwtplot3d/qwtplot3d.pri |
| 275 |
+++ b/3rdparty/qwtplot3d/qwtplot3d.pri |
| 276 |
@@ -57,11 +57,11 @@ HEADERS += ../3rdparty/qwtplot3d/include/qwt3d_color.h \ |
| 277 |
../3rdparty/qwtplot3d/include/qwt3d_multiplot.h |
| 278 |
|
| 279 |
# gl2ps support |
| 280 |
-HEADERS += ../3rdparty/qwtplot3d/3rdparty/gl2ps/gl2ps.h \ |
| 281 |
- ../3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h |
| 282 |
+HEADERS += ../3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h |
| 283 |
|
| 284 |
-SOURCES += ../3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp \ |
| 285 |
- ../3rdparty/qwtplot3d/3rdparty/gl2ps/gl2ps.c |
| 286 |
+SOURCES += ../3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp |
| 287 |
+ |
| 288 |
+LIBS += -lgl2ps |
| 289 |
|
| 290 |
# zlib support for gl2ps |
| 291 |
zlib { |
| 292 |
diff --git a/3rdparty/qwtplot3d/qwtplot3d.pro b/3rdparty/qwtplot3d/qwtplot3d.pro |
| 293 |
index 7153400..6068858 100755 |
| 294 |
--- a/3rdparty/qwtplot3d/qwtplot3d.pro |
| 295 |
+++ b/3rdparty/qwtplot3d/qwtplot3d.pro |
| 296 |
@@ -82,11 +82,11 @@ HEADERS += include/qwt3d_surfaceplot.h \ |
| 297 |
include/qwt3d_multiplot.h |
| 298 |
|
| 299 |
# gl2ps support |
| 300 |
-HEADERS+=3rdparty/gl2ps/gl2ps.h \ |
| 301 |
- include/qwt3d_io_gl2ps.h |
| 302 |
+HEADERS += include/qwt3d_io_gl2ps.h |
| 303 |
|
| 304 |
-SOURCES+=src/qwt3d_io_gl2ps.cpp \ |
| 305 |
- 3rdparty/gl2ps/gl2ps.c |
| 306 |
+SOURCES += src/qwt3d_io_gl2ps.cpp |
| 307 |
+ |
| 308 |
+LIBS += -lgl2ps |
| 309 |
|
| 310 |
# zlib support for gl2ps |
| 311 |
zlib { |
| 312 |
diff --git a/qtiplot/src/origin/origin.pri b/qtiplot/src/origin/origin.pri |
| 313 |
index d1a43aa..486ba86 100755 |
| 314 |
--- a/qtiplot/src/origin/origin.pri |
| 315 |
+++ b/qtiplot/src/origin/origin.pri |
| 316 |
@@ -4,14 +4,5 @@ |
| 317 |
INCLUDEPATH += src/origin/ |
| 318 |
|
| 319 |
HEADERS += src/origin/importOPJ.h |
| 320 |
-HEADERS += ../3rdparty/liborigin/OriginObj.h |
| 321 |
-HEADERS += ../3rdparty/liborigin/OriginFile.h |
| 322 |
-HEADERS += ../3rdparty/liborigin/OriginParser.h |
| 323 |
-HEADERS += ../3rdparty/liborigin/OriginDefaultParser.h |
| 324 |
-HEADERS += ../3rdparty/liborigin/Origin750Parser.h |
| 325 |
|
| 326 |
SOURCES += src/origin/importOPJ.cpp |
| 327 |
-SOURCES += ../3rdparty/liborigin/OriginFile.cpp |
| 328 |
-SOURCES += ../3rdparty/liborigin/OriginParser.cpp |
| 329 |
-SOURCES += ../3rdparty/liborigin/OriginDefaultParser.cpp |
| 330 |
-SOURCES += ../3rdparty/liborigin/Origin750Parser.cpp |
| 331 |
|
| 332 |
|
| 333 |
|
| 334 |
1.1 sci-visualization/qtiplot/files/qtiplot-0.9.7.11-gl2ps.patch |
| 335 |
|
| 336 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-gl2ps.patch?rev=1.1&view=markup |
| 337 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-gl2ps.patch?rev=1.1&content-type=text/plain |
| 338 |
|
| 339 |
Index: qtiplot-0.9.7.11-gl2ps.patch |
| 340 |
=================================================================== |
| 341 |
diff --git a/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp b/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp |
| 342 |
index 3fbcf9f..8ce3c8c 100755 |
| 343 |
--- a/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp |
| 344 |
+++ b/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp |
| 345 |
@@ -6,7 +6,7 @@ |
| 346 |
#include <locale.h> |
| 347 |
|
| 348 |
#include "qwt3d_openglhelper.h" |
| 349 |
-#include "../3rdparty/gl2ps/gl2ps.h" |
| 350 |
+#include <gl2ps.h> |
| 351 |
#include "qwt3d_io_gl2ps.h" |
| 352 |
#include "qwt3d_plot.h" |
| 353 |
|
| 354 |
diff --git a/3rdparty/qwtplot3d/src/qwt3d_label.cpp b/3rdparty/qwtplot3d/src/qwt3d_label.cpp |
| 355 |
index 46380a9..8b6aaf0 100755 |
| 356 |
--- a/3rdparty/qwtplot3d/src/qwt3d_label.cpp |
| 357 |
+++ b/3rdparty/qwtplot3d/src/qwt3d_label.cpp |
| 358 |
@@ -1,7 +1,7 @@ |
| 359 |
#include <qbitmap.h> |
| 360 |
#include "qwt3d_label.h" |
| 361 |
#include "qwt3d_plot.h" |
| 362 |
-#include "../3rdparty/gl2ps/gl2ps.h" |
| 363 |
+#include <gl2ps.h> |
| 364 |
|
| 365 |
using namespace Qwt3D; |
| 366 |
|
| 367 |
|
| 368 |
|
| 369 |
|
| 370 |
1.1 sci-visualization/qtiplot/files/qtiplot-0.9.7.11-sip48.patch |
| 371 |
|
| 372 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-sip48.patch?rev=1.1&view=markup |
| 373 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-sip48.patch?rev=1.1&content-type=text/plain |
| 374 |
|
| 375 |
Index: qtiplot-0.9.7.11-sip48.patch |
| 376 |
=================================================================== |
| 377 |
diff --git a/qtiplot/src/scripting/scripting.pri b/qtiplot/src/scripting/scripting.pri |
| 378 |
index 9b7d9a8..30e2d1f 100755 |
| 379 |
--- a/qtiplot/src/scripting/scripting.pri |
| 380 |
+++ b/qtiplot/src/scripting/scripting.pri |
| 381 |
@@ -105,7 +105,9 @@ contains(SCRIPTING_LANGS, Python) { |
| 382 |
$${SIP_DIR}/sipqtiConvolution.cpp \ |
| 383 |
$${SIP_DIR}/sipqtiDeconvolution.cpp \ |
| 384 |
|
| 385 |
-exists(../../$${SIP_DIR}/sipqtiQList.cpp) { |
| 386 |
+SIPVERSION = $$system( sip -V | cut -b 1-3 ) |
| 387 |
+ |
| 388 |
+equals( SIPVERSION, 4.8 ) { |
| 389 |
# SIP < 4.9 |
| 390 |
SOURCES += $${SIP_DIR}/sipqtiQList.cpp |
| 391 |
} else { |
| 392 |
|
| 393 |
|
| 394 |
|
| 395 |
1.1 sci-visualization/qtiplot/files/qtiplot-0.9.7.11-dont-install-qwt.patch |
| 396 |
|
| 397 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-dont-install-qwt.patch?rev=1.1&view=markup |
| 398 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.7.11-dont-install-qwt.patch?rev=1.1&content-type=text/plain |
| 399 |
|
| 400 |
Index: qtiplot-0.9.7.11-dont-install-qwt.patch |
| 401 |
=================================================================== |
| 402 |
diff --git a/3rdparty/qwt/qwtconfig.pri b/3rdparty/qwt/qwtconfig.pri |
| 403 |
index ab13f68..95b8d69 100755 |
| 404 |
--- a/3rdparty/qwt/qwtconfig.pri |
| 405 |
+++ b/3rdparty/qwt/qwtconfig.pri |
| 406 |
@@ -7,18 +7,6 @@ VER_MIN = 2 |
| 407 |
VER_PAT = 0 |
| 408 |
VERSION = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT} |
| 409 |
|
| 410 |
-unix { |
| 411 |
- INSTALLBASE = /usr/local/qwt-5.2.0 |
| 412 |
-} |
| 413 |
- |
| 414 |
-win32 { |
| 415 |
- INSTALLBASE = C:/Qwt-5.2.0 |
| 416 |
-} |
| 417 |
- |
| 418 |
-target.path = $$INSTALLBASE/lib |
| 419 |
-headers.path = $$INSTALLBASE/include |
| 420 |
-doc.path = $$INSTALLBASE/doc |
| 421 |
- |
| 422 |
###################################################################### |
| 423 |
# qmake internal options |
| 424 |
###################################################################### |
Archives