empathy: Remove stale package and fix build

Temporarily disable scrollkeeper to fix the build.

Signed-off-by: Joshua Lock <josh@linux.intel.com>

diff --git a/meta/packages/telepathy/empathy_0.23.4.bb b/meta/packages/telepathy/empathy_0.23.4.bb
deleted file mode 100644 (file)
index 67020a0..0000000
--- a/meta/packages/telepathy/empathy_0.23.4.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION = "Telepathy based IM client"
-HOMEPAGE = "http://blogs.gnome.org/view/xclaesse/2007/04/26/0"
-LICENSE = "GPL"
-DEPENDS = "telepathy-mission-control libtelepathy telepathy-glib gtk+ gconf libglade eds-dbus"
-RRECOMMENDS = "telepathy-gabble"
-
-inherit gnome gtk-icon-cache
-
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/empathy/0.23/empathy-${PV}.tar.bz2 \
-           file://no-gnome-doc.patch;patch=1"
-
-FILES_${PN} += "${datadir}/mission-control/profiles/*.profile \
-        ${datadir}/dbus-1/services/*.service \
-        ${datadir}/telepathy/managers/*.chandler \
-       ${datadir}/icons"
-
-PACKAGES =+ "libempathy libempathy-gtk"
-
-FILES_libempathy = "${libdir}/libempathy.so.*"
-FILES_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 3c11913e40130b375f65b45640e9d65542303c77..ea119f24ad7f1288264dd42cffcc0f02590f543f 100644 (file)
--- a/meta/packages/telepathy/empathy_2.26.1.bb
+++ b/meta/packages/telepathy/empathy_2.26.1.bb
@@ -4,11 +4,14 @@ LICENSE = "GPL"
 DEPENDS = "libcanberra telepathy-farsight gnome-doc-utils python-native telepathy-python telepathy-mission-control libtelepathy telepathy-glib gtk+ gconf libglade eds-dbus"
 RDEPENDS = "telepathy-mission-control"
 RRECOMMENDS = "telepathy-gabble"
+PR = "r1"
 
 inherit gnome
 
 PARALLEL_MAKE = ""
 
+EXTRA_OECONF = "--disable-scrollkeeper"
+
 PACKAGES =+ "empathy-scrollkeeper-junk"
 FILES_empathy-scrollkeeper-junk = "/var/lib/scrollkeeper"