mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-06-07 18:32:47 +08:00
[libxslt] Update to 1.1.37 (#26718)
This commit is contained in:
parent
29787a71b3
commit
7e430e3a90
@ -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)
|
|
@ -4,7 +4,7 @@ index 6dc6501..d36a049 100644
|
|||||||
+++ b/CMakeLists.txt
|
+++ b/CMakeLists.txt
|
||||||
@@ -317,7 +317,9 @@ target_include_directories(
|
@@ -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)
|
target_link_libraries(LibExslt PRIVATE Gcrypt::Gcrypt)
|
||||||
- set(LIBGCRYPT_LIBS "-lgcrypt")
|
- set(LIBGCRYPT_LIBS "-lgcrypt")
|
||||||
+ # For libexslt.pc
|
+ # For libexslt.pc
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
vcpkg_from_github(
|
vcpkg_from_github(
|
||||||
OUT_SOURCE_PATH SOURCE_PATH
|
OUT_SOURCE_PATH SOURCE_PATH
|
||||||
REPO GNOME/libxslt
|
REPO GNOME/libxslt
|
||||||
REF v1.1.35
|
REF v1.1.37
|
||||||
SHA512 1ab264a8d3996d74a89a22e4062950ef968b9252736e0b5f975e6f45d63a6484993fe383b85831cef0e4b9c9c90f9b2b3d5432c15ee9381dbaeb2fa681ab9b46
|
SHA512 4e7a57cbe02ceea34404213a88bdbb63a756edfab63063ce3979b670816ae3f6fb3637a49508204e6e46b936628e0a3b8b77e9201530a1184225bd68da403b25
|
||||||
HEAD_REF master
|
HEAD_REF master
|
||||||
PATCHES
|
PATCHES
|
||||||
python3.patch
|
python3.patch
|
||||||
@ -10,7 +10,6 @@ vcpkg_from_github(
|
|||||||
libexslt-pkgconfig.patch
|
libexslt-pkgconfig.patch
|
||||||
fix-gcrypt-deps.patch
|
fix-gcrypt-deps.patch
|
||||||
skip-install-docs.patch
|
skip-install-docs.patch
|
||||||
extern_export.patch
|
|
||||||
)
|
)
|
||||||
|
|
||||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||||
|
@ -13,5 +13,5 @@ index 6dc6501..d36a049 100644
|
|||||||
install(DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/libxslt COMPONENT documentation PATTERN Makefile.* EXCLUDE)
|
install(DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/libxslt COMPONENT documentation PATTERN Makefile.* EXCLUDE)
|
||||||
+endif()
|
+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)
|
install(FILES FindGcrypt.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxslt-${PROJECT_VERSION} COMPONENT development)
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "libxslt",
|
"name": "libxslt",
|
||||||
"version": "1.1.35",
|
"version": "1.1.37",
|
||||||
"port-version": 2,
|
|
||||||
"description": "Libxslt is a XSLT library implemented in C for XSLT 1.0 and most of EXSLT",
|
"description": "Libxslt is a XSLT library implemented in C for XSLT 1.0 and most of EXSLT",
|
||||||
"homepage": "https://github.com/GNOME/libxslt",
|
"homepage": "https://github.com/GNOME/libxslt",
|
||||||
"license": null,
|
"license": null,
|
||||||
|
@ -4357,8 +4357,8 @@
|
|||||||
"port-version": 0
|
"port-version": 0
|
||||||
},
|
},
|
||||||
"libxslt": {
|
"libxslt": {
|
||||||
"baseline": "1.1.35",
|
"baseline": "1.1.37",
|
||||||
"port-version": 2
|
"port-version": 0
|
||||||
},
|
},
|
||||||
"libyaml": {
|
"libyaml": {
|
||||||
"baseline": "0.2.5",
|
"baseline": "0.2.5",
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "9aebd365040f19a4060880bbf942aeda189e94ed",
|
||||||
|
"version": "1.1.37",
|
||||||
|
"port-version": 0
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "fb07abefc8894accd9967f41c8db983dcc031189",
|
"git-tree": "fb07abefc8894accd9967f41c8db983dcc031189",
|
||||||
"version": "1.1.35",
|
"version": "1.1.35",
|
||||||
|
Loading…
Reference in New Issue
Block a user