From a12a45332b897ba24095b3db286cdcecc534cbad Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sat, 11 Jan 2025 11:36:40 +0100 Subject: [PATCH] [libgwenhywfar] Update to 5.12.0 --- ports/libgwenhywfar/portfile.cmake | 37 ++++++++++------------ ports/libgwenhywfar/static-link-order.diff | 17 ++++++++++ ports/libgwenhywfar/vcpkg.json | 20 +++++------- versions/baseline.json | 4 +-- versions/l-/libgwenhywfar.json | 5 +++ 5 files changed, 48 insertions(+), 35 deletions(-) create mode 100644 ports/libgwenhywfar/static-link-order.diff diff --git a/ports/libgwenhywfar/portfile.cmake b/ports/libgwenhywfar/portfile.cmake index a0ffa609e2ab14..ca7a5c1f269a43 100644 --- a/ports/libgwenhywfar/portfile.cmake +++ b/ports/libgwenhywfar/portfile.cmake @@ -1,13 +1,15 @@ vcpkg_download_distfile(ARCHIVE - URLS "https://www.aquamaniac.de/rdm/attachments/download/364/gwenhywfar-${VERSION}.tar.gz" + URLS "https://www.aquamaniac.de/rdm/attachments/download/529/gwenhywfar-5.12.0.tar.gz" FILENAME "gwenhywfar-${VERSION}.tar.gz" - SHA512 9875d677f49fc0a46f371fd1954d15d99c7d5994e90b16f1be7a5b8a1cbcd74ae9733e4541afd6d8251a2ba1a0a37c28e0f248952b7c917313fbf5b38b1d8d11 + SHA512 0075eb626f0022ecd4ffdd59de7f0817d2def685e1d2cfbca9a32faa4b8d4d213bea631f24c5385da0b8c7743fd6d1887a46f08afa371195d911409ec7655791 ) vcpkg_extract_source_archive( SOURCE_PATH ARCHIVE "${ARCHIVE}" SOURCE_BASE "${VERSION}" + PATCHES + static-link-order.diff ) vcpkg_list(SET options) @@ -24,32 +26,31 @@ endif() list(JOIN FEATURES_GUI " " GUIS) vcpkg_list(APPEND options "--with-guis=${GUIS}") -if(VCPKG_TARGET_IS_OSX) - vcpkg_list(APPEND options "LDFLAGS=\$LDFLAGS -framework CoreFoundation -framework Security") -endif() - -vcpkg_configure_make( +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/libgpg-error/aclocal/\"") +vcpkg_make_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS --disable-binreloc + --disable-network-checks + --disable-nls ${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" + "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" "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" + "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" "LIBGCRYPT_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgcrypt/debug/bin/libgcrypt-config" ) -vcpkg_install_make() +vcpkg_make_install() vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() @@ -59,15 +60,9 @@ foreach(GUI IN LISTS FEATURES_GUI) endforeach() 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) -endif() - -# the `dir` variable is not used in the script -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libgwenhywfar/bin/gwenhywfar-config" "dir=\"${CURRENT_INSTALLED_DIR}\"" "") -if(NOT VCPKG_BUILD_TYPE) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libgwenhywfar/debug/bin/gwenhywfar-config" "dir=\"${CURRENT_INSTALLED_DIR}/debug\"" "") -endif() +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/libgwenhywfar/static-link-order.diff b/ports/libgwenhywfar/static-link-order.diff new file mode 100644 index 00000000000000..2cd0b46420d049 --- /dev/null +++ b/ports/libgwenhywfar/static-link-order.diff @@ -0,0 +1,17 @@ +diff --git a/tools/gwenbuild/Makefile.am b/tools/gwenbuild/Makefile.am +index 14aa0e2..eb60988 100644 +--- a/tools/gwenbuild/Makefile.am ++++ b/tools/gwenbuild/Makefile.am +@@ -28,11 +28,11 @@ noinst_HEADERS=\ + + + gwbuild_LDADD = \ +- $(top_builddir)/src/$(gwenhywfar_internal_libname) \ + types/libgwb_types.la \ + parser/libgwb_parser.la \ + tools/libgwb_tools.la \ + builders/libgwb_builders.la \ + buildctx/libgwb_build.la \ ++ $(top_builddir)/src/$(gwenhywfar_internal_libname) \ + $(PROG_LIBRARIES) + diff --git a/ports/libgwenhywfar/vcpkg.json b/ports/libgwenhywfar/vcpkg.json index 01962b31181bde..809fda4c6316c4 100644 --- a/ports/libgwenhywfar/vcpkg.json +++ b/ports/libgwenhywfar/vcpkg.json @@ -1,20 +1,19 @@ { "name": "libgwenhywfar", - "version-semver": "5.6.0", - "port-version": 5, + "version-semver": "5.12.0", "description": "A helper library for networking and security applications and libraries", "homepage": "https://www.aquamaniac.de/rdm/", - "supports": "!windows & !(osx & arm64)", + "supports": "!windows | mingw", "dependencies": [ "libgcrypt", + "libgnutls", + "openssl", { - "name": "libgnutls", - "features": [ - "openssl" - ] + "name": "vcpkg-cmake-config", + "host": true }, { - "name": "vcpkg-cmake-config", + "name": "vcpkg-make", "host": true } ], @@ -24,7 +23,7 @@ ], "features": { "cpp": { - "description": "C++ bindings" + "description": "A C++ binding for the C module GWEN_GUI" }, "libxml2": { "description": "Enables libXML2-depending functionality", @@ -43,9 +42,6 @@ "default-features": false } ] - }, - "tools": { - "description": "Some helper tools provided by Gwenhywfar and useful for applications using it" } } } diff --git a/versions/baseline.json b/versions/baseline.json index b975d993ce5078..0d70e6c479af96 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4641,8 +4641,8 @@ "port-version": 0 }, "libgwenhywfar": { - "baseline": "5.6.0", - "port-version": 5 + "baseline": "5.12.0", + "port-version": 0 }, "libgxps": { "baseline": "0.3.2", diff --git a/versions/l-/libgwenhywfar.json b/versions/l-/libgwenhywfar.json index 2bd0cd1d58c40e..12e461168d243b 100644 --- a/versions/l-/libgwenhywfar.json +++ b/versions/l-/libgwenhywfar.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5e874c9b061d1b706c0f3dcabd3bb96eeba9014e", + "version-semver": "5.12.0", + "port-version": 0 + }, { "git-tree": "8b4376fdc006cc932f5bc581b32479ebd273b275", "version-semver": "5.6.0",