diff options
author | Markus Volk <f_l_k@t-online.de> | 2022-12-09 15:11:14 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-12-17 11:10:04 +0000 |
commit | 15bdcd1d5981c90e378075c82eb3a6e5de442be1 (patch) | |
tree | 9b946264735821ed93b28df1177d1176dc8cbc27 /meta/recipes-gnome/gcr/gcr3/0001-gcr-meson.build-fix-one-parallel-build-failure.patch | |
parent | 2b275b425ec9d0384ed3a510e32faaf16fb6a3ee (diff) | |
download | poky-15bdcd1d5981c90e378075c82eb3a6e5de442be1.tar.gz |
gcr: rename gcr -> gcr3
gcr-3 recipe is still needed for gnome projects that stick to gtk+3, rename to gcr3.
(From OE-Core rev: d0ebe63698470fb3336cc02db698cafacedbd070)
Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gcr/gcr3/0001-gcr-meson.build-fix-one-parallel-build-failure.patch')
-rw-r--r-- | meta/recipes-gnome/gcr/gcr3/0001-gcr-meson.build-fix-one-parallel-build-failure.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gcr/gcr3/0001-gcr-meson.build-fix-one-parallel-build-failure.patch b/meta/recipes-gnome/gcr/gcr3/0001-gcr-meson.build-fix-one-parallel-build-failure.patch new file mode 100644 index 0000000000..81c4bdbbcc --- /dev/null +++ b/meta/recipes-gnome/gcr/gcr3/0001-gcr-meson.build-fix-one-parallel-build-failure.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From cb3708bad88e713e4ccf705cb8c14c5996cd9d06 Mon Sep 17 00:00:00 2001 | ||
2 | From: Changqing Li <changqing.li@windriver.com> | ||
3 | Date: Fri, 23 Apr 2021 16:32:38 +0800 | ||
4 | Subject: [PATCH] gcr/meson.build: fix one parallel build failure | ||
5 | |||
6 | ui/gcr-live-search.c includes gcr/gcr-marshal.h. Because missing | ||
7 | dependency, following error occurred intermittently during doing parallel | ||
8 | build: | ||
9 | |||
10 | -o ui/libgcr-ui-3.so.1.0.0.p/gcr-live-search.c.o -c ../gcr-3.38.1/ui/gcr-live-search.c | ||
11 | ../gcr-3.38.1/ui/gcr-live-search.c:32:10: fatal error: gcr/gcr-marshal.h: No such file or directory | ||
12 | 32 | #include "gcr/gcr-marshal.h" | ||
13 | | ^~~~~~~~~~~~~~~~~~~ | ||
14 | compilation terminated. | ||
15 | |||
16 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/68/diffs] | ||
17 | |||
18 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
19 | --- | ||
20 | gcr/meson.build | 1 + | ||
21 | 1 file changed, 1 insertion(+) | ||
22 | |||
23 | diff --git a/gcr/meson.build b/gcr/meson.build | ||
24 | index 06c3a63..d9d4b8f 100644 | ||
25 | --- a/gcr/meson.build | ||
26 | +++ b/gcr/meson.build | ||
27 | @@ -181,6 +181,7 @@ gcr_base_dep = declare_dependency( | ||
28 | sources: [ | ||
29 | gcr_enums_gen[1], | ||
30 | gcr_oids[1], | ||
31 | + gcr_marshal_gen[1], | ||
32 | ], | ||
33 | ) | ||
34 | |||
35 | -- | ||
36 | 2.17.1 | ||
37 | |||