commit: e7c9a7e4b48154186e15366dca4e788754721d0a Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Sun Nov 13 14:14:34 2022 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Sat Nov 19 01:44:19 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7c9a7e4
gnome-extra/libgda: Apply patch to fix building without introspection This has been submitted upstream but not merged yet. Closes: https://bugs.gentoo.org/810046 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/28254 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> .../files/libgda-5.2.9-no-introspection.patch | 61 ++++++++++++++++++++++ gnome-extra/libgda/libgda-5.2.9-r1.ebuild | 3 ++ 2 files changed, 64 insertions(+) diff --git a/gnome-extra/libgda/files/libgda-5.2.9-no-introspection.patch b/gnome-extra/libgda/files/libgda-5.2.9-no-introspection.patch new file mode 100644 index 000000000000..806a4a1c69e1 --- /dev/null +++ b/gnome-extra/libgda/files/libgda-5.2.9-no-introspection.patch @@ -0,0 +1,61 @@ +From df00d64aae3a5751fda757623936d4863bf88f58 Mon Sep 17 00:00:00 2001 +From: matoro <82255-mat...@users.noreply.gitlab.gnome.org> +Date: Wed, 22 Jun 2022 10:29:48 -0400 +Subject: [PATCH] Fixed behavior for --{enable,disable}-introspection + +This now works to compile using --disable-introspection even if +gobject-introspection is not installed at all +--- + configure.ac | 30 +++++++----------------------- + 1 file changed, 7 insertions(+), 23 deletions(-) + +diff --git a/configure.ac b/configure.ac +index b9e973617..b610fc953 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -476,35 +476,19 @@ AC_SUBST(JSON_GLIB_LIBS) + dnl ********************************* + dnl Check for GObject Introspection + dnl ********************************* +-GOBJECT_INTROSPECTION_CHECK([1.30.0]) +- +-AC_ARG_ENABLE([gdaui-gi], +- AS_HELP_STRING([--disable-gdaui-gi[=@<:@yes/no@:>@]], [Disable GObject Introspection for libgda-ui [default=no]]), +- [ +- if test x$enableval = xyes +- then +- disable_gdaui_gi=no +- else +- disable_gdaui_gi=yes +- fi +- ],[ +- disable_gdaui_gi=no +- ]) +- +-if test x$found_introspection != xyes ++m4_ifdef([GOBJECT_INTROSPECTION_CHECK], [GOBJECT_INTROSPECTION_CHECK([1.30.0])]) ++if test "x$found_introspection" != "xyes" + then +- disable_gda_gi=yes +- disable_gdaui_gi=yes ++ disable_gda_gi=yes ++ disable_gdaui_gi=yes + fi + +-AM_CONDITIONAL(ENABLE_GDA_GI, [test x$disable_gda_gi != xyes]) +- +-if test x$have_ui != xyes ++if test "x$have_ui" != "xyes" + then + disable_gdaui_gi=yes + fi +- +-AM_CONDITIONAL(ENABLE_GDAUI_GI, [test x$disable_gdaui_gi != xyes]) ++AM_CONDITIONAL(ENABLE_GDA_GI, [test "$disable_gda_gi" != "yes"]) ++AM_CONDITIONAL(ENABLE_GDAUI_GI, [test "$disable_gdaui_gi" != "yes"]) + + dnl ****************************** + dnl Check for Vala Compiler +-- +GitLab + diff --git a/gnome-extra/libgda/libgda-5.2.9-r1.ebuild b/gnome-extra/libgda/libgda-5.2.9-r1.ebuild index 1aca92fcec07..e2a6eaa7b82e 100644 --- a/gnome-extra/libgda/libgda-5.2.9-r1.ebuild +++ b/gnome-extra/libgda/libgda-5.2.9-r1.ebuild @@ -107,6 +107,9 @@ src_prepare() { die "mv ${f} failed" done + # Fix building without introspection. + eapply "${FILESDIR}/${PN}-5.2.9-no-introspection.patch" + gnome2_src_prepare java-pkg-opt-2_src_prepare }
