diff --git a/ports/libxslt/extern_export.patch b/ports/libxslt/extern_export.patch deleted file mode 100644 index df82ab5dc76..00000000000 --- a/ports/libxslt/extern_export.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/libexslt/exsltexports.h b/libexslt/exsltexports.h -index 381567e0a..5088e0ec4 100644 ---- a/libexslt/exsltexports.h -+++ b/libexslt/exsltexports.h -@@ -48,8 +48,8 @@ - #undef EXSLTPUBVAR - #undef EXSLTCALL - #if defined(IN_LIBEXSLT) && !defined(LIBEXSLT_STATIC) -- #define EXSLTPUBFUN __declspec(dllexport) -- #define EXSLTPUBVAR __declspec(dllexport) -+ #define EXSLTPUBFUN extern __declspec(dllexport) -+ #define EXSLTPUBVAR extern __declspec(dllexport) - #else - #define EXSLTPUBFUN - #if !defined(LIBEXSLT_STATIC) -diff --git a/libxslt/xsltexports.h b/libxslt/xsltexports.h -index 99b6ac387..bbc556fb6 100644 ---- a/libxslt/xsltexports.h -+++ b/libxslt/xsltexports.h -@@ -50,8 +50,8 @@ - #undef XSLTPUBVAR - #undef XSLTCALL - #if defined(IN_LIBXSLT) && !defined(LIBXSLT_STATIC) -- #define XSLTPUBFUN __declspec(dllexport) -- #define XSLTPUBVAR __declspec(dllexport) -+ #define XSLTPUBFUN extern __declspec(dllexport) -+ #define XSLTPUBVAR extern __declspec(dllexport) - #else - #define XSLTPUBFUN - #if !defined(LIBXSLT_STATIC) diff --git a/ports/libxslt/fix-gcrypt-deps.patch b/ports/libxslt/fix-gcrypt-deps.patch index 681e15cf843..6d91a7248d4 100644 --- a/ports/libxslt/fix-gcrypt-deps.patch +++ b/ports/libxslt/fix-gcrypt-deps.patch @@ -4,7 +4,7 @@ index 6dc6501..d36a049 100644 +++ b/CMakeLists.txt @@ -317,7 +317,9 @@ target_include_directories( - if(LIBXSLT_WITH_CRYPTO) + if(LIBXSLT_WITH_CRYPTO AND NOT WIN32) target_link_libraries(LibExslt PRIVATE Gcrypt::Gcrypt) - set(LIBGCRYPT_LIBS "-lgcrypt") + # For libexslt.pc diff --git a/ports/libxslt/portfile.cmake b/ports/libxslt/portfile.cmake index cf38cf6a74b..275644836c4 100644 --- a/ports/libxslt/portfile.cmake +++ b/ports/libxslt/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO GNOME/libxslt - REF v1.1.35 - SHA512 1ab264a8d3996d74a89a22e4062950ef968b9252736e0b5f975e6f45d63a6484993fe383b85831cef0e4b9c9c90f9b2b3d5432c15ee9381dbaeb2fa681ab9b46 + REF v1.1.37 + SHA512 4e7a57cbe02ceea34404213a88bdbb63a756edfab63063ce3979b670816ae3f6fb3637a49508204e6e46b936628e0a3b8b77e9201530a1184225bd68da403b25 HEAD_REF master PATCHES python3.patch @@ -10,7 +10,6 @@ vcpkg_from_github( libexslt-pkgconfig.patch fix-gcrypt-deps.patch skip-install-docs.patch - extern_export.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/libxslt/skip-install-docs.patch b/ports/libxslt/skip-install-docs.patch index 542cae3b803..a5d59f32540 100644 --- a/ports/libxslt/skip-install-docs.patch +++ b/ports/libxslt/skip-install-docs.patch @@ -13,5 +13,5 @@ index 6dc6501..d36a049 100644 install(DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/libxslt COMPONENT documentation PATTERN Makefile.* EXCLUDE) +endif() - if(LIBXSLT_WITH_CRYPTO) + if(LIBXSLT_WITH_CRYPTO AND NOT WIN32) install(FILES FindGcrypt.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxslt-${PROJECT_VERSION} COMPONENT development) diff --git a/ports/libxslt/vcpkg.json b/ports/libxslt/vcpkg.json index d67f9d8565c..3526b489dcb 100644 --- a/ports/libxslt/vcpkg.json +++ b/ports/libxslt/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libxslt", - "version": "1.1.35", - "port-version": 2, + "version": "1.1.37", "description": "Libxslt is a XSLT library implemented in C for XSLT 1.0 and most of EXSLT", "homepage": "https://github.com/GNOME/libxslt", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 0b513c15c9e..1b5b40ec35b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4357,8 +4357,8 @@ "port-version": 0 }, "libxslt": { - "baseline": "1.1.35", - "port-version": 2 + "baseline": "1.1.37", + "port-version": 0 }, "libyaml": { "baseline": "0.2.5", diff --git a/versions/l-/libxslt.json b/versions/l-/libxslt.json index 42335a998d8..0c97d9e82e2 100644 --- a/versions/l-/libxslt.json +++ b/versions/l-/libxslt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9aebd365040f19a4060880bbf942aeda189e94ed", + "version": "1.1.37", + "port-version": 0 + }, { "git-tree": "fb07abefc8894accd9967f41c8db983dcc031189", "version": "1.1.35",