From e6f23eaedbbc789a553322cf7592d8f80c4c78d3 Mon Sep 17 00:00:00 2001 From: NancyLi1013 Date: Thu, 17 Jun 2021 00:41:32 -0700 Subject: [PATCH 1/2] [libgpg-error] Remove COPYING.LIB from lib folder --- ports/libgpg-error/portfile.cmake | 11 ++++++----- ports/libgpg-error/vcpkg.json | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ports/libgpg-error/portfile.cmake b/ports/libgpg-error/portfile.cmake index 19e6e3c2fde271..711f7e76e62442 100644 --- a/ports/libgpg-error/portfile.cmake +++ b/ports/libgpg-error/portfile.cmake @@ -67,6 +67,7 @@ if(VCPKG_TARGET_IS_WINDOWS) configure_file("${SOURCE_PATH}/src/gpg-error.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gpg-error.pc" @ONLY) vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/COPYING.LIB" "${CURRENT_PACKAGES_DIR}/debug/lib/COPYING.LIB") else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -74,8 +75,8 @@ else() REF libgpg-error-${PACKAGE_VERSION} SHA512 f5a1c1874ac1dee36ee01504f1ab0146506aa7af810879e192eac17a31ec81945fe850953ea1c57188590c023ce3ff195c7cab62af486b731fa1534546d66ba3 HEAD_REF master - PATCHES - add_cflags_to_tools.patch + PATCHES + add_cflags_to_tools.patch ) vcpkg_configure_make( @@ -91,6 +92,6 @@ else() vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() - 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() + 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() \ No newline at end of file diff --git a/ports/libgpg-error/vcpkg.json b/ports/libgpg-error/vcpkg.json index 73c17ba9e5c812..81024b701a43a3 100644 --- a/ports/libgpg-error/vcpkg.json +++ b/ports/libgpg-error/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libgpg-error", "version": "1.42", + "port-version": 1, "description": "A common dependency of all GnuPG components", "homepage": "https://gnupg.org/software/libgpg-error/index.html", "supports": "!(windows & (arm | arm64))" From e0066aa96084e68e0de4d86ed26f603818cf0efe Mon Sep 17 00:00:00 2001 From: NancyLi1013 Date: Thu, 17 Jun 2021 00:43:13 -0700 Subject: [PATCH 2/2] Update version files --- 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 1d19fbd847081a..de41a89332b6ee 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3178,7 +3178,7 @@ }, "libgpg-error": { "baseline": "1.42", - "port-version": 0 + "port-version": 1 }, "libgpod": { "baseline": "2019-08-29", diff --git a/versions/l-/libgpg-error.json b/versions/l-/libgpg-error.json index aecf1ec8a04554..395eb94f08f5fc 100644 --- a/versions/l-/libgpg-error.json +++ b/versions/l-/libgpg-error.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b5abbf9cf832337e202ff5d8d4296025b47be1a0", + "version": "1.42", + "port-version": 1 + }, { "git-tree": "80b315c6991fd5092637d010433ebfcbcbfda92d", "version": "1.42",