git: b5385fd9efc5 - main - misc/libmodulemd: update 2.13.0 → 2.15.0

From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Tue, 26 Dec 2023 01:20:02 UTC
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b5385fd9efc5c72536c3b9ebfe6bff5cf7260bf4

commit b5385fd9efc5c72536c3b9ebfe6bff5cf7260bf4
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2023-12-25 23:22:28 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2023-12-26 01:19:56 +0000

    misc/libmodulemd: update 2.13.0 → 2.15.0
    
    Reported by:    portscout
---
 misc/libmodulemd/Makefile                |  9 ++++--
 misc/libmodulemd/distinfo                |  6 ++--
 misc/libmodulemd/files/patch-meson.build | 49 ++++++++++++++++----------------
 misc/libmodulemd/pkg-plist               |  2 +-
 4 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/misc/libmodulemd/Makefile b/misc/libmodulemd/Makefile
index 2261c834ed39..3e2979a705b1 100644
--- a/misc/libmodulemd/Makefile
+++ b/misc/libmodulemd/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	libmodulemd
-DISTVERSION=	2.13.0
+DISTVERSION=	2.15.0
 CATEGORIES=	misc
 MASTER_SITES=	https://github.com/fedora-modularity/${PORTNAME}/releases/download/${DISTVERSION}/
 DISTNAME=	modulemd-${DISTVERSION}
@@ -15,11 +15,16 @@ BUILD_DEPENDS=	bash:shells/bash \
 		help2man:misc/help2man
 LIB_DEPENDS=	librpmio.so:archivers/rpm4 \
 		libyaml.so:textproc/libyaml
+TEST_DEPENDS=	bash:shells/bash
 
-USES=		compiler:c11 gnome meson pkgconfig tar:xz
+USES=		compiler:c11 gnome meson pkgconfig shebangfix tar:xz
 USE_GNOME=	glib20 introspection:build
 USE_LDCONFIG=	yes
 
+SHEBANG_FILES=	modulemd/tests/test-import-headers.sh
+
 MESON_ARGS=	-Dwith_manpages="enabled" -Dwith_docs=false
 
+BINARY_ALIAS=	gcc=${CC} g++=${CXX}
+
 .include <bsd.port.mk>
diff --git a/misc/libmodulemd/distinfo b/misc/libmodulemd/distinfo
index ca237ee14196..2f627901c3ca 100644
--- a/misc/libmodulemd/distinfo
+++ b/misc/libmodulemd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1628472509
-SHA256 (modulemd-2.13.0.tar.xz) = cc72ce5ff48ce9a4f6c9b6606ccf5a0e75c59c35449668cfe985722ef28f9cbc
-SIZE (modulemd-2.13.0.tar.xz) = 292548
+TIMESTAMP = 1703543372
+SHA256 (modulemd-2.15.0.tar.xz) = 15458323d1d1f614f9e706f623794f95d23e59f4c37deeaa16877463aee34af5
+SIZE (modulemd-2.15.0.tar.xz) = 321088
diff --git a/misc/libmodulemd/files/patch-meson.build b/misc/libmodulemd/files/patch-meson.build
index 8a34c5d22ab4..f5a7f73846cf 100644
--- a/misc/libmodulemd/files/patch-meson.build
+++ b/misc/libmodulemd/files/patch-meson.build
@@ -1,33 +1,32 @@
---- meson.build.orig	2021-07-09 09:29:23 UTC
+--- meson.build.orig	2023-05-10 12:50:24 UTC
 +++ meson.build
-@@ -142,7 +142,7 @@ srpm_cdata.set('VERSION', meson.project_version())
+@@ -166,7 +166,7 @@ subdir('modulemd')
  srpm_cdata.set('BUILDFLAG', '-bs')
  
  subdir('modulemd')
 -subdir('bindings/python')
 +#subdir('bindings/python')
  
- if meson.version().version_compare('>=0.53')
-     if magic.found()
-@@ -203,8 +203,8 @@ if meson.version().version_compare('>=0.53')
-              'bindir': get_option('bindir'),
-              'libdir': get_option('libdir'),
-              'datadir': get_option('datadir'),
--             'Python 2 GObject Overrides': gobject_overrides_dir_py2,
--             'Python 3 GObject Overrides': gobject_overrides_dir_py3,
-+             #'Python 2 GObject Overrides': gobject_overrides_dir_py2,
-+             #'Python 3 GObject Overrides': gobject_overrides_dir_py3,
-             }, section: 'Directories')
+ if rpm.found()
+     if with_rpmio.enabled()
+@@ -196,16 +196,16 @@ summary({'prefix': get_option('prefix'),
+          'bindir': get_option('bindir'),
+          'libdir': get_option('libdir'),
+          'datadir': get_option('datadir'),
+-         'Python 2 GObject Overrides': gobject_overrides_dir_py2,
+-         'Python 3 GObject Overrides': gobject_overrides_dir_py3,
++         #'Python 2 GObject Overrides': gobject_overrides_dir_py2,
++         #'Python 3 GObject Overrides': gobject_overrides_dir_py3,
+         }, section: 'Directories')
  
-     summary({'libmagic Support': magic_status,
-@@ -212,8 +212,8 @@ if meson.version().version_compare('>=0.53')
-              'RPMIO Support': rpmio_status,
-              'Generate Manpages': manpages_status,
-              'Generate HTML Documentation': get_option('with_docs'),
--             'Python 2 Support': get_option('with_py2'),
--             'Python 3 Support': get_option('with_py3'),
-+             #'Python 2 Support': get_option('with_py2'),
-+             #'Python 3 Support': get_option('with_py3'),
-              'Skip Introspection': get_option('skip_introspection'),
-              'Test Installed Library': get_option('test_installed_lib'),
-             }, section: 'Build Configuration')
+ summary({'Custom Python': get_option('python_name'),
+          'RPMIO Support': rpmio_status,
+          'Generate Manual Pages': manpages_status,
+          'Generate HTML Documentation': get_option('with_docs'),
+-         'Python 2 Support': get_option('with_py2'),
+-         'Python 3 Support': get_option('with_py3'),
++         #'Python 2 Support': get_option('with_py2'),
++         #'Python 3 Support': get_option('with_py3'),
+          'Skip Introspection': get_option('skip_introspection'),
+          'Accept overflowed buildorder': get_option('accept_overflowed_buildorder'),
+          'Test Installed Library': get_option('test_installed_lib'),
diff --git a/misc/libmodulemd/pkg-plist b/misc/libmodulemd/pkg-plist
index 0ea03a472ca1..c13ea2b7a701 100644
--- a/misc/libmodulemd/pkg-plist
+++ b/misc/libmodulemd/pkg-plist
@@ -28,7 +28,7 @@ include/modulemd-2.0/modulemd.h
 lib/girepository-1.0/Modulemd-2.0.typelib
 lib/libmodulemd.so
 lib/libmodulemd.so.2
-lib/libmodulemd.so.2.13.0
+lib/libmodulemd.so.2.15.0
 libdata/pkgconfig/modulemd-2.0.pc
 man/man1/modulemd-validator.1.gz
 share/gir-1.0/Modulemd-2.0.gir