summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-06-01 10:57:32 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-15 18:05:24 +0100
commitf9c78510d6df1254d7a950576dca4b8d723f3521 (patch)
treed9ceff8bf1821b750146f04a3d6c781e4556419d /meta
parentbff5f0efb37b8447f71ae1ecb02848976f5ac8c0 (diff)
downloadpoky-f9c78510d6df1254d7a950576dca4b8d723f3521.tar.gz
matchbox-desktop: Add Sato folder configuration
matchbox-desktop folder configuration for Sato was in a separate project 'matchbox-desktop-sato'. Skip the extra overhead: remove matchbox-desktop-sato and include the files here. Drop Utilities folder and include those icons in the Applictions folder in an effort to make the common case a little more useful: Now e.g. Terminal icon should be visible on startup. (From OE-Core rev: 42d92eabcd6e54db551f6b2577ae6b6da0b778b8) 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')
-rw-r--r--meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb22
-rw-r--r--meta/recipes-sato/matchbox-desktop/files/vfolders/All.directory5
-rw-r--r--meta/recipes-sato/matchbox-desktop/files/vfolders/Applications.directory6
-rw-r--r--meta/recipes-sato/matchbox-desktop/files/vfolders/Games.directory9
-rw-r--r--meta/recipes-sato/matchbox-desktop/files/vfolders/Root.order4
-rw-r--r--meta/recipes-sato/matchbox-desktop/files/vfolders/Settings.directory8
-rw-r--r--meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.1.bb11
-rw-r--r--meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb2
8 files changed, 43 insertions, 24 deletions
diff --git a/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb b/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb
deleted file mode 100644
index 1979cbb769..0000000000
--- a/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb
+++ /dev/null
@@ -1,22 +0,0 @@
1SUMMARY = "Matchbox desktop folders for the Sato environment"
2HOMEPAGE = "http://matchbox-project.org"
3BUGTRACKER = "http://bugzilla.yoctoproject.org/"
4
5LICENSE = "GPLv2"
6LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
7
8SECTION = "x11"
9DEPENDS = ""
10RCONFLICTS_${PN} = "matchbox-common"
11
12SRCREV = "810b0b08eb79e4685202da2ec347b990bb467e07"
13PV = "0.1+git${SRCPV}"
14PR = "r1"
15
16SRC_URI = "git://git.yoctoproject.org/${BPN}"
17
18S = "${WORKDIR}/git"
19
20inherit autotools pkgconfig
21
22FILES_${PN} += "${datadir}"
diff --git a/meta/recipes-sato/matchbox-desktop/files/vfolders/All.directory b/meta/recipes-sato/matchbox-desktop/files/vfolders/All.directory
new file mode 100644
index 0000000000..dfa41e3d31
--- /dev/null
+++ b/meta/recipes-sato/matchbox-desktop/files/vfolders/All.directory
@@ -0,0 +1,5 @@
1[Desktop Entry]
2Name=All
3Icon=mbfolder.png
4Type=Directory
5Match=meta-all
diff --git a/meta/recipes-sato/matchbox-desktop/files/vfolders/Applications.directory b/meta/recipes-sato/matchbox-desktop/files/vfolders/Applications.directory
new file mode 100644
index 0000000000..a7e3501712
--- /dev/null
+++ b/meta/recipes-sato/matchbox-desktop/files/vfolders/Applications.directory
@@ -0,0 +1,6 @@
1[Desktop Entry]
2Name=Applications
3Comment=Applications
4Icon=gnome-applications.png
5Type=Directory
6Match=AudioVideo;Audio;Video;Graphics;Network;Office;Utility;System;Development;meta-fallback;
diff --git a/meta/recipes-sato/matchbox-desktop/files/vfolders/Games.directory b/meta/recipes-sato/matchbox-desktop/files/vfolders/Games.directory
new file mode 100644
index 0000000000..1b0928c752
--- /dev/null
+++ b/meta/recipes-sato/matchbox-desktop/files/vfolders/Games.directory
@@ -0,0 +1,9 @@
1[Desktop Entry]
2Name=Games
3Name[de]=Spiele
4Comment=Games of all kind
5Comment[de]=Spiele aller Art
6Icon=mbfolder.png
7Type=Directory
8Match=Game
9
diff --git a/meta/recipes-sato/matchbox-desktop/files/vfolders/Root.order b/meta/recipes-sato/matchbox-desktop/files/vfolders/Root.order
new file mode 100644
index 0000000000..01a86d2939
--- /dev/null
+++ b/meta/recipes-sato/matchbox-desktop/files/vfolders/Root.order
@@ -0,0 +1,4 @@
1Applications
2Games
3Settings
4All
diff --git a/meta/recipes-sato/matchbox-desktop/files/vfolders/Settings.directory b/meta/recipes-sato/matchbox-desktop/files/vfolders/Settings.directory
new file mode 100644
index 0000000000..5dde365f0e
--- /dev/null
+++ b/meta/recipes-sato/matchbox-desktop/files/vfolders/Settings.directory
@@ -0,0 +1,8 @@
1[Desktop Entry]
2Name=Settings
3Name[de]=Einstellungen
4Comment=Settings for your handheld computer
5Comment[de]=Einstellungen für Ihren Handheld-Computer
6Icon=mbfolder.png
7Type=Directory
8Match=Settings
diff --git a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.1.bb b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.1.bb
index d6c53b003c..d9a2f22147 100644
--- a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.1.bb
+++ b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.1.bb
@@ -12,7 +12,9 @@ SECTION = "x11/wm"
12 12
13# SRCREV tagged 2.1 13# SRCREV tagged 2.1
14SRCREV = "c8473519a0f37488b8b3e839e275b000cdde0b80" 14SRCREV = "c8473519a0f37488b8b3e839e275b000cdde0b80"
15SRC_URI = "git://git.yoctoproject.org/${BPN}-2" 15SRC_URI = "git://git.yoctoproject.org/${BPN}-2 \
16 file://vfolders/* \
17 "
16 18
17EXTRA_OECONF = "--enable-startup-notification --with-dbus" 19EXTRA_OECONF = "--enable-startup-notification --with-dbus"
18 20
@@ -22,3 +24,10 @@ inherit autotools pkgconfig distro_features_check
22 24
23# The startup-notification requires x11 in DISTRO_FEATURES 25# The startup-notification requires x11 in DISTRO_FEATURES
24REQUIRED_DISTRO_FEATURES = "x11" 26REQUIRED_DISTRO_FEATURES = "x11"
27
28do_install_append() {
29 install -d ${D}${datadir}/matchbox/vfolders/
30 install -m 0644 ${WORKDIR}/vfolders/* ${D}${datadir}/matchbox/vfolders/
31}
32
33FILES_${PN} += "${datadir}/matchbox/vfolders/"
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 fb4750bafd..42c742fca6 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 matchbox-theme-sato matchbox-panel-2 matchbox-desktop-sato matchbox-session gconf" 10RDEPENDS_${PN} = "formfactor matchbox-theme-sato matchbox-panel-2 matchbox-desktop 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