[OE-core] [PATCH 02/22] gcr: upgrade 3.20.0 -> 3.28.0

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin at linux.intel.com>
---
 .../gcr-add-missing-dependencies-for-vapi.patch    | 51 ----------------------
 .../gcr/{gcr_3.20.0.bb => gcr_3.28.0.bb}           | 12 +++--
 2 files changed, 8 insertions(+), 55 deletions(-)
 delete mode 100644 meta/recipes-gnome/gcr/files/gcr-add-missing-dependencies-for-vapi.patch
 rename meta/recipes-gnome/gcr/{gcr_3.20.0.bb => gcr_3.28.0.bb} (69%)

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 a2054298656..00000000000
--- a/meta/recipes-gnome/gcr/files/gcr-add-missing-dependencies-for-vapi.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From e7e0c56ca82031121f192f7f711b78418b154c9f Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang at 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 at 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- at GCR_MAJOR@.gir
- 
- if ENABLE_VAPIGEN
- 
--gcr- at GCR_MAJOR@.vapi: Gcr- at GCR_MAJOR@.gir gcr/Gcr- at GCR_MAJOR@.metadata gcr- at GCR_MAJOR@.deps
-+gcr- at GCR_MAJOR@.vapi: Gcr- at GCR_MAJOR@.gir gcr/Gcr- at GCR_MAJOR@.metadata gcr- at GCR_MAJOR@.deps gck- at GCK_MAJOR@.vapi
- 
- VAPIGEN_VAPIS += gcr- at 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- at GCR_MAJOR@.gir
- 
- if ENABLE_VAPIGEN
- 
--gcr-ui- at GCR_MAJOR@.vapi: GcrUi- at GCR_MAJOR@.gir ui/GcrUi- at GCR_MAJOR@.metadata gcr-ui- at GCR_MAJOR@.deps
-+gcr-ui- at GCR_MAJOR@.vapi: GcrUi- at GCR_MAJOR@.gir ui/GcrUi- at GCR_MAJOR@.metadata gcr-ui- at GCR_MAJOR@.deps gck- at GCK_MAJOR@.vapi gcr- at GCR_MAJOR@.vapi
- 
- VAPIGEN_VAPIS += gcr-ui- at 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.28.0.bb
similarity index 69%
rename from meta/recipes-gnome/gcr/gcr_3.20.0.bb
rename to meta/recipes-gnome/gcr/gcr_3.28.0.bb
index 4450e155e66..9e6f1ff0d98 100644
--- a/meta/recipes-gnome/gcr/gcr_3.20.0.bb
+++ b/meta/recipes-gnome/gcr/gcr_3.28.0.bb
@@ -12,10 +12,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"
+SRC_URI[archive.md5sum] = "5321319307dad34dca2fd52e7c9c01ab"
+SRC_URI[archive.sha256sum] = "15e175d1da7ec486d59749ba34906241c442898118ce224a7b70bf2e849faf0b"
 
 FILES_${PN} += " \
     ${datadir}/dbus-1 \
@@ -24,3 +22,9 @@ FILES_${PN} += " \
 
 # http://errors.yoctoproject.org/Errors/Details/20229/
 ARM_INSTRUCTION_SET = "arm"
+
+# These files may be out of date or missing our fixes
+# libgcrypt.m4 in particular is calling into libgcrypt-config
+do_configure_prepend() {
+    rm -f ${S}/build/m4/*
+}
-- 
2.16.1