mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-23 00:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

gcr: add missing dependencies for vapi

Browse Source 
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>
This commit is contained in:
Jackie Huang
2016-12-12 13:22:14 +08:00
committed by Richard Purdie
parent a63b53841b
commit 72f365b093
2 changed files with 53 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
meta/recipes-gnome/gcr/files/gcr-add-missing-dependencies-for-vapi.patch Normal file
View File

@@ -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

2
meta/recipes-gnome/gcr/gcr_3.20.0.bb
View File

@@ -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"