summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-01-14 12:23:47 +0000
committerJoshua Lock <josh@linux.intel.com>2010-01-14 12:23:47 +0000
commit9bad53754d84ae251b18e2a6c1eca0fc23419620 (patch)
tree2d2f914889c50102274b24e3daeca0100e92b151
parent46a26dc357a0961e3a30591b10c8c5dd1486109b (diff)
downloadpoky-9bad53754d84ae251b18e2a6c1eca0fc23419620.tar.gz
empathy: Remove stale package and fix build
Temporarily disable scrollkeeper to fix the build. Signed-off-by: Joshua Lock <josh@linux.intel.com>
-rw-r--r--meta/packages/telepathy/empathy_0.23.4.bb20
-rw-r--r--meta/packages/telepathy/empathy_2.26.1.bb3
2 files changed, 3 insertions, 20 deletions
diff --git a/meta/packages/telepathy/empathy_0.23.4.bb b/meta/packages/telepathy/empathy_0.23.4.bb
deleted file mode 100644
index 67020a0fb1..0000000000
--- a/meta/packages/telepathy/empathy_0.23.4.bb
+++ /dev/null
@@ -1,20 +0,0 @@
1DESCRIPTION = "Telepathy based IM client"
2HOMEPAGE = "http://blogs.gnome.org/view/xclaesse/2007/04/26/0"
3LICENSE = "GPL"
4DEPENDS = "telepathy-mission-control libtelepathy telepathy-glib gtk+ gconf libglade eds-dbus"
5RRECOMMENDS = "telepathy-gabble"
6
7inherit gnome gtk-icon-cache
8
9SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/empathy/0.23/empathy-${PV}.tar.bz2 \
10 file://no-gnome-doc.patch;patch=1"
11
12FILES_${PN} += "${datadir}/mission-control/profiles/*.profile \
13 ${datadir}/dbus-1/services/*.service \
14 ${datadir}/telepathy/managers/*.chandler \
15 ${datadir}/icons"
16
17PACKAGES =+ "libempathy libempathy-gtk"
18
19FILES_libempathy = "${libdir}/libempathy.so.*"
20FILES_libempathy-gtk = "${libdir}/libempathy-gtk.so.*"
diff --git a/meta/packages/telepathy/empathy_2.26.1.bb b/meta/packages/telepathy/empathy_2.26.1.bb
index 3c11913e40..ea119f24ad 100644
--- a/meta/packages/telepathy/empathy_2.26.1.bb
+++ b/meta/packages/telepathy/empathy_2.26.1.bb
@@ -4,11 +4,14 @@ LICENSE = "GPL"
4DEPENDS = "libcanberra telepathy-farsight gnome-doc-utils python-native telepathy-python telepathy-mission-control libtelepathy telepathy-glib gtk+ gconf libglade eds-dbus" 4DEPENDS = "libcanberra telepathy-farsight gnome-doc-utils python-native telepathy-python telepathy-mission-control libtelepathy telepathy-glib gtk+ gconf libglade eds-dbus"
5RDEPENDS = "telepathy-mission-control" 5RDEPENDS = "telepathy-mission-control"
6RRECOMMENDS = "telepathy-gabble" 6RRECOMMENDS = "telepathy-gabble"
7PR = "r1"
7 8
8inherit gnome 9inherit gnome
9 10
10PARALLEL_MAKE = "" 11PARALLEL_MAKE = ""
11 12
13EXTRA_OECONF = "--disable-scrollkeeper"
14
12PACKAGES =+ "empathy-scrollkeeper-junk" 15PACKAGES =+ "empathy-scrollkeeper-junk"
13FILES_empathy-scrollkeeper-junk = "/var/lib/scrollkeeper" 16FILES_empathy-scrollkeeper-junk = "/var/lib/scrollkeeper"
14 17