diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2018-04-04 14:13:01 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-05-04 13:28:02 +0100 |
commit | cb8116f8f09bcb658986e9eb92a0c344495a0f2b (patch) | |
tree | d95b2e7840d1e6744180a3ffe210def60d0ab802 /meta/recipes-gnome/gcr/files/gcr-add-missing-dependencies-for-vapi.patch | |
parent | 6261f8cac5c804e1fdc60236f199d0a4b9638859 (diff) | |
download | poky-cb8116f8f09bcb658986e9eb92a0c344495a0f2b.tar.gz |
gcr: upgrade 3.20.0 -> 3.28.0
(From OE-Core rev: 2d360c5eaf73061fd113875be19e211a900310a8)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gcr/files/gcr-add-missing-dependencies-for-vapi.patch')
-rw-r--r-- | meta/recipes-gnome/gcr/files/gcr-add-missing-dependencies-for-vapi.patch | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/meta/recipes-gnome/gcr/files/gcr-add-missing-dependencies-for-vapi.patch b/meta/recipes-gnome/gcr/files/gcr-add-missing-dependencies-for-vapi.patch deleted file mode 100644 index a205429865..0000000000 --- a/meta/recipes-gnome/gcr/files/gcr-add-missing-dependencies-for-vapi.patch +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | From e7e0c56ca82031121f192f7f711b78418b154c9f Mon Sep 17 00:00:00 2001 | ||
2 | From: Jackie Huang <jackie.huang@windriver.com> | ||
3 | Date: Mon, 28 Nov 2016 10:17:34 +0800 | ||
4 | Subject: [PATCH] gcr: add missing dependencies for vapi | ||
5 | |||
6 | According to the vapi_DEPS definition: | ||
7 | gcr-3.vapi depends on gck-1.vapi, | ||
8 | gcr-ui-3.vapi depends on gck-1.vapi and gcr-3.vapi | ||
9 | |||
10 | But these dependencies are missing for the make targets, | ||
11 | so it will fail when build in parallel: | ||
12 | error: Package `gck-1' not found in specified Vala API directories or GObject-Introspection GIR directories | ||
13 | error: Package `gcr-3' not found in specified Vala API directories or GObject-Introspection GIR directories | ||
14 | |||
15 | Upstream-Status: Submitted [https://bug775966.bugzilla-attachments.gnome.org/attachment.cgi?id=341791] | ||
16 | |||
17 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | ||
18 | --- | ||
19 | gcr/Makefile.am | 2 +- | ||
20 | ui/Makefile.am | 2 +- | ||
21 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
22 | |||
23 | diff --git a/gcr/Makefile.am b/gcr/Makefile.am | ||
24 | index eda302f..6e78dba 100644 | ||
25 | --- a/gcr/Makefile.am | ||
26 | +++ b/gcr/Makefile.am | ||
27 | @@ -221,7 +221,7 @@ gir_DATA += Gcr-@GCR_MAJOR@.gir | ||
28 | |||
29 | if ENABLE_VAPIGEN | ||
30 | |||
31 | -gcr-@GCR_MAJOR@.vapi: Gcr-@GCR_MAJOR@.gir gcr/Gcr-@GCR_MAJOR@.metadata gcr-@GCR_MAJOR@.deps | ||
32 | +gcr-@GCR_MAJOR@.vapi: Gcr-@GCR_MAJOR@.gir gcr/Gcr-@GCR_MAJOR@.metadata gcr-@GCR_MAJOR@.deps gck-@GCK_MAJOR@.vapi | ||
33 | |||
34 | VAPIGEN_VAPIS += gcr-@GCR_MAJOR@.vapi | ||
35 | |||
36 | diff --git a/ui/Makefile.am b/ui/Makefile.am | ||
37 | index aa52476..6612f0d 100644 | ||
38 | --- a/ui/Makefile.am | ||
39 | +++ b/ui/Makefile.am | ||
40 | @@ -160,7 +160,7 @@ gir_DATA += GcrUi-@GCR_MAJOR@.gir | ||
41 | |||
42 | if ENABLE_VAPIGEN | ||
43 | |||
44 | -gcr-ui-@GCR_MAJOR@.vapi: GcrUi-@GCR_MAJOR@.gir ui/GcrUi-@GCR_MAJOR@.metadata gcr-ui-@GCR_MAJOR@.deps | ||
45 | +gcr-ui-@GCR_MAJOR@.vapi: GcrUi-@GCR_MAJOR@.gir ui/GcrUi-@GCR_MAJOR@.metadata gcr-ui-@GCR_MAJOR@.deps gck-@GCK_MAJOR@.vapi gcr-@GCR_MAJOR@.vapi | ||
46 | |||
47 | VAPIGEN_VAPIS += gcr-ui-@GCR_MAJOR@.vapi | ||
48 | |||
49 | -- | ||
50 | 2.8.3 | ||
51 | |||