1 |
hasufell 13/07/01 23:33:28 |
2 |
|
3 |
Added: paraview-4.0.1-vtk-cg-path.patch |
4 |
paraview-4.0.1-vtknetcd.patch |
5 |
paraview-4.0.1-removesqlite.patch |
6 |
paraview-4.0.1-gcc-4.7.patch |
7 |
paraview-4.0.1-xdmf-cstring.patch |
8 |
Log: |
9 |
version bump |
10 |
|
11 |
(Portage version: 2.2.0_alpha186/cvs/Linux x86_64, signed Manifest commit with key E73C35B3) |
12 |
|
13 |
Revision Changes Path |
14 |
1.1 sci-visualization/paraview/files/paraview-4.0.1-vtk-cg-path.patch |
15 |
|
16 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/paraview/files/paraview-4.0.1-vtk-cg-path.patch?rev=1.1&view=markup |
17 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/paraview/files/paraview-4.0.1-vtk-cg-path.patch?rev=1.1&content-type=text/plain |
18 |
|
19 |
Index: paraview-4.0.1-vtk-cg-path.patch |
20 |
=================================================================== |
21 |
--- ParaView-3.98.0-src/VTK/CMake/FindCg.cmake |
22 |
+++ ParaView-3.98.0-src/VTK/CMake/FindCg.cmake |
23 |
@@ -82,6 +82,7 @@ |
24 |
FIND_PROGRAM( CG_COMPILER cgc |
25 |
/usr/bin |
26 |
/usr/local/bin |
27 |
+ /opt/nvidia-cg-toolkit/bin |
28 |
DOC "The Cg Compiler" |
29 |
) |
30 |
GET_FILENAME_COMPONENT(CG_COMPILER_DIR "${CG_COMPILER}" PATH) |
31 |
@@ -89,6 +90,7 @@ |
32 |
FIND_PATH( CG_INCLUDE_PATH Cg/cg.h |
33 |
/usr/include |
34 |
/usr/local/include |
35 |
+ /opt/nvidia-cg-toolkit/include |
36 |
${CG_COMPILER_SUPER_DIR}/include |
37 |
DOC "The directory where Cg/cg.h resides" |
38 |
) |
39 |
@@ -98,6 +100,8 @@ |
40 |
/usr/lib |
41 |
/usr/local/lib64 |
42 |
/usr/local/lib |
43 |
+ /opt/nvidia-cg-toolkit/lib64 |
44 |
+ /opt/nvidia-cg-toolkit/lib |
45 |
${CG_COMPILER_SUPER_DIR}/lib64 |
46 |
${CG_COMPILER_SUPER_DIR}/lib |
47 |
DOC "The Cg runtime library" |
48 |
@@ -108,6 +112,8 @@ |
49 |
/usr/lib |
50 |
/usr/local/lib64 |
51 |
/usr/local/lib |
52 |
+ /opt/nvidia-cg-toolkit/lib64 |
53 |
+ /opt/nvidia-cg-toolkit/lib |
54 |
${CG_COMPILER_SUPER_DIR}/lib64 |
55 |
${CG_COMPILER_SUPER_DIR}/lib |
56 |
DOC "The Cg runtime library" |
57 |
|
58 |
|
59 |
|
60 |
1.1 sci-visualization/paraview/files/paraview-4.0.1-vtknetcd.patch |
61 |
|
62 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/paraview/files/paraview-4.0.1-vtknetcd.patch?rev=1.1&view=markup |
63 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/paraview/files/paraview-4.0.1-vtknetcd.patch?rev=1.1&content-type=text/plain |
64 |
|
65 |
Index: paraview-4.0.1-vtknetcd.patch |
66 |
=================================================================== |
67 |
adapted from debian patch need to be applied after paraview-3.14.1-removesqlite.patch |
68 |
|
69 |
--- ParaView-3.98.0-src/VTK/ThirdParty/netcdf/CMakeLists.txt |
70 |
+++ ParaView-3.98.0-src/VTK/ThirdParty/netcdf/CMakeLists.txt |
71 |
@@ -1,8 +1,8 @@ |
72 |
-set(vtknetcdf_THIRD_PARTY 1) |
73 |
-set(vtknetcdf_LIBRARIES vtkNetCDF vtkNetCDF_cxx) |
74 |
-set(vtknetcdf_INCLUDE_DIRS |
75 |
- ${vtknetcdf_SOURCE_DIR}/vtknetcdf/include |
76 |
- ${vtknetcdf_BINARY_DIR}/vtknetcdf |
77 |
- ) |
78 |
+#set(vtknetcdf_THIRD_PARTY 1) |
79 |
+set(vtknetcdf_LIBRARIES netcdf netcdf_c++) |
80 |
+#set(vtknetcdf_INCLUDE_DIRS |
81 |
+# ${vtknetcdf_SOURCE_DIR}/vtknetcdf/include |
82 |
+# ${vtknetcdf_BINARY_DIR}/vtknetcdf |
83 |
+# ) |
84 |
vtk_module_export_info() |
85 |
-add_subdirectory(vtknetcdf) |
86 |
+#add_subdirectory(vtknetcdf) |
87 |
--- ParaView-3.98.0-src/VTK/ThirdParty/netcdf/vtk_netcdf.h |
88 |
+++ ParaView-3.98.0-src/VTK/ThirdParty/netcdf/vtk_netcdf.h |
89 |
@@ -16,6 +16,6 @@ |
90 |
#define __vtk_netcdf_h |
91 |
|
92 |
/* Use the netcdf library configured for VTK. */ |
93 |
-#include <vtknetcdf/include/netcdf.h> |
94 |
+#include <netcdf.h> |
95 |
|
96 |
#endif |
97 |
--- ParaView-3.98.0-src/VTK/ThirdParty/netcdf/vtk_netcdfcpp.h |
98 |
+++ ParaView-3.98.0-src/VTK/ThirdParty/netcdf/vtk_netcdfcpp.h |
99 |
@@ -16,6 +16,6 @@ |
100 |
#define __vtk_netcdfcpp_h |
101 |
|
102 |
/* Use the netcdf library configured for VTK. */ |
103 |
-#include <vtknetcdf/cxx/netcdfcpp.h> |
104 |
+#include <netcdfcpp.h> |
105 |
|
106 |
#endif |
107 |
--- ParaView-3.98.0-src/VTK/ThirdParty/exodusII/vtkexodusII/test/CMakeLists.txt |
108 |
+++ ParaView-3.98.0-src/VTK/ThirdParty/exodusII/vtkexodusII/test/CMakeLists.txt |
109 |
@@ -21,7 +21,7 @@ |
110 |
) |
111 |
|
112 |
add_executable(ExoIICTests ${ExoIICTests}) |
113 |
-target_link_libraries(ExoIICTests vtkCommon vtkexoIIc vtkNetCDF) |
114 |
+target_link_libraries(ExoIICTests vtkCommon vtkexoIIc netcdf) |
115 |
|
116 |
set(TestsToRun ${ExoIICTests}) |
117 |
remove(TestsToRun ExoIICTests.cxx) |
118 |
--- ParaView-3.98.0-src/VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt |
119 |
+++ ParaView-3.98.0-src/VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt |
120 |
@@ -241,7 +241,7 @@ |
121 |
|
122 |
|
123 |
VTK_ADD_LIBRARY(vtkexoIIc ${cbind_SRCS}) |
124 |
-TARGET_LINK_LIBRARIES(vtkexoIIc vtkNetCDF) |
125 |
+TARGET_LINK_LIBRARIES(vtkexoIIc netcdf) |
126 |
|
127 |
IF(NOT VTK_INSTALL_NO_DEVELOPMENT) |
128 |
# INSTALL_FILES(${VTK_INSTALL_INCLUDE_DIR}/vtkexodus2 .h |
129 |
--- ParaView-3.98.0-src/VTK/IO/NetCDF/CMakeLists.txt |
130 |
+++ ParaView-3.98.0-src/VTK/IO/NetCDF/CMakeLists.txt |
131 |
@@ -10,5 +10,5 @@ |
132 |
|
133 |
vtk_module_library(vtkIONetCDF ${Module_SRCS}) |
134 |
|
135 |
-target_link_libraries(vtkIONetCDF vtkNetCDF_cxx) |
136 |
+target_link_libraries(vtkIONetCDF netcdf netcdf_c++) |
137 |
set_target_properties(vtkIONetCDF PROPERTIES LINK_INTERFACE_LIBRARIES "") |
138 |
--- ParaView-3.98.0-src/VTK/IO/ParallelNetCDF/CMakeLists.txt |
139 |
+++ ParaView-3.98.0-src/VTK/IO/ParallelNetCDF/CMakeLists.txt |
140 |
@@ -8,4 +8,4 @@ |
141 |
|
142 |
vtk_module_library(vtkIOParallelNetCDF ${Module_SRCS}) |
143 |
|
144 |
-target_link_libraries(vtkIOParallelNetCDF vtkNetCDF_cxx) |
145 |
+target_link_libraries(vtkIOParallelNetCDF netcdf netcdf_c++) |
146 |
|
147 |
|
148 |
|
149 |
1.1 sci-visualization/paraview/files/paraview-4.0.1-removesqlite.patch |
150 |
|
151 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/paraview/files/paraview-4.0.1-removesqlite.patch?rev=1.1&view=markup |
152 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/paraview/files/paraview-4.0.1-removesqlite.patch?rev=1.1&content-type=text/plain |
153 |
|
154 |
Index: paraview-4.0.1-removesqlite.patch |
155 |
=================================================================== |
156 |
Description: Import patch from VTK to remove sqlite |
157 |
Author: Mathieu Malaterre <mathieu.malaterre@×××××.com> |
158 |
Last-Update: Mon Feb 11 14:58:03 UTC 2013 |
159 |
|
160 |
remove the internal copy of sqlite (vtksqlite) |
161 |
http://patch-tracker.debian.org/patch/series/view/paraview/3.14.1-7/removesqlite.patch |
162 |
|
163 |
--- VTK/IO/SQL/vtkSQLiteDatabase.cxx |
164 |
+++ VTK/IO/SQL/vtkSQLiteDatabase.cxx |
165 |
@@ -29,7 +29,7 @@ |
166 |
#include <vtksys/ios/fstream> |
167 |
#include <vtksys/ios/sstream> |
168 |
|
169 |
-#include <vtksqlite/vtk_sqlite3.h> |
170 |
+#include <sqlite3.h> |
171 |
|
172 |
vtkStandardNewMacro(vtkSQLiteDatabase); |
173 |
|
174 |
@@ -307,15 +307,15 @@ |
175 |
} |
176 |
} |
177 |
|
178 |
- int result = vtk_sqlite3_open(this->DatabaseFileName, & (this->SQLiteInstance)); |
179 |
+ int result = sqlite3_open(this->DatabaseFileName, & (this->SQLiteInstance)); |
180 |
|
181 |
- if (result != VTK_SQLITE_OK) |
182 |
+ if (result != SQLITE_OK) |
183 |
{ |
184 |
vtkDebugMacro(<<"SQLite open() failed. Error code is " |
185 |
<< result << " and message is " |
186 |
- << vtk_sqlite3_errmsg(this->SQLiteInstance) ); |
187 |
+ << sqlite3_errmsg(this->SQLiteInstance) ); |
188 |
|
189 |
- vtk_sqlite3_close(this->SQLiteInstance); |
190 |
+ sqlite3_close(this->SQLiteInstance); |
191 |
return false; |
192 |
} |
193 |
else |
194 |
@@ -334,8 +334,8 @@ |
195 |
} |
196 |
else |
197 |
{ |
198 |
- int result = vtk_sqlite3_close(this->SQLiteInstance); |
199 |
- if (result != VTK_SQLITE_OK) |
200 |
+ int result = sqlite3_close(this->SQLiteInstance); |
201 |
+ if (result != SQLITE_OK) |
202 |
{ |
203 |
vtkWarningMacro(<< "Close(): SQLite returned result code " << result); |
204 |
} |
205 |
@@ -374,7 +374,7 @@ |
206 |
if (!status) |
207 |
{ |
208 |
vtkErrorMacro(<< "GetTables(): Database returned error: " |
209 |
- << vtk_sqlite3_errmsg(this->SQLiteInstance) ); |
210 |
+ << sqlite3_errmsg(this->SQLiteInstance) ); |
211 |
query->Delete(); |
212 |
return this->Tables; |
213 |
} |
214 |
@@ -403,7 +403,7 @@ |
215 |
if (!status) |
216 |
{ |
217 |
vtkErrorMacro(<< "GetRecord(" << table << "): Database returned error: " |
218 |
- << vtk_sqlite3_errmsg(this->SQLiteInstance) ); |
219 |
+ << sqlite3_errmsg(this->SQLiteInstance) ); |
220 |
query->Delete(); |
221 |
return NULL; |
222 |
} |
223 |
@@ -467,10 +467,10 @@ |
224 |
// ---------------------------------------------------------------------- |
225 |
bool vtkSQLiteDatabase::HasError() |
226 |
{ |
227 |
- return (vtk_sqlite3_errcode(this->SQLiteInstance)!=VTK_SQLITE_OK); |
228 |
+ return (sqlite3_errcode(this->SQLiteInstance)!=SQLITE_OK); |
229 |
} |
230 |
|
231 |
const char* vtkSQLiteDatabase::GetLastErrorText() |
232 |
{ |
233 |
- return vtk_sqlite3_errmsg(this->SQLiteInstance); |
234 |
+ return sqlite3_errmsg(this->SQLiteInstance); |
235 |
} |
236 |
--- VTK/IO/SQL/vtkSQLiteQuery.cxx |
237 |
+++ VTK/IO/SQL/vtkSQLiteQuery.cxx |
238 |
@@ -25,7 +25,7 @@ |
239 |
#include "vtkVariant.h" |
240 |
#include "vtkVariantArray.h" |
241 |
|
242 |
-#include <vtksqlite/vtk_sqlite3.h> |
243 |
+#include <sqlite3.h> |
244 |
|
245 |
#include <assert.h> |
246 |
|
247 |
@@ -43,7 +43,7 @@ |
248 |
{ |
249 |
this->Statement = NULL; |
250 |
this->InitialFetch = true; |
251 |
- this->InitialFetchResult=VTK_SQLITE_DONE; |
252 |
+ this->InitialFetchResult=SQLITE_DONE; |
253 |
this->LastErrorText = NULL; |
254 |
this->TransactionInProgress = false; |
255 |
} |
256 |
@@ -61,7 +61,7 @@ |
257 |
{ |
258 |
if (this->Database != NULL) |
259 |
{ |
260 |
- vtk_sqlite3_finalize(this->Statement); |
261 |
+ sqlite3_finalize(this->Statement); |
262 |
this->Statement = NULL; |
263 |
} |
264 |
} |
265 |
@@ -131,8 +131,8 @@ |
266 |
if (this->Statement) |
267 |
{ |
268 |
vtkDebugMacro(<<"Finalizing old statement"); |
269 |
- int finalizeStatus = vtk_sqlite3_finalize(this->Statement); |
270 |
- if (finalizeStatus != VTK_SQLITE_OK) |
271 |
+ int finalizeStatus = sqlite3_finalize(this->Statement); |
272 |
+ if (finalizeStatus != SQLITE_OK) |
273 |
{ |
274 |
vtkWarningMacro(<<"SetQuery(): Finalize returned unexpected code " |
275 |
<< finalizeStatus); |
276 |
@@ -151,19 +151,19 @@ |
277 |
return false; |
278 |
} |
279 |
|
280 |
- vtk_sqlite3 *db = dbContainer->SQLiteInstance; |
281 |
+ sqlite3 *db = dbContainer->SQLiteInstance; |
282 |
const char *unused_statement; |
283 |
|
284 |
- int prepareStatus = vtk_sqlite3_prepare_v2(db, |
285 |
+ int prepareStatus = sqlite3_prepare_v2(db, |
286 |
this->Query, |
287 |
static_cast<int>(strlen(this->Query)), |
288 |
&this->Statement, |
289 |
&unused_statement); |
290 |
|
291 |
- if (prepareStatus != VTK_SQLITE_OK) |
292 |
+ if (prepareStatus != SQLITE_OK) |
293 |
{ |
294 |
- this->SetLastErrorText(vtk_sqlite3_errmsg(db)); |
295 |
- vtkWarningMacro(<<"SetQuery(): vtk_sqlite3_prepare_v2() failed with error message " |
296 |
+ this->SetLastErrorText(sqlite3_errmsg(db)); |
297 |
+ vtkWarningMacro(<<"SetQuery(): sqlite3_prepare_v2() failed with error message " |
298 |
<< this->GetLastErrorText() |
299 |
<< " on statement: '" |
300 |
<< this->Query << "'"); |
301 |
@@ -194,31 +194,31 @@ |
302 |
} |
303 |
else |
304 |
{ |
305 |
- vtk_sqlite3_reset(this->Statement); |
306 |
+ sqlite3_reset(this->Statement); |
307 |
} |
308 |
|
309 |
vtkDebugMacro(<<"Execute(): Query ready to execute."); |
310 |
|
311 |
this->InitialFetch = true; |
312 |
- int result = vtk_sqlite3_step(this->Statement); |
313 |
+ int result = sqlite3_step(this->Statement); |
314 |
this->InitialFetchResult = result; |
315 |
|
316 |
- if (result == VTK_SQLITE_DONE) |
317 |
+ if (result == SQLITE_DONE) |
318 |
{ |
319 |
this->SetLastErrorText(NULL); |
320 |
this->Active = true; |
321 |
return true; |
322 |
} |
323 |
- else if (result != VTK_SQLITE_ROW) |
324 |
+ else if (result != SQLITE_ROW) |
325 |
{ |
326 |
vtkSQLiteDatabase *dbContainer = |
327 |
vtkSQLiteDatabase::SafeDownCast(this->Database); |
328 |
assert(dbContainer != NULL); |
329 |
|
330 |
- vtk_sqlite3 *db = dbContainer->SQLiteInstance; |
331 |
+ sqlite3 *db = dbContainer->SQLiteInstance; |
332 |
|
333 |
- this->SetLastErrorText(vtk_sqlite3_errmsg(db)); |
334 |
- vtkDebugMacro(<< "Execute(): vtk_sqlite3_step() returned error message " |
335 |
+ this->SetLastErrorText(sqlite3_errmsg(db)); |
336 |
+ vtkDebugMacro(<< "Execute(): sqlite3_step() returned error message " |
337 |
<< this->GetLastErrorText()); |
338 |
this->Active = false; |
339 |
return false; |
340 |
@@ -239,7 +239,7 @@ |
341 |
} |
342 |
else |
343 |
{ |
344 |
- return vtk_sqlite3_column_count(this->Statement); |
345 |
+ return sqlite3_column_count(this->Statement); |
346 |
} |
347 |
} |
348 |
|
349 |
@@ -259,7 +259,7 @@ |
350 |
} |
351 |
else |
352 |
{ |
353 |
- return vtk_sqlite3_column_name(this->Statement, column); |
354 |
+ return sqlite3_column_name(this->Statement, column); |
355 |
} |
356 |
} |
357 |
|
358 |
@@ -279,22 +279,22 @@ |
359 |
} |
360 |
else |
361 |
{ |
362 |
- switch (vtk_sqlite3_column_type(this->Statement, column)) |
363 |
+ switch (sqlite3_column_type(this->Statement, column)) |
364 |
{ |
365 |
- case VTK_SQLITE_INTEGER: |
366 |
+ case SQLITE_INTEGER: |
367 |
return VTK_INT; |
368 |
- case VTK_SQLITE_FLOAT: |
369 |
+ case SQLITE_FLOAT: |
370 |
return VTK_FLOAT; |
371 |
- case VTK_SQLITE_TEXT: |
372 |
+ case SQLITE_TEXT: |
373 |
return VTK_STRING; |
374 |
- case VTK_SQLITE_BLOB: |
375 |
+ case SQLITE_BLOB: |
376 |
return VTK_STRING; // until we have a BLOB type of our own |
377 |
- case VTK_SQLITE_NULL: |
378 |
+ case SQLITE_NULL: |
379 |
return VTK_VOID; // ??? what makes sense here? |
380 |
default: |
381 |
{ |
382 |
vtkErrorMacro(<<"GetFieldType(): Unknown data type " |
383 |
- << vtk_sqlite3_column_type(this->Statement, column) |
384 |
+ << sqlite3_column_type(this->Statement, column) |
385 |
<<" from SQLite."); |
386 |
return VTK_VOID; |
387 |
} |
388 |
@@ -315,7 +315,7 @@ |
389 |
{ |
390 |
vtkDebugMacro(<<"NextRow(): Initial fetch being handled."); |
391 |
this->InitialFetch = false; |
392 |
- if (this->InitialFetchResult == VTK_SQLITE_DONE) |
393 |
+ if (this->InitialFetchResult == SQLITE_DONE) |
394 |
{ |
395 |
return false; |
396 |
} |
397 |
@@ -326,12 +326,12 @@ |
398 |
} |
399 |
else |
400 |
{ |
401 |
- int result = vtk_sqlite3_step(this->Statement); |
402 |
- if (result == VTK_SQLITE_DONE) |
403 |
+ int result = sqlite3_step(this->Statement); |
404 |
+ if (result == SQLITE_DONE) |
405 |
{ |
406 |
return false; |
407 |
} |
408 |
- else if (result == VTK_SQLITE_ROW) |
409 |
+ else if (result == SQLITE_ROW) |
410 |
{ |
411 |
return true; |
412 |
} |
413 |
@@ -339,8 +339,8 @@ |
414 |
{ |
415 |
vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database ); |
416 |
assert(dbContainer != NULL); |
417 |
- vtk_sqlite3 *db = dbContainer->SQLiteInstance; |
418 |
- this->SetLastErrorText(vtk_sqlite3_errmsg(db)); |
419 |
+ sqlite3 *db = dbContainer->SQLiteInstance; |
420 |
+ this->SetLastErrorText(sqlite3_errmsg(db)); |
421 |
vtkErrorMacro(<<"NextRow(): Database returned error code " |
422 |
<< result << " with the following message: " |
423 |
<< this->GetLastErrorText()); |
424 |
@@ -366,33 +366,33 @@ |
425 |
} |
426 |
else |
427 |
{ |
428 |
- switch (vtk_sqlite3_column_type(this->Statement, column)) |
429 |
+ switch (sqlite3_column_type(this->Statement, column)) |
430 |
{ |
431 |
- case VTK_SQLITE_INTEGER: |
432 |
- return vtkVariant(vtk_sqlite3_column_int(this->Statement, column)); |
433 |
+ case SQLITE_INTEGER: |
434 |
+ return vtkVariant(sqlite3_column_int(this->Statement, column)); |
435 |
|
436 |
- case VTK_SQLITE_FLOAT: |
437 |
- return vtkVariant(vtk_sqlite3_column_double(this->Statement, column)); |
438 |
+ case SQLITE_FLOAT: |
439 |
+ return vtkVariant(sqlite3_column_double(this->Statement, column)); |
440 |
|
441 |
- case VTK_SQLITE_TEXT: |
442 |
+ case SQLITE_TEXT: |
443 |
{ |
444 |
vtksys_ios::ostringstream str; |
445 |
- str << vtk_sqlite3_column_text(this->Statement, column); |
446 |
+ str << sqlite3_column_text(this->Statement, column); |
447 |
return vtkVariant(vtkStdString(str.str())); |
448 |
} |
449 |
|
450 |
- case VTK_SQLITE_BLOB: |
451 |
+ case SQLITE_BLOB: |
452 |
{ |
453 |
// This is a hack ... by passing the BLOB to vtkStdString with an explicit |
454 |
// byte count, we ensure that the string will store all of the BLOB's bytes, |
455 |
// even if there are NULL values. |
456 |
|
457 |
return vtkVariant(vtkStdString( |
458 |
- static_cast<const char*>(vtk_sqlite3_column_blob(this->Statement, column)), |
459 |
- vtk_sqlite3_column_bytes(this->Statement, column))); |
460 |
+ static_cast<const char*>(sqlite3_column_blob(this->Statement, column)), |
461 |
+ sqlite3_column_bytes(this->Statement, column))); |
462 |
} |
463 |
|
464 |
- case VTK_SQLITE_NULL: |
465 |
+ case SQLITE_NULL: |
466 |
default: |
467 |
return vtkVariant(); |
468 |
} |
469 |
@@ -423,11 +423,11 @@ |
470 |
vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database ); |
471 |
assert(dbContainer != NULL); |
472 |
|
473 |
- vtk_sqlite3 *db = dbContainer->SQLiteInstance; |
474 |
+ sqlite3 *db = dbContainer->SQLiteInstance; |
475 |
char *errorMessage = NULL; |
476 |
- int result = vtk_sqlite3_exec(db, BEGIN_TRANSACTION, NULL, NULL, &errorMessage); |
477 |
+ int result = sqlite3_exec(db, BEGIN_TRANSACTION, NULL, NULL, &errorMessage); |
478 |
|
479 |
- if (result == VTK_SQLITE_OK) |
480 |
+ if (result == SQLITE_OK) |
481 |
{ |
482 |
this->TransactionInProgress = true; |
483 |
this->SetLastErrorText(NULL); |
484 |
@@ -451,7 +451,7 @@ |
485 |
{ |
486 |
if (this->Statement) |
487 |
{ |
488 |
- vtk_sqlite3_finalize(this->Statement); |
489 |
+ sqlite3_finalize(this->Statement); |
490 |
this->Statement = NULL; |
491 |
} |
492 |
|
493 |
@@ -463,11 +463,11 @@ |
494 |
|
495 |
vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database ); |
496 |
assert(dbContainer != NULL); |
497 |
- vtk_sqlite3 *db = dbContainer->SQLiteInstance; |
498 |
+ sqlite3 *db = dbContainer->SQLiteInstance; |
499 |
char *errorMessage = NULL; |
500 |
- int result = vtk_sqlite3_exec(db, COMMIT_TRANSACTION, NULL, NULL, &errorMessage); |
501 |
+ int result = sqlite3_exec(db, COMMIT_TRANSACTION, NULL, NULL, &errorMessage); |
502 |
|
503 |
- if (result == VTK_SQLITE_OK) |
504 |
+ if (result == SQLITE_OK) |
505 |
{ |
506 |
this->TransactionInProgress = false; |
507 |
this->SetLastErrorText(NULL); |
508 |
@@ -499,11 +499,11 @@ |
509 |
|
510 |
vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database ); |
511 |
assert(dbContainer != NULL); |
512 |
- vtk_sqlite3 *db = dbContainer->SQLiteInstance; |
513 |
+ sqlite3 *db = dbContainer->SQLiteInstance; |
514 |
char *errorMessage = NULL; |
515 |
- int result = vtk_sqlite3_exec(db, ROLLBACK_TRANSACTION, NULL, NULL, &errorMessage); |
516 |
+ int result = sqlite3_exec(db, ROLLBACK_TRANSACTION, NULL, NULL, &errorMessage); |
517 |
|
518 |
- if (result == VTK_SQLITE_OK) |
519 |
+ if (result == SQLITE_OK) |
520 |
{ |
521 |
this->TransactionInProgress = false; |
522 |
this->SetLastErrorText(NULL); |
523 |
@@ -647,11 +647,11 @@ |
524 |
if (this->Active) |
525 |
{ |
526 |
this->Active = false; |
527 |
- vtk_sqlite3_reset(this->Statement); |
528 |
+ sqlite3_reset(this->Statement); |
529 |
} |
530 |
- int status = vtk_sqlite3_bind_int(this->Statement, index+1, value); |
531 |
+ int status = sqlite3_bind_int(this->Statement, index+1, value); |
532 |
|
533 |
- if (status != VTK_SQLITE_OK) |
534 |
+ if (status != SQLITE_OK) |
535 |
{ |
536 |
vtksys_ios::ostringstream errormessage; |
537 |
errormessage << "sqlite_bind_int returned error: " << status; |
538 |
@@ -676,11 +676,11 @@ |
539 |
if (this->Active) |
540 |
{ |
541 |
this->Active = false; |
542 |
- vtk_sqlite3_reset(this->Statement); |
543 |
+ sqlite3_reset(this->Statement); |
544 |
} |
545 |
- int status = vtk_sqlite3_bind_int(this->Statement, index+1, static_cast<vtk_sqlite_int64>(value)); |
546 |
+ int status = sqlite3_bind_int(this->Statement, index+1, static_cast<sqlite_int64>(value)); |
547 |
|
548 |
- if (status != VTK_SQLITE_OK) |
549 |
+ if (status != SQLITE_OK) |
550 |
{ |
551 |
vtksys_ios::ostringstream errormessage; |
552 |
errormessage << "sqlite_bind_int64 returned error: " << status; |
553 |
@@ -705,12 +705,12 @@ |
554 |
if (this->Active) |
555 |
{ |
556 |
this->Active = false; |
557 |
- vtk_sqlite3_reset(this->Statement); |
558 |
+ sqlite3_reset(this->Statement); |
559 |
} |
560 |
|
561 |
- int status = vtk_sqlite3_bind_double(this->Statement, index+1, value); |
562 |
+ int status = sqlite3_bind_double(this->Statement, index+1, value); |
563 |
|
564 |
- if (status != VTK_SQLITE_OK) |
565 |
+ if (status != SQLITE_OK) |
566 |
{ |
567 |
vtksys_ios::ostringstream errormessage; |
568 |
errormessage << "sqlite_bind_double returned error: " << status; |
569 |
@@ -734,12 +734,12 @@ |
570 |
if (this->Active) |
571 |
{ |
572 |
this->Active = false; |
573 |
- vtk_sqlite3_reset(this->Statement); |
574 |
+ sqlite3_reset(this->Statement); |
575 |
} |
576 |
|
577 |
- int status = vtk_sqlite3_bind_text(this->Statement, index+1, value, length, VTK_SQLITE_TRANSIENT); |
578 |
+ int status = sqlite3_bind_text(this->Statement, index+1, value, length, SQLITE_TRANSIENT); |
579 |
|
580 |
- if (status != VTK_SQLITE_OK) |
581 |
+ if (status != SQLITE_OK) |
582 |
{ |
583 |
vtksys_ios::ostringstream errormessage; |
584 |
errormessage << "sqlite_bind_text returned error: " << status; |
585 |
@@ -763,17 +763,17 @@ |
586 |
if (this->Active) |
587 |
{ |
588 |
this->Active = false; |
589 |
- vtk_sqlite3_reset(this->Statement); |
590 |
+ sqlite3_reset(this->Statement); |
591 |
} |
592 |
|
593 |
int status = |
594 |
- vtk_sqlite3_bind_blob(this->Statement, |
595 |
+ sqlite3_bind_blob(this->Statement, |
596 |
index+1, |
597 |
data, |
598 |
length, |
599 |
- VTK_SQLITE_TRANSIENT); |
600 |
+ SQLITE_TRANSIENT); |
601 |
|
602 |
- if (status != VTK_SQLITE_OK) |
603 |
+ if (status != SQLITE_OK) |
604 |
{ |
605 |
vtksys_ios::ostringstream errormessage; |
606 |
errormessage << "sqlite_bind_blob returned error: " << status; |
607 |
@@ -797,12 +797,12 @@ |
608 |
if (this->Active) |
609 |
{ |
610 |
this->Active = false; |
611 |
- vtk_sqlite3_reset(this->Statement); |
612 |
+ sqlite3_reset(this->Statement); |
613 |
} |
614 |
|
615 |
- int status = vtk_sqlite3_clear_bindings(this->Statement); |
616 |
+ int status = sqlite3_clear_bindings(this->Statement); |
617 |
|
618 |
- if (status != VTK_SQLITE_OK) |
619 |
+ if (status != SQLITE_OK) |
620 |
{ |
621 |
vtksys_ios::ostringstream errormessage; |
622 |
errormessage << "sqlite_clear_bindings returned error: " << status; |
623 |
--- VTK/IO/SQL/vtkSQLiteDatabase.h |
624 |
+++ VTK/IO/SQL/vtkSQLiteDatabase.h |
625 |
@@ -49,7 +49,7 @@ |
626 |
class vtkSQLQuery; |
627 |
class vtkSQLiteQuery; |
628 |
class vtkStringArray; |
629 |
-struct vtk_sqlite3; |
630 |
+struct sqlite3; |
631 |
|
632 |
class VTKIOSQL_EXPORT vtkSQLiteDatabase : public vtkSQLDatabase |
633 |
{ |
634 |
@@ -147,7 +147,7 @@ |
635 |
virtual bool ParseURL(const char* url); |
636 |
|
637 |
private: |
638 |
- vtk_sqlite3 *SQLiteInstance; |
639 |
+ sqlite3 *SQLiteInstance; |
640 |
|
641 |
// We want this to be private, a user of this class |
642 |
// should not be setting this for any reason |
643 |
--- VTK/IO/SQL/vtkSQLiteQuery.h |
644 |
+++ VTK/IO/SQL/vtkSQLiteQuery.h |
645 |
@@ -47,7 +47,7 @@ |
646 |
class vtkSQLiteDatabase; |
647 |
class vtkVariant; |
648 |
class vtkVariantArray; |
649 |
-struct vtk_sqlite3_stmt; |
650 |
+struct sqlite3_stmt; |
651 |
|
652 |
class VTKIOSQL_EXPORT vtkSQLiteQuery : public vtkSQLQuery |
653 |
{ |
654 |
@@ -155,7 +155,7 @@ |
655 |
vtkSQLiteQuery(const vtkSQLiteQuery &); // Not implemented. |
656 |
void operator=(const vtkSQLiteQuery &); // Not implemented. |
657 |
|
658 |
- vtk_sqlite3_stmt *Statement; |
659 |
+ sqlite3_stmt *Statement; |
660 |
bool InitialFetch; |
661 |
int InitialFetchResult; |
662 |
char *LastErrorText; |
663 |
--- VTK/ThirdParty/sqlite/CMakeLists.txt |
664 |
+++ VTK/ThirdParty/sqlite/CMakeLists.txt |
665 |
@@ -1,4 +1,4 @@ |
666 |
-set(vtksqlite_THIRD_PARTY 1) |
667 |
-set(vtksqlite_LIBRARIES vtksqlite) |
668 |
+#set(vtksqlite_THIRD_PARTY 1) |
669 |
+set(vtksqlite_LIBRARIES sqlite3) |
670 |
vtk_module_export_info() |
671 |
-add_subdirectory(vtksqlite) |
672 |
+#add_subdirectory(vtksqlite) |
673 |
|
674 |
|
675 |
|
676 |
1.1 sci-visualization/paraview/files/paraview-4.0.1-gcc-4.7.patch |
677 |
|
678 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/paraview/files/paraview-4.0.1-gcc-4.7.patch?rev=1.1&view=markup |
679 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/paraview/files/paraview-4.0.1-gcc-4.7.patch?rev=1.1&content-type=text/plain |
680 |
|
681 |
Index: paraview-4.0.1-gcc-4.7.patch |
682 |
=================================================================== |
683 |
Description: fix FTBFS with gcc-4.7 |
684 |
Author: Mathieu Malaterre <malat@××××××.org> |
685 |
Origin: http://anonscm.debian.org/gitweb/?p=collab-maint/vtk.git;a=commitdiff;h=428e763c995bb303805e07da70c1a34fc103d208 |
686 |
Reviewed-by: Anton Gladky <gladky.anton@×××××.com> |
687 |
Last-Update: 2012-05-08 |
688 |
|
689 |
--- a/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx |
690 |
+++ b/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx |
691 |
@@ -35,6 +35,8 @@ |
692 |
using namespace ftgl; |
693 |
#endif |
694 |
|
695 |
+#include <stdint.h> |
696 |
+ |
697 |
// Print debug info |
698 |
#define VTK_FTFC_DEBUG 0 |
699 |
#define VTK_FTFC_DEBUG_CD 0 |
700 |
--- a/VTK/Rendering/FreeType/vtkFreeTypeUtilities.cxx |
701 |
+++ b/VTK/Rendering/FreeType/vtkFreeTypeUtilities.cxx |
702 |
@@ -36,6 +36,8 @@ |
703 |
using namespace ftgl; |
704 |
#endif |
705 |
|
706 |
+#include <stdint.h> |
707 |
+ |
708 |
// Print debug info |
709 |
|
710 |
#define VTK_FTFC_DEBUG 0 |
711 |
|
712 |
|
713 |
|
714 |
1.1 sci-visualization/paraview/files/paraview-4.0.1-xdmf-cstring.patch |
715 |
|
716 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/paraview/files/paraview-4.0.1-xdmf-cstring.patch?rev=1.1&view=markup |
717 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/paraview/files/paraview-4.0.1-xdmf-cstring.patch?rev=1.1&content-type=text/plain |
718 |
|
719 |
Index: paraview-4.0.1-xdmf-cstring.patch |
720 |
=================================================================== |
721 |
gcc header fix |
722 |
|
723 |
--- ParaView-3.98.0-src/VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfObject.h |
724 |
+++ ParaView-3.98.0-src/VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfObject.h |
725 |
@@ -82,6 +82,7 @@ |
726 |
# ifdef UNIX |
727 |
# include "sys/file.h" |
728 |
# include "strings.h" |
729 |
+# include <cstring> |
730 |
# define STRCASECMP strcasecmp |
731 |
# define STRNCASECMP strncasecmp |
732 |
# define STRCMP strcmp |