diff options
author | Dave Cobbley <david.j.cobbley@linux.intel.com> | 2018-08-14 20:05:37 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-23 04:26:31 +0300 |
commit | eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 (patch) | |
tree | de291a73dc37168da6370e2cf16c347d1eba9df8 /poky/meta/recipes-gnome/gcr/files | |
parent | 9c3cf826d853102535ead04cebc2d6023eff3032 (diff) | |
download | openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.tar.xz |
[Subtree] Removing import-layers directory
As part of the move to subtrees, need to bring all the import layers
content to the top level.
Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-gnome/gcr/files')
-rw-r--r-- | poky/meta/recipes-gnome/gcr/files/gcr-add-missing-dependencies-for-vapi.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/poky/meta/recipes-gnome/gcr/files/gcr-add-missing-dependencies-for-vapi.patch b/poky/meta/recipes-gnome/gcr/files/gcr-add-missing-dependencies-for-vapi.patch new file mode 100644 index 0000000000..a205429865 --- /dev/null +++ b/poky/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 + |