From d5dc1ac5fd8d4d0f1b029b69958121f5041a8db6 Mon Sep 17 00:00:00 2001 From: AleaJactaEst Date: Sun, 4 Nov 2018 16:49:51 +0100 Subject: [PATCH] update patch libicuuc --- patch/libicuuc.patch | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/patch/libicuuc.patch b/patch/libicuuc.patch index 56dc4453d..70651b0bb 100644 --- a/patch/libicuuc.patch +++ b/patch/libicuuc.patch @@ -1,5 +1,5 @@ diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt -index 4e422c0b5..e76be35f1 100644 +index 4e5292f2a..8c706ea94 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -153,6 +153,17 @@ IF(WITH_STATIC) @@ -20,3 +20,30 @@ index 4e422c0b5..e76be35f1 100644 ENDIF() ENDIF() +diff --git a/patch/libicuuc.patch b/patch/libicuuc.patch +index 56dc4453d..e69de29bb 100644 +--- a/patch/libicuuc.patch ++++ b/patch/libicuuc.patch +@@ -1,22 +0,0 @@ +-diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt +-index 4e422c0b5..e76be35f1 100644 +---- a/code/CMakeLists.txt +-+++ b/code/CMakeLists.txt +-@@ -153,6 +153,17 @@ IF(WITH_STATIC) +- IF(LIBLZMA_LIBRARIES) +- SET(LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} ${LIBLZMA_LIBRARIES}) +- ENDIF() +-+ # under Linux, recent libxml2 versions are linked without libicuuc & libicudata +-+ IF(WITH_STATIC_EXTERNAL) +-+ find_library (LIBICUUC_LIBRARY NAMES icuuc) +-+ IF(LIBICUUC_LIBRARY) +-+ SET(LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} ${LIBICUUC_LIBRARY}) +-+ ENDIF() +-+ find_library (LIBICUDATA_LIBRARY NAMES icudata) +-+ IF(LIBICUDATA_LIBRARY) +-+ SET(LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} ${LIBICUDATA_LIBRARY}) +-+ ENDIF() +-+ ENDIF() +- ENDIF() +- ENDIF() +-