Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Changelog: https://gitlab.gnome.org/GNOME/libxml2/-/blob/v2.11.6/NEWS PR: 273210 Reviewed by: fluffy Approved by: desktop (arrowd) Exp-run by: antoine
- Loading branch information
Daniel Engberg
authored and
Daniel Engberg
committed
Jan 12, 2024
1 parent
362c9e8
commit 25e6f68
Showing
9 changed files
with
87 additions
and
126 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
TIMESTAMP = 1681763197 | ||
SHA256 (gnome/libxml2-2.10.4.tar.xz) = ed0c91c5845008f1936739e4eee2035531c1c94742c6541f44ee66d885948d45 | ||
SIZE (gnome/libxml2-2.10.4.tar.xz) = 2643600 | ||
TIMESTAMP = 1700425627 | ||
SHA256 (gnome/libxml2-2.11.6.tar.xz) = c90eee7506764abbe07bb616b82da452529609815aefef423d66ef080eb0c300 | ||
SIZE (gnome/libxml2-2.11.6.tar.xz) = 2628652 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
--- 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( |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters