| 1 |
commit: 85608326ec157e60fd7a01ea032fb38e87e12ffc |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Apr 30 16:17:41 2021 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 30 16:18:44 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85608326 |
| 7 |
|
| 8 |
x11-libs/gtksourceview: Add patch to avoid build race |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/787146 |
| 11 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 12 |
|
| 13 |
...sure-access-to-resources-in-corelib-build.patch | 57 ++++++++++++++++++++++ |
| 14 |
x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild | 1 + |
| 15 |
2 files changed, 58 insertions(+) |
| 16 |
|
| 17 |
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 |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..3fde96b1485 |
| 20 |
--- /dev/null |
| 21 |
+++ b/x11-libs/gtksourceview/files/4.8.1-build-ensure-access-to-resources-in-corelib-build.patch |
| 22 |
@@ -0,0 +1,57 @@ |
| 23 |
+From 9bea9d1c4a56310701717bb106c52a5324ee392a Mon Sep 17 00:00:00 2001 |
| 24 |
+From: Christian Hergert <chergert@××××××.com> |
| 25 |
+Date: Sun, 7 Mar 2021 08:54:15 -0800 |
| 26 |
+Subject: [PATCH] build: ensure access to resources in corelib build |
| 27 |
+ |
| 28 |
+This should help with some transient build failures in dependent projects. |
| 29 |
+--- |
| 30 |
+ gtksourceview/meson.build | 13 +++++++------ |
| 31 |
+ 1 file changed, 7 insertions(+), 6 deletions(-) |
| 32 |
+ |
| 33 |
+diff --git a/gtksourceview/meson.build b/gtksourceview/meson.build |
| 34 |
+index fd080a9c..b6192604 100644 |
| 35 |
+--- a/gtksourceview/meson.build |
| 36 |
++++ b/gtksourceview/meson.build |
| 37 |
+@@ -172,12 +172,18 @@ gtksourceversion_h = configure_file( |
| 38 |
+ install_dir: join_paths(pkgincludedir, 'gtksourceview'), |
| 39 |
+ ) |
| 40 |
+ |
| 41 |
++gtksource_res = gnome.compile_resources( |
| 42 |
++ 'gtksourceview-gresources', |
| 43 |
++ 'gtksourceview.gresource.xml' |
| 44 |
++) |
| 45 |
++ |
| 46 |
+ core_sources = [ |
| 47 |
+ core_public_c, |
| 48 |
+ core_private_c, |
| 49 |
+ core_enums, |
| 50 |
+ gtksourceversion_h, |
| 51 |
+ core_marshallers, |
| 52 |
++ gtksource_res, |
| 53 |
+ ] |
| 54 |
+ |
| 55 |
+ install_headers( |
| 56 |
+@@ -216,11 +222,6 @@ extra_public_sources = [] |
| 57 |
+ |
| 58 |
+ subdir('completion-providers') |
| 59 |
+ |
| 60 |
+-gtksource_res = gnome.compile_resources( |
| 61 |
+- 'gtksourceview-gresources', |
| 62 |
+- 'gtksourceview.gresource.xml' |
| 63 |
+-) |
| 64 |
+- |
| 65 |
+ |
| 66 |
+ # We can't use the static libs on Visual Studio builds |
| 67 |
+ # to form our DLL here directly, so we must use |
| 68 |
+@@ -233,7 +234,7 @@ foreach int_lib : gtksource_libs |
| 69 |
+ gtksource_objs += int_lib.extract_all_objects() |
| 70 |
+ endforeach |
| 71 |
+ |
| 72 |
+-gtksource_lib = shared_library(package_string, gtksource_res, |
| 73 |
++gtksource_lib = shared_library(package_string, |
| 74 |
+ version: lib_version, |
| 75 |
+ darwin_versions: lib_osx_version, |
| 76 |
+ include_directories: gtksourceview_include_dirs, |
| 77 |
+-- |
| 78 |
+2.26.3 |
| 79 |
+ |
| 80 |
|
| 81 |
diff --git a/x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild b/x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild |
| 82 |
index ea3909535ab..8a04ceac09f 100644 |
| 83 |
--- a/x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild |
| 84 |
+++ b/x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild |
| 85 |
@@ -38,6 +38,7 @@ BDEPEND=" |
| 86 |
|
| 87 |
PATCHES=( |
| 88 |
"${FILESDIR}"/${PV}-build-disable-Werror-for-incompatible-pointer-types.patch |
| 89 |
+ "${FILESDIR}"/${PV}-build-ensure-access-to-resources-in-corelib-build.patch |
| 90 |
) |
| 91 |
|
| 92 |
src_prepare() { |
Archives