<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/d1b31e0b42b1be03cff54d6c1c7c39c0d0ec932c">https://github.com/macports/macports-ports/commit/d1b31e0b42b1be03cff54d6c1c7c39c0d0ec932c</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 d1b31e0b42b osinfo-db-tools: Fix build with libxml2 2.12+
</span>d1b31e0b42b is described below

<span style='display:block; white-space:pre;color:#808000;'>commit d1b31e0b42b1be03cff54d6c1c7c39c0d0ec932c
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Tue Jul 2 14:27:35 2024 -0500

<span style='display:block; white-space:pre;color:#404040;'>    osinfo-db-tools: Fix build with libxml2 2.12+
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/70311
</span>---
 sysutils/osinfo-db-tools/Portfile                  |  4 ++--
 sysutils/osinfo-db-tools/files/libxml2-2.12.patch  | 26 ++++++++++++++++++++++
 .../osinfo-db-tools/files/patch-fix-linking.diff   |  3 +++
 3 files changed, 31 insertions(+), 2 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/osinfo-db-tools/Portfile b/sysutils/osinfo-db-tools/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ba5a8dbb897..9d323ef4728 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/osinfo-db-tools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/osinfo-db-tools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +22,7 @@ use_xz              yes
</span> 
 depends_build-append \
                     port:gettext \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:bin/pkg-config:pkgconfig
</span> 
 depends_lib-append  port:gettext-runtime \
                     path:lib/pkgconfig/glib-2.0.pc:glib2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +31,7 @@ depends_lib-append  port:gettext-runtime \
</span>                     port:libsoup \
                     port:libxslt
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Undefined symbols: "___gcc_personality_v0", "__Unwind_Resume"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append   libxml2-2.12.patch
</span> patchfiles-append   patch-fix-linking.diff
 
 # soup-message.h: error: redefinition of typedef ‘SoupMessage’
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/osinfo-db-tools/files/libxml2-2.12.patch b/sysutils/osinfo-db-tools/files/libxml2-2.12.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8d213053dab
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/osinfo-db-tools/files/libxml2-2.12.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix build failure with libxml2 2.12+:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: incompatible function pointer types passing 'void (void *, xmlErrorPtr)' (aka 'void (void *, struct _xmlError *)') to parameter of type 'xmlStructuredErrorFunc' (aka 'void (*)(void *, const struct _xmlError *)') [-Wincompatible-function-pointer-types]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://gitlab.com/libosinfo/osinfo-db-tools/-/commit/34378a4ac257f2f5fcf364786d1634a8c36b304f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tools/osinfo-db-validate.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools/osinfo-db-validate.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,7 +35,7 @@ static void validate_generic_error_nop(void *userData G_GNUC_UNUSED,
</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;'>+ static void validate_structured_error_nop(void *userData G_GNUC_UNUSED,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                                          xmlErrorPtr error G_GNUC_UNUSED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                                          const xmlError *error)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if (error->file)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         g_printerr("%s:%d %s", error->file, error->line, error->message);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -173,7 +173,8 @@ static gboolean validate_files(GFile *schema, gsize nfiles, GFile **files, GErro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     g_autofree gchar *schemapath = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     xmlSetGenericErrorFunc(NULL, validate_generic_error_nop);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    xmlSetStructuredErrorFunc(NULL, validate_structured_error_nop);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    /* Drop this typecast when >=libxml2-2.12.0 is required */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    xmlSetStructuredErrorFunc(NULL, (xmlStructuredErrorFunc) validate_structured_error_nop);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     schemapath = g_file_get_path(schema);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     rngParser = xmlRelaxNGNewParserCtxt(schemapath);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/osinfo-db-tools/files/patch-fix-linking.diff b/sysutils/osinfo-db-tools/files/patch-fix-linking.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 81d59b2c552..ca584380820 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/osinfo-db-tools/files/patch-fix-linking.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/osinfo-db-tools/files/patch-fix-linking.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,3 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Undefined symbols: "___gcc_personality_v0", "__Unwind_Resume"
</span> --- meson.build   2023-10-27 22:08:20.000000000 +0800
 +++ meson.build        2024-01-28 12:42:32.000000000 +0800
 @@ -1,8 +1,8 @@
</pre><pre style='margin:0'>

</pre>