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

[Sebastien Jodogne]

Author: jodogne-guest
Date: 2017-07-20 10:49:15 +0000 (Thu, 20 Jul 2017)
New Revision: 23876

Removed:
   trunk/packages/orthanc-webviewer/trunk/debian/patches/sqlite
Modified:
   trunk/packages/orthanc-webviewer/trunk/debian/changelog
   trunk/packages/orthanc-webviewer/trunk/debian/patches/cmake
   trunk/packages/orthanc-webviewer/trunk/debian/patches/series
Log:
New upstream version 2.3

Modified: trunk/packages/orthanc-webviewer/trunk/debian/changelog
===================================================================
--- trunk/packages/orthanc-webviewer/trunk/debian/changelog	2017-07-18 08:29:49 UTC (rev 23875)
+++ trunk/packages/orthanc-webviewer/trunk/debian/changelog	2017-07-20 10:49:15 UTC (rev 23876)
@@ -1,3 +1,9 @@
+orthanc-webviewer (2.3-1) UNRELEASED; urgency=medium
+
+  * New upstream version.
+
+ -- Sebastien Jodogne <s.jodogne at gmail.com>  Thu, 20 Jul 2017 12:42:34 +0200
+
 orthanc-webviewer (2.2-3) unstable; urgency=medium
 
   * Fix FTBFS with libsqlite3-dev >= 3.19.0. Closes: #867789

Modified: trunk/packages/orthanc-webviewer/trunk/debian/patches/cmake
===================================================================
--- trunk/packages/orthanc-webviewer/trunk/debian/patches/cmake	2017-07-18 08:29:49 UTC (rev 23875)
+++ trunk/packages/orthanc-webviewer/trunk/debian/patches/cmake	2017-07-20 10:49:15 UTC (rev 23876)
@@ -2,11 +2,11 @@
 Author: Sebastien Jodogne <s.jodogne at gmail.com>
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: OrthancWebViewer-2.2/CMakeLists.txt
+Index: OrthancWebViewer-2.3/CMakeLists.txt
 ===================================================================
---- OrthancWebViewer-2.2.orig/CMakeLists.txt
-+++ OrthancWebViewer-2.2/CMakeLists.txt
-@@ -54,7 +54,7 @@ include(${CMAKE_SOURCE_DIR}/Orthanc/Reso
+--- OrthancWebViewer-2.3.orig/CMakeLists.txt
++++ OrthancWebViewer-2.3/CMakeLists.txt
+@@ -56,7 +56,7 @@ include(${CMAKE_SOURCE_DIR}/Orthanc/Reso
  include(${CMAKE_SOURCE_DIR}/Orthanc/Resources/CMake/SQLiteConfiguration.cmake)
  
  include(${CMAKE_SOURCE_DIR}/Resources/CMake/GdcmConfiguration.cmake)
@@ -14,8 +14,8 @@
 +set(JAVASCRIPT_LIBS_DIR ${CMAKE_CURRENT_BINARY_DIR}/javascript-libs/)
  
  
- # Check that the Orthanc SDK headers are available or download them
-@@ -183,9 +183,10 @@ message("Setting the version of the libr
+ # Check that the Orthanc SDK headers are available
+@@ -187,9 +187,10 @@ message("Setting the version of the libr
  
  add_definitions(-DORTHANC_WEBVIEWER_VERSION="${ORTHANC_WEBVIEWER_VERSION}")
  

Modified: trunk/packages/orthanc-webviewer/trunk/debian/patches/series
===================================================================
--- trunk/packages/orthanc-webviewer/trunk/debian/patches/series	2017-07-18 08:29:49 UTC (rev 23875)
+++ trunk/packages/orthanc-webviewer/trunk/debian/patches/series	2017-07-20 10:49:15 UTC (rev 23876)
@@ -1,2 +1 @@
 cmake
-sqlite

Deleted: trunk/packages/orthanc-webviewer/trunk/debian/patches/sqlite
===================================================================
--- trunk/packages/orthanc-webviewer/trunk/debian/patches/sqlite	2017-07-18 08:29:49 UTC (rev 23875)
+++ trunk/packages/orthanc-webviewer/trunk/debian/patches/sqlite	2017-07-20 10:49:15 UTC (rev 23876)
@@ -1,47 +0,0 @@
-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;
-