diff options
| author | Jackie Huang <jackie.huang@windriver.com> | 2016-12-12 13:22:14 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-13 22:47:33 +0000 |
| commit | 8f582cf189ee6c4efdb1e0f1748ad1b13bad951b (patch) | |
| tree | 98d5edc180344c7271f3bb2907d0b4d27a898a64 /meta/recipes-gnome | |
| parent | 9945cbccc4c737c84ad441773061acbf90c7baed (diff) | |
| download | openembedded-core-8f582cf189ee6c4efdb1e0f1748ad1b13bad951b.tar.gz openembedded-core-8f582cf189ee6c4efdb1e0f1748ad1b13bad951b.tar.bz2 openembedded-core-8f582cf189ee6c4efdb1e0f1748ad1b13bad951b.zip | |
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
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-gnome')
| -rw-r--r-- | meta/recipes-gnome/gcr/files/gcr-add-missing-dependencies-for-vapi.patch | 51 | ||||
| -rw-r--r-- | meta/recipes-gnome/gcr/gcr_3.20.0.bb | 2 |
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 @@ +From e7e0c56ca82031121f192f7f711b78418b154c9f Mon Sep 17 00:00:00 2001 +From: Jackie Huang <jackie.huang@windriver.com> +Date: Mon, 28 Nov 2016 10:17:34 +0800 +Subject: [PATCH] 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 + +Upstream-Status: Submitted [https://bug775966.bugzilla-attachments.gnome.org/attachment.cgi?id=341791] + +Signed-off-by: Jackie Huang <jackie.huang@windriver.com> +--- + gcr/Makefile.am | 2 +- + ui/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gcr/Makefile.am b/gcr/Makefile.am +index eda302f..6e78dba 100644 +--- a/gcr/Makefile.am ++++ b/gcr/Makefile.am +@@ -221,7 +221,7 @@ gir_DATA += Gcr-@GCR_MAJOR@.gir + + if ENABLE_VAPIGEN + +-gcr-@GCR_MAJOR@.vapi: Gcr-@GCR_MAJOR@.gir gcr/Gcr-@GCR_MAJOR@.metadata gcr-@GCR_MAJOR@.deps ++gcr-@GCR_MAJOR@.vapi: Gcr-@GCR_MAJOR@.gir gcr/Gcr-@GCR_MAJOR@.metadata gcr-@GCR_MAJOR@.deps gck-@GCK_MAJOR@.vapi + + VAPIGEN_VAPIS += gcr-@GCR_MAJOR@.vapi + +diff --git a/ui/Makefile.am b/ui/Makefile.am +index aa52476..6612f0d 100644 +--- a/ui/Makefile.am ++++ b/ui/Makefile.am +@@ -160,7 +160,7 @@ gir_DATA += GcrUi-@GCR_MAJOR@.gir + + if ENABLE_VAPIGEN + +-gcr-ui-@GCR_MAJOR@.vapi: GcrUi-@GCR_MAJOR@.gir ui/GcrUi-@GCR_MAJOR@.metadata gcr-ui-@GCR_MAJOR@.deps ++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 + + VAPIGEN_VAPIS += gcr-ui-@GCR_MAJOR@.vapi + +-- +2.8.3 + 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 # depends on gtk+3, but also x11 through gtk+-x11 REQUIRED_DISTRO_FEATURES = "x11" +SRC_URI += "file://gcr-add-missing-dependencies-for-vapi.patch" + SRC_URI[archive.md5sum] = "4314bf89eac293dd0a9d806593ff1b35" SRC_URI[archive.sha256sum] = "90572c626d8a708225560c42b4421f7941315247fa1679d4ef569bde7f4bb379" |