diff options
| author | SvenPStarFinanz <spa@starfinanz.de> | 2020-11-18 22:07:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-18 13:07:04 -0800 |
| commit | 232aa4b2cf2a91cb7dc8c349d367a8f863144a94 (patch) | |
| tree | 1ae031cfe96c18888e53e2dfac1def7a552aa59a | |
| parent | 5c48bee4519267e565d5cc550a8618a91f47961d (diff) | |
| download | vcpkg-232aa4b2cf2a91cb7dc8c349d367a8f863144a94.tar.gz vcpkg-232aa4b2cf2a91cb7dc8c349d367a8f863144a94.zip | |
[xmlsec] Update to 1.2.31 (#14587)
Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
| -rw-r--r-- | ports/xmlsec/0001-uwp-fix.patch | 24 | ||||
| -rw-r--r-- | ports/xmlsec/CONTROL | 3 | ||||
| -rw-r--r-- | ports/xmlsec/portfile.cmake | 4 |
3 files changed, 13 insertions, 18 deletions
diff --git a/ports/xmlsec/0001-uwp-fix.patch b/ports/xmlsec/0001-uwp-fix.patch index f48cbf589..d1e62f91c 100644 --- a/ports/xmlsec/0001-uwp-fix.patch +++ b/ports/xmlsec/0001-uwp-fix.patch @@ -1,20 +1,16 @@ diff --git a/src/dl.c b/src/dl.c -index b13f9d4..4a1b0c1 100644 +index e934fe4e..a511df43 100644 --- a/src/dl.c +++ b/src/dl.c -@@ -148,7 +148,14 @@ xmlSecCryptoDLLibraryCreate(const xmlChar* name) { +@@ -148,7 +148,7 @@ xmlSecCryptoDLLibraryCreate(const xmlChar* name) { #endif /* XMLSEC_DL_LIBLTDL */ #ifdef XMLSEC_DL_WIN32 -- lib->handle = LoadLibraryA((char*)lib->filename); -+#if !defined(WINAPI_FAMILY) || WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP -+ lib->handle = LoadLibraryA((char*)lib->filename); -+#else -+ LPTSTR wcLib = NULL; -+ wcLib = xmlSecWin32ConvertUtf8ToTstr((char*)lib->filename); -+ if (wcLib) -+ lib->handle = LoadPackagedLibrary(wcLib, 0); -+#endif - if(lib->handle == NULL) { - xmlSecIOError("LoadLibraryA", lib->filename, NULL); - xmlSecCryptoDLLibraryDestroy(lib); +-#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP) ++#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP) + lib->handle = LoadLibraryA((char*)lib->filename); + #else + LPWSTR wcLibFilename = xmlSecWin32ConvertUtf8ToUnicode(lib->filename); +-- +2.25.1.windows.1 + diff --git a/ports/xmlsec/CONTROL b/ports/xmlsec/CONTROL index e4437a14d..095b99a17 100644 --- a/ports/xmlsec/CONTROL +++ b/ports/xmlsec/CONTROL @@ -1,6 +1,5 @@ Source: xmlsec -Version: 1.2.30 -Port-Version: 1 +Version: 1.2.31 Homepage: https://www.aleksey.com/xmlsec/ Description: XML Security Library is a C library based on LibXML2. The library supports major XML security standards. Build-Depends: libxml2, openssl diff --git a/ports/xmlsec/portfile.cmake b/ports/xmlsec/portfile.cmake index 0c47010e3..a3f88a687 100644 --- a/ports/xmlsec/portfile.cmake +++ b/ports/xmlsec/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO lsh123/xmlsec - REF xmlsec-1_2_30 - SHA512 e631e7b132b39bb53f2713fe34880f8b4e81fd759fd206e8872c066236a8a64713842ba5e0ba9ad2f345f9f6d1da304acbeb61411b52cfa79d2934fc9e260ce9 + REF xmlsec-1_2_31 + SHA512 00c67bdfed208c23cbdbcdecd0648c19b66e6036a8dd27145d3c3f2150cba92cbdf5bf976f8561273e752ed3b5c188fa56ab84677e894194c6f1269a07caf04d HEAD_REF master PATCHES 0001-uwp-fix.patch |