From 4c4cce74985185e85351aec61b36a6640d69b273 Mon Sep 17 00:00:00 2001 From: Vitaly Petrov Date: Wed, 15 Dec 2021 19:26:04 +0300 Subject: [PATCH 1/4] [libgpg-error] Release-only build support --- ports/libgpg-error/portfile.cmake | 11 +++++++++-- ports/libgpg-error/vcpkg.json | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ports/libgpg-error/portfile.cmake b/ports/libgpg-error/portfile.cmake index 17d26617d24996..229703ad88097d 100644 --- a/ports/libgpg-error/portfile.cmake +++ b/ports/libgpg-error/portfile.cmake @@ -91,8 +91,15 @@ else() vcpkg_install_make() vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libgpg-error/bin/gpg-error-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libgpg-error/debug/bin/gpg-error-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..") + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libgpg-error/bin/gpg-error-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") + endif() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libgpg-error/debug/bin/gpg-error-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..") + endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}/locale" "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL "${SOURCE_PATH}/COPYING.LIB" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) endif() diff --git a/ports/libgpg-error/vcpkg.json b/ports/libgpg-error/vcpkg.json index 515330256255c5..8132e6b2d62f55 100644 --- a/ports/libgpg-error/vcpkg.json +++ b/ports/libgpg-error/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libgpg-error", "version": "1.42", - "port-version": 2, + "port-version": 3, "description": "A common dependency of all GnuPG components", "homepage": "https://gnupg.org/software/libgpg-error/index.html", "supports": "!(windows & (arm | arm64))" From d3796ac0fed0f2eeaa2c529e671ea9b1b9ccf4ee Mon Sep 17 00:00:00 2001 From: Vitaly Petrov Date: Wed, 15 Dec 2021 19:26:35 +0300 Subject: [PATCH 2/4] Update version database --- versions/baseline.json | 2 +- versions/l-/libgpg-error.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 2a6b1334000980..b715c98ae5b4ba 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3498,7 +3498,7 @@ }, "libgpg-error": { "baseline": "1.42", - "port-version": 2 + "port-version": 3 }, "libgpod": { "baseline": "2019-08-29", diff --git a/versions/l-/libgpg-error.json b/versions/l-/libgpg-error.json index 9d75dd02f4f995..7bb2120d0e10cf 100644 --- a/versions/l-/libgpg-error.json +++ b/versions/l-/libgpg-error.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "23741fd17cfc7e77d0be728ce287129affc88d58", + "version": "1.42", + "port-version": 3 + }, { "git-tree": "f6c78e927a70ff136576abd61f1125861824bfd2", "version": "1.42", From e1a3948b5f48a867a98a9d52efd09e1f8425e5c7 Mon Sep 17 00:00:00 2001 From: Vitaly Petrov Date: Wed, 15 Dec 2021 19:29:33 +0300 Subject: [PATCH 3/4] Fix protfile spaces --- ports/libgpg-error/portfile.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/libgpg-error/portfile.cmake b/ports/libgpg-error/portfile.cmake index 229703ad88097d..cc795c59daf03f 100644 --- a/ports/libgpg-error/portfile.cmake +++ b/ports/libgpg-error/portfile.cmake @@ -92,13 +92,13 @@ else() vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libgpg-error/bin/gpg-error-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") - endif() + endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libgpg-error/debug/bin/gpg-error-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..") - endif() + endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}/locale" "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL "${SOURCE_PATH}/COPYING.LIB" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) From 7d862222400b6cb27dbbd132608603b5730dfbcd Mon Sep 17 00:00:00 2001 From: Vitaly Petrov Date: Wed, 15 Dec 2021 19:29:51 +0300 Subject: [PATCH 4/4] Update version database --- versions/l-/libgpg-error.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libgpg-error.json b/versions/l-/libgpg-error.json index 7bb2120d0e10cf..7b6379058fd517 100644 --- a/versions/l-/libgpg-error.json +++ b/versions/l-/libgpg-error.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "23741fd17cfc7e77d0be728ce287129affc88d58", + "git-tree": "1ced42ca6160e2283326366e1c1132fe50acfb97", "version": "1.42", "port-version": 3 },