aboutsummaryrefslogtreecommitdiffstats
path: root/meta-gnome
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2014-08-01 15:34:48 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2014-08-05 12:02:40 +0200
commit749bbc043a41a190a722e2a1824c299c0a19a696 (patch)
tree74b383633c21082e243144cd30cda99138c315c9 /meta-gnome
parentaa12671b93b92428fc63d822ba9cc7e6346c4f12 (diff)
downloadmeta-openembedded-contrib-749bbc043a41a190a722e2a1824c299c0a19a696.tar.gz
gnome-settings-daemon: remove blacklist, libgnomekbd has been fixed
Also fix S!=B and dependency issues. Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-gnome')
-rw-r--r--meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb6
1 files changed, 2 insertions, 4 deletions
diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb
index 24827321f2..fc7321e341 100644
--- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb
@@ -4,9 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
PR = "r7"
-PNBLACKLIST[gnome-settings-daemon] = "BROKEN: depends on broken libgnomekbd"
-
-DEPENDS = "libxxf86misc libsndfile1 libxtst glib-2.0 polkit gtk+ gconf dbus-glib libnotify libgnomekbd libxklavier gnome-doc-utils gnome-desktop"
+DEPENDS = "intltool libxxf86misc libsndfile1 libxtst glib-2.0 polkit gtk+ gconf dbus-glib libnotify libgnomekbd libxklavier gnome-doc-utils gnome-desktop"
inherit gnome
@@ -25,7 +23,7 @@ EXTRA_OECONF = "--disable-esd \
"
do_configure_prepend() {
- sed -i -e 's:-L$libdir::g' -e 's:-I$includedir::g' configure.ac
+ sed -i -e 's:-L$libdir::g' -e 's:-I$includedir::g' ${S}/configure.ac
}
FILES_${PN} += "${libdir}/gnome-settings-daemon-2.0/*.so ${libdir}/gnome-settings-daemon-2.0/*plugin \