[libpqxx] Update version to 7.9.2 (#40366)

This commit is contained in:
Frank 2024-08-12 23:40:09 +00:00 committed by GitHub
parent 0f8b6ddf49
commit 82c91595b3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 17 additions and 65 deletions

View File

@ -1,42 +0,0 @@
From d5bf7cf83d0c86c502b6b30d5f0c8dc3b3049a38 Mon Sep 17 00:00:00 2001
From: Jeroen Vermeulen <jtvjtv@gmail.com>
Date: Sun, 23 Jun 2024 21:03:24 +0200
Subject: [PATCH] Fixes https://github.com/jtv/libpqxx/issues/851
Thanks @tt4g.
---
cmake/config.cmake | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/cmake/config.cmake b/cmake/config.cmake
index ef2ebf5fc..4d9f7e935 100644
--- a/cmake/config.cmake
+++ b/cmake/config.cmake
@@ -8,10 +8,18 @@ function(detect_code_compiled code macro msg)
endif()
endfunction(detect_code_compiled)
+if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.30.0)
+ include(CMakeDetermineCompilerSupport)
+ cmake_determine_compiler_support(CXX)
+else()
+ # This function changed names in CMake 3.30. :-(
+ include(CMakeDetermineCompileFeatures)
+ cmake_determine_compile_features(CXX)
+endif()
+
include(CheckIncludeFileCXX)
include(CheckFunctionExists)
include(CheckSymbolExists)
-include(CMakeDetermineCompileFeatures)
include(CheckCXXSourceCompiles)
include(CMakeFindDependencyMacro)
@@ -39,7 +47,6 @@ check_function_exists("poll" PQXX_HAVE_POLL)
set(CMAKE_REQUIRED_LIBRARIES pq)
-cmake_determine_compile_features(CXX)
cmake_policy(SET CMP0057 NEW)
# check_cxx_source_compiles requires CMAKE_REQUIRED_DEFINITIONS to specify

View File

@ -1,12 +1,11 @@
diff --git a/include/pqxx/internal/header-pre.hxx b/include/pqxx/internal/header-pre.hxx
index abc1a39..cba0242 100644
index 833d583..21b7400 100644
--- a/include/pqxx/internal/header-pre.hxx
+++ b/include/pqxx/internal/header-pre.hxx
@@ -90,6 +90,12 @@
@@ -101,6 +101,11 @@
// Workarounds for Microsoft Visual C++
# ifdef _MSC_VER
+
+// Workarounds for deprecated attribute syntax error in Visual Studio 2017.
+# if _MSC_VER < 1920
+# define PQXX_DEPRECATED(MESSAGE) __declspec(deprecated( #MESSAGE ))
@ -15,7 +14,7 @@ index abc1a39..cba0242 100644
// Suppress vtables on abstract classes.
# define PQXX_NOVTABLE __declspec(novtable)
@@ -159,6 +165,10 @@
@@ -170,6 +175,10 @@
# define PQXX_NOVTABLE /* novtable */
#endif
@ -27,7 +26,7 @@ index abc1a39..cba0242 100644
#if defined(PQXX_HAVE_LIKELY)
# define PQXX_LIKELY [[likely]]
diff --git a/include/pqxx/stream_from.hxx b/include/pqxx/stream_from.hxx
index 1e8a272..299248c 100644
index b275a7f..c63a80f 100644
--- a/include/pqxx/stream_from.hxx
+++ b/include/pqxx/stream_from.hxx
@@ -160,7 +160,7 @@ public:
@ -73,10 +72,10 @@ index 1e8a272..299248c 100644
Iter columns_end);
diff --git a/include/pqxx/stream_to.hxx b/include/pqxx/stream_to.hxx
index 2a49d8f..06e602e 100644
index 281af28..838003d 100644
--- a/include/pqxx/stream_to.hxx
+++ b/include/pqxx/stream_to.hxx
@@ -169,7 +169,7 @@ public:
@@ -248,7 +248,7 @@ public:
* your data fields and the table is explicit in your code, and not hidden
* in an "implicit contract" between your code and your schema.
*/
@ -85,7 +84,7 @@ index 2a49d8f..06e602e 100644
transaction_base &tx, std::string_view table_name) :
stream_to{tx, table_name, ""sv}
{}
@@ -178,14 +178,14 @@ public:
@@ -257,7 +257,7 @@ public:
/** @deprecated Use @ref table or @ref raw_table as a factory.
*/
template<typename Columns>
@ -93,12 +92,4 @@ index 2a49d8f..06e602e 100644
+ PQXX_DEPRECATED("Use table() or raw_table() factory.") stream_to(
transaction_base &, std::string_view table_name, Columns const &columns);
/// Create a stream, specifying column names as a sequence of strings.
/** @deprecated Use @ref table or @ref raw_table as a factory.
*/
template<typename Iter>
- [[deprecated("Use table() or raw_table() factory.")]] stream_to(
+ PQXX_DEPRECATED("Use table() or raw_table() factory.") stream_to(
transaction_base &, std::string_view table_name, Iter columns_begin,
Iter columns_end);
private:

View File

@ -2,11 +2,10 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO jtv/libpqxx
REF "${VERSION}"
SHA512 134e28177f6a205c8a45462fa6b3cb4c407ab8f03a45708400fdc9f567d2ba1fae9cce9d541bdccd46694bf5d1b8dfd72bc6de5f6c915181909623357f86ce47
SHA512 f4035b1d976580f0ca101d484940f18a5af8299e249b754098c6c4bbe8198a855013112965300f7d978ca127b75547f2e2f4fb567b77114f010392952f0ed642
HEAD_REF master
PATCHES
fix_build_with_vs2017.patch
fix_build_cmake_3.30.patch # remove with > 7.9.1, upstream fix: https://github.com/jtv/libpqxx/commit/d5bf7cf83d0c86c502b6b30d5f0c8dc3b3049a38
)
file(COPY "${CMAKE_CURRENT_LIST_DIR}/config-public-compiler.h.in" DESTINATION "${SOURCE_PATH}")

View File

@ -1,7 +1,6 @@
{
"name": "libpqxx",
"version": "7.9.0",
"port-version": 1,
"version": "7.9.2",
"description": "The official C++ client API for PostgreSQL",
"homepage": "https://www.postgresql.org/",
"license": "BSD-3-Clause",

View File

@ -4893,8 +4893,8 @@
"port-version": 0
},
"libpqxx": {
"baseline": "7.9.0",
"port-version": 1
"baseline": "7.9.2",
"port-version": 0
},
"libprotobuf-mutator": {
"baseline": "1.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e7a918510cbcca1b6cd6f4cf72611ff796bc20af",
"version": "7.9.2",
"port-version": 0
},
{
"git-tree": "36fb80efda7137194f2bf679b9e685e9dab60bb5",
"version": "7.9.0",