[med-svn] r23868 - in trunk/packages/orthanc-webviewer/trunk/debian: . patches

[Sebastien Jodogne]

Author: jodogne-guest
Date: 2017-07-10 10:04:03 +0000 (Mon, 10 Jul 2017)
New Revision: 23868

Added:
   trunk/packages/orthanc-webviewer/trunk/debian/patches/sqlite
Modified:
   trunk/packages/orthanc-webviewer/trunk/debian/changelog
   trunk/packages/orthanc-webviewer/trunk/debian/patches/series
Log:
fix #867789

Modified: trunk/packages/orthanc-webviewer/trunk/debian/changelog
===================================================================
--- trunk/packages/orthanc-webviewer/trunk/debian/changelog	2017-07-07 15:35:21 UTC (rev 23867)
+++ trunk/packages/orthanc-webviewer/trunk/debian/changelog	2017-07-10 10:04:03 UTC (rev 23868)
@@ -1,3 +1,9 @@
+orthanc-webviewer (2.2-3) UNRELEASED; urgency=medium
+
+  * Fix FTBFS with libsqlite3-dev >= 3.19.0. Closes: #867789
+
+ -- Sebastien Jodogne <s.jodogne at gmail.com>  Mon, 10 Jul 2017 11:57:21 +0200
+
 orthanc-webviewer (2.2-2) unstable; urgency=medium
 
   [ Tiago Sturmer Daitx <tiago.daitx at canonical.com> ]

Modified: trunk/packages/orthanc-webviewer/trunk/debian/patches/series
===================================================================
--- trunk/packages/orthanc-webviewer/trunk/debian/patches/series	2017-07-07 15:35:21 UTC (rev 23867)
+++ trunk/packages/orthanc-webviewer/trunk/debian/patches/series	2017-07-10 10:04:03 UTC (rev 23868)
@@ -1 +1,2 @@
 cmake
+sqlite

Added: trunk/packages/orthanc-webviewer/trunk/debian/patches/sqlite
===================================================================
--- trunk/packages/orthanc-webviewer/trunk/debian/patches/sqlite	                        (rev 0)
+++ trunk/packages/orthanc-webviewer/trunk/debian/patches/sqlite	2017-07-10 10:04:03 UTC (rev 23868)
@@ -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: OrthancWebViewer-2.2/Orthanc/Core/SQLite/FunctionContext.cpp
+===================================================================
+--- OrthancWebViewer-2.2.orig/Orthanc/Core/SQLite/FunctionContext.cpp
++++ OrthancWebViewer-2.2/Orthanc/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: OrthancWebViewer-2.2/Orthanc/Core/SQLite/FunctionContext.h
+===================================================================
+--- OrthancWebViewer-2.2.orig/Orthanc/Core/SQLite/FunctionContext.h
++++ OrthancWebViewer-2.2/Orthanc/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;
+