From 42d92eabcd6e54db551f6b2577ae6b6da0b778b8 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Wed, 1 Jun 2016 10:57:32 +0300 Subject: 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. Signed-off-by: Jussi Kukkonen Signed-off-by: Ross Burton --- .../matchbox-desktop-sato_git.bb | 22 ---------------------- .../matchbox-desktop/files/vfolders/All.directory | 5 +++++ .../files/vfolders/Applications.directory | 6 ++++++ .../files/vfolders/Games.directory | 9 +++++++++ .../matchbox-desktop/files/vfolders/Root.order | 4 ++++ .../files/vfolders/Settings.directory | 8 ++++++++ .../matchbox-desktop/matchbox-desktop_2.1.bb | 11 ++++++++++- .../matchbox-sato/matchbox-session-sato_0.1.bb | 2 +- 8 files changed, 43 insertions(+), 24 deletions(-) delete mode 100644 meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb create mode 100644 meta/recipes-sato/matchbox-desktop/files/vfolders/All.directory create mode 100644 meta/recipes-sato/matchbox-desktop/files/vfolders/Applications.directory create mode 100644 meta/recipes-sato/matchbox-desktop/files/vfolders/Games.directory create mode 100644 meta/recipes-sato/matchbox-desktop/files/vfolders/Root.order create mode 100644 meta/recipes-sato/matchbox-desktop/files/vfolders/Settings.directory 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 @@ -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}" 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 @@ +[Desktop Entry] +Name=All +Icon=mbfolder.png +Type=Directory +Match=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 @@ +[Desktop Entry] +Name=Applications +Comment=Applications +Icon=gnome-applications.png +Type=Directory +Match=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 @@ +[Desktop Entry] +Name=Games +Name[de]=Spiele +Comment=Games of all kind +Comment[de]=Spiele aller Art +Icon=mbfolder.png +Type=Directory +Match=Game + 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 @@ +Applications +Games +Settings +All 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 @@ +[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 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" # 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/" 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 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 -- cgit 1.2.3-korg