<pre style='margin:0'>
Mohamed Akram (mohd-akram) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7336393fb8ad7d5d7b670df0645ba3f23ae4efc1">https://github.com/macports/macports-ports/commit/7336393fb8ad7d5d7b670df0645ba3f23ae4efc1</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 7336393fb8a osinfo-db-tools: update to 1.12.0
</span>7336393fb8a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7336393fb8ad7d5d7b670df0645ba3f23ae4efc1
</span>Author: Mohamed Akram <makr@macports.org>
AuthorDate: Sat Feb 15 11:53:38 2025 +0400
<span style='display:block; white-space:pre;color:#404040;'> osinfo-db-tools: update to 1.12.0
</span>---
sysutils/osinfo-db-tools/Portfile | 11 ++---
sysutils/osinfo-db-tools/files/libxml2-2.12.patch | 26 -----------
.../osinfo-db-tools/files/patch-fix-linking.diff | 52 ----------------------
3 files changed, 4 insertions(+), 85 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 45f8dc0a53e..13407b42eb1 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;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup meson 1.0
name osinfo-db-tools
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.11.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.12.0
</span> categories sysutils gnome
license LGPL-2.1+
maintainers {makr @mohd-akram} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,9 +15,9 @@ long_description ${description}
</span> homepage https://libosinfo.org
master_sites https://releases.pagure.org/libosinfo/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 a97bd00fe812b126629fed0b883ef6ccaa88eef0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8ba6d31bb5ef07056e38879e070671afbcfec0eb41a87f9950450bbb831b0a1d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 64792
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 dfe9499f0767c6ee58da10641d8e4a2386b9e2ad \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f3315f675d18770f25dea8ed04b20b8fc80efb00f60c37ee5e815f9c3776e7f3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 66204
</span> use_xz yes
depends_build-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,9 +31,6 @@ depends_lib-append port:gettext-runtime \
</span> port:libsoup \
port:libxslt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append libxml2-2.12.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-fix-linking.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # soup-message.h: error: redefinition of typedef ‘SoupMessage’
compiler.blacklist-append \
*gcc-4.0 *gcc-4.2
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8d213053dab..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/osinfo-db-tools/files/libxml2-2.12.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,26 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix build failure with libxml2 2.12+:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://gitlab.com/libosinfo/osinfo-db-tools/-/commit/34378a4ac257f2f5fcf364786d1634a8c36b304f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tools/osinfo-db-validate.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tools/osinfo-db-validate.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -35,7 +35,7 @@ static void validate_generic_error_nop(void *userData G_GNUC_UNUSED,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void validate_structured_error_nop(void *userData G_GNUC_UNUSED,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- xmlErrorPtr error G_GNUC_UNUSED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const xmlError *error)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (error->file)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_printerr("%s:%d %s", error->file, error->line, error->message);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -173,7 +173,8 @@ static gboolean validate_files(GFile *schema, gsize nfiles, GFile **files, GErro
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_autofree gchar *schemapath = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xmlSetGenericErrorFunc(NULL, validate_generic_error_nop);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- xmlSetStructuredErrorFunc(NULL, validate_structured_error_nop);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Drop this typecast when >=libxml2-2.12.0 is required */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ xmlSetStructuredErrorFunc(NULL, (xmlStructuredErrorFunc) validate_structured_error_nop);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- schemapath = g_file_get_path(schema);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ca584380820..00000000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,52 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><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:#ffe0e0;'>---- meson.build 2023-10-27 22:08:20.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ meson.build 2024-01-28 12:42:32.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,8 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- project(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 'osinfo-db-tools', 'c',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'osinfo-db-tools', ['c','cpp'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version: '1.11.0',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- license: 'GPLv2+',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- meson_version: '>= 0.49.0',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ meson_version: '>= 0.51.0',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_options: [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'buildtype=debugoptimized',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'c_std=gnu99',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tools/meson.build 2023-10-27 22:08:20.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tools/meson.build 2024-01-28 12:39:17.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22,6 +22,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sources: osinfo_db_validate_sources,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include_directories: osinfo_db_tools_include,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dependencies: osinfo_db_validate_dependencies,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ link_language: 'cpp',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install: true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -41,6 +42,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sources: osinfo_db_import_sources,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include_directories: osinfo_db_tools_include,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dependencies: osinfo_db_import_dependencies,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ link_language: 'cpp',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install: true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -58,6 +60,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sources: osinfo_db_export_sources,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include_directories: osinfo_db_tools_include,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dependencies: osinfo_db_export_dependencies,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ link_language: 'cpp',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install: true)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # osinfo-db-path
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -71,6 +74,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sources: osinfo_db_path_sources,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include_directories: osinfo_db_tools_include,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dependencies: osinfo_db_path_dependencies,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ link_language: 'cpp',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install: true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>