mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

matchbox-desktop: Add Sato folder configuration

Browse Source 
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>
This commit is contained in:
Jussi Kukkonen
2016-06-01 10:57:32 +03:00
committed by Richard Purdie
parent bff5f0efb3
commit f9c78510d6
8 changed files with 43 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb
View File

@@ -1,22 +0,0 @@
SUMMARY = "Matchbox desktop folders for the Sato environment"
HOMEPAGE = "http://matchbox-project.org"
BUGTRACKER = "http://bugzilla.yoctoproject.org/"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
SECTION = "x11"
DEPENDS = ""
RCONFLICTS_${PN} = "matchbox-common"
SRCREV = "810b0b08eb79e4685202da2ec347b990bb467e07"
PV = "0.1+git${SRCPV}"
PR = "r1"
SRC_URI = "git://git.yoctoproject.org/${BPN}"
S = "${WORKDIR}/git"
inherit autotools pkgconfig
FILES_${PN} += "${datadir}"

5
meta/recipes-sato/matchbox-desktop/files/vfolders/All.directory Normal file
View File

@@ -0,0 +1,5 @@
[Desktop Entry]
Name=All
Icon=mbfolder.png
Type=Directory
Match=meta-all

6
meta/recipes-sato/matchbox-desktop/files/vfolders/Applications.directory Normal file
View File

@@ -0,0 +1,6 @@
[Desktop Entry]
Name=Applications
Comment=Applications
Icon=gnome-applications.png
Type=Directory
Match=AudioVideo;Audio;Video;Graphics;Network;Office;Utility;System;Development;meta-fallback;

9
meta/recipes-sato/matchbox-desktop/files/vfolders/Games.directory Normal file
View File

@@ -0,0 +1,9 @@
[Desktop Entry]
Name=Games
Name[de]=Spiele
Comment=Games of all kind
Comment[de]=Spiele aller Art
Icon=mbfolder.png
Type=Directory
Match=Game

4
meta/recipes-sato/matchbox-desktop/files/vfolders/Root.order Normal file
View File

@@ -0,0 +1,4 @@
Applications
Games
Settings
All

8
meta/recipes-sato/matchbox-desktop/files/vfolders/Settings.directory Normal file
View File

@@ -0,0 +1,8 @@
[Desktop Entry]
Name=Settings
Name[de]=Einstellungen
Comment=Settings for your handheld computer
Comment[de]=Einstellungen für Ihren Handheld-Computer
Icon=mbfolder.png
Type=Directory
Match=Settings

11
meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.1.bb
View File

@@ -12,7 +12,9 @@ SECTION = "x11/wm"
# SRCREV tagged 2.1
SRCREV = "c8473519a0f37488b8b3e839e275b000cdde0b80"
SRC_URI = "git://git.yoctoproject.org/${BPN}-2"
SRC_URI = "git://git.yoctoproject.org/${BPN}-2 \
file://vfolders/* \
"
EXTRA_OECONF = "--enable-startup-notification --with-dbus"
@@ -22,3 +24,10 @@ inherit autotools pkgconfig distro_features_check
# The startup-notification requires x11 in DISTRO_FEATURES
REQUIRED_DISTRO_FEATURES = "x11"
do_install_append() {
install -d ${D}${datadir}/matchbox/vfolders/
install -m 0644 ${WORKDIR}/vfolders/* ${D}${datadir}/matchbox/vfolders/
}
FILES_${PN} += "${datadir}/matchbox/vfolders/"

2
meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb
View File

@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://session;endline=3;md5=f8a5c5b9c279e52dc094d10e11c2be6
SECTION = "x11"
DEPENDS = "gconf-native"
RDEPENDS_${PN} = "formfactor matchbox-theme-sato matchbox-panel-2 matchbox-desktop-sato matchbox-session gconf"
RDEPENDS_${PN} = "formfactor matchbox-theme-sato matchbox-panel-2 matchbox-desktop matchbox-session gconf"
PR = "r30"
# This package is architecture specific because the session script is modified