From 6810129b5a13785fd1d2e9f9a2d00322e8372992 Mon Sep 17 00:00:00 2001
From: Cristian Iorga <cristian.iorga@intel.com>
Date: Mon, 5 Aug 2013 12:41:43 +0300
Subject: [PATCH] telepathy-glib: upgrade to v0.20.4

pkgconfig.patch removed; already integrated in upstream.

(From OE-Core rev: 8e1d380ad30161c358aef22fb8ad7b1d35afa520)

Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../telepathy/telepathy-glib/pkgconfig.patch  | 41 -------------------
 ...lib_0.20.1.bb => telepathy-glib_0.20.4.bb} |  8 ++--
 2 files changed, 3 insertions(+), 46 deletions(-)
 delete mode 100644 meta/recipes-connectivity/telepathy/telepathy-glib/pkgconfig.patch
 rename meta/recipes-connectivity/telepathy/{telepathy-glib_0.20.1.bb => telepathy-glib_0.20.4.bb} (73%)

diff --git a/meta/recipes-connectivity/telepathy/telepathy-glib/pkgconfig.patch b/meta/recipes-connectivity/telepathy/telepathy-glib/pkgconfig.patch
deleted file mode 100644
index 8f0ac28328..0000000000
--- a/meta/recipes-connectivity/telepathy/telepathy-glib/pkgconfig.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-From 4acc51d5b848359211bb8a00f0daa8e0bc44eb65 Mon Sep 17 00:00:00 2001
-From: Will Thompson <will.thompson@collabora.co.uk>
-Date: Mon, 10 Dec 2012 14:11:05 +0000
-Subject: Remove pkg-config dependency from .pc files
-
-This causes problems for Yocto, since they use pc files when choosing
-package dependencies. It doesn't make a huge amount of sense for a
-.pc file to depend on pkg-config: by the time you've parsed the file,
-you've got pkg-config. And the versioned dependency is checked by
-configure, as commit 1154794 (which added this) mentions, so if you've
-compiled telepathy-glib, your pkg-config is new enough.
----
-diff --git a/telepathy-glib/telepathy-glib-uninstalled.pc.in b/telepathy-glib/telepathy-glib-uninstalled.pc.in
-index 932983c..3dbefb2 100644
---- a/telepathy-glib/telepathy-glib-uninstalled.pc.in
-+++ b/telepathy-glib/telepathy-glib-uninstalled.pc.in
-@@ -6,7 +6,6 @@ abs_top_builddir=@abs_top_builddir@
- Name: Telepathy-GLib (uninstalled copy)
- Description: GLib utility library for the Telepathy framework
- Version: @VERSION@
--Requires: pkg-config >= 0.21
- Requires.private: dbus-1 >= 0.95, dbus-glib-1 >= 0.90, glib-2.0 >= 2.30, gobject-2.0 >= 2.30, gio-2.0 >= 2.30
- Libs: ${abs_top_builddir}/telepathy-glib/libtelepathy-glib.la
- Cflags: -I${abs_top_srcdir} -I${abs_top_builddir}
-diff --git a/telepathy-glib/telepathy-glib.pc.in b/telepathy-glib/telepathy-glib.pc.in
-index 1c5f4b6..75ac275 100644
---- a/telepathy-glib/telepathy-glib.pc.in
-+++ b/telepathy-glib/telepathy-glib.pc.in
-@@ -6,7 +6,6 @@ includedir=@includedir@
- Name: Telepathy-GLib
- Description: GLib utility library for the Telepathy framework
- Version: @VERSION@
--Requires: pkg-config >= 0.21
- Requires.private: dbus-1 >= 0.95, dbus-glib-1 >= 0.90, glib-2.0 >= 2.30, gobject-2.0 >= 2.30, gio-2.0 >= 2.30
- Libs: -L${libdir} -ltelepathy-glib
- Cflags: -I${includedir}/telepathy-1.0
---
-cgit v0.9.0.2-2-gbebe
diff --git a/meta/recipes-connectivity/telepathy/telepathy-glib_0.20.1.bb b/meta/recipes-connectivity/telepathy/telepathy-glib_0.20.4.bb
similarity index 73%
rename from meta/recipes-connectivity/telepathy/telepathy-glib_0.20.1.bb
rename to meta/recipes-connectivity/telepathy/telepathy-glib_0.20.4.bb
index 85071c053d..7d529b651a 100644
--- a/meta/recipes-connectivity/telepathy/telepathy-glib_0.20.1.bb
+++ b/meta/recipes-connectivity/telepathy/telepathy-glib_0.20.4.bb
@@ -4,11 +4,9 @@ HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
 DEPENDS = "glib-2.0 dbus python-native-runtime dbus-native dbus-glib libxslt-native"
 LICENSE = "LGPLv2.1+"
 
-SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-glib/${BPN}-${PV}.tar.gz \
-           file://pkgconfig.patch"
-
-SRC_URI[md5sum] = "780034ff7433f33e6577b02fd7a2cb0a"
-SRC_URI[sha256sum] = "01a0343f61fbd389fed9c819751aa75914150aa567472dcb480ced7f4ed261b6"
+SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-glib/${BPN}-${PV}.tar.gz"
+SRC_URI[md5sum] = "78be56307d2da7c580cf6df33a225ba0"
+SRC_URI[sha256sum] = "c9a307c85d412c58bc68265c4c4128a8e3ffb283bc784143f1f086faaafcb16c"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=e413d83db6ee8f2c8e6055719096a48e"