git: 3ef0580b55ca - main - devel/gobject-introspection: unbreak build with Meson 0.61.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Wed, 12 Jan 2022 01:25:17 UTC
The branch main has been updated by jbeich:

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

commit 3ef0580b55cacc092002fc78780503c966837523
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2022-01-12 01:14:29 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2022-01-12 01:24:59 +0000

    devel/gobject-introspection: unbreak build with Meson 0.61.0
    
    giscanner/meson.build:58:0: ERROR: File doctemplates does not exist.
    
    PR:             260943
    Reported by:    antoine (via exp-run)
    Regressed by:   https://github.com/mesonbuild/meson/commit/1e5d7f212246
---
 devel/gobject-introspection/Makefile | 6 ++++++
 devel/gobject-introspection/distinfo | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile
index 2f8c09869d7a..a1739fa17b1c 100644
--- a/devel/gobject-introspection/Makefile
+++ b/devel/gobject-introspection/Makefile
@@ -7,6 +7,9 @@ CATEGORIES=	devel
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
 
+PATCH_SITES=	https://gitlab.gnome.org/GNOME/${PORTNAME}/-/commit/
+PATCHFILES+=	effb1e09dee2.patch:-p1 # https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/305
+
 MAINTAINER=	desktop@FreeBSD.org
 COMMENT=	Generate interface introspection data for GObject libraries
 
@@ -36,4 +39,7 @@ post-stage:
 	@${PYTHON_CMD} -O -m compileall -d ${PREFIX}/lib/${PORTNAME} \
 		"${STAGEDIR}${PREFIX}/lib/${PORTNAME}"
 
+post-install:
+	@${RM} ${STAGEDIR}${PREFIX}/lib/gobject-introspection/giscanner/doctemplates/*/meson.build*
+
 .include <bsd.port.mk>
diff --git a/devel/gobject-introspection/distinfo b/devel/gobject-introspection/distinfo
index fed07838303d..dceff007a506 100644
--- a/devel/gobject-introspection/distinfo
+++ b/devel/gobject-introspection/distinfo
@@ -1,3 +1,5 @@
 TIMESTAMP = 1636923576
 SHA256 (gnome/gobject-introspection-1.70.0.tar.xz) = 902b4906e3102d17aa2fcb6dad1c19971c70f2a82a159ddc4a94df73a3cafc4a
 SIZE (gnome/gobject-introspection-1.70.0.tar.xz) = 1029372
+SHA256 (gnome/effb1e09dee2.patch) = a3b6b4a834f9218718733f2da1e66efa73e3dd2c12e76b0d826c60cec9a5a784
+SIZE (gnome/effb1e09dee2.patch) = 6495