diff --git a/ports/libgwenhywfar/fd_set-android.diff b/ports/libgwenhywfar/fd_set-android.diff new file mode 100644 index 0000000000..554b25b9b9 --- /dev/null +++ b/ports/libgwenhywfar/fd_set-android.diff @@ -0,0 +1,14 @@ +diff --git a/src/os/posix/inetsocket_p.h b/src/os/posix/inetsocket_p.h +index 0fb1704..03923f9 100644 +--- a/src/os/posix/inetsocket_p.h ++++ b/src/os/posix/inetsocket_p.h +@@ -43,6 +43,9 @@ + #ifdef HAVE_ARPA_INET_H + # include + #endif ++#if defined (__ANDROID__) ++#include ++#endif + + + struct GWEN_SOCKET { diff --git a/ports/libgwenhywfar/portfile.cmake b/ports/libgwenhywfar/portfile.cmake index a824c30637..61c84bec88 100644 --- a/ports/libgwenhywfar/portfile.cmake +++ b/ports/libgwenhywfar/portfile.cmake @@ -1,13 +1,7 @@ vcpkg_download_distfile(ARCHIVE - URLS "https://www.aquamaniac.de/rdm/attachments/download/529/gwenhywfar-5.12.0.tar.gz" + URLS "https://www.aquamaniac.de/rdm/attachments/download/630/gwenhywfar-5.14.1.tar.gz" FILENAME "gwenhywfar-${VERSION}.tar.gz" - SHA512 0075eb626f0022ecd4ffdd59de7f0817d2def685e1d2cfbca9a32faa4b8d4d213bea631f24c5385da0b8c7743fd6d1887a46f08afa371195d911409ec7655791 -) - -vcpkg_download_distfile(osx_patch - URLS "https://www.aquamaniac.de/rdm/projects/gwenhywfar/repository/revisions/55d4b7b526df30e4003c92e2f504f480c01021f0/diff?format=diff" - FILENAME "gwenhywfar-5.12.0-55d4b7b.diff" - SHA512 87fa9ff3e9027c5a6839f800990b420a824efbd115ed67eeaef3c909b14c59c0b9bae41c539d400166862c0353ad730313ee4f9366928c333883d41429912731 + SHA512 770a9f3aba84440526229375000b02cb938d2ccd4c75c25503e322ee717f3b738d2bdf17a1dff7f0486b37a60b0038406d336a3167c932a6336abc14d1bea6f0 ) vcpkg_extract_source_archive( @@ -16,9 +10,9 @@ vcpkg_extract_source_archive( SOURCE_BASE "${VERSION}" PATCHES control-openssl.diff + fd_set-android.diff pkgconfig.diff static-link-order.diff - ${osx_patch} ) vcpkg_list(SET options) @@ -50,16 +44,16 @@ vcpkg_make_configure( --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" + "QMAKE=${CURRENT_HOST_INSTALLED_DIR}/tools/qt5/bin/qmake" + "QT_MOC=${CURRENT_HOST_INSTALLED_DIR}/tools/qt5/bin/moc" + "QT_UIC=${CURRENT_HOST_INSTALLED_DIR}/tools/qt5/bin/uic" "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" + "QMAKE=${CURRENT_HOST_INSTALLED_DIR}/tools/qt5/debug/bin/qmake" + "QT_MOC=${CURRENT_HOST_INSTALLED_DIR}/tools/qt5/debug/bin/moc" + "QT_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" "GPGRT_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/debug/bin/gpgrt-config" "LIBGCRYPT_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgcrypt/debug/bin/libgcrypt-config" diff --git a/ports/libgwenhywfar/vcpkg.json b/ports/libgwenhywfar/vcpkg.json index 88bfb4ad46..6bd7d54346 100644 --- a/ports/libgwenhywfar/vcpkg.json +++ b/ports/libgwenhywfar/vcpkg.json @@ -1,8 +1,9 @@ { "name": "libgwenhywfar", - "version-semver": "5.12.0", + "version-semver": "5.14.1", "description": "A helper library for networking and security applications and libraries", "homepage": "https://www.aquamaniac.de/rdm/", + "license": "LGPL-2.1-or-later", "supports": "!windows | mingw", "dependencies": [ { diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 3abf883326..573a97e85a 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -357,9 +357,6 @@ libdc1394:x64-android=fail libfreenect2:arm64-windows-static-md=fail libfreenect2:arm64-windows=fail libgo:x64-android=fail -libgwenhywfar:arm-neon-android=fail -libgwenhywfar:arm64-android=fail -libgwenhywfar:x64-android=fail libgxps:x64-windows-static=fail libhdfs3:arm-neon-android=fail libhdfs3:arm64-android=fail diff --git a/scripts/test_ports/vcpkg-ci-libgwenhywfar/vcpkg.json b/scripts/test_ports/vcpkg-ci-libgwenhywfar/vcpkg.json index 3f9f827b08..f8570bb7b6 100644 --- a/scripts/test_ports/vcpkg-ci-libgwenhywfar/vcpkg.json +++ b/scripts/test_ports/vcpkg-ci-libgwenhywfar/vcpkg.json @@ -19,7 +19,7 @@ }, { "name": "qt5", - "platform": "!(osx & static)" + "platform": "native | (x64 & windows)" } ], "features": { diff --git a/versions/baseline.json b/versions/baseline.json index 2490992f81..d62ecd4988 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4957,7 +4957,7 @@ "port-version": 0 }, "libgwenhywfar": { - "baseline": "5.12.0", + "baseline": "5.14.1", "port-version": 0 }, "libgxps": { diff --git a/versions/l-/libgwenhywfar.json b/versions/l-/libgwenhywfar.json index 294b4c8605..5b29fef728 100644 --- a/versions/l-/libgwenhywfar.json +++ b/versions/l-/libgwenhywfar.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7ac9d38af5ef3ec67270248b2ac146dc2f4b2d92", + "version-semver": "5.14.1", + "port-version": 0 + }, { "git-tree": "35c7f16cf8e9c02e65d9ce898690ef2b8b0691dd", "version-semver": "5.12.0",