[PATCH 0/4] various upgrades

[PATCH 0/4] various upgrades

[Cristian Iorga]

Various PUs

The following changes since commit 4cff3defb545643132b7233fcffb3fedc1bf182b:

  grep: Add patch for texinfo 5.1 (2013-08-03 10:33:14 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib ciorga/updates_prime
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ciorga/updates_prime

Cristian Iorga (4):
  neon: upgrade to v0.30.0
  gstreamer1.0-plugins-ugly: upgrade to v1.0.9
  telepathy-glib: upgrade to v0.20.4
  harfbuzz: upgrade to v0.9.19

 .../telepathy/telepathy-glib/pkgconfig.patch       | 41 ----------------------
 ...thy-glib_0.20.1.bb => telepathy-glib_0.20.4.bb} |  8 ++---
 .../harfbuzz-0.9.17/disable_graphite.patch         | 15 --------
 .../harfbuzz/harfbuzz/disable_graphite.patch       | 15 ++++++++
 .../{harfbuzz_0.9.17.bb => harfbuzz_0.9.19.bb}     |  7 ++--
 .../gstreamer/gstreamer1.0-plugins-ugly.inc        |  2 --
 ...1.0.7.bb => gstreamer1.0-plugins-ugly_1.0.9.bb} |  4 +--
 .../{neon-0.29.6 => neon-0.30.0}/pkgconfig.patch   |  0
 .../neon/{neon_0.29.6.bb => neon_0.30.0.bb}        |  7 ++--
 9 files changed, 24 insertions(+), 75 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%)
 delete mode 100644 meta/recipes-graphics/harfbuzz/harfbuzz-0.9.17/disable_graphite.patch
 create mode 100644 meta/recipes-graphics/harfbuzz/harfbuzz/disable_graphite.patch
 rename meta/recipes-graphics/harfbuzz/{harfbuzz_0.9.17.bb => harfbuzz_0.9.19.bb} (85%)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-ugly_1.0.7.bb => gstreamer1.0-plugins-ugly_1.0.9.bb} (66%)
 rename meta/recipes-support/neon/{neon-0.29.6 => neon-0.30.0}/pkgconfig.patch (100%)
 rename meta/recipes-support/neon/{neon_0.29.6.bb => neon_0.30.0.bb} (83%)

-- 
1.8.1.2

[PATCH 1/4] neon: upgrade to v0.30.0

[Cristian Iorga]

Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
---
 .../neon/{neon-0.29.6 => neon-0.30.0}/pkgconfig.patch              | 0
 meta/recipes-support/neon/{neon_0.29.6.bb => neon_0.30.0.bb}       | 7 ++-----
 2 files changed, 2 insertions(+), 5 deletions(-)
 rename meta/recipes-support/neon/{neon-0.29.6 => neon-0.30.0}/pkgconfig.patch (100%)
 rename meta/recipes-support/neon/{neon_0.29.6.bb => neon_0.30.0.bb} (83%)

diff --git a/meta/recipes-support/neon/neon-0.29.6/pkgconfig.patch b/meta/recipes-support/neon/neon-0.30.0/pkgconfig.patch
similarity index 100%
rename from meta/recipes-support/neon/neon-0.29.6/pkgconfig.patch
rename to meta/recipes-support/neon/neon-0.30.0/pkgconfig.patch
diff --git a/meta/recipes-support/neon/neon_0.29.6.bb b/meta/recipes-support/neon/neon_0.30.0.bb
similarity index 83%
rename from meta/recipes-support/neon/neon_0.29.6.bb
rename to meta/recipes-support/neon/neon_0.30.0.bb
index 157f711..dbc43bb 100644
--- a/meta/recipes-support/neon/neon_0.29.6.bb
+++ b/meta/recipes-support/neon/neon_0.30.0.bb
@@ -7,15 +7,12 @@ LIC_FILES_CHKSUM = "file://src/COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a
 DEPENDS = "zlib libxml2 expat time gnutls libproxy"
 DEPENDS_class-native = "zlib-native libxml2-native expat-native gnutls-native"
 
-PR = "r3"
-
 BBCLASSEXTEND = "native"
 
 SRC_URI = "http://www.webdav.org/${BPN}/${BPN}-${PV}.tar.gz \
            file://pkgconfig.patch"
-
-SRC_URI[md5sum] = "591e0c82e6979e7e615211b386b8f6bc"
-SRC_URI[sha256sum] = "9c640b728d6dc80ef1e48f83181166ab6bc95309cece5537e01ffdd01b96eb43"
+SRC_URI[md5sum] = "fb60b3a124eeec441937a812c456fd94"
+SRC_URI[sha256sum] = "2962cfcb5d30f3272e3d2fa0e473434419770a3801afe3d46e5d1650787990c2"
 
 inherit autotools binconfig lib_package pkgconfig
 
-- 
1.8.1.2

[PATCH 2/4] gstreamer1.0-plugins-ugly: upgrade to v1.0.9

[Cristian Iorga]

Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
---
 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc       | 2 --
 ...er1.0-plugins-ugly_1.0.7.bb => gstreamer1.0-plugins-ugly_1.0.9.bb} | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-ugly_1.0.7.bb => gstreamer1.0-plugins-ugly_1.0.9.bb} (66%)

diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc
index 4a54d1b..3f47949 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc
@@ -5,8 +5,6 @@ LICENSE_FLAGS = "commercial"
 
 DEPENDS += "gstreamer1.0-plugins-base libid3tag"
 
-PR = "r1"
-
 inherit gettext
 
 
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.0.7.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.0.9.bb
similarity index 66%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.0.7.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.0.9.bb
index 7e9b8aa..30fa3a3 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.0.7.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.0.9.bb
@@ -3,8 +3,8 @@ include gstreamer1.0-plugins-ugly.inc
 LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
                     file://tests/check/elements/xingmux.c;beginline=1;endline=21;md5=4c771b8af188724855cb99cadd390068 "
 
-SRC_URI[md5sum] = "8754edf6c3be235f232fb75ad11708bb"
-SRC_URI[sha256sum] = "b78b8cfabe322497da432a0f297dbb21862a033f95e8d4cd8f207eccb5288f2b"
+SRC_URI[md5sum] = "ea8b4e05ed5beb982762b45aba266720"
+SRC_URI[sha256sum] = "11250fe9e44b0169c3a289e981b31874b483643ed78f619682ae1644d7088379"
 
 S = "${WORKDIR}/gst-plugins-ugly-${PV}"
 
-- 
1.8.1.2

[PATCH 3/4] telepathy-glib: upgrade to v0.20.4

[Cristian Iorga]

pkgconfig.patch removed; already integrated in upstream.

Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
---
 .../telepathy/telepathy-glib/pkgconfig.patch       | 41 ----------------------
 ...thy-glib_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 8f0ac28..0000000
--- 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 85071c0..7d529b6 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"
 
-- 
1.8.1.2

[PATCH 4/4] harfbuzz: upgrade to v0.9.19

[Cristian Iorga]

disable_graphite.patch updated.

Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
---
 .../harfbuzz/harfbuzz-0.9.17/disable_graphite.patch       | 15 ---------------
 .../harfbuzz/harfbuzz/disable_graphite.patch              | 15 +++++++++++++++
 .../harfbuzz/{harfbuzz_0.9.17.bb => harfbuzz_0.9.19.bb}   |  7 ++-----
 3 files changed, 17 insertions(+), 20 deletions(-)
 delete mode 100644 meta/recipes-graphics/harfbuzz/harfbuzz-0.9.17/disable_graphite.patch
 create mode 100644 meta/recipes-graphics/harfbuzz/harfbuzz/disable_graphite.patch
 rename meta/recipes-graphics/harfbuzz/{harfbuzz_0.9.17.bb => harfbuzz_0.9.19.bb} (85%)

diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz-0.9.17/disable_graphite.patch b/meta/recipes-graphics/harfbuzz/harfbuzz-0.9.17/disable_graphite.patch
deleted file mode 100644
index 49938ba..0000000
--- a/meta/recipes-graphics/harfbuzz/harfbuzz-0.9.17/disable_graphite.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Inappropriate [disable feature]
-
-Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
-diff -Nurd harfbuzz-0.9.10/configure.ac harfbuzz-0.9.10/configure.ac
---- harfbuzz-0.9.10/configure.ac	2013-01-03 08:08:51.000000000 +0200
-+++ harfbuzz-0.9.10/configure.ac	2013-01-09 08:18:04.812529418 +0200
-@@ -185,7 +185,7 @@
-
- dnl ==========================================================================
-
--PKG_CHECK_MODULES(GRAPHITE2, graphite2, have_graphite=true, have_graphite=false)
-+have_graphite=false
- if $have_graphite; then
-     AC_DEFINE(HAVE_GRAPHITE2, 1, [Have Graphite library])
- fi
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz/disable_graphite.patch b/meta/recipes-graphics/harfbuzz/harfbuzz/disable_graphite.patch
new file mode 100644
index 0000000..228ebb1
--- /dev/null
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz/disable_graphite.patch
@@ -0,0 +1,15 @@
+Upstream-Status: Inappropriate [disable feature]
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+Index: harfbuzz-0.9.19/configure.ac
+===================================================================
+--- harfbuzz-0.9.19.orig/configure.ac
++++ harfbuzz-0.9.19/configure.ac
+@@ -253,6 +253,7 @@ fi
+ if test "x$with_graphite2" = "xyes" -a "x$have_graphite2" != "xtrue"; then
+ 	AC_MSG_ERROR([graphite2 support requested but libgraphite2 not found])
+ fi
++have_graphite=false
+ if $have_graphite2; then
+     AC_DEFINE(HAVE_GRAPHITE2, 1, [Have Graphite2 library])
+ fi
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.17.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.19.bb
similarity index 85%
rename from meta/recipes-graphics/harfbuzz/harfbuzz_0.9.17.bb
rename to meta/recipes-graphics/harfbuzz/harfbuzz_0.9.19.bb
index 968d8a2..6128358 100644
--- a/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.17.bb
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.19.bb
@@ -13,14 +13,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e021dd6dda6ff1e6b1044002fc662b9b \
 
 SECTION = "libs"
 
-PR = "r0"
-
 SRC_URI = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${PV}.tar.bz2 \
            file://disable_graphite.patch \
 "
-
-SRC_URI[md5sum] = "c48827713e93539dc7285f9e86ffbdc5"
-SRC_URI[sha256sum] = "a4773003512035cb5c559de23e1d53f292bcb0212f023b540c4dc695b39690ed"
+SRC_URI[md5sum] = "9782581ee6ef972554772e84ca448131"
+SRC_URI[sha256sum] = "d2da0f060d47f6ad9de8c8781bb21fa4b9eae8ea1cd1e956b814095baa002f35"
 
 inherit autotools pkgconfig
 
-- 
1.8.1.2

Re: [PATCH 4/4] harfbuzz: upgrade to v0.9.19

[Burton, Ross]

Hi Cristian,

I did a buildhistory-diff and noticed more than the expected churn.
See the upstream NEWS for some important changes:
http://cgit.freedesktop.org/harfbuzz/tree/NEWS

"""
Moreover, ICU support is now build into a separate library:
libharfbuzz-icu.so, and a new harfbuzz-icu.pc is shipped for it.
Distros can enable ICU now without every application on earth
getting linked to via libharfbuzz.so.

For distros I recommend that they make sure they are building --with-glib
--with-freetype --with-cairo, --with-icu, and optionally --with-graphite2;
And package harfbuzz and harfbuzz-icu separately.
"""

We should split out the ICU package, and re-evaluate
disable_graphite.patch/submit upstream if it is a genuine problem with
the build system.

Ross

Re: [PATCH 0/4] various upgrades

[Burton, Ross]

On 5 August 2013 15:59, Cristian Iorga <cristian.iorga@intel.com> wrote:
> Cristian Iorga (4):
>   neon: upgrade to v0.30.0
>   gstreamer1.0-plugins-ugly: upgrade to v1.0.9
>   telepathy-glib: upgrade to v0.20.4
>   harfbuzz: upgrade to v0.9.19

I just sent a mail about harfbuzz, but
neon/gstreamer1.0-plugins-ugly/telepathy-glib look good.

Ross

Re: [PATCH 4/4] harfbuzz: upgrade to v0.9.19

[Iorga, Cristian]

Hi Ross,

For evaluating the correct functionality of harfbuzz, I built and ran core-image-sato.
The text looked OK, I try to see if there are some issues in any of the included apps.
Did not find any, so I considered that the harfbuzz upgrade went OK.
Are there any other more complex tests to perform?

I will try to disseminate the information that you provided and come back with fixes.
Given the load that I am experiencing, I am not sure it will happen this week.
Regards,
Cristian

-----Original Message-----
From: Burton, Ross [mailto:ross.burton@intel.com] 
Sent: Monday, August 05, 2013 8:19 PM
To: Iorga, Cristian
Cc: openembedded-core@lists.openembedded.org
Subject: Re: [OE-core] [PATCH 4/4] harfbuzz: upgrade to v0.9.19

Hi Cristian,

I did a buildhistory-diff and noticed more than the expected churn.
See the upstream NEWS for some important changes:
http://cgit.freedesktop.org/harfbuzz/tree/NEWS

"""
Moreover, ICU support is now build into a separate library:
libharfbuzz-icu.so, and a new harfbuzz-icu.pc is shipped for it.
Distros can enable ICU now without every application on earth getting linked to via libharfbuzz.so.

For distros I recommend that they make sure they are building --with-glib --with-freetype --with-cairo, --with-icu, and optionally --with-graphite2; And package harfbuzz and harfbuzz-icu separately.
"""

We should split out the ICU package, and re-evaluate disable_graphite.patch/submit upstream if it is a genuine problem with the build system.

Ross

Re: [PATCH 0/4] various upgrades

[Iorga, Cristian]

Alright, thanks.
/Cristian

-----Original Message-----
From: Burton, Ross [mailto:ross.burton@intel.com] 
Sent: Monday, August 05, 2013 8:19 PM
To: Iorga, Cristian
Cc: openembedded-core@lists.openembedded.org
Subject: Re: [OE-core] [PATCH 0/4] various upgrades

On 5 August 2013 15:59, Cristian Iorga <cristian.iorga@intel.com> wrote:
> Cristian Iorga (4):
>   neon: upgrade to v0.30.0
>   gstreamer1.0-plugins-ugly: upgrade to v1.0.9
>   telepathy-glib: upgrade to v0.20.4
>   harfbuzz: upgrade to v0.9.19

I just sent a mail about harfbuzz, but
neon/gstreamer1.0-plugins-ugly/telepathy-glib look good.

Ross

Re: [PATCH 4/4] harfbuzz: upgrade to v0.9.19

[Burton, Ross]

On 6 August 2013 08:00, Iorga, Cristian <cristian.iorga@intel.com> wrote:
> For evaluating the correct functionality of harfbuzz, I built and ran core-image-sato.
> The text looked OK, I try to see if there are some issues in any of the included apps.
> Did not find any, so I considered that the harfbuzz upgrade went OK.
> Are there any other more complex tests to perform?

Hopefully harfbuzz has a test suite we can ptest one day, but
generally when it breaks all you can see is squares. :)

Ross

[PATCH 3/4] telepathy-glib: upgrade to v0.20.4

[Cristian Iorga]

pkgconfig.patch removed; already integrated in upstream.

Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
---
 .../telepathy/telepathy-glib/pkgconfig.patch       | 41 ----------------------
 ...thy-glib_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 8f0ac28..0000000
--- 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 85071c0..7d529b6 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"
 
-- 
1.8.1.2