[vtk7] 18/24: Update sqlite patch

[Gert Wollny]

This is an automated email from the git hooks/post-receive script.

gewo pushed a commit to branch master
in repository vtk7.

commit 98f84eaa11441881e79cc8e1506ce2183f12f0de
Author: Gert Wollny <gewo at debian.org>
Date:   Sat Jul 8 17:39:14 2017 +0000

    Update sqlite patch
---
 debian/patches/40_use_system_sqlite.patch | 69 ++++++++++++++++++++-----------
 1 file changed, 46 insertions(+), 23 deletions(-)

diff --git a/debian/patches/40_use_system_sqlite.patch b/debian/patches/40_use_system_sqlite.patch
index 6afcd63..59fd4cb 100644
--- a/debian/patches/40_use_system_sqlite.patch
+++ b/debian/patches/40_use_system_sqlite.patch
@@ -45,7 +45,14 @@ Last-Update: 2014-06-03
      {
        vtkWarningMacro(<< "Close(): SQLite returned result code " << result);
      }
-@@ -374,7 +374,7 @@
+@@ -368,13 +368,13 @@
+   }
+ 
+   vtkSQLQuery *query = this->GetQueryInstance();
+-  query->SetQuery("SELECT name FROM sqlite_master WHERE type='table' ORDER BY name");
++  query->SetQuery("SELECT name FROM sqlite3_master WHERE type='table' ORDER BY name");
+   bool status = query->Execute();
+ 
    if (!status)
    {
      vtkErrorMacro(<< "GetTables(): Database returned error: "
@@ -383,7 +390,7 @@ Last-Update: 2014-06-03
    {
      this->TransactionInProgress = false;
      this->SetLastErrorText(NULL);
-@@ -644,11 +644,11 @@
+@@ -644,14 +644,14 @@
    if (this->Active)
    {
      this->Active = false;
@@ -397,23 +404,31 @@ Last-Update: 2014-06-03
 +  if (status != SQLITE_OK)
    {
      std::ostringstream errormessage;
-     errormessage << "sqlite3_bind_int returned error: " << status;
-@@ -673,11 +673,11 @@
+-    errormessage << "sqlite_bind_int returned error: " << status;
++    errormessage << "sqlite3_bind_int returned error: " << status;
+     this->SetLastErrorText(errormessage.str().c_str());
+     vtkErrorMacro(<<errormessage.str().c_str());
+     return false;
+@@ -673,14 +673,14 @@
    if (this->Active)
    {
      this->Active = false;
 -    vtk_sqlite3_reset(this->Statement);
 +    sqlite3_reset(this->Statement);
    }
--  int status = vtk_sqlite3_bind_int(this->Statement, index+1, static_cast<vtk_sqlite3_int64>(value));
-+  int status = sqlite3_bind_int(this->Statement, index+1, static_cast<vtk_sqlite3_int64>(value));
+-  int status = vtk_sqlite3_bind_int(this->Statement, index+1, static_cast<vtk_sqlite_int64>(value));
++  int status = sqlite3_bind_int(this->Statement, index+1, static_cast<sqlite3_int64>(value));
  
 -  if (status != VTK_SQLITE_OK)
 +  if (status != SQLITE_OK)
    {
      std::ostringstream errormessage;
-     errormessage << "sqlite3_bind_int64 returned error: " << status;
-@@ -702,12 +702,12 @@
+-    errormessage << "sqlite_bind_int64 returned error: " << status;
++    errormessage << "sqlite3_bind_int64 returned error: " << status;
+     this->SetLastErrorText(errormessage.str().c_str());
+     vtkErrorMacro(<<this->GetLastErrorText());
+     return false;
+@@ -702,15 +702,15 @@
    if (this->Active)
    {
      this->Active = false;
@@ -428,8 +443,12 @@ Last-Update: 2014-06-03
 +  if (status != SQLITE_OK)
    {
      std::ostringstream errormessage;
-     errormessage << "sqlite3_bind_double returned error: " << status;
-@@ -731,12 +731,12 @@
+-    errormessage << "sqlite_bind_double returned error: " << status;
++    errormessage << "sqlite3_bind_double returned error: " << status;
+     this->SetLastErrorText(errormessage.str().c_str());
+     vtkErrorMacro(<<this->GetLastErrorText());
+     return false;
+@@ -731,15 +731,15 @@
    if (this->Active)
    {
      this->Active = false;
@@ -444,8 +463,12 @@ Last-Update: 2014-06-03
 +  if (status != SQLITE_OK)
    {
      std::ostringstream errormessage;
-     errormessage << "sqlite3_bind_text returned error: " << status;
-@@ -760,17 +760,17 @@
+-    errormessage << "sqlite_bind_text returned error: " << status;
++    errormessage << "sqlite3_bind_text returned error: " << status;
+     this->SetLastErrorText(errormessage.str().c_str());
+     vtkErrorMacro(<<this->GetLastErrorText());
+     return false;
+@@ -760,20 +760,20 @@
    if (this->Active)
    {
      this->Active = false;
@@ -466,8 +489,12 @@ Last-Update: 2014-06-03
 +  if (status != SQLITE_OK)
    {
      std::ostringstream errormessage;
-     errormessage << "sqlite3_bind_blob returned error: " << status;
-@@ -794,12 +794,12 @@
+-    errormessage << "sqlite_bind_blob returned error: " << status;
++    errormessage << "sqlite3_bind_blob returned error: " << status;
+     this->SetLastErrorText(errormessage.str().c_str());
+     vtkErrorMacro(<<this->GetLastErrorText());
+     return false;
+@@ -794,15 +794,15 @@
    if (this->Active)
    {
      this->Active = false;
@@ -482,7 +509,11 @@ Last-Update: 2014-06-03
 +  if (status != SQLITE_OK)
    {
      std::ostringstream errormessage;
-     errormessage << "sqlite3_clear_bindings returned error: " << status;
+-    errormessage << "sqlite_clear_bindings returned error: " << status;
++    errormessage << "sqlite3_clear_bindings returned error: " << status;
+     this->SetLastErrorText(errormessage.str().c_str());
+     vtkErrorMacro(<<this->GetLastErrorText());
+     return false;
 --- a/IO/SQL/vtkSQLiteQuery.h
 +++ b/IO/SQL/vtkSQLiteQuery.h
 @@ -50,7 +50,7 @@
@@ -503,11 +534,3 @@ Last-Update: 2014-06-03
    bool InitialFetch;
    int InitialFetchResult;
    char *LastErrorText;
---- a/ThirdParty/sqlite/CMakeLists.txt
-+++ b/ThirdParty/sqlite/CMakeLists.txt
-@@ -1,4 +1,3 @@
- set(vtksqlite3_THIRD_PARTY 1)
--set(vtksqlite3_LIBRARIES vtksqlite)
-+set(vtksqlite3_LIBRARIES sqlite3)
- vtk_module_export_info()
--add_subdirectory(vtksqlite)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/vtk7.git