commit: 85608326ec157e60fd7a01ea032fb38e87e12ffc Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Fri Apr 30 16:17:41 2021 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Fri Apr 30 16:18:44 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85608326
x11-libs/gtksourceview: Add patch to avoid build race Closes: https://bugs.gentoo.org/787146 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> ...sure-access-to-resources-in-corelib-build.patch | 57 ++++++++++++++++++++++ x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild | 1 + 2 files changed, 58 insertions(+) diff --git a/x11-libs/gtksourceview/files/4.8.1-build-ensure-access-to-resources-in-corelib-build.patch b/x11-libs/gtksourceview/files/4.8.1-build-ensure-access-to-resources-in-corelib-build.patch new file mode 100644 index 00000000000..3fde96b1485 --- /dev/null +++ b/x11-libs/gtksourceview/files/4.8.1-build-ensure-access-to-resources-in-corelib-build.patch @@ -0,0 +1,57 @@ +From 9bea9d1c4a56310701717bb106c52a5324ee392a Mon Sep 17 00:00:00 2001 +From: Christian Hergert <[email protected]> +Date: Sun, 7 Mar 2021 08:54:15 -0800 +Subject: [PATCH] build: ensure access to resources in corelib build + +This should help with some transient build failures in dependent projects. +--- + gtksourceview/meson.build | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/gtksourceview/meson.build b/gtksourceview/meson.build +index fd080a9c..b6192604 100644 +--- a/gtksourceview/meson.build ++++ b/gtksourceview/meson.build +@@ -172,12 +172,18 @@ gtksourceversion_h = configure_file( + install_dir: join_paths(pkgincludedir, 'gtksourceview'), + ) + ++gtksource_res = gnome.compile_resources( ++ 'gtksourceview-gresources', ++ 'gtksourceview.gresource.xml' ++) ++ + core_sources = [ + core_public_c, + core_private_c, + core_enums, + gtksourceversion_h, + core_marshallers, ++ gtksource_res, + ] + + install_headers( +@@ -216,11 +222,6 @@ extra_public_sources = [] + + subdir('completion-providers') + +-gtksource_res = gnome.compile_resources( +- 'gtksourceview-gresources', +- 'gtksourceview.gresource.xml' +-) +- + + # We can't use the static libs on Visual Studio builds + # to form our DLL here directly, so we must use +@@ -233,7 +234,7 @@ foreach int_lib : gtksource_libs + gtksource_objs += int_lib.extract_all_objects() + endforeach + +-gtksource_lib = shared_library(package_string, gtksource_res, ++gtksource_lib = shared_library(package_string, + version: lib_version, + darwin_versions: lib_osx_version, + include_directories: gtksourceview_include_dirs, +-- +2.26.3 + diff --git a/x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild b/x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild index ea3909535ab..8a04ceac09f 100644 --- a/x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild +++ b/x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild @@ -38,6 +38,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PV}-build-disable-Werror-for-incompatible-pointer-types.patch + "${FILESDIR}"/${PV}-build-ensure-access-to-resources-in-corelib-build.patch ) src_prepare() {
