[oe-commits] Ross Burton : pcmanfm: hide the desktop preferences

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 778ef56c4b5c0d450a9b2e1df2b3e963dcfebed9
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=778ef56c4b5c0d450a9b2e1df2b3e963dcfebed9

Author: Ross Burton <ross.burton at intel.com>
Date:   Fri Sep 27 16:41:16 2013 +0000

pcmanfm: hide the desktop preferences

Sato doesn't use the pcmanfm desktop, so hide the desktop preferences launcher.

Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-sato/pcmanfm/files/no-desktop.patch |   15 +++++++++++++++
 meta/recipes-sato/pcmanfm/pcmanfm_1.1.0.bb       |    3 ++-
 2 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-sato/pcmanfm/files/no-desktop.patch b/meta/recipes-sato/pcmanfm/files/no-desktop.patch
new file mode 100644
index 0000000..cb4cae0
--- /dev/null
+++ b/meta/recipes-sato/pcmanfm/files/no-desktop.patch
@@ -0,0 +1,15 @@
+Disable the desktop preferences launcher as we don't use the pcmanfm desktop in
+Sato.
+
+Upstream-Status: Inappropriate
+Signed-off-by: Ross Burton <ross.burton at intel.com>
+
+diff --git a/data/pcmanfm-desktop-pref.desktop b/data/pcmanfm-desktop-pref.desktop
+index ccf8abb..3f6fc1c 100644
+--- a/data/pcmanfm-desktop-pref.desktop
++++ b/data/pcmanfm-desktop-pref.desktop
+@@ -97,3 +97,4 @@ Exec=pcmanfm --desktop-pref
+ StartupNotify=true
+ Terminal=false
+ NotShowIn=GNOME;XFCE;KDE;
++NoDisplay=true
diff --git a/meta/recipes-sato/pcmanfm/pcmanfm_1.1.0.bb b/meta/recipes-sato/pcmanfm/pcmanfm_1.1.0.bb
index bcfc9db..9a038fe 100644
--- a/meta/recipes-sato/pcmanfm/pcmanfm_1.1.0.bb
+++ b/meta/recipes-sato/pcmanfm/pcmanfm_1.1.0.bb
@@ -20,7 +20,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/pcmanfm-${PV}.tar.gz \
 	   file://gnome-fs-regular.png \
 	   file://gnome-mime-text-plain.png \
 	   file://emblem-symbolic-link.png \
-	   file://cross-compile-fix.patch"
+	   file://cross-compile-fix.patch \
+	   file://no-desktop.patch"
 
 SRC_URI[md5sum] = "af0cff78690e658f3c06ceabf27bc71a"
 SRC_URI[sha256sum] = "1f6301f330ad648f3322708ec6c0f680a8695a9453932fe19653bab6731e5582"