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.

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

[libgcrypt] update to 1.9.4, fix arm64-osx compilation #20854

Merged
merged 5 commits into from
Oct 27, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 0 additions & 13 deletions ports/libgcrypt/fix-flags.patch

This file was deleted.

11 changes: 0 additions & 11 deletions ports/libgcrypt/fix-pkgconfig.patch

This file was deleted.

11 changes: 4 additions & 7 deletions ports/libgcrypt/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports unix platform" ON_TARGET "Windows")

vcpkg_from_github(
vcpkg_from_git(
OUT_SOURCE_PATH SOURCE_PATH
REPO gpg/libgcrypt
REF libgcrypt-1.8.7
SHA512 43e50a1b8a3cdbf420171c785fe558f443b414b708defa585277ac5ea59f9d8ae7f4555ed291c16fa004e7d4dd93a5ab2011c3c591e784ce3c6662a3193fd3e1
URL git://git.gnupg.org/libgcrypt.git
FETCH_REF libgcrypt-1.9.4
REF 05422ca24a0391dad2a0b7790a904ce348819c10 # https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commit;h=05422ca24a0391dad2a0b7790a904ce348819c10
HEAD_REF master
PATCHES
fix-pkgconfig.patch
fix-flags.patch
)

vcpkg_configure_make(
Expand Down
5 changes: 2 additions & 3 deletions ports/libgcrypt/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
{
"name": "libgcrypt",
"version-string": "1.8.7",
"port-version": 2,
"description": "A library implementing the so-called Assuan protocol",
"version": "1.9.4",
"description": "A general purpose cryptographic library",
"homepage": "https://gnupg.org/software/libgcrypt/index.html",
"supports": "linux | osx",
"dependencies": [
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -3377,8 +3377,8 @@
"port-version": 1
},
"libgcrypt": {
"baseline": "1.8.7",
"port-version": 2
"baseline": "1.9.4",
"port-version": 0
},
"libgd": {
"baseline": "2.3.2",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libgcrypt.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7b99b42dfc0f469a13d4e39d9802012b9a7e78d1",
"version": "1.9.4",
"port-version": 0
},
{
"git-tree": "43a3a46962e0195eefd661d621f1a69c267d067e",
"version-string": "1.8.7",
Expand Down