<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/04541d1fce23479e40d5df8dd3f48571c46f92df">https://github.com/macports/macports-ports/commit/04541d1fce23479e40d5df8dd3f48571c46f92df</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 04541d1fce2 libxmldiff: Fix build with libxslt 1.1.41 and later
</span>04541d1fce2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 04541d1fce23479e40d5df8dd3f48571c46f92df
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Fri Feb 28 18:18:31 2025 -0600
<span style='display:block; white-space:pre;color:#404040;'> libxmldiff: Fix build with libxslt 1.1.41 and later
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Close: https://trac.macports.org/ticket/72109
</span>---
textproc/libxmldiff/Portfile | 9 ++++--
textproc/libxmldiff/files/configure.ac.patch | 45 ++++++++++++++++++++++++++++
2 files changed, 51 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/libxmldiff/Portfile b/textproc/libxmldiff/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ff27b8b06f7..bcdea3c24c5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/libxmldiff/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/libxmldiff/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,16 +15,19 @@ maintainers nomaintainer
</span> description libxmldiff aims at providing efficient diff on XML files
long_description {*}${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.lprp.fr/soft/xml/libxmldiff/libxmldiff_en.php3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://www.lprp.fr/libxmldiff/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build path:bin/pkg-config:pkgconfig
</span>
depends_lib port:libxml2 \
port:libxslt \
port:libiconv \
port:zlib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles configure.ac.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Avoid:
# WARNING: 'aclocal-1.16' is missing on your system.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Also, we are patching configure.ac.
</span> use_autoreconf yes
autoreconf.args --install --verbose --force
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --with-xml-prefix=${prefix}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/libxmldiff/files/configure.ac.patch b/textproc/libxmldiff/files/configure.ac.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..6dbcc3f3a3b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/libxmldiff/files/configure.ac.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,45 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Find dependencies using pkg-config. Fixes configure failure when using
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+libxslt 1.1.41 or later:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ac:21: error: possibly undefined macro: AM_PATH_XSLT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/rpeyron/libxmldiff/issues/7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/rpeyron/libxmldiff/commit/ad965442f675dc0c045dd9c54d248a4a8560997f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/rpeyron/libxmldiff/commit/36e6220aef124256b99c372501462f10a5df7963
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2020-05-09 14:28:29.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2025-02-28 18:06:34.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,10 +17,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_FUNC_VPRINTF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl libxml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AM_PATH_XML2( 2.0.0, , AC_MSG_ERROR(libxml2 must be installed.) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AM_PATH_XSLT(,, AC_MSG_ERROR(libxslt must be installed.) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++dnl AM_PATH_XML2( 2.0.0, , AC_MSG_ERROR(libxml2 must be installed.) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++dnl AM_PATH_XSLT(,, AC_MSG_ERROR(libxslt must be installed.) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl AC_CHECK_LIB(xslt, main, , AC_MSG_ERROR(libxslt must be installed.))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl AC_CHECK_LIB(exslt, main, , AC_MSG_ERROR(libexslt must be installed.))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PKG_CHECK_MODULES(XML, libxml-2.0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PKG_CHECK_MODULES(XSLT, libxslt)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PKG_CHECK_MODULES(EXSLT, libexslt)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl GCOV
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -54,11 +57,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CHECK_PROGS(LCOV, lcov, false)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl Exports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++dnl a bug in libxml-2.0 pkg-config needs to include cflags in LIBS...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++dnl and pkg-config does not seem to declare CXXFLAGS or CPPFLAGS, so it may be redundant, but more will not harm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEBUG="-g"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LIBS="$DEBUG $LIBS $XML_LIBS $XSLT_LIBS -lexslt $GCOV_LIBS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CXXFLAGS="$DEBUG $CXXFLAGS $XML_CXXFLAGS $XSLT_CXXFLAGS $GCOV_CFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CPPFLAGS="$DEBUG $CPPFLAGS $XML_CPPFLAGS $XSLT_CPPFLAGS -Wno-write-strings $GCOV_CFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CFLAGS="$DEBUG $CFLAGS $XML_CFLAGS $XSLT_CFLAGS - -Wno-write-strings $GCOV_LIBS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIBS="$DEBUG $LIBS $XML_LIBS $XML_CFLAGS $XSLT_LIBS $EXSLT_LIBS -lexslt $GCOV_LIBS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CXXFLAGS="$DEBUG $CXXFLAGS $XML_CXXFLAGS $XSLT_CXXFLAGS $EXSLT_CXXFLAGS $XML_CFLAGS $XSLT_CFLAGS $EXSLT_CFLAGS $GCOV_CFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CPPFLAGS="$DEBUG $CPPFLAGS $XML_CPPFLAGS $XSLT_CPPFLAGS $EXSLT_CPPFLAGS $XML_CFLAGS $XSLT_CFLAGS $EXSLT_CFLAGS -Wno-write-strings $GCOV_CFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CFLAGS="$DEBUG $CFLAGS $XML_CFLAGS $XSLT_CFLAGS $EXSLT_CFLAGS - -Wno-write-strings $GCOV_LIBS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_OUTPUT( \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Makefile \
</span></pre><pre style='margin:0'>
</pre>