From c2e6708f5272380cdeaa400e54423ef3168794fa Mon Sep 17 00:00:00 2001
From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Date: Sat, 17 Oct 2020 03:36:47 +0800
Subject: [libpqxx] Update to 7.2.0 (#14067)

* [libpqxx] Update to 7.1.2

* [libpqxx] Update to 7.2.0

* Update ports/libpqxx/portfile.cmake

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
---
 ports/libpqxx/CONTROL                  |  2 +-
 ports/libpqxx/fix-deprecated-bug.patch | 40 ----------------------------------
 ports/libpqxx/portfile.cmake           | 18 ++++++++-------
 3 files changed, 11 insertions(+), 49 deletions(-)
 delete mode 100644 ports/libpqxx/fix-deprecated-bug.patch

diff --git a/ports/libpqxx/CONTROL b/ports/libpqxx/CONTROL
index 44adafec2..8692e13dd 100644
--- a/ports/libpqxx/CONTROL
+++ b/ports/libpqxx/CONTROL
@@ -1,5 +1,5 @@
 Source: libpqxx
-Version: 6.4.7
+Version: 7.2.0
 Homepage: https://github.com/jtv/libpqxx
 Description: The official C++ client API for PostgreSQL
 Build-Depends: libpq[core]
diff --git a/ports/libpqxx/fix-deprecated-bug.patch b/ports/libpqxx/fix-deprecated-bug.patch
deleted file mode 100644
index d3486be7a..000000000
--- a/ports/libpqxx/fix-deprecated-bug.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/include/pqxx/tablereader.hxx b/include/pqxx/tablereader.hxx
-index f5300cb..0cc0e43 100644
---- a/include/pqxx/tablereader.hxx
-+++ b/include/pqxx/tablereader.hxx
-@@ -34,13 +34,13 @@ public:
- 	const std::string &Name,
- 	const std::string &Null=std::string{});
-   template<typename ITER>
--  PQXX_DEPRECATED tablereader(
-+  tablereader(
- 	transaction_base &,
- 	const std::string &Name,
- 	ITER begincolumns,
- 	ITER endcolumns);
-   template<typename ITER>
--  PQXX_DEPRECATED tablereader(
-+  tablereader(
- 	transaction_base &,
- 	const std::string &Name,
- 	ITER begincolumns,
-diff --git a/include/pqxx/tablewriter.hxx b/include/pqxx/tablewriter.hxx
-index 32e7a98..a25b356 100644
---- a/include/pqxx/tablewriter.hxx
-+++ b/include/pqxx/tablewriter.hxx
-@@ -36,13 +36,13 @@ public:
- 	const std::string &WName,
- 	const std::string &Null=std::string{});
-   template<typename ITER>
--        PQXX_DEPRECATED tablewriter(
-+        tablewriter(
- 	transaction_base &,
- 	const std::string &WName,
- 	ITER begincolumns,
- 	ITER endcolumns);
-   template<typename ITER>
--        PQXX_DEPRECATED tablewriter(
-+        tablewriter(
- 	transaction_base &T,
- 	const std::string &WName,
- 	ITER begincolumns,
diff --git a/ports/libpqxx/portfile.cmake b/ports/libpqxx/portfile.cmake
index 85d680c32..6c234bb31 100644
--- a/ports/libpqxx/portfile.cmake
+++ b/ports/libpqxx/portfile.cmake
@@ -1,25 +1,27 @@
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO jtv/libpqxx
-    REF ff7bf80ea942fd91a6ce526405ecbc64131f634f # 6.4.7
-    SHA512 e4f94ecee4ac0b67059f8381a4f71798793b69d5da8762cdf665909e4209d2cde88a77358e04e60c524ee369b2a91325e309273e1ca12648c05b5aacdb832b71
+    REF 5015f8aa620ed8103840549b57fb46a5524f41ce # 7.2.0
+    SHA512 54f8886dd5189785c13f6d5c6a7f9d417474a2250d00bd0eff346d3e307ca6cc0fca11136c924b5c231833b0d6ec7e6680114682022e2b065921a4fe8eecdef5
     HEAD_REF master
-    PATCHES
-        fix-deprecated-bug.patch
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/config-public-compiler.h.in DESTINATION ${SOURCE_PATH})
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/config-internal-compiler.h.in DESTINATION ${SOURCE_PATH})
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
+    OPTIONS -DSKIP_BUILD_TEST=ON
 )
 
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libpqxx RENAME copyright)
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libpqxx)
+file(REMOVE_RECURSE 
+    ${CURRENT_PACKAGES_DIR}/debug/include
+    ${CURRENT_PACKAGES_DIR}/debug/share
+)
+
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-- 
cgit v1.2.3