Skip to content

Commit 671c6b3

Browse files
committed
fix(libxml2): Update Windows ICU Patch
1 parent 2e7be07 commit 671c6b3

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

patches/libxml2-windows-icu.patch

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/CMakeLists.txt b/CMakeLists.txt
2-
index c23fe75f..5cc294b2 100644
2+
index ab3d0d24..f8dcd44d 100644
33
--- a/CMakeLists.txt
44
+++ b/CMakeLists.txt
5-
@@ -362,7 +362,7 @@ endif()
5+
@@ -355,7 +355,7 @@ endif()
66

77
if(LIBXML2_WITH_ICU)
88
target_link_libraries(LibXml2 PRIVATE ICU::uc)
@@ -11,19 +11,19 @@ index c23fe75f..5cc294b2 100644
1111
list(APPEND XML_PRIVATE_LIBS "${ICU_LDFLAGS}")
1212
pkg_check_modules(ICU_PC IMPORTED_TARGET icu-uc)
1313
if(ICU_PC_FOUND)
14-
@@ -417,7 +417,6 @@ set_target_properties(
14+
@@ -411,7 +411,6 @@ set_target_properties(
1515
IMPORT_PREFIX lib
1616
OUTPUT_NAME xml2
1717
POSITION_INDEPENDENT_CODE ON
1818
- PREFIX lib
1919
VERSION "${LIBXML_SOVERSION}.${LIBXML_AGE}.${LIBXML_MICRO_VERSION}"
2020
SOVERSION ${LIBXML_SOVERSION}
21-
)
21+
MACHO_COMPATIBILITY_VERSION ${LIBXML_MACHO_COMPAT}
2222
diff --git a/encoding.c b/encoding.c
23-
index a90694f5..a0b9a9c1 100644
23+
index 7dfd37aa..96c00a72 100644
2424
--- a/encoding.c
2525
+++ b/encoding.c
26-
@@ -48,7 +48,7 @@
26+
@@ -47,7 +47,7 @@
2727
#include "private/memory.h"
2828

2929
#ifdef LIBXML_ICU_ENABLED
@@ -33,10 +33,10 @@ index a90694f5..a0b9a9c1 100644
3333

3434
#define XML_HANDLER_STATIC (1 << 0)
3535
diff --git a/libxml2-config.cmake.cmake.in b/libxml2-config.cmake.cmake.in
36-
index de084bdf..39d30622 100644
36+
index ac15ded1..59121cc5 100644
3737
--- a/libxml2-config.cmake.cmake.in
3838
+++ b/libxml2-config.cmake.cmake.in
39-
@@ -124,7 +124,7 @@ if(NOT LIBXML2_SHARED)
39+
@@ -122,7 +122,7 @@ if(NOT LIBXML2_SHARED)
4040
endif()
4141

4242
if(LIBXML2_WITH_ICU)
@@ -46,18 +46,18 @@ index de084bdf..39d30622 100644
4646
if(NOT ICU_FOUND)
4747
set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE)
4848
diff --git a/libxml2-config.cmake.in b/libxml2-config.cmake.in
49-
index 31036805..469d110b 100644
49+
index b70eb1dd..78de2cb8 100644
5050
--- a/libxml2-config.cmake.in
5151
+++ b/libxml2-config.cmake.in
52-
@@ -76,9 +76,9 @@ if(LIBXML2_WITH_THREADS)
53-
endif()
52+
@@ -75,9 +75,9 @@ if(NOT LIBXML2_SHARED)
53+
endif()
5454

55-
if(LIBXML2_WITH_ICU)
56-
- find_dependency(ICU COMPONENTS data i18n uc)
57-
+ find_dependency(ICU COMPONENTS i18n uc)
58-
list(APPEND LIBXML2_LIBRARIES ${ICU_LIBRARIES})
59-
- list(APPEND LIBXML2_INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:ICU::data>;\$<LINK_ONLY:ICU::i18n>;\$<LINK_ONLY:ICU::uc>")
60-
+ list(APPEND LIBXML2_INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:ICU::i18n>;\$<LINK_ONLY:ICU::uc>")
61-
if(NOT ICU_FOUND)
62-
set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE)
63-
set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "ICU dependency was not found")
55+
if(LIBXML2_WITH_ICU)
56+
- find_dependency(ICU COMPONENTS data i18n uc)
57+
+ find_dependency(ICU COMPONENTS i18n uc)
58+
list(APPEND LIBXML2_LIBRARIES ${ICU_LIBRARIES})
59+
- list(APPEND LIBXML2_INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:ICU::data>;\$<LINK_ONLY:ICU::i18n>;\$<LINK_ONLY:ICU::uc>")
60+
+ list(APPEND LIBXML2_INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:ICU::i18n>;\$<LINK_ONLY:ICU::uc>")
61+
if(NOT ICU_FOUND)
62+
set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE)
63+
set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "ICU dependency was not found")

0 commit comments

Comments
 (0)