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

[libassuan] Update to 3.0.1 #43214

Merged
merged 2 commits into from
Jan 14, 2025
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
16 changes: 10 additions & 6 deletions ports/libassuan/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,35 @@ vcpkg_download_distfile(tarball
"https://mirrors.dotsrc.org/gcrypt/libassuan/libassuan-${VERSION}.tar.bz2"
"https://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/libassuan/libassuan-${VERSION}.tar.bz2"
FILENAME "libassuan-${VERSION}.tar.bz2"
SHA512 ca33bd0325bbebccb63b6a84cc0aa5c85b25c6275a68df83aeb3f3729b2cd38220198a941c3479bd461f16b7ddb6b558c0664697ca3153c7fb430544303d773f
SHA512 6914a02c20053bae0fc4c29c5c40655f1cec711983d57fa85e46df34e90b10e33d31256dd50ae7c7faa8d8d750a529bf9072da0cda3bdd77ebfedbc0e26e5e16
)
vcpkg_extract_source_archive(
SOURCE_PATH
ARCHIVE "${tarball}"
PATCHES
cross-tools.patch
upstream-69069bc.diff
)

if(VCPKG_CROSSCOMPILING)
set(ENV{HOST_TOOLS_PREFIX} "${CURRENT_HOST_INSTALLED_DIR}/manual-tools/${PORT}")
endif()

vcpkg_configure_make(
set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/libgpg-error/aclocal/\"")
vcpkg_make_configure(
SOURCE_PATH "${SOURCE_PATH}"
AUTOCONFIG
AUTORECONF
OPTIONS
--disable-doc
"GPG_ERROR_CONFIG=no"
OPTIONS_RELEASE
"GPG_ERROR_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/bin/gpgrt-config gpg-error"
"GPGRT_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/bin/gpgrt-config"
OPTIONS_DEBUG
"GPG_ERROR_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/debug/bin/gpgrt-config gpg-error"
"GPGRT_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/debug/bin/gpgrt-config"
)

vcpkg_install_make()
vcpkg_make_install()
vcpkg_fixup_pkgconfig()
vcpkg_copy_pdbs()

Expand All @@ -52,4 +55,5 @@ if(NOT VCPKG_CROSSCOMPILING)
endif()

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
file(INSTALL "${SOURCE_PATH}/COPYING.LIB" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING.LIB")
14 changes: 14 additions & 0 deletions ports/libassuan/upstream-69069bc.diff
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/src/assuan-defs.h b/src/assuan-defs.h
index faf9aae..5052e8e 100644
--- a/src/assuan-defs.h
+++ b/src/assuan-defs.h
@@ -431,9 +431,6 @@ char *stpcpy (char *dest, const char *src);
#define clearenv _assuan_clearenv
int setenv (const char *name, const char *value, int replace);
#endif
-#ifndef HAVE_PUTC_UNLOCKED
-int putc_unlocked (int c, FILE *stream);
-#endif


#define DIM(v) (sizeof(v)/sizeof((v)[0]))
8 changes: 6 additions & 2 deletions ports/libassuan/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "libassuan",
"version": "2.5.7",
"version": "3.0.1",
"description": "A library implementing the so-called Assuan protocol",
"homepage": "https://gnupg.org/software/libassuan/index.html",
"license": "LGPL-2.1-or-later",
Expand All @@ -10,6 +10,10 @@
"name": "libassuan",
"host": true
},
"libgpg-error"
"libgpg-error",
{
"name": "vcpkg-make",
"host": true
}
]
}
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -4333,7 +4333,7 @@
"port-version": 0
},
"libassuan": {
"baseline": "2.5.7",
"baseline": "3.0.1",
"port-version": 0
},
"libatomic-ops": {
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libassuan.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "0462cb4466ccdb69468f11ee9af018b8581ecc64",
"version": "3.0.1",
"port-version": 0
},
{
"git-tree": "9f619f927aa36d89e928f02b815690fe87164ff9",
"version": "2.5.7",
Expand Down