From 749bbc043a41a190a722e2a1824c299c0a19a696 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 1 Aug 2014 15:34:48 +0200 Subject: [PATCH] gnome-settings-daemon: remove blacklist, libgnomekbd has been fixed Also fix S!=B and dependency issues. Signed-off-by: Koen Kooi Signed-off-by: Martin Jansa --- .../gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb | 6 ++---- 1 file 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 \