git: 7847fd718848 - main - x11-toolkits/gtk40: explicitly enable introspection

From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Mon, 20 Mar 2023 13:14:29 UTC
The branch main has been updated by jbeich:

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

commit 7847fd71884884acfa8b9cee61f11ffa767e9ea6
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-03-20 13:09:43 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-03-20 13:14:09 +0000

    x11-toolkits/gtk40: explicitly enable introspection
    
    Upstream prefers misleading "auto" instead of "disabled" by default
    even if not consistent with other "auto" uses in Gtk's meson_options.txt
---
 x11-toolkits/gtk40/Makefile                |  2 +-
 x11-toolkits/gtk40/files/patch-meson.build | 14 --------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/x11-toolkits/gtk40/Makefile b/x11-toolkits/gtk40/Makefile
index f8175c06e50b..be5430f33c43 100644
--- a/x11-toolkits/gtk40/Makefile
+++ b/x11-toolkits/gtk40/Makefile
@@ -32,7 +32,7 @@ USE_LDCONFIG=	yes
 USE_PERL5=	build
 USE_GNOME=	atk cairo gdkpixbuf2 introspection:build pango \
 		librsvg2:run
-MESON_ARGS=	-Dbuild-testsuite=false
+MESON_ARGS=	-Dintrospection=enabled -Dbuild-testsuite=false
 LDFLAGS+=	-lexecinfo
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
diff --git a/x11-toolkits/gtk40/files/patch-meson.build b/x11-toolkits/gtk40/files/patch-meson.build
deleted file mode 100644
index c93d9bf8c833..000000000000
--- a/x11-toolkits/gtk40/files/patch-meson.build
+++ /dev/null
@@ -1,14 +0,0 @@
-https://gitlab.gnome.org/GNOME/gtk/-/issues/5633
-
---- meson.build.orig	2023-03-14 11:50:49 UTC
-+++ meson.build
-@@ -740,8 +740,7 @@ endif
-   error('Introspection enabled, but g-ir-scanner not found.')
- endif
- 
--build_gir = gir.found() and (get_option('introspection').enabled() or
--                             (get_option('introspection').allowed() and get_option('gtk_doc')))
-+build_gir = gir.found() and get_option('introspection').allowed()
- 
- project_build_root = meson.current_build_dir()
-