commit: b9e64c2cc352c1309d3c8d35ae9917b35a30116b Author: Gabi Falk <gabifalk <AT> gmx <DOT> com> AuthorDate: Sat Dec 21 21:30:00 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Dec 21 22:18:09 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9e64c2c
dev-libs/glib: Backport upstream fix for autoptr test Closes: https://bugs.gentoo.org/946789 Signed-off-by: Gabi Falk <gabifalk <AT> gmx.com> Closes: https://github.com/gentoo/gentoo/pull/39816 Signed-off-by: Sam James <sam <AT> gentoo.org> .../glib/files/glib-2.80.5-tests-autoptr-ffi.patch | 29 ++++++++++++++++++++++ dev-libs/glib/glib-2.80.5-r1.ebuild | 1 + 2 files changed, 30 insertions(+) diff --git a/dev-libs/glib/files/glib-2.80.5-tests-autoptr-ffi.patch b/dev-libs/glib/files/glib-2.80.5-tests-autoptr-ffi.patch new file mode 100644 index 000000000000..0130481897ef --- /dev/null +++ b/dev-libs/glib/files/glib-2.80.5-tests-autoptr-ffi.patch @@ -0,0 +1,29 @@ +https://gitlab.gnome.org/GNOME/glib/-/commit/99382cfb4b5edf56f7c62eccc155f361a640298a.patch +https://bugs.gentoo.org/946789 + +From 99382cfb4b5edf56f7c62eccc155f361a640298a Mon Sep 17 00:00:00 2001 +From: Andoni Morales Alastruey <[email protected]> +Date: Tue, 28 May 2024 17:26:38 +0200 +Subject: [PATCH] girepository: fix autoptr tests build + +In macOS compilation fails with the following error: +``` +In file included from ../girepository/tests/autoptr.c:23: +../girepository/girffi.h:30:10: fatal error: 'ffi.h' file not found +``` +--- + girepository/tests/meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/girepository/tests/meson.build b/girepository/tests/meson.build +index 6fa947cfdf..f9928267d5 100644 +--- a/girepository/tests/meson.build ++++ b/girepository/tests/meson.build +@@ -72,6 +72,7 @@ if enable_gir + if cc.get_id() != 'msvc' + girepository_tests += { + 'autoptr-girepository' : { ++ 'dependencies': [libffi_dep], + 'source' : 'autoptr.c', + 'depends': gio_gir_testing_dep, + }, diff --git a/dev-libs/glib/glib-2.80.5-r1.ebuild b/dev-libs/glib/glib-2.80.5-r1.ebuild index 95720f481240..cdc1222f8c58 100644 --- a/dev-libs/glib/glib-2.80.5-r1.ebuild +++ b/dev-libs/glib/glib-2.80.5-r1.ebuild @@ -93,6 +93,7 @@ MULTILIB_CHOST_TOOLS=( PATCHES=( "${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch + "${FILESDIR}"/${P}-tests-autoptr-ffi.patch ) python_check_deps() {
