Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[libgpg-error] Remove COPYING.LIB from lib folder #18492

Merged
merged 2 commits into from
Jun 18, 2021
Merged

[libgpg-error] Remove COPYING.LIB from lib folder #18492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6f23ea
[libgpg-error] Remove COPYING.LIB from lib folder
Jun 17, 2021
e0066aa
Update version files
Jun 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions ports/libgpg-error/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,16 @@ 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
REPO gpg/libgpg-error
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(
Expand All @@ -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()
1 change: 1 addition & 0 deletions ports/libgpg-error/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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))"
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3178,7 +3178,7 @@
},
"libgpg-error": {
"baseline": "1.42",
"port-version": 0
"port-version": 1
},
"libgpod": {
"baseline": "2019-08-29",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libgpg-error.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b5abbf9cf832337e202ff5d8d4296025b47be1a0",
"version": "1.42",
"port-version": 1
},
{
"git-tree": "80b315c6991fd5092637d010433ebfcbcbfda92d",
"version": "1.42",
Expand Down