mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-27 19:19:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[libgpg-error,libgcrypt,libassuan,gpgme,libgwenhywfar] Update and fix (#34135)

Browse Source
This commit is contained in:
Kai Pastor 2023-10-04 05:34:51 +02:00 committed by GitHub
parent 9997c0aa76
commit fc3b54c757
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 201 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
ports/gpgme/disable-tests.patch
View File

@ -1,51 +0,0 @@
From b05747aea79083106b27ac7d829db3e65e192682 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com>
Date: Thu, 29 Oct 2020 13:23:56 -0400
Subject: [PATCH] cpp,python: Respect --disable-gpg-test for tests
* lang/cpp/Makefile.am: Respect --disable-gpg-test
* lang/python/Makefile.am: Respect --disable-gpg-test
This is similar to the qt that had it already enabled
---
lang/cpp/Makefile.am | 8 +++++++-
lang/python/Makefile.am | 8 +++++++-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/lang/cpp/Makefile.am b/lang/cpp/Makefile.am
index 724da6ca..70ca7462 100644
--- a/lang/cpp/Makefile.am
+++ b/lang/cpp/Makefile.am
@@ -18,6 +18,12 @@
# License along with this program; if not, see <https://gnu.org/licenses/>.
# SPDX-License-Identifier: LGPL-2.1-or-later
-SUBDIRS = src tests
+if RUN_GPG_TESTS
+tests = tests
+else
+tests =
+endif
+
+SUBDIRS = src ${tests}
EXTRA_DIST = README
diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am
index 845b7b17..68b98e8e 100644
--- a/lang/python/Makefile.am
+++ b/lang/python/Makefile.am
@@ -23,7 +23,13 @@ EXTRA_DIST = \
gpgme.i \
helpers.c helpers.h private.h
-SUBDIRS = . tests examples doc src
+if RUN_GPG_TESTS
+tests = tests
+else
+tests =
+endif
+
+SUBDIRS = . ${tests} examples doc src
.PHONY: prepare
prepare: copystamp

56
ports/gpgme/fix-c++11.patch
View File

@ -1,56 +0,0 @@
diff --git a/lang/cpp/src/importresult.cpp b/lang/cpp/src/importresult.cpp
index 06258729..0a7ad03d 100644
--- a/lang/cpp/src/importresult.cpp
+++ b/lang/cpp/src/importresult.cpp
@@ -152,17 +152,17 @@ void GpgME::ImportResult::mergeWith(const ImportResult &other)
}
// was this key also considered during the first import
const auto consideredInFirstImports =
- std::any_of(std::begin(d->imports), std::end(d->imports), [fpr](const auto i) {
+ std::any_of(std::begin(d->imports), std::end(d->imports), [fpr](const gpgme_import_status_t i) {
return i->fpr && !strcmp(i->fpr, fpr);
});
// did we see this key already in the list of keys of the other import
const auto consideredInPreviousOtherImports =
- std::any_of(std::begin(other.d->imports), it, [fpr](const auto i) {
+ std::any_of(std::begin(other.d->imports), it, [fpr](const gpgme_import_status_t i) {
return i->fpr && !strcmp(i->fpr, fpr);
});
// was anything added to this key during the other import
const auto changedInOtherImports =
- std::any_of(std::begin(other.d->imports), std::end(other.d->imports), [fpr](const auto i) {
+ std::any_of(std::begin(other.d->imports), std::end(other.d->imports), [fpr](const gpgme_import_status_t i) {
return i->fpr && !strcmp(i->fpr, fpr) && (i->status != 0);
});
if (consideredInFirstImports && !consideredInPreviousOtherImports) {
@@ -177,15 +177,15 @@ void GpgME::ImportResult::mergeWith(const ImportResult &other)
// now do the same for the secret key counts
const auto secretKeyConsideredInFirstImports =
- std::any_of(std::begin(d->imports), std::end(d->imports), [fpr](const auto i) {
+ std::any_of(std::begin(d->imports), std::end(d->imports), [fpr](const gpgme_import_status_t i) {
return i->fpr && !strcmp(i->fpr, fpr) && (i->status & GPGME_IMPORT_SECRET);
});
const auto secretKeyConsideredInPreviousOtherImports =
- std::any_of(std::begin(other.d->imports), it, [fpr](const auto i) {
+ std::any_of(std::begin(other.d->imports), it, [fpr](const gpgme_import_status_t i) {
return i->fpr && !strcmp(i->fpr, fpr) && (i->status & GPGME_IMPORT_SECRET);
});
const auto secretKeyChangedInOtherImports =
- std::any_of(std::begin(other.d->imports), std::end(other.d->imports), [fpr](const auto i) {
+ std::any_of(std::begin(other.d->imports), std::end(other.d->imports), [fpr](const gpgme_import_status_t i) {
return i->fpr && !strcmp(i->fpr, fpr) && (i->status & GPGME_IMPORT_SECRET) && (i->status != GPGME_IMPORT_SECRET);
});
if (secretKeyConsideredInFirstImports && !secretKeyConsideredInPreviousOtherImports) {
@@ -204,7 +204,7 @@ void GpgME::ImportResult::mergeWith(const ImportResult &other)
d->imports.reserve(d->imports.size() + other.d->imports.size());
std::transform(std::begin(other.d->imports), std::end(other.d->imports),
std::back_inserter(d->imports),
- [](const auto import) {
+ [](const gpgme_import_status_t import) {
gpgme_import_status_t copy = new _gpgme_import_status{*import};
if (import->fpr) {
copy->fpr = strdup(import->fpr);
--
2.11.0

32
ports/gpgme/portfile.cmake
View File

@ -1,20 +1,16 @@
vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
vcpkg_download_distfile(tarball
URLS
"https://gnupg.org/ftp/gcrypt/gpgme/gpgme-${VERSION}.tar.bz2"
"https://mirrors.dotsrc.org/gcrypt/gpgme/gpgme-${VERSION}.tar.bz2"
"https://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/gpgme/gpgme-${VERSION}.tar.bz2"
FILENAME "gpgme-${VERSION}.tar.bz2"
SHA512 c0cb0b337d017793a15dd477a7f5eaef24587fcda3d67676bf746bb342398d04792c51abe3c26ae496e799c769ce667d4196d91d86e8a690d02c6718c8f6b4ac
SHA512 17053053fa885f01416433e43072ac716b5d5db0c3edf45b2d6e90e6384d127626e6ae3ce421abba8f449f5ca7e8963f3d62f3565d295847170bc998d1ec1a70
)
vcpkg_extract_source_archive(
SOURCE_PATH
ARCHIVE "${tarball}"
PATCHES
disable-tests.patch
disable-docs.patch
fix-c++11.patch # https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commit;h=f02c20cc9c5756690b07abfd02a43533547ba2ef
)
vcpkg_list(SET LANGUAGES)
@ -31,22 +27,30 @@ vcpkg_configure_make(
--disable-gpgsm-test
--disable-g13-test
--enable-languages=${LANGUAGES}
--with-libgpg-error-prefix=${CURRENT_INSTALLED_DIR}/tools/libgpg-error
--with-libassuan-prefix=${CURRENT_INSTALLED_DIR}/tools/libassuan
GPG_ERROR_CONFIG=/ # fake absolute path; gpgrt-config is used instead
OPTIONS_RELEASE
"GPGRT_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/bin/gpgrt-config"
OPTIONS_DEBUG
"GPGRT_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/debug/bin/gpgrt-config"
)
vcpkg_install_make()
# CMake config needs work for linkage and build type
# vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Gpgmepp PACKAGE_NAME Gpgmepp)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake" "${CURRENT_PACKAGES_DIR}/debug/lib/cmake")
vcpkg_copy_pdbs()
# We have no dependency on glib, so remove this extra .pc file
# This port doesn't support the windows-only glib integration.
file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gpgme-glib.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gpgme-glib.pc")
vcpkg_fixup_pkgconfig()
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/gpgme/bin/gpgme-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..")
if (NOT VCPKG_BUILD_TYPE)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/gpgme/debug/bin/gpgme-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..")
# CMake config needs work for linkage and build type.
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake" "${CURRENT_PACKAGES_DIR}/debug/lib/cmake")
set(install_prefix "${CURRENT_INSTALLED_DIR}")
if(VCPKG_HOST_IS_WINDOWS)
string(REGEX REPLACE "^([a-zA-Z]):/" "/\\1/" install_prefix "${install_prefix}")
endif()
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/gpgme-config" "${install_prefix}" "`dirname $0`/../../..")
if(NOT VCPKG_BUILD_TYPE)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/gpgme-config" "${install_prefix}" "`dirname $0`/../../../..")
endif()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

10
ports/gpgme/vcpkg.json
View File

@ -1,17 +1,13 @@
{
"name": "gpgme",
"version": "1.18.0",
"version": "1.22.0",
"description": "A library designed to make access to GnuPG easier for applications",
"homepage": "https://gnupg.org/software/gpgme/index.html",
"homepage": "https://gnupg.org/software/gpgme/",
"license": null,
"supports": "!windows | mingw",
"dependencies": [
"libassuan",
"libgpg-error",
{
"name": "vcpkg-cmake-config",
"host": true
}
"libgpg-error"
],
"default-features": [
"cpp"

8
ports/libassuan/cross-tools.patch
View File

@ -20,8 +20,8 @@ index 6b9a46d..5156865 100644
$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) \
$(LDFLAGS_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c
-assuan.h: assuan.h.in mkheader $(parts_of_assuan_h)
- ./mkheader $(host_os) $(srcdir)/assuan.h.in \
+assuan.h: assuan.h.in $(HOST_TOOLS_PREFIX)/mkheader $(parts_of_assuan_h)
+ $(HOST_TOOLS_PREFIX)/mkheader $(host_os) $(srcdir)/assuan.h.in \
-assuan.h: assuan.h.in mkheader$(EXEEXT_FOR_BUILD) $(parts_of_assuan_h)
- ./mkheader$(EXEEXT_FOR_BUILD) $(host_os) $(srcdir)/assuan.h.in \
+assuan.h: assuan.h.in $(HOST_TOOLS_PREFIX)/mkheader$(EXEEXT_FOR_BUILD) $(parts_of_assuan_h)
+ $(HOST_TOOLS_PREFIX)/mkheader$(EXEEXT_FOR_BUILD) $(host_os) $(srcdir)/assuan.h.in \
$(PACKAGE_VERSION) $(VERSION_NUMBER) >$@

24
ports/libassuan/portfile.cmake
View File

@ -1,12 +1,10 @@
vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
vcpkg_download_distfile(tarball
URLS
"https://gnupg.org/ftp/gcrypt/libassuan/libassuan-${VERSION}.tar.bz2"
"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 70117f77aa43bbbe0ed28da5ef23834c026780a74076a92ec775e30f851badb423e9a2cb9e8d142c94e4f6f8a794988c1b788fd4bd2271e562071adf0ab16403
SHA512 dcca942d222a2c226a7e34ba7988ee0c3c55bd6032166eb472caf2053db89aeeea7a40e93d8c2887c7ee73c5f838e8b0725e8cfb595accc1606646559362f7ee
)
vcpkg_extract_source_archive(
SOURCE_PATH
@ -24,25 +22,29 @@ vcpkg_configure_make(
AUTOCONFIG
OPTIONS
--disable-doc
--disable-silent-rules
OPTIONS_RELEASE
"GPG_ERROR_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/bin/gpg-error-config"
OPTIONS_DEBUG
"GPG_ERROR_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/debug/bin/gpg-error-config"
"GPG_ERROR_CONFIG=no"
OPTIONS_RELEASE
"GPGRT_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/bin/gpgrt-config"
OPTIONS_DEBUG
"GPGRT_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/debug/bin/gpgrt-config"
)
vcpkg_install_make()
vcpkg_fixup_pkgconfig()
vcpkg_copy_pdbs()
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/libassuan-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..")
set(install_prefix "${CURRENT_INSTALLED_DIR}")
if(VCPKG_HOST_IS_WINDOWS)
string(REGEX REPLACE "^([a-zA-Z]):/" "/\\1/" install_prefix "${install_prefix}")
endif()
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/libassuan-config" "${install_prefix}" "`dirname $0`/../../..")
if(NOT VCPKG_BUILD_TYPE)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/libassuan-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/libassuan-config" "${install_prefix}" "`dirname $0`/../../../..")
endif()
if(NOT VCPKG_CROSSCOMPILING)
file(INSTALL
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/src/mkheader${VCPKG_TARGET_SUFFIX}"
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/src/mkheader${VCPKG_TARGET_EXECUTABLE_SUFFIX}"
DESTINATION "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}"
USE_SOURCE_PERMISSIONS
)

2
ports/libassuan/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "libassuan",
"version": "2.5.5",
"version": "2.5.6",
"description": "A library implementing the so-called Assuan protocol",
"homepage": "https://gnupg.org/software/libassuan/index.html",
"license": "LGPL-2.1-or-later",

21
ports/libgcrypt/portfile.cmake
View File

@ -1,18 +1,17 @@
vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
vcpkg_download_distfile(tarball
URLS
"https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-${VERSION}.tar.bz2"
"https://mirrors.dotsrc.org/gcrypt/libgcrypt/libgcrypt-${VERSION}.tar.bz2"
"https://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${VERSION}.tar.bz2"
FILENAME "libgcrypt-${VERSION}.tar.bz2"
SHA512 e5ca7966624fff16c3013795836a2c4377f0193dbb4ac5ad2b79654b1fa8992e17d83816569a402212dc8367a7980d4141f5d6ac282bae6b9f02186365b61f13
SHA512 3a850baddfe8ffe8b3e96dc54af3fbb9e1dab204db1f06b9b90b8fbbfb7fb7276260cd1e61ba4dde5a662a2385385007478834e62e95f785d2e3d32652adb29e
)
vcpkg_extract_source_archive(
SOURCE_PATH
ARCHIVE "${tarball}"
PATCHES
cross-tools.patch
upstream-fa21ddc1.patch
)
if(VCPKG_CROSSCOMPILING)
@ -28,12 +27,12 @@ vcpkg_configure_make(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
--disable-doc
--disable-silent-rules
"AS=${VCPKG_DETECTED_CMAKE_ASM_COMPILER}"
"GPG_ERROR_CONFIG=no"
OPTIONS_RELEASE
"GPG_ERROR_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/bin/gpg-error-config"
"GPGRT_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/bin/gpgrt-config"
OPTIONS_DEBUG
"GPG_ERROR_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/debug/bin/gpg-error-config"
"GPGRT_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/debug/bin/gpgrt-config"
)
vcpkg_install_make(OPTIONS "CCAS=${VCPKG_DETECTED_CMAKE_ASM_COMPILER}")
@ -42,16 +41,20 @@ vcpkg_copy_pdbs()
if(NOT VCPKG_CROSSCOMPILING)
file(INSTALL
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/cipher/gost-s-box${VCPKG_TARGET_SUFFIX}"
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/cipher/gost-s-box${VCPKG_TARGET_EXECUTABLE_SUFFIX}"
DESTINATION "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}"
USE_SOURCE_PERMISSIONS
)
vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}")
endif()
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/libgcrypt-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..")
set(install_prefix "${CURRENT_INSTALLED_DIR}")
if(VCPKG_HOST_IS_WINDOWS)
string(REGEX REPLACE "^([a-zA-Z]):/" "/\\1/" install_prefix "${install_prefix}")
endif()
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/libgcrypt-config" "${install_prefix}" "`dirname $0`/../../..")
if(NOT VCPKG_BUILD_TYPE)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/libgcrypt-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/libgcrypt-config" "${install_prefix}" "`dirname $0`/../../../..")
endif()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

20
ports/libgcrypt/upstream-fa21ddc1.patch Normal file
View File

@ -0,0 +1,20 @@
diff --git a/random/rndgetentropy.c b/random/rndgetentropy.c
index 513da0b95..a6f3c4ab1 100644
--- a/random/rndgetentropy.c
+++ b/random/rndgetentropy.c
@@ -81,6 +81,7 @@ _gcry_rndgetentropy_gather_random (void (*add)(const void*, size_t,
do
{
_gcry_pre_syscall ();
+#ifdef GRND_RANDOM
if (fips_mode ())
{
/* DRBG chaining defined in SP 800-90A (rev 1) specify
@@ -98,6 +99,7 @@ _gcry_rndgetentropy_gather_random (void (*add)(const void*, size_t,
ret = getrandom (buffer, nbytes, GRND_RANDOM);
}
else
+#endif
{
nbytes = length < sizeof (buffer) ? length : sizeof (buffer);
ret = getentropy (buffer, nbytes);

3
ports/libgcrypt/vcpkg.json
View File

@ -1,7 +1,6 @@
{
"name": "libgcrypt",
"version": "1.10.1",
"port-version": 1,
"version": "1.10.2",
"description": "A general purpose cryptographic library",
"homepage": "https://gnupg.org/software/libgcrypt/index.html",
"license": null,

51
ports/libgpg-error/gpgrt-config.patch Normal file
View File

@ -0,0 +1,51 @@
diff --git a/src/gpgrt-config.in b/src/gpgrt-config.in
index bada0f2..8c03a05 100644
--- a/src/gpgrt-config.in
+++ b/src/gpgrt-config.in
@@ -78,7 +78,7 @@ substitute_vars () {
esac
done
- echo "$__result"
+ echo "$__result" | sed -e 's,",,g'
}
#
@@ -132,7 +132,6 @@ EOF2
*:|*:\ ) ;;
*)
echo "Error reading $_filename: $_line" 1>&2
- exit 1
;;
esac
fi
@@ -166,6 +165,7 @@ read_config_file () {
fi
exit 1
fi
+ VAR_pcfiledir="${RESULT%/*}" \
read_config_from_stdin $RESULT < $RESULT
}
@@ -540,6 +540,11 @@ while test $# -gt 0; do
;;
esac
done
+vcpkg_prefix=$(echo "$0" | sed -e 's,^\([a-zA-Z]\):/,/\1/,')
+case "$vcpkg_prefix" in
+*/tools/libgpg-error/debug/bin/gpgrt-config) libdir="${vcpkg_prefix%/*/*/*/*/*}/debug/lib" ;;
+*/tools/libgpg-error/bin/gpgrt-config) libdir="${vcpkg_prefix%/*/*/*/*}/lib" ;;
+esac
if env | grep '^PKG_CONFIG_LIBDIR=$' >/dev/null 2>&1; then
# The variable set as empty, we use PKG_CONFIG_PATH in this case,
@@ -598,7 +603,8 @@ output=""
mt="no"
-VAR_list=VAR_pc_sysrootdir
+VAR_list="VAR_pcfiledir VAR_pc_sysrootdir"
+VAR_pcfiledir=""
if [ -z "$PKG_CONFIG_SYSROOT_DIR" ]; then
VAR_pc_sysrootdir="/"
else

16
ports/libgpg-error/portfile.cmake
View File

@ -1,18 +1,17 @@
vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
vcpkg_download_distfile(tarball
URLS
"https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-${VERSION}.tar.bz2"
"https://mirrors.dotsrc.org/gcrypt/libgpg-error/libgpg-error-${VERSION}.tar.bz2"
"https://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${VERSION}.tar.bz2"
FILENAME "libgpg-error-${VERSION}.tar.bz2"
SHA512 b06223bb2b0f67d3db5d0d9ab116361a0eda175d4667352b5c0941408d37f2b0ba8e507297e480ccebb88cbba9d0a133820b896914b07d264fb3edaac7b8c99d
SHA512 bbb4b15dae75856ee5b1253568674b56ad155524ae29a075cb5b0a7e74c4af685131775c3ea2226fff2f84ef80855e77aa661645d002b490a795c7ae57b66a30
)
vcpkg_extract_source_archive(
SOURCE_PATH
ARCHIVE "${tarball}"
PATCHES
cross-tools.patch
gpgrt-config.patch
pkgconfig-libintl.patch
)
@ -35,8 +34,6 @@ vcpkg_configure_make(
${options}
--disable-tests
--disable-doc
--disable-silent-rules
--enable-install-gpg-error-config # still used downstream
)
vcpkg_install_make()
@ -45,19 +42,14 @@ vcpkg_copy_pdbs()
if(NOT VCPKG_CROSSCOMPILING)
file(INSTALL
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/src/mkerrcodes${VCPKG_TARGET_SUFFIX}"
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/src/mkheader${VCPKG_TARGET_SUFFIX}"
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/src/mkerrcodes${VCPKG_TARGET_EXECUTABLE_SUFFIX}"
"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/src/mkheader${VCPKG_TARGET_EXECUTABLE_SUFFIX}"
DESTINATION "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}"
USE_SOURCE_PERMISSIONS
)
vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}")
endif()
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/gpg-error-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..")
if(NOT VCPKG_BUILD_TYPE)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/gpg-error-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..")
endif()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
if(NOT "nls" IN_LIST FEATURES)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}/locale")

9
ports/libgpg-error/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "libgpg-error",
"version": "1.46",
"version": "1.47",
"description": "A common dependency of all GnuPG components",
"homepage": "https://gnupg.org/software/libgpg-error/index.html",
"license": "LGPL-2.1-or-later",
@ -8,22 +8,21 @@
"dependencies": [
{
"name": "libgpg-error",
"host": true,
"default-features": false
"host": true
}
],
"features": {
"nls": {
"description": "Enable native language support",
"dependencies": [
"gettext",
{
"name": "gettext",
"host": true,
"features": [
"tools"
]
}
},
"gettext-libintl"
]
}
}

58
ports/libgwenhywfar/portfile.cmake
View File

@ -1,8 +1,3 @@
set(VERSION_MAJOR 5)
set(VERSION_MINOR 6)
set(VERSION_PATCH 0)
set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
vcpkg_download_distfile(ARCHIVE
URLS "https://www.aquamaniac.de/rdm/attachments/download/364/gwenhywfar-${VERSION}.tar.gz"
FILENAME "gwenhywfar-${VERSION}.tar.gz"
@ -11,54 +6,61 @@ vcpkg_download_distfile(ARCHIVE
vcpkg_extract_source_archive(
SOURCE_PATH
ARCHIVE ${ARCHIVE}
SOURCE_BASE ${VERSION}
ARCHIVE "${ARCHIVE}"
SOURCE_BASE "${VERSION}"
)
vcpkg_list(SET options)
if ("libxml2" IN_LIST FEATURES)
set(WITH_LIBXML2_CODE "--with-libxml2-code=yes")
vcpkg_list(APPEND options "--with-libxml2-code=yes")
endif()
if ("cpp" IN_LIST FEATURES)
list(APPEND FEATURES_GUI "cpp")
list(APPEND FEATURES_GUI "cpp")
endif()
if ("qt5" IN_LIST FEATURES)
list(APPEND FEATURES_GUI "qt5")
list(APPEND FEATURES_GUI "qt5")
endif()
list(JOIN FEATURES_GUI " " GUIS)
vcpkg_list(APPEND options "--with-guis=${GUIS}")
if(VCPKG_TARGET_IS_OSX)
set(LDFLAGS "-framework CoreFoundation -framework Security")
else()
set(LDFLAGS "")
vcpkg_list(APPEND options "LDFLAGS=\$LDFLAGS -framework CoreFoundation -framework Security")
endif()
vcpkg_configure_make(
SOURCE_PATH ${SOURCE_PATH}
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
--disable-silent-rules
--disable-binreloc
--with-guis=${GUIS}
--with-libgpg-error-prefix=${CURRENT_INSTALLED_DIR}/tools/libgpg-error
--with-libgcrypt-prefix=${CURRENT_INSTALLED_DIR}/tools/libgcrypt
--with-qt5-qmake=${CURRENT_INSTALLED_DIR}/tools/qt5/bin/qmake
--with-qt5-moc=${CURRENT_INSTALLED_DIR}/tools/qt5/bin/moc
--with-qt5-uic=${CURRENT_INSTALLED_DIR}/tools/qt5/bin/uic
${WITH_LIBXML2_CODE}
"LDFLAGS=${LDFLAGS}"
${options}
OPTIONS_RELEASE
"--with-qt5-qmake=${CURRENT_HOST_INSTALLED_DIR}/tools/qt5/bin/qmake"
"--with-qt5-moc=${CURRENT_HOST_INSTALLED_DIR}/tools/qt5/bin/moc"
"--with-qt5-uic=${CURRENT_HOST_INSTALLED_DIR}/tools/qt5/bin/uic"
"GPG_ERROR_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/bin/gpgrt-config"
"gpg_error_config_args=gpg-error"
"LIBGCRYPT_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgcrypt/bin/libgcrypt-config"
OPTIONS_DEBUG
"--with-qt5-qmake=${CURRENT_HOST_INSTALLED_DIR}/tools/qt5/debug/bin/qmake"
"--with-qt5-moc=${CURRENT_HOST_INSTALLED_DIR}/tools/qt5/debug/bin/moc"
"--with-qt5-uic=${CURRENT_HOST_INSTALLED_DIR}/tools/qt5/debug/bin/uic"
"GPG_ERROR_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/debug/bin/gpgrt-config"
"gpg_error_config_args=gpg-error"
"LIBGCRYPT_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgcrypt/debug/bin/libgcrypt-config"
)
vcpkg_install_make()
vcpkg_copy_pdbs()
vcpkg_fixup_pkgconfig()
string(REGEX MATCH "^([0-9]*[.][0-9]*)" MAJOR_MINOR "${VERSION}")
foreach(GUI IN LISTS FEATURES_GUI)
vcpkg_cmake_config_fixup(PACKAGE_NAME gwengui-cpp CONFIG_PATH lib/cmake/gwengui-${GUI}-${VERSION_MAJOR}.${VERSION_MINOR} DO_NOT_DELETE_PARENT_CONFIG_PATH)
vcpkg_cmake_config_fixup(PACKAGE_NAME gwengui-${GUI} CONFIG_PATH lib/cmake/gwengui-${GUI}-${MAJOR_MINOR} DO_NOT_DELETE_PARENT_CONFIG_PATH)
endforeach()
vcpkg_cmake_config_fixup(PACKAGE_NAME gwenhywfar CONFIG_PATH lib/cmake/gwenhywfar-${VERSION_MAJOR}.${VERSION_MINOR})
vcpkg_cmake_config_fixup(PACKAGE_NAME gwenhywfar CONFIG_PATH lib/cmake/gwenhywfar-${MAJOR_MINOR})
if ("tools" IN_LIST FEATURES)
vcpkg_copy_tools(SEARCH_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin TOOL_NAMES gct-tool gsa mklistdoc typemaker typemaker2 xmlmerge AUTO_CLEAN)
vcpkg_copy_tools(SEARCH_DIR "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin" TOOL_NAMES gct-tool gsa mklistdoc typemaker typemaker2 xmlmerge AUTO_CLEAN)
endif()
# the `dir` variable is not used in the script
@ -68,4 +70,4 @@ if(NOT VCPKG_BUILD_TYPE)
endif()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")

12
ports/libgwenhywfar/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "libgwenhywfar",
"version-semver": "5.6.0",
"port-version": 3,
"port-version": 4,
"description": "A helper library for networking and security applications and libraries",
"homepage": "https://www.aquamaniac.de/rdm/",
"supports": "!windows",
@ -29,13 +29,19 @@
"libxml2": {
"description": "Enables libXML2-depending functionality",
"dependencies": [
"libxml2"
{
"name": "libxml2",
"default-features": false
}
]
},
"qt5": {
"description": "Qt bindings",
"dependencies": [
"qt5-base"
{
"name": "qt5-base",
"default-features": false
}
]
},
"tools": {

12
versions/baseline.json
View File

@ -3005,7 +3005,7 @@
"port-version": 1
},
"gpgme": {
"baseline": "1.18.0",
"baseline": "1.22.0",
"port-version": 0
},
"gpgmm": {
@ -3961,7 +3961,7 @@
"port-version": 0
},
"libassuan": {
"baseline": "2.5.5",
"baseline": "2.5.6",
"port-version": 0
},
"libatomic-ops": {
@ -4181,8 +4181,8 @@
"port-version": 4
},
"libgcrypt": {
"baseline": "1.10.1",
"port-version": 1
"baseline": "1.10.2",
"port-version": 0
},
"libgd": {
"baseline": "2.3.3",
@ -4209,7 +4209,7 @@
"port-version": 5
},
"libgpg-error": {
"baseline": "1.46",
"baseline": "1.47",
"port-version": 0
},
"libgpiod": {
@ -4230,7 +4230,7 @@
},
"libgwenhywfar": {
"baseline": "5.6.0",
"port-version": 3
"port-version": 4
},
"libgxps": {
"baseline": "0.3.2",

5
versions/g-/gpgme.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "71d1688aa684def46e7303068d31cbac5a90c010",
"version": "1.22.0",
"port-version": 0
},
{
"git-tree": "ac2d5bcf5b538ac0c93f5af00fb210e1da266911",
"version": "1.18.0",

5
versions/l-/libassuan.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5eb84b4591e790d4fe81a7a5cd37ebd6e567d40e",
"version": "2.5.6",
"port-version": 0
},
{
"git-tree": "0072ae5afdd0e25564266077bd7600faf20d2770",
"version": "2.5.5",

5
versions/l-/libgcrypt.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "fb85f5dab3e4cacb5da45cf352ca23a25d7c4d18",
"version": "1.10.2",
"port-version": 0
},
{
"git-tree": "47460b53b2ea4430d6b020f00d4a4557ef690427",
"version": "1.10.1",

5
versions/l-/libgpg-error.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4375cd3cc867a96a2d8b5e99a425b9b3efb4f863",
"version": "1.47",
"port-version": 0
},
{
"git-tree": "29784b31b199a3d0c00583b6619f73b834e1b3ed",
"version": "1.46",

5
versions/l-/libgwenhywfar.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "6402ae94301ce25a7f846286954d8847e1360871",
"version-semver": "5.6.0",
"port-version": 4
},
{
"git-tree": "82aafb480367645c4ef047b08b420a8926b1b24e",
"version-semver": "5.6.0",