[med-svn] [orthanc] 01/02: preparing for 1.2.0+dfsg-3

[Sebastien Jodogne]

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

jodogne-guest pushed a commit to branch master
in repository orthanc.

commit ade35a24fb01e7b19a3da2baf4dda7b97cf9036e
Author: jodogne-guest <s.jodogne at gmail.com>
Date:   Mon Jul 10 11:42:53 2017 +0200

    preparing for 1.2.0+dfsg-3
---
 debian/changelog      |  6 ++++++
 debian/patches/series |  1 +
 debian/patches/sqlite | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 54 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 651c595..65a7abe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+orthanc (1.2.0+dfsg-3) UNRELEASED; urgency=medium
+
+  * Fix FTBFS with libsqlite3-dev >= 3.19.0. Closes: #867782
+
+ -- Sebastien Jodogne <s.jodogne at gmail.com>  Mon, 10 Jul 2017 11:34:52 +0200
+
 orthanc (1.2.0+dfsg-2) unstable; urgency=medium
 
   * Fix FTBFS with libdcmtk-dev 3.6.1~20170228-2. Closes: #865606
diff --git a/debian/patches/series b/debian/patches/series
index fad379f..00d5d53 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix-dcmtk-3.6.1
+sqlite
diff --git a/debian/patches/sqlite b/debian/patches/sqlite
new file mode 100644
index 0000000..7f40ba1
--- /dev/null
+++ b/debian/patches/sqlite
@@ -0,0 +1,47 @@
+Description: Fix FTBFS with libsqlite3-dev 3.19.3-3
+Author: Sebastien Jodogne <s.jodogne at gmail.com>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: Orthanc-1.2.0/Core/SQLite/FunctionContext.cpp
+===================================================================
+--- Orthanc-1.2.0.orig/Core/SQLite/FunctionContext.cpp
++++ Orthanc-1.2.0/Core/SQLite/FunctionContext.cpp
+@@ -49,7 +49,7 @@ namespace Orthanc
+   {
+     FunctionContext::FunctionContext(struct sqlite3_context* context,
+                                      int argc,
+-                                     struct ::Mem** argv)
++                                     struct sqlite3_value** argv)
+     {
+       assert(context != NULL);
+       assert(argc >= 0);
+Index: Orthanc-1.2.0/Core/SQLite/FunctionContext.h
+===================================================================
+--- Orthanc-1.2.0.orig/Core/SQLite/FunctionContext.h
++++ Orthanc-1.2.0/Core/SQLite/FunctionContext.h
+@@ -37,7 +37,7 @@
+ #include "Statement.h"
+ 
+ struct sqlite3_context;
+-struct Mem;  // This corresponds to the opaque type "sqlite3_value"
++struct sqlite3_value;
+  
+ namespace Orthanc
+ {
+@@ -50,14 +50,14 @@ namespace Orthanc
+     private:
+       struct sqlite3_context* context_;
+       unsigned int argc_;
+-      struct ::Mem** argv_;
++      struct sqlite3_value** argv_;
+ 
+       void CheckIndex(unsigned int index) const;
+ 
+     public:
+       FunctionContext(struct sqlite3_context* context,
+                       int argc,
+-                      struct ::Mem** argv);
++                      struct sqlite3_value** argv);
+ 
+       ColumnType GetColumnType(unsigned int index) const;
+  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/orthanc.git