summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCristian Iorga <cristian.iorga@intel.com>2013-08-05 12:41:43 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-06 12:39:58 +0100
commit6810129b5a13785fd1d2e9f9a2d00322e8372992 (patch)
tree520e9b065bb4affa9b2e1eefca8482435208660e
parentf1a0743e09f05669b8bf64b0a4f700dfed68c192 (diff)
downloadpoky-6810129b5a13785fd1d2e9f9a2d00322e8372992.tar.gz
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>
-rw-r--r--meta/recipes-connectivity/telepathy/telepathy-glib/pkgconfig.patch41
-rw-r--r--meta/recipes-connectivity/telepathy/telepathy-glib_0.20.4.bb (renamed from meta/recipes-connectivity/telepathy/telepathy-glib_0.20.1.bb)8
2 files changed, 3 insertions, 46 deletions
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 @@
1Upstream-Status: Backport
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From 4acc51d5b848359211bb8a00f0daa8e0bc44eb65 Mon Sep 17 00:00:00 2001
5From: Will Thompson <will.thompson@collabora.co.uk>
6Date: Mon, 10 Dec 2012 14:11:05 +0000
7Subject: Remove pkg-config dependency from .pc files
8
9This causes problems for Yocto, since they use pc files when choosing
10package dependencies. It doesn't make a huge amount of sense for a
11.pc file to depend on pkg-config: by the time you've parsed the file,
12you've got pkg-config. And the versioned dependency is checked by
13configure, as commit 1154794 (which added this) mentions, so if you've
14compiled telepathy-glib, your pkg-config is new enough.
15---
16diff --git a/telepathy-glib/telepathy-glib-uninstalled.pc.in b/telepathy-glib/telepathy-glib-uninstalled.pc.in
17index 932983c..3dbefb2 100644
18--- a/telepathy-glib/telepathy-glib-uninstalled.pc.in
19+++ b/telepathy-glib/telepathy-glib-uninstalled.pc.in
20@@ -6,7 +6,6 @@ abs_top_builddir=@abs_top_builddir@
21 Name: Telepathy-GLib (uninstalled copy)
22 Description: GLib utility library for the Telepathy framework
23 Version: @VERSION@
24-Requires: pkg-config >= 0.21
25 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
26 Libs: ${abs_top_builddir}/telepathy-glib/libtelepathy-glib.la
27 Cflags: -I${abs_top_srcdir} -I${abs_top_builddir}
28diff --git a/telepathy-glib/telepathy-glib.pc.in b/telepathy-glib/telepathy-glib.pc.in
29index 1c5f4b6..75ac275 100644
30--- a/telepathy-glib/telepathy-glib.pc.in
31+++ b/telepathy-glib/telepathy-glib.pc.in
32@@ -6,7 +6,6 @@ includedir=@includedir@
33 Name: Telepathy-GLib
34 Description: GLib utility library for the Telepathy framework
35 Version: @VERSION@
36-Requires: pkg-config >= 0.21
37 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
38 Libs: -L${libdir} -ltelepathy-glib
39 Cflags: -I${includedir}/telepathy-1.0
40--
41cgit 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
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/"
4DEPENDS = "glib-2.0 dbus python-native-runtime dbus-native dbus-glib libxslt-native" 4DEPENDS = "glib-2.0 dbus python-native-runtime dbus-native dbus-glib libxslt-native"
5LICENSE = "LGPLv2.1+" 5LICENSE = "LGPLv2.1+"
6 6
7SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-glib/${BPN}-${PV}.tar.gz \ 7SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-glib/${BPN}-${PV}.tar.gz"
8 file://pkgconfig.patch" 8SRC_URI[md5sum] = "78be56307d2da7c580cf6df33a225ba0"
9 9SRC_URI[sha256sum] = "c9a307c85d412c58bc68265c4c4128a8e3ffb283bc784143f1f086faaafcb16c"
10SRC_URI[md5sum] = "780034ff7433f33e6577b02fd7a2cb0a"
11SRC_URI[sha256sum] = "01a0343f61fbd389fed9c819751aa75914150aa567472dcb480ced7f4ed261b6"
12 10
13LIC_FILES_CHKSUM = "file://COPYING;md5=e413d83db6ee8f2c8e6055719096a48e" 11LIC_FILES_CHKSUM = "file://COPYING;md5=e413d83db6ee8f2c8e6055719096a48e"
14 12