diff -Nurd libxml2-2.12.4.orig/doc/xml2-config.1 libxml2-2.12.4/doc/xml2-config.1 --- libxml2-2.12.4.orig/doc/xml2-config.1 2023-02-14 06:37:07.000000000 -0500 +++ libxml2-2.12.4/doc/xml2-config.1 2024-01-24 18:41:20.000000000 -0500 @@ -16,8 +16,6 @@ .TP 8 .B \-\-libs Print the linker flags that are necessary to link a \fIlibxml2\fP program. -Add \-\-dynamic after \-\-libs to print only shared library linking -information. .TP 8 .B \-\-cflags Print the compiler flags that are necessary to compile a \fIlibxml2\fP program. diff -Nurd libxml2-2.12.4.orig/libxml-2.0.pc.in libxml2-2.12.4/libxml-2.0.pc.in --- libxml2-2.12.4.orig/libxml-2.0.pc.in 2023-12-13 09:51:48.000000000 -0500 +++ libxml2-2.12.4/libxml-2.0.pc.in 2024-01-24 18:41:20.000000000 -0500 @@ -7,6 +7,5 @@ Name: libXML Version: @VERSION@ Description: libXML library version2. -Requires@XML_PC_PRIVATE@: @XML_PC_REQUIRES@ -Libs: -L${libdir} @XML_LIBS@ @XML_PC_LIBS_PRIVATE@ @XML_PC_LIBS@ @LIBS@ +Libs: -L${libdir} @XML_LIBS@ Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@ diff -Nurd libxml2-2.12.4.orig/libxml2-config.cmake.in libxml2-2.12.4/libxml2-config.cmake.in --- libxml2-2.12.4.orig/libxml2-config.cmake.in 2024-01-15 10:39:19.000000000 -0500 +++ libxml2-2.12.4/libxml2-config.cmake.in 2024-01-24 18:41:20.000000000 -0500 @@ -50,71 +50,6 @@ set(LIBXML2_WITH_LZMA @WITH_LZMA@) set(LIBXML2_WITH_ZLIB @WITH_ZLIB@) -if(LIBXML2_WITH_ICONV) - find_dependency(Iconv) - list(APPEND LIBXML2_LIBRARIES ${Iconv_LIBRARIES}) - list(APPEND LIBXML2_INCLUDE_DIRS ${Iconv_INCLUDE_DIRS}) - list(APPEND LIBXML2_INTERFACE_LINK_LIBRARIES "Iconv::Iconv") - if(NOT Iconv_FOUND) - set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) - set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "Iconv dependency was not found") - return() - endif() -endif() - -if(LIBXML2_WITH_THREADS) - find_dependency(Threads) - list(APPEND LIBXML2_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) - list(APPEND LIBXML2_INTERFACE_LINK_LIBRARIES "\$") - if(NOT Threads_FOUND) - set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) - set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "Threads dependency was not found") - return() - endif() -endif() - -if(LIBXML2_WITH_ICU) - find_dependency(ICU COMPONENTS data i18n uc) - list(APPEND LIBXML2_LIBRARIES ${ICU_LIBRARIES}) - list(APPEND LIBXML2_INTERFACE_LINK_LIBRARIES "\$;\$;\$") - if(NOT ICU_FOUND) - set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) - set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "ICU dependency was not found") - return() - endif() -endif() - -if(LIBXML2_WITH_LZMA) - find_dependency(LibLZMA) - list(APPEND LIBXML2_LIBRARIES ${LIBLZMA_LIBRARIES}) - list(APPEND LIBXML2_INTERFACE_LINK_LIBRARIES "\$") - if(NOT LibLZMA_FOUND) - set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) - set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "LibLZMA dependency was not found") - return() - endif() -endif() - -if(LIBXML2_WITH_ZLIB) - find_dependency(ZLIB) - list(APPEND LIBXML2_LIBRARIES ${ZLIB_LIBRARIES}) - list(APPEND LIBXML2_INTERFACE_LINK_LIBRARIES "\$") - if(NOT ZLIB_FOUND) - set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) - set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "ZLIB dependency was not found") - return() - endif() -endif() - -if(UNIX) - list(APPEND LIBXML2_LIBRARIES m) - list(APPEND LIBXML2_INTERFACE_LINK_LIBRARIES "\$") -endif() - -if(WIN32) - list(APPEND LIBXML2_LIBRARIES ws2_32) - list(APPEND LIBXML2_INTERFACE_LINK_LIBRARIES "\$") -endif() # whether libxml2 has dso support set(LIBXML2_MODULES @WITH_MODULES@) diff -Nurd libxml2-2.12.4.orig/update-sgml-catalog libxml2-2.12.4/update-sgml-catalog --- libxml2-2.12.4.orig/update-sgml-catalog 1969-12-31 19:00:00.000000000 -0500 +++ libxml2-2.12.4/update-sgml-catalog 2024-01-24 18:41:20.000000000 -0500 @@ -0,0 +1,28 @@ +#!/bin/sh -e +# +# update-sgml-catalog +# see DescPackaging field of libxml2 .info file for usage. +# + +CATALOG=@PREFIX@/etc/sgml/catalog +CATALOG_D=@PREFIX@/etc/sgml/catalog.d + +mkdir -p ${CATALOG_D} + +TMPFILE=`tempfile` + +if [ "`echo ${CATALOG_D}/*`" != "${CATALOG_D}/*" ]; then + cat ${CATALOG_D}/* | sed 's/#.*$//g' | { + while read cat; do + if [ -z "${cat}" ]; then + continue + fi + echo CATALOG ${cat} >>${TMPFILE} + done + } +fi + +mv -f ${TMPFILE} ${CATALOG} +chmod 0644 ${CATALOG} + +exit 0 diff -Nurd libxml2-2.12.4.orig/update-xml-catalog libxml2-2.12.4/update-xml-catalog --- libxml2-2.12.4.orig/update-xml-catalog 1969-12-31 19:00:00.000000000 -0500 +++ libxml2-2.12.4/update-xml-catalog 2024-01-24 18:41:20.000000000 -0500 @@ -0,0 +1,29 @@ +#!/bin/sh -e +# +# update-xml-catalog +# see DescPackaging field of libxml2 .info file for usage. +# + +CATALOG=@PREFIX@/etc/xml/catalog +CATALOG_D=@PREFIX@/etc/xml/catalog.d + +mkdir -p ${CATALOG_D} + +TMPFILE=`tempfile` +xmlcatalog --create >>${TMPFILE} + +if [ "`echo ${CATALOG_D}/*`" != "${CATALOG_D}/*" ]; then + cat ${CATALOG_D}/* | sed 's/#.*$//g' | { + while read type orig replace; do + if [ -z "${type}" -o -z "${orig}" -o -z "${replace}" ]; then + continue + fi + eval xmlcatalog --noout --add ${type} ${orig} ${replace} ${TMPFILE} + done + } +fi + +mv -f ${TMPFILE} ${CATALOG} +chmod 0644 ${CATALOG} + +exit 0 diff -Nurd libxml2-2.12.4.orig/xml2-config.in libxml2-2.12.4/xml2-config.in --- libxml2-2.12.4.orig/xml2-config.in 2023-12-13 09:51:49.000000000 -0500 +++ libxml2-2.12.4/xml2-config.in 2024-01-24 18:41:20.000000000 -0500 @@ -16,8 +16,8 @@ --prefix=DIR change libxml prefix [default $prefix] --exec-prefix=DIR change libxml exec prefix [default $exec_prefix] - --libs print library linking information - add --dynamic to print only shared libraries + --libs print dynamic library linking information + (--dynamic is a no-op, always assumed) --cflags print pre-processor and compiler flags --modules module support enabled --help display this help and exit @@ -84,9 +84,9 @@ --libs) if [ "$2" = "--dynamic" ]; then shift - libs="@XML_LIBS@ @XML_PRIVATE_LIBS_NO_SHARED@" + libs="@XML_LIBS@" else - libs="@XML_LIBS@ @XML_PRIVATE_LIBS@ @MODULE_PLATFORM_LIBS@ @LIBS@" + libs="@XML_LIBS@" fi if [ "@XML_LIBDIR@" != "-L/usr/lib" -a "@XML_LIBDIR@" != "-L/usr/lib64" ]; then