[vtk6] 01/04: Refresh patches.
Anton Gladky
gladk at moszumanska.debian.org
Thu Apr 14 19:14:49 UTC 2016
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository vtk6.
commit 23a537c27042373a8fdef54d909bdb096fd680b5
Author: Anton Gladky <gladk at debian.org>
Date: Thu Apr 14 17:46:26 2016 +0200
Refresh patches.
---
debian/patches/100_javac-heap.patch | 6 +-
debian/patches/101_java_install_path.patch | 8 +-
debian/patches/102_enable_system_proj4_lib.patch | 36 +++----
debian/patches/104_fix_gcc_version_6.patch | 16 +--
debian/patches/105_unforce_embedded_glew.patch | 8 +-
debian/patches/20_soversion-sharedlib.patch | 12 +--
debian/patches/30_matplotlib.patch | 8 +-
debian/patches/40_use_system_sqlite.patch | 122 ++++++++++++-----------
debian/patches/50_use_system_utf8.patch | 12 ++-
debian/patches/60_use_system_mpi4py.patch | 16 +--
debian/patches/70_fix_ftbfs_gcc49.patch | 26 ++---
debian/patches/80_fix_arm_compilation.patch | 8 +-
debian/patches/90_gdal-2.0.patch | 6 +-
13 files changed, 159 insertions(+), 125 deletions(-)
diff --git a/debian/patches/100_javac-heap.patch b/debian/patches/100_javac-heap.patch
index 0a01247..a6e8a7f 100644
--- a/debian/patches/100_javac-heap.patch
+++ b/debian/patches/100_javac-heap.patch
@@ -3,10 +3,10 @@ Author: Matthias Klose <doko at ubuntu.com>
Acked-By: Anton Gladky <gladk at debian.org>
Last-Update: 2016-02-12
-Index: VTK-6.2.0/Wrapping/Java/CMakeLists.txt
+Index: VTK-6.3.0/Wrapping/Java/CMakeLists.txt
===================================================================
---- VTK-6.2.0.orig/Wrapping/Java/CMakeLists.txt
-+++ VTK-6.2.0/Wrapping/Java/CMakeLists.txt
+--- VTK-6.3.0.orig/Wrapping/Java/CMakeLists.txt
++++ VTK-6.3.0/Wrapping/Java/CMakeLists.txt
@@ -80,6 +80,8 @@ if(APPLE)
set(JAVAC_OPTIONS -J-Xmx512m)
endif()
diff --git a/debian/patches/101_java_install_path.patch b/debian/patches/101_java_install_path.patch
index 5da0e36..18af20a 100644
--- a/debian/patches/101_java_install_path.patch
+++ b/debian/patches/101_java_install_path.patch
@@ -6,9 +6,11 @@ Description: Install Java modules in the correct path
Author: Gert Wollny <gw.fossdev at gmail.com
Last-Update: 2016-03-26
---- a/CMake/vtkJavaWrapping.cmake
-+++ b/CMake/vtkJavaWrapping.cmake
-@@ -79,7 +79,7 @@
+Index: VTK-6.3.0/CMake/vtkJavaWrapping.cmake
+===================================================================
+--- VTK-6.3.0.orig/CMake/vtkJavaWrapping.cmake
++++ VTK-6.3.0/CMake/vtkJavaWrapping.cmake
+@@ -79,7 +79,7 @@ function(vtk_add_java_wrapping module_na
install(TARGETS ${module_name}Java
EXPORT ${VTK_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${VTK_INSTALL_RUNTIME_DIR} COMPONENT RuntimeLibraries
diff --git a/debian/patches/102_enable_system_proj4_lib.patch b/debian/patches/102_enable_system_proj4_lib.patch
index 27cb456..03a9532 100644
--- a/debian/patches/102_enable_system_proj4_lib.patch
+++ b/debian/patches/102_enable_system_proj4_lib.patch
@@ -3,11 +3,11 @@ Author: Matthew Woehlke <matthew.woehlke at kitware.com>
Bug: https://bugs.debian.org/750184
Upstream-Bug: http://www.vtk.org/Bug/view.php?id=14126
-Index: vtk6-6.2.0+dfsg1/CMake/FindLIBPROJ4.cmake
+Index: VTK-6.3.0/CMake/FindLIBPROJ4.cmake
===================================================================
---- a/CMake/FindLIBPROJ4.cmake
-+++ b/CMake/FindLIBPROJ4.cmake
-@@ -12,7 +12,7 @@
+--- VTK-6.3.0.orig/CMake/FindLIBPROJ4.cmake
++++ VTK-6.3.0/CMake/FindLIBPROJ4.cmake
+@@ -12,7 +12,7 @@ if ( NOT LIBPROJ4_INCLUDE_DIR OR NOT LIB
endif ()
find_library( LIBPROJ4_LIBRARIES
@@ -16,7 +16,7 @@ Index: vtk6-6.2.0+dfsg1/CMake/FindLIBPROJ4.cmake
PATHS
${_LIBPROJ4_DIR}/lib64
${CMAKE_INSTALL_PREFIX}/lib64
-@@ -24,11 +24,12 @@
+@@ -24,11 +24,12 @@ if ( NOT LIBPROJ4_INCLUDE_DIR OR NOT LIB
${CMAKE_INSTALL_PREFIX}/lib
/usr/local/lib
/usr/lib
@@ -31,7 +31,7 @@ Index: vtk6-6.2.0+dfsg1/CMake/FindLIBPROJ4.cmake
PATHS
${_LIBPROJ4_DIR}
${_LIBPROJ4_DIR}/include
-@@ -40,6 +41,8 @@
+@@ -40,6 +41,8 @@ if ( NOT LIBPROJ4_INCLUDE_DIR OR NOT LIB
NO_DEFAULT_PATH
)
@@ -40,10 +40,10 @@ Index: vtk6-6.2.0+dfsg1/CMake/FindLIBPROJ4.cmake
if ( NOT LIBPROJ4_INCLUDE_DIR OR NOT LIBPROJ4_LIBRARIES )
if ( LIBPROJ4_REQUIRED )
message( FATAL_ERROR "LIBPROJ4 is required. Set LIBPROJ4_DIR" )
-Index: vtk6-6.2.0+dfsg1/Geovis/Core/vtkGeoProjection.cxx
+Index: VTK-6.3.0/Geovis/Core/vtkGeoProjection.cxx
===================================================================
---- vtk6-6.2.0+dfsg1.orig/Geovis/Core/vtkGeoProjection.cxx
-+++ vtk6-6.2.0+dfsg1/Geovis/Core/vtkGeoProjection.cxx
+--- VTK-6.3.0.orig/Geovis/Core/vtkGeoProjection.cxx
++++ VTK-6.3.0/Geovis/Core/vtkGeoProjection.cxx
@@ -80,7 +80,7 @@ int vtkGeoProjection::GetNumberOfProject
if ( vtkGeoProjectionNumProj < 0 )
{
@@ -116,10 +116,10 @@ Index: vtk6-6.2.0+dfsg1/Geovis/Core/vtkGeoProjection.cxx
delete[] pjArgs;
if ( this->Projection )
{
-Index: vtk6-6.2.0+dfsg1/Geovis/Core/vtkGeoProjection.h
+Index: VTK-6.3.0/Geovis/Core/vtkGeoProjection.h
===================================================================
---- vtk6-6.2.0+dfsg1.orig/Geovis/Core/vtkGeoProjection.h
-+++ vtk6-6.2.0+dfsg1/Geovis/Core/vtkGeoProjection.h
+--- VTK-6.3.0.orig/Geovis/Core/vtkGeoProjection.h
++++ VTK-6.3.0/Geovis/Core/vtkGeoProjection.h
@@ -29,8 +29,9 @@
#include "vtkGeovisCoreModule.h" // For export macro
#include "vtkObject.h"
@@ -150,10 +150,10 @@ Index: vtk6-6.2.0+dfsg1/Geovis/Core/vtkGeoProjection.h
vtkTimeStamp ProjectionMTime;
private:
-Index: vtk6-6.2.0+dfsg1/Geovis/Core/vtkGeoTransform.cxx
+Index: VTK-6.3.0/Geovis/Core/vtkGeoTransform.cxx
===================================================================
---- vtk6-6.2.0+dfsg1.orig/Geovis/Core/vtkGeoTransform.cxx
-+++ vtk6-6.2.0+dfsg1/Geovis/Core/vtkGeoTransform.cxx
+--- VTK-6.3.0.orig/Geovis/Core/vtkGeoTransform.cxx
++++ VTK-6.3.0/Geovis/Core/vtkGeoTransform.cxx
@@ -73,8 +73,8 @@ void vtkGeoTransform::TransformPoints( v
}
dstCoords->DeepCopy( srcCoords );
@@ -206,10 +206,10 @@ Index: vtk6-6.2.0+dfsg1/Geovis/Core/vtkGeoTransform.cxx
}
}
else // ! dst
-Index: vtk6-6.2.0+dfsg1/ThirdParty/libproj4/vtk_libproj4.h.in
+Index: VTK-6.3.0/ThirdParty/libproj4/vtk_libproj4.h.in
===================================================================
---- vtk6-6.2.0+dfsg1.orig/ThirdParty/libproj4/vtk_libproj4.h.in
-+++ vtk6-6.2.0+dfsg1/ThirdParty/libproj4/vtk_libproj4.h.in
+--- VTK-6.3.0.orig/ThirdParty/libproj4/vtk_libproj4.h.in
++++ VTK-6.3.0/ThirdParty/libproj4/vtk_libproj4.h.in
@@ -18,7 +18,8 @@
/* Use the libproj4 library configured for VTK. */
#cmakedefine VTK_USE_SYSTEM_LIBPROJ4
diff --git a/debian/patches/104_fix_gcc_version_6.patch b/debian/patches/104_fix_gcc_version_6.patch
index 7982e50..db8d70e 100644
--- a/debian/patches/104_fix_gcc_version_6.patch
+++ b/debian/patches/104_fix_gcc_version_6.patch
@@ -2,9 +2,11 @@ Description: Fix to be able to compile with gcc-6
Author: Gerardo Malazdrewicz <gerardo at malazdrewicz.com.ar>
Bug: https://bugs.debian.org/812296
---- a/CMake/GenerateExportHeader.cmake
-+++ b/CMake/GenerateExportHeader.cmake
-@@ -166,7 +166,7 @@
+Index: VTK-6.3.0/CMake/GenerateExportHeader.cmake
+===================================================================
+--- VTK-6.3.0.orig/CMake/GenerateExportHeader.cmake
++++ VTK-6.3.0/CMake/GenerateExportHeader.cmake
+@@ -166,7 +166,7 @@ macro(_test_compiler_hidden_visibility)
execute_process(COMMAND ${CMAKE_C_COMPILER} ARGS --version
OUTPUT_VARIABLE _gcc_version_info
ERROR_VARIABLE _gcc_version_info)
@@ -13,9 +15,11 @@ Bug: https://bugs.debian.org/812296
_gcc_version "${_gcc_version_info}")
# gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the
# patch level, handle this here:
---- a/CMake/vtkCompilerExtras.cmake
-+++ b/CMake/vtkCompilerExtras.cmake
-@@ -32,7 +32,7 @@
+Index: VTK-6.3.0/CMake/vtkCompilerExtras.cmake
+===================================================================
+--- VTK-6.3.0.orig/CMake/vtkCompilerExtras.cmake
++++ VTK-6.3.0/CMake/vtkCompilerExtras.cmake
+@@ -32,7 +32,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
OUTPUT_VARIABLE _gcc_version_info
ERROR_VARIABLE _gcc_version_info)
diff --git a/debian/patches/105_unforce_embedded_glew.patch b/debian/patches/105_unforce_embedded_glew.patch
index be7d9b7..6c4930a 100644
--- a/debian/patches/105_unforce_embedded_glew.patch
+++ b/debian/patches/105_unforce_embedded_glew.patch
@@ -3,9 +3,11 @@ Description: Remove the FORCE from the use_system_glew=off option
provided by Debian, so I assume that the fixes have been applied.
Author: Gert Wollny <gw.fossdev at gmail.com>
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -207,7 +207,7 @@
+Index: VTK-6.3.0/CMakeLists.txt
+===================================================================
+--- VTK-6.3.0.orig/CMakeLists.txt
++++ VTK-6.3.0/CMakeLists.txt
+@@ -207,7 +207,7 @@ else()
endif()
# default to not using the system GLEW as ours has fixes in it right now
diff --git a/debian/patches/20_soversion-sharedlib.patch b/debian/patches/20_soversion-sharedlib.patch
index a20e395..a503d49 100644
--- a/debian/patches/20_soversion-sharedlib.patch
+++ b/debian/patches/20_soversion-sharedlib.patch
@@ -1,7 +1,7 @@
-Index: VTK-6.2.0/CMake/vtkModuleMacros.cmake
+Index: VTK-6.3.0/CMake/vtkModuleMacros.cmake
===================================================================
---- VTK-6.2.0.orig/CMake/vtkModuleMacros.cmake
-+++ VTK-6.2.0/CMake/vtkModuleMacros.cmake
+--- VTK-6.3.0.orig/CMake/vtkModuleMacros.cmake
++++ VTK-6.3.0/CMake/vtkModuleMacros.cmake
@@ -401,8 +401,8 @@ endfunction()
function(vtk_target_name _name)
get_property(_type TARGET ${_name} PROPERTY TYPE)
@@ -13,10 +13,10 @@ Index: VTK-6.2.0/CMake/vtkModuleMacros.cmake
endif()
if("${_name}" MATCHES "^[Vv][Tt][Kk]")
set(_vtk "")
-Index: VTK-6.2.0/Rendering/Tk/CMakeLists.txt
+Index: VTK-6.3.0/Rendering/Tk/CMakeLists.txt
===================================================================
---- VTK-6.2.0.orig/Rendering/Tk/CMakeLists.txt
-+++ VTK-6.2.0/Rendering/Tk/CMakeLists.txt
+--- VTK-6.3.0.orig/Rendering/Tk/CMakeLists.txt
++++ VTK-6.3.0/Rendering/Tk/CMakeLists.txt
@@ -122,7 +122,7 @@ if(TK_FOUND AND VTK_USE_TK)
vtk_target_install(vtkRenderingPythonTkWidgets)
diff --git a/debian/patches/30_matplotlib.patch b/debian/patches/30_matplotlib.patch
index 3e1e54f..cac3abd 100644
--- a/debian/patches/30_matplotlib.patch
+++ b/debian/patches/30_matplotlib.patch
@@ -1,6 +1,8 @@
---- a/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
-+++ b/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
-@@ -143,6 +143,10 @@
+Index: VTK-6.3.0/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
+===================================================================
+--- VTK-6.3.0.orig/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
++++ VTK-6.3.0/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
+@@ -143,6 +143,10 @@ private:
// is called internally when matplotlib rendering is first needed and is used
// to implement IsAvailable.
static Availability CheckMPLAvailability();
diff --git a/debian/patches/40_use_system_sqlite.patch b/debian/patches/40_use_system_sqlite.patch
index f3e4b06..ee393a5 100644
--- a/debian/patches/40_use_system_sqlite.patch
+++ b/debian/patches/40_use_system_sqlite.patch
@@ -3,8 +3,10 @@ Author: Anton Gladky <gladk at debian.org>
Bug-Debian: http://bugs.debian.org/750183
Last-Update: 2014-06-03
---- a/IO/SQL/vtkSQLiteDatabase.cxx
-+++ b/IO/SQL/vtkSQLiteDatabase.cxx
+Index: VTK-6.3.0/IO/SQL/vtkSQLiteDatabase.cxx
+===================================================================
+--- VTK-6.3.0.orig/IO/SQL/vtkSQLiteDatabase.cxx
++++ VTK-6.3.0/IO/SQL/vtkSQLiteDatabase.cxx
@@ -29,7 +29,7 @@
#include <vtksys/ios/fstream>
#include <vtksys/ios/sstream>
@@ -14,7 +16,7 @@ Last-Update: 2014-06-03
vtkStandardNewMacro(vtkSQLiteDatabase);
-@@ -307,15 +307,15 @@
+@@ -307,15 +307,15 @@ bool vtkSQLiteDatabase::Open(const char*
}
}
@@ -34,7 +36,7 @@ Last-Update: 2014-06-03
return false;
}
else
-@@ -334,8 +334,8 @@
+@@ -334,8 +334,8 @@ void vtkSQLiteDatabase::Close()
}
else
{
@@ -45,7 +47,7 @@ Last-Update: 2014-06-03
{
vtkWarningMacro(<< "Close(): SQLite returned result code " << result);
}
-@@ -374,7 +374,7 @@
+@@ -374,7 +374,7 @@ vtkStringArray * vtkSQLiteDatabase::GetT
if (!status)
{
vtkErrorMacro(<< "GetTables(): Database returned error: "
@@ -54,7 +56,7 @@ Last-Update: 2014-06-03
query->Delete();
return this->Tables;
}
-@@ -403,7 +403,7 @@
+@@ -403,7 +403,7 @@ vtkStringArray * vtkSQLiteDatabase::GetR
if (!status)
{
vtkErrorMacro(<< "GetRecord(" << table << "): Database returned error: "
@@ -63,7 +65,7 @@ Last-Update: 2014-06-03
query->Delete();
return NULL;
}
-@@ -467,10 +467,10 @@
+@@ -467,10 +467,10 @@ bool vtkSQLiteDatabase::ParseURL(const c
// ----------------------------------------------------------------------
bool vtkSQLiteDatabase::HasError()
{
@@ -76,8 +78,32 @@ Last-Update: 2014-06-03
- return vtk_sqlite3_errmsg(this->SQLiteInstance);
+ return sqlite3_errmsg(this->SQLiteInstance);
}
---- a/IO/SQL/vtkSQLiteQuery.cxx
-+++ b/IO/SQL/vtkSQLiteQuery.cxx
+Index: VTK-6.3.0/IO/SQL/vtkSQLiteDatabase.h
+===================================================================
+--- VTK-6.3.0.orig/IO/SQL/vtkSQLiteDatabase.h
++++ VTK-6.3.0/IO/SQL/vtkSQLiteDatabase.h
+@@ -49,7 +49,7 @@
+ class vtkSQLQuery;
+ class vtkSQLiteQuery;
+ class vtkStringArray;
+-struct vtk_sqlite3;
++struct sqlite3;
+
+ class VTKIOSQL_EXPORT vtkSQLiteDatabase : public vtkSQLDatabase
+ {
+@@ -147,7 +147,7 @@ protected:
+ virtual bool ParseURL(const char* url);
+
+ private:
+- vtk_sqlite3 *SQLiteInstance;
++ sqlite3 *SQLiteInstance;
+
+ // We want this to be private, a user of this class
+ // should not be setting this for any reason
+Index: VTK-6.3.0/IO/SQL/vtkSQLiteQuery.cxx
+===================================================================
+--- VTK-6.3.0.orig/IO/SQL/vtkSQLiteQuery.cxx
++++ VTK-6.3.0/IO/SQL/vtkSQLiteQuery.cxx
@@ -25,7 +25,7 @@
#include "vtkVariant.h"
#include "vtkVariantArray.h"
@@ -87,7 +113,7 @@ Last-Update: 2014-06-03
#include <cassert>
-@@ -43,7 +43,7 @@
+@@ -43,7 +43,7 @@ vtkSQLiteQuery::vtkSQLiteQuery()
{
this->Statement = NULL;
this->InitialFetch = true;
@@ -96,7 +122,7 @@ Last-Update: 2014-06-03
this->LastErrorText = NULL;
this->TransactionInProgress = false;
}
-@@ -61,7 +61,7 @@
+@@ -61,7 +61,7 @@ vtkSQLiteQuery::~vtkSQLiteQuery()
{
if (this->Database != NULL)
{
@@ -105,7 +131,7 @@ Last-Update: 2014-06-03
this->Statement = NULL;
}
}
-@@ -128,8 +128,8 @@
+@@ -128,8 +128,8 @@ bool vtkSQLiteQuery::SetQuery(const char
if (this->Statement)
{
vtkDebugMacro(<<"Finalizing old statement");
@@ -116,7 +142,7 @@ Last-Update: 2014-06-03
{
vtkWarningMacro(<<"SetQuery(): Finalize returned unexpected code "
<< finalizeStatus);
-@@ -148,19 +148,19 @@
+@@ -148,19 +148,19 @@ bool vtkSQLiteQuery::SetQuery(const char
return false;
}
@@ -141,7 +167,7 @@ Last-Update: 2014-06-03
<< this->GetLastErrorText()
<< " on statement: '"
<< this->Query << "'");
-@@ -191,31 +191,31 @@
+@@ -191,31 +191,31 @@ bool vtkSQLiteQuery::Execute()
}
else
{
@@ -180,7 +206,7 @@ Last-Update: 2014-06-03
<< this->GetLastErrorText());
this->Active = false;
return false;
-@@ -236,7 +236,7 @@
+@@ -236,7 +236,7 @@ int vtkSQLiteQuery::GetNumberOfFields()
}
else
{
@@ -189,7 +215,7 @@ Last-Update: 2014-06-03
}
}
-@@ -256,7 +256,7 @@
+@@ -256,7 +256,7 @@ const char * vtkSQLiteQuery::GetFieldNam
}
else
{
@@ -198,7 +224,7 @@ Last-Update: 2014-06-03
}
}
-@@ -276,22 +276,22 @@
+@@ -276,22 +276,22 @@ int vtkSQLiteQuery::GetFieldType(int col
}
else
{
@@ -228,7 +254,7 @@ Last-Update: 2014-06-03
<<" from SQLite.");
return VTK_VOID;
}
-@@ -312,7 +312,7 @@
+@@ -312,7 +312,7 @@ bool vtkSQLiteQuery::NextRow()
{
vtkDebugMacro(<<"NextRow(): Initial fetch being handled.");
this->InitialFetch = false;
@@ -237,7 +263,7 @@ Last-Update: 2014-06-03
{
return false;
}
-@@ -323,12 +323,12 @@
+@@ -323,12 +323,12 @@ bool vtkSQLiteQuery::NextRow()
}
else
{
@@ -253,7 +279,7 @@ Last-Update: 2014-06-03
{
return true;
}
-@@ -336,8 +336,8 @@
+@@ -336,8 +336,8 @@ bool vtkSQLiteQuery::NextRow()
{
vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database );
assert(dbContainer != NULL);
@@ -264,7 +290,7 @@ Last-Update: 2014-06-03
vtkErrorMacro(<<"NextRow(): Database returned error code "
<< result << " with the following message: "
<< this->GetLastErrorText());
-@@ -363,33 +363,33 @@
+@@ -363,33 +363,33 @@ vtkVariant vtkSQLiteQuery::DataValue(vtk
}
else
{
@@ -309,7 +335,7 @@ Last-Update: 2014-06-03
default:
return vtkVariant();
}
-@@ -420,11 +420,11 @@
+@@ -420,11 +420,11 @@ bool vtkSQLiteQuery::BeginTransaction()
vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database );
assert(dbContainer != NULL);
@@ -324,7 +350,7 @@ Last-Update: 2014-06-03
{
this->TransactionInProgress = true;
this->SetLastErrorText(NULL);
-@@ -448,7 +448,7 @@
+@@ -448,7 +448,7 @@ bool vtkSQLiteQuery::CommitTransaction()
{
if (this->Statement)
{
@@ -333,7 +359,7 @@ Last-Update: 2014-06-03
this->Statement = NULL;
}
-@@ -460,11 +460,11 @@
+@@ -460,11 +460,11 @@ bool vtkSQLiteQuery::CommitTransaction()
vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database );
assert(dbContainer != NULL);
@@ -348,7 +374,7 @@ Last-Update: 2014-06-03
{
this->TransactionInProgress = false;
this->SetLastErrorText(NULL);
-@@ -496,11 +496,11 @@
+@@ -496,11 +496,11 @@ bool vtkSQLiteQuery::RollbackTransaction
vtkSQLiteDatabase *dbContainer = vtkSQLiteDatabase::SafeDownCast( this->Database );
assert(dbContainer != NULL);
@@ -363,7 +389,7 @@ Last-Update: 2014-06-03
{
this->TransactionInProgress = false;
this->SetLastErrorText(NULL);
-@@ -644,11 +644,11 @@
+@@ -644,11 +644,11 @@ bool vtkSQLiteQuery::BindIntegerParamete
if (this->Active)
{
this->Active = false;
@@ -378,7 +404,7 @@ Last-Update: 2014-06-03
{
vtksys_ios::ostringstream errormessage;
errormessage << "sqlite_bind_int returned error: " << status;
-@@ -673,11 +673,11 @@
+@@ -673,11 +673,11 @@ bool vtkSQLiteQuery::BindInt64Parameter(
if (this->Active)
{
this->Active = false;
@@ -393,7 +419,7 @@ Last-Update: 2014-06-03
{
vtksys_ios::ostringstream errormessage;
errormessage << "sqlite_bind_int64 returned error: " << status;
-@@ -702,12 +702,12 @@
+@@ -702,12 +702,12 @@ bool vtkSQLiteQuery::BindDoubleParameter
if (this->Active)
{
this->Active = false;
@@ -409,7 +435,7 @@ Last-Update: 2014-06-03
{
vtksys_ios::ostringstream errormessage;
errormessage << "sqlite_bind_double returned error: " << status;
-@@ -731,12 +731,12 @@
+@@ -731,12 +731,12 @@ bool vtkSQLiteQuery::BindStringParameter
if (this->Active)
{
this->Active = false;
@@ -425,7 +451,7 @@ Last-Update: 2014-06-03
{
vtksys_ios::ostringstream errormessage;
errormessage << "sqlite_bind_text returned error: " << status;
-@@ -760,17 +760,17 @@
+@@ -760,17 +760,17 @@ bool vtkSQLiteQuery::BindBlobParameter(i
if (this->Active)
{
this->Active = false;
@@ -447,7 +473,7 @@ Last-Update: 2014-06-03
{
vtksys_ios::ostringstream errormessage;
errormessage << "sqlite_bind_blob returned error: " << status;
-@@ -794,12 +794,12 @@
+@@ -794,12 +794,12 @@ bool vtkSQLiteQuery::ClearParameterBindi
if (this->Active)
{
this->Active = false;
@@ -463,8 +489,10 @@ Last-Update: 2014-06-03
{
vtksys_ios::ostringstream errormessage;
errormessage << "sqlite_clear_bindings returned error: " << status;
---- a/IO/SQL/vtkSQLiteQuery.h
-+++ b/IO/SQL/vtkSQLiteQuery.h
+Index: VTK-6.3.0/IO/SQL/vtkSQLiteQuery.h
+===================================================================
+--- VTK-6.3.0.orig/IO/SQL/vtkSQLiteQuery.h
++++ VTK-6.3.0/IO/SQL/vtkSQLiteQuery.h
@@ -47,7 +47,7 @@
class vtkSQLiteDatabase;
class vtkVariant;
@@ -474,7 +502,7 @@ Last-Update: 2014-06-03
class VTKIOSQL_EXPORT vtkSQLiteQuery : public vtkSQLQuery
{
-@@ -155,7 +155,7 @@
+@@ -155,7 +155,7 @@ private:
vtkSQLiteQuery(const vtkSQLiteQuery &); // Not implemented.
void operator=(const vtkSQLiteQuery &); // Not implemented.
@@ -483,31 +511,13 @@ Last-Update: 2014-06-03
bool InitialFetch;
int InitialFetchResult;
char *LastErrorText;
---- a/ThirdParty/sqlite/CMakeLists.txt
-+++ b/ThirdParty/sqlite/CMakeLists.txt
+Index: VTK-6.3.0/ThirdParty/sqlite/CMakeLists.txt
+===================================================================
+--- VTK-6.3.0.orig/ThirdParty/sqlite/CMakeLists.txt
++++ VTK-6.3.0/ThirdParty/sqlite/CMakeLists.txt
@@ -1,4 +1,3 @@
set(vtksqlite_THIRD_PARTY 1)
-set(vtksqlite_LIBRARIES vtksqlite)
+set(vtksqlite_LIBRARIES sqlite3)
vtk_module_export_info()
-add_subdirectory(vtksqlite)
---- a/IO/SQL/vtkSQLiteDatabase.h
-+++ b/IO/SQL/vtkSQLiteDatabase.h
-@@ -49,7 +49,7 @@
- class vtkSQLQuery;
- class vtkSQLiteQuery;
- class vtkStringArray;
--struct vtk_sqlite3;
-+struct sqlite3;
-
- class VTKIOSQL_EXPORT vtkSQLiteDatabase : public vtkSQLDatabase
- {
-@@ -147,7 +147,7 @@
- virtual bool ParseURL(const char* url);
-
- private:
-- vtk_sqlite3 *SQLiteInstance;
-+ sqlite3 *SQLiteInstance;
-
- // We want this to be private, a user of this class
- // should not be setting this for any reason
diff --git a/debian/patches/50_use_system_utf8.patch b/debian/patches/50_use_system_utf8.patch
index ed73941..ee398ab 100644
--- a/debian/patches/50_use_system_utf8.patch
+++ b/debian/patches/50_use_system_utf8.patch
@@ -25,8 +25,10 @@ Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
---- vtk6-6.2.0.orig/Common/Core/vtkUnicodeString.cxx
-+++ vtk6-6.2.0/Common/Core/vtkUnicodeString.cxx
+Index: VTK-6.3.0/Common/Core/vtkUnicodeString.cxx
+===================================================================
+--- VTK-6.3.0.orig/Common/Core/vtkUnicodeString.cxx
++++ VTK-6.3.0/Common/Core/vtkUnicodeString.cxx
@@ -41,7 +41,7 @@ vtkUnicodeString::const_iterator::const_
vtkUnicodeString::value_type vtkUnicodeString::const_iterator::operator*() const
@@ -206,8 +208,10 @@ Last-Update: <YYYY-MM-DD>
return vtkUnicodeString(from, to);
}
---- vtk6-6.2.0.orig/IO/Core/vtkUTF8TextCodec.cxx
-+++ vtk6-6.2.0/IO/Core/vtkUTF8TextCodec.cxx
+Index: VTK-6.3.0/IO/Core/vtkUTF8TextCodec.cxx
+===================================================================
+--- VTK-6.3.0.orig/IO/Core/vtkUTF8TextCodec.cxx
++++ VTK-6.3.0/IO/Core/vtkUTF8TextCodec.cxx
@@ -124,7 +124,7 @@ vtkUnicodeString::value_type vtkUTF8Text
throw(std::string("End of Input"));
}
diff --git a/debian/patches/60_use_system_mpi4py.patch b/debian/patches/60_use_system_mpi4py.patch
index b0bfbb0..7f6e035 100644
--- a/debian/patches/60_use_system_mpi4py.patch
+++ b/debian/patches/60_use_system_mpi4py.patch
@@ -2,9 +2,11 @@ Description: use system mpi4py
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-03-24
---- a/Parallel/MPI4Py/CMakeLists.txt
-+++ b/Parallel/MPI4Py/CMakeLists.txt
-@@ -18,7 +18,7 @@
+Index: VTK-6.3.0/Parallel/MPI4Py/CMakeLists.txt
+===================================================================
+--- VTK-6.3.0.orig/Parallel/MPI4Py/CMakeLists.txt
++++ VTK-6.3.0/Parallel/MPI4Py/CMakeLists.txt
+@@ -18,7 +18,7 @@ if(VTK_USE_SYSTEM_MPI4PY)
mark_as_advanced(MPI4PY_INCLUDE_DIR)
endif()
else()
@@ -13,9 +15,11 @@ Last-Update: 2015-03-24
endif()
include_directories("${MPI4PY_INCLUDE_DIR}")
---- a/Parallel/MPI4Py/module.cmake
-+++ b/Parallel/MPI4Py/module.cmake
-@@ -5,8 +5,6 @@
+Index: VTK-6.3.0/Parallel/MPI4Py/module.cmake
+===================================================================
+--- VTK-6.3.0.orig/Parallel/MPI4Py/module.cmake
++++ VTK-6.3.0/Parallel/MPI4Py/module.cmake
+@@ -5,8 +5,6 @@ if (VTK_WRAP_PYTHON)
DEPENDS
vtkParallelMPI
vtkPython
diff --git a/debian/patches/70_fix_ftbfs_gcc49.patch b/debian/patches/70_fix_ftbfs_gcc49.patch
index 5923b1c..adb9bb5 100644
--- a/debian/patches/70_fix_ftbfs_gcc49.patch
+++ b/debian/patches/70_fix_ftbfs_gcc49.patch
@@ -4,9 +4,11 @@ Bug-Debian: http://bugs.debian.org/746923
Forwarded: https://github.com/Kitware/VTK/pull/7
Last-Update: 2014-05-30
---- a/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
-+++ b/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
-@@ -1112,7 +1112,10 @@
+Index: VTK-6.3.0/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
+===================================================================
+--- VTK-6.3.0.orig/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
++++ VTK-6.3.0/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
+@@ -1112,7 +1112,10 @@ vtkDataSet *vtkDistributedDataFilter::Te
vtkIdType cellsPerNode = numTotalCells / nprocs;
vtkIdList **sendCells = new vtkIdList * [ nprocs ];
@@ -18,7 +20,7 @@ Last-Update: 2014-05-30
if (numConsumers == nprocs - 1)
{
-@@ -1597,7 +1600,9 @@
+@@ -1597,7 +1600,9 @@ vtkFloatArray **
// Exchange int arrays
float **recvArrays = new float * [nprocs];
@@ -29,7 +31,7 @@ Last-Update: 2014-05-30
if (sendSize[me] > 0) // sent myself an array
{
-@@ -1719,7 +1724,9 @@
+@@ -1719,7 +1724,9 @@ vtkIdTypeArray **
// Exchange int arrays
vtkIdType **recvArrays = new vtkIdType * [nprocs];
@@ -40,7 +42,7 @@ Last-Update: 2014-05-30
if (sendSize[me] > 0) // sent myself an array
{
-@@ -2788,7 +2795,9 @@
+@@ -2788,7 +2795,9 @@ void vtkDistributedDataFilter::AddConsta
unsigned char *vals = new unsigned char [npoints];
@@ -51,7 +53,7 @@ Last-Update: 2014-05-30
vtkUnsignedCharArray *Array = vtkUnsignedCharArray::New();
Array->SetName(arrayName);
-@@ -2808,7 +2817,9 @@
+@@ -2808,7 +2817,9 @@ void vtkDistributedDataFilter::AddConsta
unsigned char *vals = new unsigned char [ncells];
@@ -62,7 +64,7 @@ Last-Update: 2014-05-30
vtkUnsignedCharArray *Array = vtkUnsignedCharArray::New();
Array->SetName(arrayName);
-@@ -3007,7 +3018,9 @@
+@@ -3007,7 +3018,9 @@ int vtkDistributedDataFilter::AssignGlob
vtkIdType nGridPoints = grid->GetNumberOfPoints();
vtkIdType *numPointsOutside = new vtkIdType [nprocs];
@@ -73,7 +75,7 @@ Last-Update: 2014-05-30
vtkIdTypeArray *globalIds = vtkIdTypeArray::New();
globalIds->SetNumberOfValues(nGridPoints);
-@@ -3089,10 +3102,16 @@
+@@ -3089,10 +3102,16 @@ int vtkDistributedDataFilter::AssignGlob
// global ID back?
vtkFloatArray **ptarrayOut = new vtkFloatArray * [nprocs];
@@ -92,7 +94,7 @@ Last-Update: 2014-05-30
vtkIdType *next = new vtkIdType [nprocs];
vtkIdType *next3 = new vtkIdType [nprocs];
-@@ -3267,7 +3286,9 @@
+@@ -3267,7 +3286,9 @@ vtkIdTypeArray **vtkDistributedDataFilte
{
// There are no cells in my assigned region
@@ -103,7 +105,7 @@ Last-Update: 2014-05-30
return gids;
}
-@@ -3472,7 +3493,10 @@
+@@ -3472,7 +3493,10 @@ vtkIdTypeArray **vtkDistributedDataFilte
std::multimap<int, int>::iterator mapIt;
vtkIdTypeArray **processList = new vtkIdTypeArray * [nprocs];
@@ -115,7 +117,7 @@ Last-Update: 2014-05-30
for (int i=0; i<nprocs; i++)
{
-@@ -3562,7 +3586,9 @@
+@@ -3562,7 +3586,9 @@ vtkIdTypeArray **vtkDistributedDataFilte
vtkIdType numPoints = grid->GetNumberOfPoints();
vtkIdTypeArray **ghostPtIds = new vtkIdTypeArray * [nprocs];
diff --git a/debian/patches/80_fix_arm_compilation.patch b/debian/patches/80_fix_arm_compilation.patch
index d4583df..cf5bcb0 100644
--- a/debian/patches/80_fix_arm_compilation.patch
+++ b/debian/patches/80_fix_arm_compilation.patch
@@ -5,9 +5,11 @@ Author: Anton Gladky <gladk at debian.org>
Bug-Debian: https://bugs.debian.org/793304
Last-Update: 2015-07-29
---- a/Examples/Infovis/Cxx/CMakeLists.txt
-+++ b/Examples/Infovis/Cxx/CMakeLists.txt
-@@ -26,11 +26,6 @@
+Index: VTK-6.3.0/Examples/Infovis/Cxx/CMakeLists.txt
+===================================================================
+--- VTK-6.3.0.orig/Examples/Infovis/Cxx/CMakeLists.txt
++++ VTK-6.3.0/Examples/Infovis/Cxx/CMakeLists.txt
+@@ -26,11 +26,6 @@ if(vtkViewsInfovis_LOADED)
endif()
# If Qt is enabled include the QT based examples
diff --git a/debian/patches/90_gdal-2.0.patch b/debian/patches/90_gdal-2.0.patch
index 15d3c58..4db3240 100644
--- a/debian/patches/90_gdal-2.0.patch
+++ b/debian/patches/90_gdal-2.0.patch
@@ -3,8 +3,10 @@ Description: Fix GDAL 2.0 compatibility.
Origin: https://projects.archlinux.org/svntogit/community.git/tree/trunk/gdal2.patch?h=packages/vtk
Bug: http://www.vtk.org/Bug/view.php?id=15692
---- a/IO/GDAL/vtkGDALVectorReader.cxx
-+++ b/IO/GDAL/vtkGDALVectorReader.cxx
+Index: VTK-6.3.0/IO/GDAL/vtkGDALVectorReader.cxx
+===================================================================
+--- VTK-6.3.0.orig/IO/GDAL/vtkGDALVectorReader.cxx
++++ VTK-6.3.0/IO/GDAL/vtkGDALVectorReader.cxx
@@ -44,7 +44,11 @@ class vtkGDALVectorReader::Internal
public:
Internal( const char* srcName, int srcMode, int appendFeatures, int addFeatIds )
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/vtk6.git
More information about the debian-science-commits
mailing list