summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2012-01-12 19:17:11 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-16 14:11:25 (GMT)
commitb02e7d45e06d1fbaf072deea9f3773ca14787e65 (patch)
treedb7210e362db3be79d66248fa0c3ab86a5212837 /meta/recipes-gnome
parentf17c9d3b3832d65543e582dec5d5518e41f08772 (diff)
downloadpoky-b02e7d45e06d1fbaf072deea9f3773ca14787e65.tar.gz
gconf: enable gtk+ 2.0 support to build gconf-sanity-check-2
This is needed for e.g. gnome-session: gnome-session[424]: WARNING: Failed to run gconf-sanity-check-2: Failed to execute child process "/usr/libexec/gconf-sanity-check-2" (No such file or directory) (From OE-Core rev: ecf15d60dd0c255c80de223dad08234e915916a2) Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/gnome/gconf_3.2.3.bb20
1 files changed, 11 insertions, 9 deletions
diff --git a/meta/recipes-gnome/gnome/gconf_3.2.3.bb b/meta/recipes-gnome/gnome/gconf_3.2.3.bb
index f7d3594..412f01c 100644
--- a/meta/recipes-gnome/gnome/gconf_3.2.3.bb
+++ b/meta/recipes-gnome/gnome/gconf_3.2.3.bb
@@ -3,10 +3,10 @@ SECTION = "x11/gnome"
3LICENSE = "LGPLv2+" 3LICENSE = "LGPLv2+"
4LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" 4LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
5 5
6DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native polkit" 6DEPENDS = "glib-2.0 gtk+ dbus dbus-glib libxml2 intltool-native polkit"
7DEPENDS_virtclass-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native" 7DEPENDS_virtclass-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native"
8 8
9PR = "r3" 9PR = "r5"
10 10
11inherit gnomebase 11inherit gnomebase
12 12
@@ -21,8 +21,10 @@ S = "${WORKDIR}/GConf-${PV}"
21 21
22POLKIT_OECONF = "--enable-defaults-service" 22POLKIT_OECONF = "--enable-defaults-service"
23POLKIT_OECONF_virtclass-native = "--disable-defaults-service" 23POLKIT_OECONF_virtclass-native = "--disable-defaults-service"
24EXTRA_OECONF = "--disable-gtk-doc --disable-gtk --enable-shared --disable-static --enable-debug=yes \ 24GTKOECONF = "--with-gtk=2.0 --enable-gtk"
25 --disable-introspection --disable-orbit --with-openldap=no ${POLKIT_OECONF}" 25GTKOECONF_virtclass-native = "--disable-gtk"
26EXTRA_OECONF = "--disable-gtk-doc --enable-shared --disable-static --enable-debug=yes \
27 --disable-introspection --disable-orbit --with-openldap=no ${POLKIT_OECONF} ${GTKOECONF}"
26 28
27do_configure_prepend () { 29do_configure_prepend () {
28 touch gtk-doc.make 30 touch gtk-doc.make
@@ -42,11 +44,11 @@ RDEPENDS_${PN} += "${@base_contains('DISTRO_FEATURES', 'x11', 'dbus-x11', '', d)
42RDEPENDS_${PN}_virtclass-native = "" 44RDEPENDS_${PN}_virtclass-native = ""
43 45
44FILES_${PN} += "${libdir}/GConf/* \ 46FILES_${PN} += "${libdir}/GConf/* \
45 ${libdir}/gio/*/*.so \ 47 ${libdir}/gio/*/*.so \
46 ${datadir}/polkit* \ 48 ${datadir}/polkit* \
47 ${datadir}/dbus-1/services/*.service \ 49 ${datadir}/dbus-1/services/*.service \
48 ${datadir}/dbus-1/system-services/*.service \ 50 ${datadir}/dbus-1/system-services/*.service \
49 " 51 "
50FILES_${PN}-dbg += "${libdir}/*/*/.debug" 52FILES_${PN}-dbg += "${libdir}/*/*/.debug"
51FILES_${PN}-dev += "${datadir}/sgml/gconf/gconf-1.0.dtd" 53FILES_${PN}-dev += "${datadir}/sgml/gconf/gconf-1.0.dtd"
52 54