From: Rafael Sadowski Subject: UPDATE: databases/libpqxx To: ports@openbsd.org Date: Wed, 25 Jun 2025 21:08:56 +0200 This update unbreaks the build with libcxx19 and the one and only consumer is still happy at build time. OK? diff --git a/databases/libpqxx/Makefile b/databases/libpqxx/Makefile index 038e81cb5e9..6ced43d3e51 100644 --- a/databases/libpqxx/Makefile +++ b/databases/libpqxx/Makefile @@ -2,14 +2,13 @@ COMMENT= C++ client API for PostgreSQL GH_ACCOUNT= jtv GH_PROJECT= libpqxx -GH_TAGNAME= 6.4.7 -REVISION= 0 +GH_TAGNAME= 7.10.1 CATEGORIES= databases devel -SHARED_LIBS = pqxx 3.0 # .0.0 +SHARED_LIBS = pqxx 4.0 # .0.0 -HOMEPAGE= http://pqxx.org/development/libpqxx/ +HOMEPAGE= https://pqxx.org/development/libpqxx/ # 3-clause BSDL PERMIT_PACKAGE= Yes diff --git a/databases/libpqxx/distinfo b/databases/libpqxx/distinfo index 8fe1721a890..b131bd6a79b 100644 --- a/databases/libpqxx/distinfo +++ b/databases/libpqxx/distinfo @@ -1,2 +1,2 @@ -SHA256 (libpqxx-6.4.7.tar.gz) = P+nzjfHw+bcsj+G0vAGFzxS07YAanHgxibc1QENhzn8= -SIZE (libpqxx-6.4.7.tar.gz) = 717177 +SHA256 (libpqxx-7.10.1.tar.gz) = z7ux2ToKPYExnscdmj24BEe7AzxPbO4IhVSoiGL9d9c= +SIZE (libpqxx-7.10.1.tar.gz) = 783904 diff --git a/databases/libpqxx/patches/patch-src_Makefile_in b/databases/libpqxx/patches/patch-src_Makefile_in index 049b4e9a3ef..81115f5dd8b 100644 --- a/databases/libpqxx/patches/patch-src_Makefile_in +++ b/databases/libpqxx/patches/patch-src_Makefile_in @@ -1,9 +1,9 @@ Index: src/Makefile.in --- src/Makefile.in.orig +++ src/Makefile.in -@@ -399,7 +399,7 @@ libpqxx_la_SOURCES = \ - util.cxx \ - version.cxx +@@ -384,7 +384,7 @@ libpqxx_la_SOURCES = \ + version.cxx \ + wait.cxx -libpqxx_version = -release $(PQXX_ABI) +#libpqxx_version = -release $(PQXX_ABI) diff --git a/databases/libpqxx/pkg/PLIST b/databases/libpqxx/pkg/PLIST index ca7d84be32c..5431db5107f 100644 --- a/databases/libpqxx/pkg/PLIST +++ b/databases/libpqxx/pkg/PLIST @@ -1,20 +1,15 @@ include/pqxx/ include/pqxx/array include/pqxx/array.hxx -include/pqxx/basic_connection -include/pqxx/basic_connection.hxx include/pqxx/binarystring include/pqxx/binarystring.hxx -include/pqxx/compiler-internal-post.hxx -include/pqxx/compiler-internal-pre.hxx -include/pqxx/compiler-public.hxx +include/pqxx/blob +include/pqxx/blob.hxx +include/pqxx/composite +include/pqxx/composite.hxx include/pqxx/config-public-compiler.h include/pqxx/connection include/pqxx/connection.hxx -include/pqxx/connection_base -include/pqxx/connection_base.hxx -include/pqxx/connectionpolicy -include/pqxx/connectionpolicy.hxx include/pqxx/cursor include/pqxx/cursor.hxx include/pqxx/dbtransaction @@ -26,40 +21,43 @@ include/pqxx/except.hxx include/pqxx/field include/pqxx/field.hxx include/pqxx/internal/ +include/pqxx/internal/array-composite.hxx include/pqxx/internal/callgate.hxx +include/pqxx/internal/concat.hxx +include/pqxx/internal/conversions.hxx include/pqxx/internal/encoding_group.hxx include/pqxx/internal/encodings.hxx include/pqxx/internal/gates/ -include/pqxx/internal/gates/connection-dbtransaction.hxx include/pqxx/internal/gates/connection-errorhandler.hxx include/pqxx/internal/gates/connection-largeobject.hxx include/pqxx/internal/gates/connection-notification_receiver.hxx -include/pqxx/internal/gates/connection-parameterized_invocation.hxx include/pqxx/internal/gates/connection-pipeline.hxx -include/pqxx/internal/gates/connection-prepare-invocation.hxx -include/pqxx/internal/gates/connection-reactivation_avoidance_exemption.hxx include/pqxx/internal/gates/connection-sql_cursor.hxx +include/pqxx/internal/gates/connection-stream_from.hxx +include/pqxx/internal/gates/connection-stream_to.hxx include/pqxx/internal/gates/connection-transaction.hxx include/pqxx/internal/gates/errorhandler-connection.hxx include/pqxx/internal/gates/icursor_iterator-icursorstream.hxx include/pqxx/internal/gates/icursorstream-icursor_iterator.hxx include/pqxx/internal/gates/result-connection.hxx include/pqxx/internal/gates/result-creation.hxx -include/pqxx/internal/gates/result-row.hxx +include/pqxx/internal/gates/result-pipeline.hxx include/pqxx/internal/gates/result-sql_cursor.hxx include/pqxx/internal/gates/transaction-sql_cursor.hxx -include/pqxx/internal/gates/transaction-stream_from.hxx -include/pqxx/internal/gates/transaction-stream_to.hxx -include/pqxx/internal/gates/transaction-subtransaction.hxx -include/pqxx/internal/gates/transaction-tablereader.hxx -include/pqxx/internal/gates/transaction-tablewriter.hxx -include/pqxx/internal/gates/transaction-transactionfocus.hxx +include/pqxx/internal/gates/transaction-transaction_focus.hxx +include/pqxx/internal/header-post.hxx +include/pqxx/internal/header-pre.hxx include/pqxx/internal/ignore-deprecated-post.hxx include/pqxx/internal/ignore-deprecated-pre.hxx include/pqxx/internal/libpq-forward.hxx +include/pqxx/internal/result_iter.hxx +include/pqxx/internal/result_iterator.hxx include/pqxx/internal/sql_cursor.hxx include/pqxx/internal/statement_parameters.hxx -include/pqxx/internal/type_utils.hxx +include/pqxx/internal/stream_iterator.hxx +include/pqxx/internal/stream_query.hxx +include/pqxx/internal/stream_query_impl.hxx +include/pqxx/internal/wait.hxx include/pqxx/isolation include/pqxx/isolation.hxx include/pqxx/largeobject @@ -68,37 +66,39 @@ include/pqxx/nontransaction include/pqxx/nontransaction.hxx include/pqxx/notification include/pqxx/notification.hxx +include/pqxx/params +include/pqxx/params.hxx include/pqxx/pipeline include/pqxx/pipeline.hxx include/pqxx/pqxx include/pqxx/prepared_statement include/pqxx/prepared_statement.hxx +include/pqxx/range +include/pqxx/range.hxx include/pqxx/result include/pqxx/result.hxx -include/pqxx/result_iterator.hxx include/pqxx/robusttransaction include/pqxx/robusttransaction.hxx include/pqxx/row include/pqxx/row.hxx +include/pqxx/separated_list +include/pqxx/separated_list.hxx include/pqxx/strconv include/pqxx/strconv.hxx -include/pqxx/stream_base.hxx include/pqxx/stream_from include/pqxx/stream_from.hxx include/pqxx/stream_to include/pqxx/stream_to.hxx include/pqxx/subtransaction include/pqxx/subtransaction.hxx -include/pqxx/tablereader -include/pqxx/tablereader.hxx -include/pqxx/tablestream -include/pqxx/tablestream.hxx -include/pqxx/tablewriter -include/pqxx/tablewriter.hxx +include/pqxx/time +include/pqxx/time.hxx include/pqxx/transaction include/pqxx/transaction.hxx include/pqxx/transaction_base include/pqxx/transaction_base.hxx +include/pqxx/transaction_focus +include/pqxx/transaction_focus.hxx include/pqxx/transactor include/pqxx/transactor.hxx include/pqxx/types @@ -107,6 +107,8 @@ include/pqxx/util include/pqxx/util.hxx include/pqxx/version include/pqxx/version.hxx +include/pqxx/zview +include/pqxx/zview.hxx @static-lib lib/libpqxx.a lib/libpqxx.la @lib lib/libpqxx.so.${LIBpqxx_VERSION}