summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/distro/include/preferred-shr-versions.inc1
-rw-r--r--recipes/tasks/task-shr-feed.bb4
2 files changed, 3 insertions, 2 deletions
diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc
index 46b518cf2a..6b6caee73d 100644
--- a/conf/distro/include/preferred-shr-versions.inc
+++ b/conf/distro/include/preferred-shr-versions.inc
@@ -10,6 +10,7 @@ PREFERRED_VERSION_libmikmod = "3.2.0-beta2"
PREFERRED_VERSION_mtd-utils-native = "1.2.0+git"
PREFERRED_VERSION_strace = "4.5.15"
PREFERRED_VERSION_mesa-dri = "7.8.1"
+PREFERRED_VERSION_emacs-x11 = "23.1"
# We need this for jamvm
PREFERRED_VERSION_classpath = "0.98"
diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb
index 9750abcd3d..79ef8ed156 100644
--- a/recipes/tasks/task-shr-feed.bb
+++ b/recipes/tasks/task-shr-feed.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "SHR Feed"
-PR = "r55"
+PR = "r56"
PV = "1.0"
LICENSE = "GPL"
@@ -94,7 +94,7 @@ RDEPENDS_${PN} += "\
intone \
vim \
vpnc \
-# emacs \
+ emacs-x11 \
mcabber \
gdb \
oh-puzzles \