From 8e1d380ad30161c358aef22fb8ad7b1d35afa520 Mon Sep 17 00:00:00 2001 From: Cristian Iorga Date: Mon, 5 Aug 2013 12:41:43 +0300 Subject: telepathy-glib: upgrade to v0.20.4 pkgconfig.patch removed; already integrated in upstream. Signed-off-by: Cristian Iorga Signed-off-by: Saul Wold --- .../telepathy/telepathy-glib/pkgconfig.patch | 41 ---------------------- 1 file changed, 41 deletions(-) delete mode 100644 meta/recipes-connectivity/telepathy/telepathy-glib/pkgconfig.patch (limited to 'meta/recipes-connectivity/telepathy/telepathy-glib/pkgconfig.patch') 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 - -From 4acc51d5b848359211bb8a00f0daa8e0bc44eb65 Mon Sep 17 00:00:00 2001 -From: Will Thompson -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 -- cgit 1.2.3-korg