diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2024-12-21 22:33:16 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-12-21 22:33:16 +0000 |
| commit | 43bc5c6159e0841ea5fcc7fd746533aba7c25627 (patch) | |
| tree | eef71e8a1eb282edba0d88f9f178b9c3b5dc463a | |
| parent | 2024-12-21 21:33:33 UTC (diff) | |
| parent | dev-vcs/repo: Stabilize 2.48 ppc, #946780 (diff) | |
| download | gentoo-43bc5c6159e0841ea5fcc7fd746533aba7c25627.tar.gz gentoo-43bc5c6159e0841ea5fcc7fd746533aba7c25627.tar.bz2 gentoo-43bc5c6159e0841ea5fcc7fd746533aba7c25627.zip | |
Merge updates from master
| -rw-r--r-- | dev-libs/glib/files/glib-2.80.5-tests-autoptr-ffi.patch | 29 | ||||
| -rw-r--r-- | dev-libs/glib/glib-2.80.5-r1.ebuild | 1 | ||||
| -rw-r--r-- | dev-vcs/repo/repo-2.48.ebuild | 2 |
3 files changed, 31 insertions, 1 deletions
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 <ylatuya@gmail.com> +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() { diff --git a/dev-vcs/repo/repo-2.48.ebuild b/dev-vcs/repo/repo-2.48.ebuild index 9fb66dcdb29d..4bb30e231840 100644 --- a/dev-vcs/repo/repo-2.48.ebuild +++ b/dev-vcs/repo/repo-2.48.ebuild @@ -19,7 +19,7 @@ S="${WORKDIR}/git-${P}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" REQUIRED_USE="${PYTHON_REQUIRED_USE}" |