<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f632f30a7ed5621d3589a4feb742ba078700090d">https://github.com/macports/macports-ports/commit/f632f30a7ed5621d3589a4feb742ba078700090d</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 f632f30a7ed osinfo-db-tools: update to 1.11.0
</span>f632f30a7ed is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f632f30a7ed5621d3589a4feb742ba078700090d
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Sun Jan 28 13:08:25 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> osinfo-db-tools: update to 1.11.0
</span>---
sysutils/osinfo-db-tools/Portfile | 54 ++++++++++++++++++----
.../osinfo-db-tools/files/patch-fix-linking.diff | 49 ++++++++++++++++++++
.../osinfo-db-tools/files/patch-fix-python.diff | 11 +++++
3 files changed, 105 insertions(+), 9 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 4fb03ec3651..ba5a8dbb897 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;'>@@ -1,10 +1,10 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup meson 1.0
</span>
name osinfo-db-tools
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.4.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.11.0
</span> categories sysutils gnome
license LGPL-2.1+
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,16 +15,52 @@ 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 212c439f0708ac8c4702f584f263facb70e0b0ce \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7ee0125c6b99b5b9e10d9bf5951ecc8a170278499a778e6be5c61ef10296f723 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 519089
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a97bd00fe812b126629fed0b883ef6ccaa88eef0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8ba6d31bb5ef07056e38879e070671afbcfec0eb41a87f9950450bbb831b0a1d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 64792
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xz yes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span> port:gettext \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:gettext-runtime \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span> port:json-glib \
port:libarchive \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsoup \
</span> port:libxslt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --disable-dependency-tracking --disable-silent-rules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Undefined symbols: "___gcc_personality_v0", "__Unwind_Resume"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-fix-linking.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# soup-message.h: error: redefinition of typedef ‘SoupMessage’
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *gcc-4.0 *gcc-4.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -std=gnu99
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant tests description "Enable testing" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set py_ver 3.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set py_ver_nodot [string map {. {}} ${py_ver}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.python ${prefix}/bin/python${py_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-fix-python.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PYTHON@|${configure.python}|" ${worksrcpath}/tests/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fs-traverse f ${worksrcpath}/tests {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string match *.py ${f}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q "s|/usr/bin/env python3|${configure.python}|" ${f}
</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;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${py_ver_nodot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_test-append port:py${py_ver_nodot}-pytest \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${py_ver_nodot}-requests
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..81d59b2c552
</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/patch-fix-linking.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,49 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build 2023-10-27 22:08:20.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2024-01-28 12:42:32.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,8 +1,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ project(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'osinfo-db-tools', 'c',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 'osinfo-db-tools', ['c','cpp'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version: '1.11.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ license: 'GPLv2+',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- meson_version: '>= 0.49.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ meson_version: '>= 0.51.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_options: [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'buildtype=debugoptimized',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'c_std=gnu99',
</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;'>+--- tools/meson.build 2023-10-27 22:08:20.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools/meson.build 2024-01-28 12:39:17.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,6 +22,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sources: osinfo_db_validate_sources,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include_directories: osinfo_db_tools_include,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dependencies: osinfo_db_validate_dependencies,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ link_language: 'cpp',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install: true
</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;'>+@@ -41,6 +42,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sources: osinfo_db_import_sources,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include_directories: osinfo_db_tools_include,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dependencies: osinfo_db_import_dependencies,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ link_language: 'cpp',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install: true
</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;'>+@@ -58,6 +60,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sources: osinfo_db_export_sources,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include_directories: osinfo_db_tools_include,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dependencies: osinfo_db_export_dependencies,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ link_language: 'cpp',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install: true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # osinfo-db-path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -71,6 +74,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sources: osinfo_db_path_sources,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include_directories: osinfo_db_tools_include,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dependencies: osinfo_db_path_dependencies,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ link_language: 'cpp',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install: true
</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;color:#808080;'>diff --git a/sysutils/osinfo-db-tools/files/patch-fix-python.diff b/sysutils/osinfo-db-tools/files/patch-fix-python.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f55f34c118d
</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/patch-fix-python.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tests/meson.build 2023-10-27 22:08:20.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tests/meson.build 2024-01-28 12:50:08.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9,7 +9,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python = import('python')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-python3 = python.find_installation('python3', required: false)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++python3 = python.find_installation('@PYTHON@', required: false)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if python3.found()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tests = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'export-import': 'test_osinfo_db_export_import.py',
</span></pre><pre style='margin:0'>
</pre>