From 3fadaffacee6de7c6ddaf9a3c15e4b8996b5b1c0 Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Mon, 10 Jun 2019 17:01:54 -0700
Subject: [many ports] Updates 2019.05.24 (#6618)

* [many ports] Updates 2019.05.24

* Update SHA512 and resolve conflict for ebml and matroska

* [avro-c]Fix build error caused by jansson upgrades.

* [xxhash]Update to the next version to fix build error.(xxhash issue:#179)

* Fix failures and undo asio

* [libyaml, grpc, miniz, paho-mqtt, sqlitecpp] Update patches

* Update REF

* Undo nvtt flann itk libtins aws-sdk-cpp openvdb vlpp xmsh changes

* [flann, fastcdr] Fix old patches and build error.

* [flann, fastcdr] Fix build error.

* Fix ensmallen uvatlas cppcms libplist failures and undo aws-c-common libopusenc arb taglib changes

* [dcmtk, draco, flatbuffers, forge, ftgl, mosquitto,nmslib, ogre] Update old patches and fix build error.

* fix libusbmuxd failures and undo xxhash paho-mqtt mongo-c-driver flann libffi

* fix libimobiledevice and undo qhull harfbuzz lcm libbson draco flatbuffers

* undo libmupdf forge kd-soap qca

* [mosquitto] Fix installation of import libs

* [arb][asio][aws-c-common][collada-dom][concurrentqueue][cryptopp][ebml] Revert trivial/undesired changes

* [fastcdr] Minimize patch

* [many ports] Revert trivial changes

* [libyaml] Switch to non-dist tag

* [sqlite-modern-cpp] Track master due to infrequent release

* [nano-signal-slot] Revert downgrade

* [openvpn3] Bump control version to account for portfile change

* [sqlite-modern-cpp] Fixup wrong hash

* [mosquitto] Commit missing patch
---
 ports/sqlitecpp/0001-Find-external-sqlite3.patch | 40 +++++++++---------------
 ports/sqlitecpp/CONTROL                          |  2 +-
 ports/sqlitecpp/portfile.cmake                   |  5 +--
 3 files changed, 18 insertions(+), 29 deletions(-)

(limited to 'ports/sqlitecpp')

diff --git a/ports/sqlitecpp/0001-Find-external-sqlite3.patch b/ports/sqlitecpp/0001-Find-external-sqlite3.patch
index f9473ff53..a59df97ae 100644
--- a/ports/sqlitecpp/0001-Find-external-sqlite3.patch
+++ b/ports/sqlitecpp/0001-Find-external-sqlite3.patch
@@ -1,26 +1,14 @@
-From 495f0f8bf2caf158ffed78e479d68359f51289a2 Mon Sep 17 00:00:00 2001
-From: Stanislav Ershov <digital.stream.of.mind@gmail.com>
-Date: Sat, 6 Jan 2018 11:26:55 +0300
-Subject: [PATCH] Find external sqlite3
-
----
- CMakeLists.txt | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4a3e492..f7e22a5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -193,7 +193,8 @@ install(EXPORT ${PROJECT_NAME}Config DESTINATION lib/cmake/${PROJECT_NAME})
- ## Build provided copy of SQLite3 C library ##
-
- # TODO NOCOMMIT
--#find_package(sqlite3)
-+find_package(sqlite3 CONFIG)
-+target_link_libraries(SQLiteCpp PRIVATE sqlite3)
- #if(sqlite3_VERSION VERSION_LESS "3.19")
- #    set_target_properties(SQLiteCpp PROPERTIES COMPILE_FLAGS "-DSQLITECPP_HAS_MEM_STRUCT")
- #endif()
---
-2.15.0.windows.1
-
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 00e058c..489b884 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -199,7 +199,8 @@ install(EXPORT ${PROJECT_NAME}Config DESTINATION lib/cmake/${PROJECT_NAME})
+ ## Build provided copy of SQLite3 C library ##
+ 
+ # TODO 
+-#find_package(sqlite3)
++find_package(sqlite3 CONFIG)
++target_link_libraries(SQLiteCpp PRIVATE sqlite3)
+ #if(sqlite3_VERSION VERSION_LESS "3.19")
+ #    set_target_properties(SQLiteCpp PROPERTIES COMPILE_FLAGS "-DSQLITECPP_HAS_MEM_STRUCT")
+ #endif()
diff --git a/ports/sqlitecpp/CONTROL b/ports/sqlitecpp/CONTROL
index 3374074d1..ecb0f16e5 100644
--- a/ports/sqlitecpp/CONTROL
+++ b/ports/sqlitecpp/CONTROL
@@ -1,4 +1,4 @@
 Source: sqlitecpp
-Version: 2.2-2
+Version: 2.3.0
 Build-Depends: sqlite3
 Description: SQLiteC++ (SQLiteCpp) is a smart and easy to use C++ SQLite3 wrapper.
diff --git a/ports/sqlitecpp/portfile.cmake b/ports/sqlitecpp/portfile.cmake
index 6876bdf8c..b57573d73 100644
--- a/ports/sqlitecpp/portfile.cmake
+++ b/ports/sqlitecpp/portfile.cmake
@@ -4,9 +4,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH
     REPO "SRombauts/SQLiteCpp"
-    REF "2.2.0"
+    REF 09dd10886c560ab5af41cfe694567f34c88cd101
     HEAD_REF master
-    SHA512 769857c50cc24596cbd7c6f057ca1e158a3bfecf00d7865d6ef0b90a2ff8ecb9ccb9e1d0e660bb9df8ecd50075a94a9bc9e3a71b96f2ef1c30780c6da9446cf0)
+    SHA512 d0a440e2e96fca9aac7fe73d46bb6508825a82547dca1e9c93d8c3ca46878fa137e7a2a7a865bcfa641d0236e26307a3342d55fc83578552a37eec7565642d91
+)
 
 vcpkg_apply_patches(
     SOURCE_PATH ${SOURCE_PATH}
-- 
cgit v1.2.3