diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2010-02-01 13:54:29 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-02-01 13:54:29 +0000 |
| commit | 5cf94e1d1ef1c2655b47f4d57221b807861c37e1 (patch) | |
| tree | 1b782292208431d6db98c404f2e0be8fca8b0ded | |
| parent | 769baa11436400d570b66ec7d0b0adf149ad10f5 (diff) | |
| download | openembedded-core-5cf94e1d1ef1c2655b47f4d57221b807861c37e1.tar.gz openembedded-core-5cf94e1d1ef1c2655b47f4d57221b807861c37e1.tar.bz2 openembedded-core-5cf94e1d1ef1c2655b47f4d57221b807861c37e1.tar.xz openembedded-core-5cf94e1d1ef1c2655b47f4d57221b807861c37e1.zip | |
libtelepathy: Fix double referenced file causing autoconf/automake issues
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
| -rw-r--r-- | meta/packages/telepathy/libtelepathy/doublefix.patch | 16 | ||||
| -rw-r--r-- | meta/packages/telepathy/libtelepathy_0.3.3.bb | 5 |
2 files changed, 19 insertions, 2 deletions
diff --git a/meta/packages/telepathy/libtelepathy/doublefix.patch b/meta/packages/telepathy/libtelepathy/doublefix.patch new file mode 100644 index 000000000..5ff1c436d --- /dev/null +++ b/meta/packages/telepathy/libtelepathy/doublefix.patch @@ -0,0 +1,16 @@ +Fix double reference to this file to work with recent autoconf+automake + +RP 1/2/10 + +Index: libtelepathy-0.3.3/src/Makefile.am +=================================================================== +--- libtelepathy-0.3.3.orig/src/Makefile.am 2010-02-01 13:13:50.869038984 +0000 ++++ libtelepathy-0.3.3/src/Makefile.am 2010-02-01 13:14:23.267789456 +0000 +@@ -27,7 +27,6 @@ + tp-chan-type-text-gen.h \ + tp-chan-type-tubes-gen.h \ + tp-conn-iface-aliasing-gen.h \ +- tp-conn-iface-avatars-gen.h \ + tp-conn-iface-capabilities-gen.h \ + tp-conn-iface-contact-info-gen.h \ + tp-conn-iface-forwarding-gen.h \ diff --git a/meta/packages/telepathy/libtelepathy_0.3.3.bb b/meta/packages/telepathy/libtelepathy_0.3.3.bb index 1c9bf2a71..69e34a9f4 100644 --- a/meta/packages/telepathy/libtelepathy_0.3.3.bb +++ b/meta/packages/telepathy/libtelepathy_0.3.3.bb @@ -2,10 +2,11 @@ DESCRIPTION = "Telepathy framework - GLib library" HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" DEPENDS = "glib-2.0 dbus dbus-glib telepathy-glib" LICENSE = "LGPL" -PR = "r2" +PR = "r3" SRC_URI = "http://telepathy.freedesktop.org/releases/libtelepathy/libtelepathy-${PV}.tar.gz \ - file://prefer_python_2.5.patch;patch=1 " + file://prefer_python_2.5.patch;patch=1 \ + file://doublefix.patch;patch=1" inherit autotools_stage pkgconfig |