Skip to content

Commit b4c6026

Browse files
committed
Update libxslt to v1.1.40
1 parent dc315de commit b4c6026

6 files changed

+21
-22
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ the requirements.
5858
| [c-ares](https://c-ares.org) | 1.28.1 | 2024-03-30 |
5959
| [curl](https://curl.se) | 8.8.0 | 2024-05-21 |
6060
| [libxml2](http://xmlsoft.org) | 2.13.0 | 2024-06-12 |
61-
| [libxslt](http://xmlsoft.org/libxslt) | 1.1.39 | 2023-11-16 |
61+
| [libxslt](http://xmlsoft.org/libxslt) | 1.1.40 | 2024-06-12 |
6262
| [lcms](https://www.littlecms.com/) | 2.16.0 | 2023-12-03 |
6363
| [highway](https://github.com/google/highway) | 1.2.0 | 2024-05-31 |
6464
| [libpng](http://www.libpng.org/pub/png/libpng.html) | 1.6.43 | 2024-02-23 |
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
From 8e1cb823b5bc59a6a1f1e02de95d0cd1b9458098 Mon Sep 17 00:00:00 2001
1+
From 6633ceefa002e021aa7a5e1ee7c96f9a51f8a9ae Mon Sep 17 00:00:00 2001
22
From: Don <don.j.olmstead@gmail.com>
33
Date: Thu, 3 Mar 2022 15:32:10 -0800
4-
Subject: [PATCH 2/4] Add ICU build option
4+
Subject: [PATCH 1/3] Add ICU build option
55

66
The provided CMake doesn't have a build option for ICU so add it.
77
---
88
CMakeLists.txt | 8 ++++++++
99
1 file changed, 8 insertions(+)
1010

1111
diff --git a/CMakeLists.txt b/CMakeLists.txt
12-
index d0b0d15d..c821c780 100644
12+
index a18f7402..c446c186 100644
1313
--- a/CMakeLists.txt
1414
+++ b/CMakeLists.txt
1515
@@ -40,6 +40,7 @@ endif()
1616
option(BUILD_SHARED_LIBS "Build shared libraries" ON)
1717
option(LIBXSLT_WITH_DEBUGGER "Add the debugging support" ON)
1818
option(LIBXSLT_WITH_CRYPTO "Add crypto support to exslt" OFF)
1919
+option(LIBXSLT_WITH_ICU "Add ICU support to xslt" OFF)
20-
option(LIBXSLT_WITH_MEM_DEBUG "Add the memory debugging module" OFF)
2120
option(LIBXSLT_WITH_MODULES "Add the module support" ON)
2221
option(LIBXSLT_WITH_PROFILER "Add the profiling support" ON)
23-
@@ -57,6 +58,10 @@ if(LIBXSLT_WITH_CRYPTO AND NOT WIN32)
22+
option(LIBXSLT_WITH_PYTHON "Build Python bindings" ON)
23+
@@ -56,6 +57,10 @@ if(LIBXSLT_WITH_CRYPTO AND NOT WIN32)
2424
find_package(Gcrypt REQUIRED)
2525
endif()
2626

@@ -31,7 +31,7 @@ index d0b0d15d..c821c780 100644
3131
if(LIBXSLT_WITH_PYTHON)
3232
check_include_files(unistd.h HAVE_UNISTD_H)
3333
check_symbol_exists(F_GETFL fcntl.h HAVE_F_GETFL)
34-
@@ -230,6 +235,9 @@ target_include_directories(
34+
@@ -229,6 +234,9 @@ target_include_directories(
3535
)
3636

3737
target_link_libraries(LibXslt PUBLIC LibXml2::LibXml2)
@@ -42,5 +42,5 @@ index d0b0d15d..c821c780 100644
4242
if(UNIX)
4343
target_link_libraries(LibXslt PRIVATE m)
4444
--
45-
2.42.0.windows.2
45+
2.45.2.windows.1
4646

ports/libxslt/patches/0002-Add-tooling-build-option.patch

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
From dbeac3a1f3f03a962679b20616ac839152080caa Mon Sep 17 00:00:00 2001
1+
From af6fdbeb28f021ac8c780b351996ad7457dc8199 Mon Sep 17 00:00:00 2001
22
From: Don <don.j.olmstead@gmail.com>
33
Date: Thu, 3 Mar 2022 15:34:42 -0800
4-
Subject: [PATCH 3/4] Add tooling build option
4+
Subject: [PATCH 2/3] Add tooling build option
55

66
Allow disabling of the xsltproc executable build.
77
---
88
CMakeLists.txt | 3 +++
99
1 file changed, 3 insertions(+)
1010

1111
diff --git a/CMakeLists.txt b/CMakeLists.txt
12-
index c821c780..04ad51c8 100644
12+
index c446c186..1d51c42b 100644
1313
--- a/CMakeLists.txt
1414
+++ b/CMakeLists.txt
15-
@@ -46,6 +46,7 @@ option(LIBXSLT_WITH_MODULES "Add the module support" ON)
15+
@@ -45,6 +45,7 @@ option(LIBXSLT_WITH_MODULES "Add the module support" ON)
1616
option(LIBXSLT_WITH_PROFILER "Add the profiling support" ON)
1717
option(LIBXSLT_WITH_PYTHON "Build Python bindings" ON)
1818
option(LIBXSLT_WITH_TESTS "Build tests" ON)
1919
+option(LIBXSLT_WITH_TOOLS "Build tools" ON)
2020
option(LIBXSLT_WITH_THREADS "Add multithread support" ON)
2121
set(LIBXSLT_WITH_TRIO OFF)
2222
option(LIBXSLT_WITH_XSLT_DEBUG "Add the debugging code" ON)
23-
@@ -381,11 +382,13 @@ if(MSVC AND BUILD_SHARED_LIBS)
23+
@@ -380,11 +381,13 @@ if(MSVC AND BUILD_SHARED_LIBS)
2424
install(FILES $<TARGET_PDB_FILE:LibExslt> DESTINATION ${CMAKE_INSTALL_BINDIR} CONFIGURATIONS Debug RelWithDebInfo COMPONENT debug)
2525
endif()
2626

@@ -35,5 +35,5 @@ index c821c780..04ad51c8 100644
3535
if(LIBXSLT_WITH_TESTS)
3636
enable_testing()
3737
--
38-
2.42.0.windows.2
38+
2.45.2.windows.1
3939

ports/libxslt/patches/0003-Remove-config-requirement-for-libxml2.patch

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
From 42e884f0984ba08dd07ea19041c3fd6471a1536c Mon Sep 17 00:00:00 2001
1+
From 1302939554bcf09cdc0de94ac826bf4fd7428ad4 Mon Sep 17 00:00:00 2001
22
From: Don Olmstead <don.j.olmstead@gmail.com>
33
Date: Fri, 22 Sep 2023 13:14:02 -0700
4-
Subject: [PATCH 4/4] Remove config requirement for libxml2
4+
Subject: [PATCH 3/3] Remove config requirement for libxml2
55

66
---
77
CMakeLists.txt | 2 +-
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/CMakeLists.txt b/CMakeLists.txt
11-
index 04ad51c8..5b406784 100644
11+
index 1d51c42b..16a2b994 100644
1212
--- a/CMakeLists.txt
1313
+++ b/CMakeLists.txt
1414
@@ -34,7 +34,7 @@ include(CMakePackageConfigHelpers)
@@ -21,5 +21,5 @@ index 04ad51c8..5b406784 100644
2121

2222
option(BUILD_SHARED_LIBS "Build shared libraries" ON)
2323
--
24-
2.42.0.windows.2
24+
2.45.2.windows.1
2525

ports/libxslt/portfile.cmake

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
set(VERSION_MAJOR 1)
22
set(VERSION_MINOR 1)
3-
set(VERSION_PATCH 39)
3+
set(VERSION_PATCH 40)
44
set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
55

66
# Get archive
77
vcpkg_download_distfile(ARCHIVE
88
URLS "https://download.gnome.org/sources/libxslt/${VERSION_MAJOR}.${VERSION_MINOR}/libxslt-${VERSION}.tar.xz"
99
FILENAME "libxslt-${VERSION}.tar.xz"
10-
SHA512 c0c99dc63f8b2acb6cc3ad7ad684ffa2a427ee8d1740495cbf8a7c9b9c8679f96351b4b676c73ccc191014db4cb4ab42b9a0070f6295565f39dbc665c5c16f89
10+
SHA512 5823dc8fbfe276a8fbdb1ee0d8b7924b0653b65101278db6cc7f6979c69df44f68d6b5b1ddaf753f6d8b353bc70ac65df5ab0d73e2230f996d99d018c53cb47f
1111
)
1212

1313
# Patches
@@ -31,7 +31,6 @@ set(BUILD_OPTIONS
3131
-DLIBXSLT_WITH_CRYPTO=OFF
3232
-DLIBXSLT_WITH_DEBUGGER=OFF
3333
-DLIBXSLT_WITH_ICU=ON
34-
-DLIBXSLT_WITH_MEM_DEBUG=OFF
3534
-DLIBXSLT_WITH_MODULES=OFF
3635
-DLIBXSLT_WITH_PROFILER=OFF
3736
-DLIBXSLT_WITH_PYTHON=OFF

ports/libxslt/vcpkg.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "libxslt",
3-
"version": "1.1.39",
3+
"version": "1.1.40",
44
"description": "Libxslt is a XSLT library implemented in C for XSLT 1.0 and most of EXSLT",
55
"homepage": "http://xmlsoft.org/libxslt",
66
"license": "MIT",

0 commit comments

Comments
 (0)