summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-02-29 13:51:10 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-15 18:05:24 +0100
commitbff5f0efb37b8447f71ae1ecb02848976f5ac8c0 (patch)
tree2009ef8e7e9bbe3a473c6eae7403ccf6af40b286 /meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb
parentdda59ddc1c123b8bcfcbc76a41cedf7bb9bf0490 (diff)
downloadpoky-bff5f0efb37b8447f71ae1ecb02848976f5ac8c0.tar.gz
matchbox-session-sato: Update session startup
* Use Adwaita Gtk+ theme * sato-gtk-engine is no longer needed with Adwaita * GTK_CSD tricks are no longer needed since the panel does not draw on top windows * Add meta-theme index file: it used to be provided by gtk-sato-engine and is used by matchbox-config-gtk only (to be able to show a single selection for Gtk+, icon and Matchbox themes). This is a more logical place for it. * Set matchbox-theme gconf key (just to be explicit, this is the default already) (From OE-Core rev: 0c32b6e9585a39b14002a5da230222d2fe01ddff) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb')
-rw-r--r--meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb11
1 files changed, 8 insertions, 3 deletions
diff --git a/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb b/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb
index 76de18ae93..fb4750bafd 100644
--- a/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb
+++ b/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://session;endline=3;md5=f8a5c5b9c279e52dc094d10e11c2be6
7 7
8SECTION = "x11" 8SECTION = "x11"
9DEPENDS = "gconf-native" 9DEPENDS = "gconf-native"
10RDEPENDS_${PN} = "formfactor gtk-sato-engine matchbox-theme-sato gtk-theme-sato matchbox-panel-2 matchbox-desktop-sato matchbox-session gconf" 10RDEPENDS_${PN} = "formfactor matchbox-theme-sato matchbox-panel-2 matchbox-desktop-sato matchbox-session gconf"
11PR = "r30" 11PR = "r30"
12 12
13# This package is architecture specific because the session script is modified 13# This package is architecture specific because the session script is modified
@@ -19,9 +19,12 @@ inherit distro_features_check
19# The matchbox-theme-sato requires x11 in DISTRO_FEATURES 19# The matchbox-theme-sato requires x11 in DISTRO_FEATURES
20REQUIRED_DISTRO_FEATURES = "x11" 20REQUIRED_DISTRO_FEATURES = "x11"
21 21
22SRC_URI = "file://session" 22SRC_URI = "file://session \
23 file://index.theme"
23S = "${WORKDIR}" 24S = "${WORKDIR}"
24 25
26FILES_${PN} += "${datadir}/themes/Sato/index.theme"
27
25do_install() { 28do_install() {
26 # This is the set of machine features that the script has markers for 29 # This is the set of machine features that the script has markers for
27 FEATURES="phone" 30 FEATURES="phone"
@@ -34,6 +37,7 @@ do_install() {
34 fi 37 fi
35 done 38 done
36 39
40 install -D ${S}/index.theme ${D}/${datadir}/themes/Sato/index.theme
37 install -d ${D}/${sysconfdir}/matchbox 41 install -d ${D}/${sysconfdir}/matchbox
38 sed -f "$SCRIPT" ${S}/session > ${D}/${sysconfdir}/matchbox/session 42 sed -f "$SCRIPT" ${S}/session > ${D}/${sysconfdir}/matchbox/session
39 chmod +x ${D}/${sysconfdir}/matchbox/session 43 chmod +x ${D}/${sysconfdir}/matchbox/session
@@ -44,7 +48,8 @@ pkg_postinst_${PN} () {
44 #type, name, value 48 #type, name, value
45 gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type $1 --set /desktop/poky/interface/$2 "$3" 49 gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type $1 --set /desktop/poky/interface/$2 "$3"
46 } 50 }
47 set_value string theme Sato 51 set_value string theme Adwaita
52 set_value string matchbox_theme Sato
48 set_value string icon_theme Sato 53 set_value string icon_theme Sato
49 set_value bool touchscreen true 54 set_value bool touchscreen true
50 set_value string font_name "Sans 9" 55 set_value string font_name "Sans 9"