Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 6 Jun 2017 13:51:35 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r442773 - head/science/orthanc/files
Message-ID:  <201706061351.v56DpZ0l024884@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Tue Jun  6 13:51:35 2017
New Revision: 442773
URL: https://svnweb.freebsd.org/changeset/ports/442773

Log:
  Fix build with SQLite 3.19.2
  
  Submitted by:	Pavel Volkov <pavelivolkov@gmail.com>
  Approved by:	portmgr (blanket)

Added:
  head/science/orthanc/files/patch-Core_SQLite_FunctionContext.cpp   (contents, props changed)
  head/science/orthanc/files/patch-Core_SQLite_FunctionContext.h   (contents, props changed)

Added: head/science/orthanc/files/patch-Core_SQLite_FunctionContext.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/science/orthanc/files/patch-Core_SQLite_FunctionContext.cpp	Tue Jun  6 13:51:35 2017	(r442773)
@@ -0,0 +1,11 @@
+--- Core/SQLite/FunctionContext.cpp.orig	2016-06-27 11:02:35 UTC
++++ 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);

Added: head/science/orthanc/files/patch-Core_SQLite_FunctionContext.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/science/orthanc/files/patch-Core_SQLite_FunctionContext.h	Tue Jun  6 13:51:35 2017	(r442773)
@@ -0,0 +1,28 @@
+--- Core/SQLite/FunctionContext.h.orig	2016-06-27 11:02:35 UTC
++++ 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;  // This corresponds to the opaque type "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;
+  



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706061351.v56DpZ0l024884>