From 27404c277985e4e917aefba8b7d94f71d1d9b7b1 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Thu, 29 Feb 2024 00:46:19 +0000 Subject: [PATCH] [libpq] Delete gendef.pl related patches (#36992) Fixes https://github.com/microsoft/vcpkg/issues/36693 Delete the patch of gendef.pl in `vcpkg\ports\libpq\windows\msbuild.patch`. Because starting with PostgreSQL 16, the "Win32" patch is no longer valid, the command line arguments to gendef.pl were changed from Win32 to x86. - [X] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [ ] ~~SHA512s are updated for each updated download.~~ - [ ] ~~The "supports" clause reflects platforms that may be fixed by this new version.~~ - [ ] ~~Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file.~~ - [X] Any patches that are no longer applied are deleted from the port's directory. - [X] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [X] Only one version is added to each modified port's versions file. Usage test pass with following triplets: ``` x86-windows x64-windows ``` --- ports/libpq/vcpkg.json | 1 + ports/libpq/windows/msbuild.patch | 13 ------------- versions/baseline.json | 2 +- versions/l-/libpq.json | 5 +++++ 4 files changed, 7 insertions(+), 14 deletions(-) diff --git a/ports/libpq/vcpkg.json b/ports/libpq/vcpkg.json index c700d45408..772c1a995b 100644 --- a/ports/libpq/vcpkg.json +++ b/ports/libpq/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libpq", "version": "16.2", + "port-version": 1, "description": "The official database access API of postgresql", "homepage": "https://www.postgresql.org/", "license": "PostgreSQL", diff --git a/ports/libpq/windows/msbuild.patch b/ports/libpq/windows/msbuild.patch index 27ff546441..e6c70ad094 100644 --- a/ports/libpq/windows/msbuild.patch +++ b/ports/libpq/windows/msbuild.patch @@ -396,16 +396,3 @@ index b6d31c3..27d89fc 100644 } if ($self->{options}->{uuid}) { -diff --git a/src/tools/msvc/gendef.pl b/src/tools/msvc/gendef.pl -index cf83d7d..2d9a4ec 100644 ---- a/src/tools/msvc/gendef.pl -+++ b/src/tools/msvc/gendef.pl -@@ -122,7 +122,7 @@ sub writedef - - # Strip the leading underscore for win32, but not x64 - $f =~ s/^_// -- unless ($arch eq "x86_64"); -+ if ($arch eq "Win32"); - - # Emit just the name if it's a function symbol, or emit the name - # decorated with the DATA option for variables. diff --git a/versions/baseline.json b/versions/baseline.json index 9e71305342..651ce24a8e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4750,7 +4750,7 @@ }, "libpq": { "baseline": "16.2", - "port-version": 0 + "port-version": 1 }, "libpqxx": { "baseline": "7.9.0", diff --git a/versions/l-/libpq.json b/versions/l-/libpq.json index cccc327aa3..5cde1562a8 100644 --- a/versions/l-/libpq.json +++ b/versions/l-/libpq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aac67118e4bd1ee29001f206697fb8461e47a590", + "version": "16.2", + "port-version": 1 + }, { "git-tree": "97c817b2d307e12dfec28d56e87ae08faff70a1b", "version": "16.2",