summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gcr
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2016-12-12 13:22:14 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-13 22:55:21 +0000
commit72f365b09319f575b2db975f54133f42c355d35d (patch)
treeae65f994309d3de2fb7c89a9166ca23611a3888b /meta/recipes-gnome/gcr
parenta63b53841b2d7d0c360d3c6813a19317216f85d0 (diff)
downloadpoky-72f365b09319f575b2db975f54133f42c355d35d.tar.gz
gcr: add missing dependencies for vapi
According to the vapi_DEPS definition: gcr-3.vapi depends on gck-1.vapi, gcr-ui-3.vapi depends on gck-1.vapi and gcr-3.vapi But these dependencies are missing for the make targets, so it will fail when build in parallel: error: Package `gck-1' not found in specified Vala API directories or GObject-Introspection GIR directories error: Package `gcr-3' not found in specified Vala API directories or GObject-Introspection GIR directories (From OE-Core rev: 8f582cf189ee6c4efdb1e0f1748ad1b13bad951b) Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gcr')
-rw-r--r--meta/recipes-gnome/gcr/files/gcr-add-missing-dependencies-for-vapi.patch51
-rw-r--r--meta/recipes-gnome/gcr/gcr_3.20.0.bb2
2 files changed, 53 insertions, 0 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
new file mode 100644
index 0000000000..a205429865
--- /dev/null
+++ b/meta/recipes-gnome/gcr/files/gcr-add-missing-dependencies-for-vapi.patch
@@ -0,0 +1,51 @@
1From e7e0c56ca82031121f192f7f711b78418b154c9f Mon Sep 17 00:00:00 2001
2From: Jackie Huang <jackie.huang@windriver.com>
3Date: Mon, 28 Nov 2016 10:17:34 +0800
4Subject: [PATCH] gcr: add missing dependencies for vapi
5
6According to the vapi_DEPS definition:
7gcr-3.vapi depends on gck-1.vapi,
8gcr-ui-3.vapi depends on gck-1.vapi and gcr-3.vapi
9
10But these dependencies are missing for the make targets,
11so it will fail when build in parallel:
12error: Package `gck-1' not found in specified Vala API directories or GObject-Introspection GIR directories
13error: Package `gcr-3' not found in specified Vala API directories or GObject-Introspection GIR directories
14
15Upstream-Status: Submitted [https://bug775966.bugzilla-attachments.gnome.org/attachment.cgi?id=341791]
16
17Signed-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
23diff --git a/gcr/Makefile.am b/gcr/Makefile.am
24index 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
36diff --git a/ui/Makefile.am b/ui/Makefile.am
37index 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--
502.8.3
51
diff --git a/meta/recipes-gnome/gcr/gcr_3.20.0.bb b/meta/recipes-gnome/gcr/gcr_3.20.0.bb
index b32a455e31..20889021a5 100644
--- a/meta/recipes-gnome/gcr/gcr_3.20.0.bb
+++ b/meta/recipes-gnome/gcr/gcr_3.20.0.bb
@@ -11,6 +11,8 @@ inherit autotools gnomebase gtk-icon-cache gtk-doc distro_features_check upstrea
11# depends on gtk+3, but also x11 through gtk+-x11 11# depends on gtk+3, but also x11 through gtk+-x11
12REQUIRED_DISTRO_FEATURES = "x11" 12REQUIRED_DISTRO_FEATURES = "x11"
13 13
14SRC_URI += "file://gcr-add-missing-dependencies-for-vapi.patch"
15
14SRC_URI[archive.md5sum] = "4314bf89eac293dd0a9d806593ff1b35" 16SRC_URI[archive.md5sum] = "4314bf89eac293dd0a9d806593ff1b35"
15SRC_URI[archive.sha256sum] = "90572c626d8a708225560c42b4421f7941315247fa1679d4ef569bde7f4bb379" 17SRC_URI[archive.sha256sum] = "90572c626d8a708225560c42b4421f7941315247fa1679d4ef569bde7f4bb379"
16 18