diff options
Diffstat (limited to 'textproc/libxml2/files')
-rw-r--r-- | textproc/libxml2/files/patch-CMakeLists.txt | 33 | ||||
-rw-r--r-- | textproc/libxml2/files/patch-uri.c | 25 |
2 files changed, 0 insertions, 58 deletions
diff --git a/textproc/libxml2/files/patch-CMakeLists.txt b/textproc/libxml2/files/patch-CMakeLists.txt deleted file mode 100644 index 6926e72e1e54..000000000000 --- a/textproc/libxml2/files/patch-CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ ---- CMakeLists.txt.orig 2023-08-11 18:59:11 UTC -+++ CMakeLists.txt -@@ -395,13 +395,17 @@ if(LIBXML2_WITH_ICU) - if(WIN32) - set(ICU_LIBS "-licudt -licuin -licuuc") - else() -- set(ICU_LIBS "-licudata -licui18n -licuuc") -+ set(ICU_LIBS_DIR "${ICU_INCLUDE_DIRS}") -+ STRING(REGEX REPLACE "include" "lib" ICU_LIBS_DIR ${ICU_LIBS_DIR}) -+ set(ICU_LIBS "-L${ICU_LIBS_DIR} -licudata -licui18n -licuuc") - endif() - endif() - - if(LIBXML2_WITH_LZMA) - target_link_libraries(LibXml2 PRIVATE LibLZMA::LibLZMA) -- set(LZMA_LIBS "-llzma") -+ set(LZMA_LIBS_DIR "${LIBLZMA_INCLUDE_DIRS}") -+ STRING(REGEX REPLACE "include" "lib" LZMA_LIBS_DIR ${LZMA_LIBS_DIR}) -+ set(LZMA_LIBS "-L${LZMA_LIBS_DIR} -llzma") - endif() - - if(LIBXML2_WITH_THREADS) -@@ -411,7 +415,9 @@ endif() - - if(LIBXML2_WITH_ZLIB) - target_link_libraries(LibXml2 PRIVATE ZLIB::ZLIB) -- set(Z_LIBS "-lz") -+ set(Z_LIBS_DIR "${ZLIB_INCLUDE_DIRS}") -+ STRING(REGEX REPLACE "include" "lib" Z_LIBS_DIR ${Z_LIBS_DIR}) -+ set(Z_LIBS "-L${Z_LIBS_DIR} -lz") - endif() - - set_target_properties( diff --git a/textproc/libxml2/files/patch-uri.c b/textproc/libxml2/files/patch-uri.c deleted file mode 100644 index 82b06581c80e..000000000000 --- a/textproc/libxml2/files/patch-uri.c +++ /dev/null @@ -1,25 +0,0 @@ -Revert the following commit, it makes the freebsd doc chain fail. - -From 8eb55d782a2b9afacc7938694891cc6fad7b42a5 Mon Sep 17 00:00:00 2001 -From: Dennis Filder <d.filder@web.de> -Date: Fri, 13 Jun 2014 14:56:14 +0800 -Subject: xmlSaveUri() incorrectly recomposes URIs with rootless paths - -For https://bugzilla.gnome.org/show_bug.cgi?id=731063 - -xmlSaveUri() of libxml2 (snapshot 2014-05-31 and earlier) returns -bogus values when called with URIs that have rootless paths -(e.g. "urx:b:b" becomes "urx://b%3Ab" where "urx:b%3Ab" would be -correct) - ---- uri.c.orig 2019-10-22 18:46:01 UTC -+++ uri.c -@@ -1201,6 +1201,8 @@ xmlSaveUri(xmlURIPtr uri) { - if (temp == NULL) goto mem_error; - ret = temp; - } -+ ret[len++] = '/'; -+ ret[len++] = '/'; - } - if (uri->path != NULL) { - p = uri->path; |