diff options
| -rw-r--r-- | ports/xmlsec/0001-uwp-fix.patch | 16 | ||||
| -rw-r--r-- | ports/xmlsec/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | ports/xmlsec/portfile.cmake | 5 | ||||
| -rw-r--r-- | ports/xmlsec/vcpkg.json | 3 | ||||
| -rw-r--r-- | versions/baseline.json | 4 | ||||
| -rw-r--r-- | versions/x-/xmlsec.json | 5 |
6 files changed, 13 insertions, 23 deletions
diff --git a/ports/xmlsec/0001-uwp-fix.patch b/ports/xmlsec/0001-uwp-fix.patch deleted file mode 100644 index d1e62f91c..000000000 --- a/ports/xmlsec/0001-uwp-fix.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/dl.c b/src/dl.c -index e934fe4e..a511df43 100644 ---- a/src/dl.c -+++ b/src/dl.c -@@ -148,7 +148,7 @@ xmlSecCryptoDLLibraryCreate(const xmlChar* name) { - #endif /* XMLSEC_DL_LIBLTDL */ - - #ifdef XMLSEC_DL_WIN32 --#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/CMakeLists.txt b/ports/xmlsec/CMakeLists.txt index 8ecb7bb65..cf019d51c 100644 --- a/ports/xmlsec/CMakeLists.txt +++ b/ports/xmlsec/CMakeLists.txt @@ -55,6 +55,9 @@ if(MSVC) add_compile_options(/wd4130 /wd4127 /wd4152) endif() +set(CMAKE_SHARED_LIBRARY_PREFIX "lib") +set(CMAKE_STATIC_LIBRARY_PREFIX "lib") + add_library(xmlsec1 ${SOURCESXMLSEC}) add_library(xmlsec1-openssl ${SOURCESXMLSECOPENSSL}) diff --git a/ports/xmlsec/portfile.cmake b/ports/xmlsec/portfile.cmake index 72a32d90c..280f9aea7 100644 --- a/ports/xmlsec/portfile.cmake +++ b/ports/xmlsec/portfile.cmake @@ -1,11 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO lsh123/xmlsec - REF xmlsec-1_2_31 - SHA512 00c67bdfed208c23cbdbcdecd0648c19b66e6036a8dd27145d3c3f2150cba92cbdf5bf976f8561273e752ed3b5c188fa56ab84677e894194c6f1269a07caf04d + REF xmlsec-1_2_32 + SHA512 45e2efc6bdf6ec09db6ff01b521c3fbcf44aa9804d5692bea5296e80d7fc2f05fac322868f82840a7b67e0abd4233222098aa94a29ec9a6a7d049180cf131c57 HEAD_REF master PATCHES - 0001-uwp-fix.patch pkgconfig_fixes.patch ) diff --git a/ports/xmlsec/vcpkg.json b/ports/xmlsec/vcpkg.json index be3a5b97f..0d2c235da 100644 --- a/ports/xmlsec/vcpkg.json +++ b/ports/xmlsec/vcpkg.json @@ -1,7 +1,6 @@ { "name": "xmlsec", - "version-string": "1.2.31", - "port-version": 1, + "version": "1.2.32", "description": "XML Security Library is a C library based on LibXML2. The library supports major XML security standards.", "homepage": "https://www.aleksey.com/xmlsec/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 4ce9ba563..dd1ef888f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6677,8 +6677,8 @@ "port-version": 1 }, "xmlsec": { - "baseline": "1.2.31", - "port-version": 1 + "baseline": "1.2.32", + "port-version": 0 }, "xmsh": { "baseline": "0.5.2-1", diff --git a/versions/x-/xmlsec.json b/versions/x-/xmlsec.json index cf67e3a34..29672537a 100644 --- a/versions/x-/xmlsec.json +++ b/versions/x-/xmlsec.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "f15cb0d0c8dd69a916421866901a7bce6d81666c", + "version": "1.2.32", + "port-version": 0 + }, + { "git-tree": "9bce4d43cc99b63c9be1b547fcede14a75a61447", "version-string": "1.2.31", "port-version": 1 |