summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-gnome/libnotify/libnotify_0.6.0.bb6
-rw-r--r--meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb8
-rw-r--r--meta/recipes-sato/libowl/libowl_git.bb5
-rw-r--r--meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_git.bb4
-rw-r--r--meta/recipes-sato/puzzles/oh-puzzles_git.bb9
-rw-r--r--meta/recipes-sato/settings-daemon/settings-daemon_git.bb5
6 files changed, 28 insertions, 9 deletions
diff --git a/meta/recipes-gnome/libnotify/libnotify_0.6.0.bb b/meta/recipes-gnome/libnotify/libnotify_0.6.0.bb
index 1d92b6482f..e6ee89bd01 100644
--- a/meta/recipes-gnome/libnotify/libnotify_0.6.0.bb
+++ b/meta/recipes-gnome/libnotify/libnotify_0.6.0.bb
@@ -7,7 +7,11 @@ PR = "r1"
7 7
8DEPENDS = "dbus gtk+ dbus-glib" 8DEPENDS = "dbus gtk+ dbus-glib"
9 9
10inherit gnomebase 10inherit gnomebase distro_features_check
11
12# Requires gdk/gdkx.h which is provided by gtk when x11 in DISTRO_FEATURES
13REQUIRED_DISTRO_FEATURES = "x11"
14
11SRC_URI[archive.md5sum] = "732c9d2cd5eb6a9069264a319d330516" 15SRC_URI[archive.md5sum] = "732c9d2cd5eb6a9069264a319d330516"
12SRC_URI[archive.sha256sum] = "73b16a79bb2fed62dcf146b11c4405776cb96a09dce66379ca541da7dbd64210" 16SRC_URI[archive.sha256sum] = "73b16a79bb2fed62dcf146b11c4405776cb96a09dce66379ca541da7dbd64210"
13 17
diff --git a/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb b/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
index 830c053b6b..f71514916b 100644
--- a/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
+++ b/meta/recipes-sato/leafpad/leafpad_0.8.18.1.bb
@@ -6,8 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
6 file://src/leafpad.h;endline=20;md5=d3d6a89f5e61e8b13bdea537511ba1fa \ 6 file://src/leafpad.h;endline=20;md5=d3d6a89f5e61e8b13bdea537511ba1fa \
7 file://src/utils.c;endline=20;md5=0d2cc6584ba3202448bb274f62739571" 7 file://src/utils.c;endline=20;md5=0d2cc6584ba3202448bb274f62739571"
8 8
9DEPENDS = "gtk+ intltool-native" 9DEPENDS = "gtk+ intltool-native libowl"
10DEPENDS_append_poky = " libowl" 10# The libowl requires x11 in DISTRO_FEATURES
11REQUIRED_DISTRO_FEATURES = "x11"
12
11SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ 13SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
12 file://leafpad.desktop" 14 file://leafpad.desktop"
13 15
@@ -17,7 +19,7 @@ PR = "r2"
17 19
18SRC_URI_append_poky = " file://owl-menu.patch;apply=yes " 20SRC_URI_append_poky = " file://owl-menu.patch;apply=yes "
19 21
20inherit autotools pkgconfig 22inherit autotools pkgconfig distro_features_check
21 23
22EXTRA_OECONF = " --enable-chooser --disable-emacs --disable-print" 24EXTRA_OECONF = " --enable-chooser --disable-emacs --disable-print"
23 25
diff --git a/meta/recipes-sato/libowl/libowl_git.bb b/meta/recipes-sato/libowl/libowl_git.bb
index 3ccd3406bd..9cc47dbd53 100644
--- a/meta/recipes-sato/libowl/libowl_git.bb
+++ b/meta/recipes-sato/libowl/libowl_git.bb
@@ -17,4 +17,7 @@ SRC_URI = "git://git.yoctoproject.org/${BPN}"
17 17
18S = "${WORKDIR}/git" 18S = "${WORKDIR}/git"
19 19
20inherit autotools pkgconfig 20inherit autotools pkgconfig distro_features_check
21
22# Requires gdk/gdkx.h which is provided by gtk when x11 in DISTRO_FEATURES
23REQUIRED_DISTRO_FEATURES = "x11"
diff --git a/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_git.bb b/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_git.bb
index f0119b7073..5f73a4c48d 100644
--- a/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_git.bb
+++ b/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_git.bb
@@ -17,5 +17,7 @@ S = "${WORKDIR}/git"
17SRC_URI = "git://git.yoctoproject.org/${BPN} \ 17SRC_URI = "git://git.yoctoproject.org/${BPN} \
18 file://no-handed.patch;striplevel=0" 18 file://no-handed.patch;striplevel=0"
19 19
20inherit autotools pkgconfig 20inherit autotools pkgconfig distro_features_check
21 21
22# The settings-daemon requires x11 in DISTRO_FEATURES
23REQUIRED_DISTRO_FEATURES = "x11"
diff --git a/meta/recipes-sato/puzzles/oh-puzzles_git.bb b/meta/recipes-sato/puzzles/oh-puzzles_git.bb
index bd762e9315..36cd2cc7a2 100644
--- a/meta/recipes-sato/puzzles/oh-puzzles_git.bb
+++ b/meta/recipes-sato/puzzles/oh-puzzles_git.bb
@@ -9,7 +9,12 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=f56ec6772dd1c7c367067bbea8ea1675 \
9 9
10SECTION = "x11" 10SECTION = "x11"
11DEPENDS = "gtk+ gconf intltool-native librsvg" 11DEPENDS = "gtk+ gconf intltool-native librsvg"
12DEPENDS_append_poky = " libowl" 12
13# libowl requires x11 in DISTRO_FEATURES
14DEPENDS_append_poky = " ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libowl', '', d)}"
15
16# Requires gdk/gdkx.h which is provided by gtk when x11 in DISTRO_FEATURES
17REQUIRED_DISTRO_FEATURES = "x11"
13 18
14SRCREV = "92f1a20e4b72eed7a35b00984d9793b51dc2fb3b" 19SRCREV = "92f1a20e4b72eed7a35b00984d9793b51dc2fb3b"
15PV = "0.2+git${SRCPV}" 20PV = "0.2+git${SRCPV}"
@@ -20,7 +25,7 @@ SRC_URI_append_poky = " file://oh-puzzles-owl-menu.patch;striplevel=0 "
20 25
21S = "${WORKDIR}/git" 26S = "${WORKDIR}/git"
22 27
23inherit autotools pkgconfig 28inherit autotools pkgconfig distro_features_check
24 29
25bindir = "/usr/games" 30bindir = "/usr/games"
26 31
diff --git a/meta/recipes-sato/settings-daemon/settings-daemon_git.bb b/meta/recipes-sato/settings-daemon/settings-daemon_git.bb
index ba48d90773..c0615530af 100644
--- a/meta/recipes-sato/settings-daemon/settings-daemon_git.bb
+++ b/meta/recipes-sato/settings-daemon/settings-daemon_git.bb
@@ -17,10 +17,13 @@ SRC_URI = "git://git.yoctoproject.org/xsettings-daemon \
17 17
18S = "${WORKDIR}/git" 18S = "${WORKDIR}/git"
19 19
20inherit autotools pkgconfig gconf 20inherit autotools pkgconfig gconf distro_features_check
21 21
22FILES_${PN} = "${bindir}/* ${sysconfdir}" 22FILES_${PN} = "${bindir}/* ${sysconfdir}"
23 23
24# Requires gdk-x11-2.0 which is provided by gtk when x11 in DISTRO_FEATURES
25REQUIRED_DISTRO_FEATURES = "x11"
26
24do_install_append () { 27do_install_append () {
25 install -d ${D}/${sysconfdir}/X11/Xsession.d 28 install -d ${D}/${sysconfdir}/X11/Xsession.d
26 install -m 755 ${WORKDIR}/70settings-daemon.sh ${D}/${sysconfdir}/X11/Xsession.d/ 29 install -m 755 ${WORKDIR}/70settings-daemon.sh ${D}/${sysconfdir}/X11/Xsession.d/