summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-02-01 13:54:29 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-02-01 13:54:29 +0000
commit5cf94e1d1ef1c2655b47f4d57221b807861c37e1 (patch)
tree1b782292208431d6db98c404f2e0be8fca8b0ded /meta
parent769baa11436400d570b66ec7d0b0adf149ad10f5 (diff)
downloadpoky-5cf94e1d1ef1c2655b47f4d57221b807861c37e1.tar.gz
libtelepathy: Fix double referenced file causing autoconf/automake issues
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/telepathy/libtelepathy/doublefix.patch16
-rw-r--r--meta/packages/telepathy/libtelepathy_0.3.3.bb5
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 0000000000..5ff1c436da
--- /dev/null
+++ b/meta/packages/telepathy/libtelepathy/doublefix.patch
@@ -0,0 +1,16 @@
1Fix double reference to this file to work with recent autoconf+automake
2
3RP 1/2/10
4
5Index: libtelepathy-0.3.3/src/Makefile.am
6===================================================================
7--- libtelepathy-0.3.3.orig/src/Makefile.am 2010-02-01 13:13:50.869038984 +0000
8+++ libtelepathy-0.3.3/src/Makefile.am 2010-02-01 13:14:23.267789456 +0000
9@@ -27,7 +27,6 @@
10 tp-chan-type-text-gen.h \
11 tp-chan-type-tubes-gen.h \
12 tp-conn-iface-aliasing-gen.h \
13- tp-conn-iface-avatars-gen.h \
14 tp-conn-iface-capabilities-gen.h \
15 tp-conn-iface-contact-info-gen.h \
16 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 1c9bf2a714..69e34a9f42 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"
2HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" 2HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
3DEPENDS = "glib-2.0 dbus dbus-glib telepathy-glib" 3DEPENDS = "glib-2.0 dbus dbus-glib telepathy-glib"
4LICENSE = "LGPL" 4LICENSE = "LGPL"
5PR = "r2" 5PR = "r3"
6 6
7SRC_URI = "http://telepathy.freedesktop.org/releases/libtelepathy/libtelepathy-${PV}.tar.gz \ 7SRC_URI = "http://telepathy.freedesktop.org/releases/libtelepathy/libtelepathy-${PV}.tar.gz \
8 file://prefer_python_2.5.patch;patch=1 " 8 file://prefer_python_2.5.patch;patch=1 \
9 file://doublefix.patch;patch=1"
9 10
10inherit autotools_stage pkgconfig 11inherit autotools_stage pkgconfig
11 12