Patchwork telepathy-glib: remove pkgconfig dependency in pkgconfig

login
register
mail settings
Submitter Ross Burton
Date Dec. 10, 2012, 3:23 p.m.
Message ID <1355152987-6438-1-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/40695/
State Accepted
Commit 1024f59c78ebdec132fde6a2d7eccde4b03ba468
Headers show

Comments

Ross Burton - Dec. 10, 2012, 3:23 p.m.
A pkg-config file depending on pkg-config doesn't really make sense, and this is
causing unexpected dependencies on pkg-config at image contruction time (see

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../telepathy/telepathy-glib/pkgconfig.patch       |   41 ++++++++++++++++++++
 .../telepathy/telepathy-glib_0.19.8.bb             |    5 ++-
 2 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-connectivity/telepathy/telepathy-glib/pkgconfig.patch

Patch

diff --git a/meta/recipes-connectivity/telepathy/telepathy-glib/pkgconfig.patch b/meta/recipes-connectivity/telepathy/telepathy-glib/pkgconfig.patch
new file mode 100644
index 0000000..8f0ac28
--- /dev/null
+++ b/meta/recipes-connectivity/telepathy/telepathy-glib/pkgconfig.patch
@@ -0,0 +1,41 @@ 
+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.19.8.bb b/meta/recipes-connectivity/telepathy/telepathy-glib_0.19.8.bb
index 6bf27b2..370a822 100644
--- a/meta/recipes-connectivity/telepathy/telepathy-glib_0.19.8.bb
+++ b/meta/recipes-connectivity/telepathy/telepathy-glib_0.19.8.bb
@@ -3,9 +3,10 @@  DESCRIPTION = "Telepathy Framework: GLib-based helper library for connection man
 HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
 DEPENDS = "glib-2.0 dbus python-native-runtime dbus-native dbus-glib"
 LICENSE = "LGPLv2.1+"
-PR = "r1"
+PR = "r2"
 
-SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-glib/${BPN}-${PV}.tar.gz"
+SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-glib/${BPN}-${PV}.tar.gz \
+           file://pkgconfig.patch"
 
 SRC_URI[md5sum] = "ffd0953953981473fcd9c373ccb9e882"
 SRC_URI[sha256sum] = "581682a937ee33bd4ce01e17d09b338155a79dff44925b988b0701fdbee50b20"