Skip to contentSkip to conversation

pcmanfm: hide the desktop preferences

PATCH New Ross Burton 1 participant 2 messages Sep 27, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 pcmanfm: hide the desktop preferences

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

---
 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 deletion(-)
 create mode 100644 meta/recipes-sato/pcmanfm/files/no-desktop.patch
meta/recipes-sato/pcmanfm/files/no-desktop.patch new file +15 -0
new file mode 100644
index 0000000..cb4cae0
@@ -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 <[email protected]>
+
+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
meta/recipes-sato/pcmanfm/pcmanfm_1.1.0.bb +2 -1
index bcfc9db..9a038fe 100644
@@ -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"
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 2/2 sato-icon-theme: add more compatibility symlinks

libfm uses "preferences-desktop", so link it to the close-enough "preferences-sytem".

x11vnc uses "computer", link it to "terminal".

pcmanfm uses "system-file-manager", link it to "file-manager".

[ YOCTO #4062 ]

---
 meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb |    6 ++++++
 1 file changed, 6 insertions(+)
meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb +6 -0
index cb3b68c..cf23aeb 100644
@@ -23,6 +23,12 @@ FILES_${PN} += "${datadir}"
 
 EXTRA_OECONF += "--with-iconmap=${@d.getVar('STAGING_LIBEXECDIR_NATIVE', True).replace('sato-icon-theme', 'icon-naming-utils')}/icon-name-mapping"
 
+do_install_append() {
+	find ${D}${datadir}/icons/Sato/ -maxdepth 1 -type d -exec ln -s preferences-system.png {}/apps/preferences-desktop.png \;
+	find ${D}${datadir}/icons/Sato/ -maxdepth 1 -type d -exec ln -s file-manager.png {}/apps/system-file-manager.png \;
+	find ${D}${datadir}/icons/Sato/ -maxdepth 1 -type d -exec ln -s ../apps/terminal.png {}/places/computer.png \;
+}
+
 # Explictly setting "Sato" as the default icon theme to avoid flickering from
 # the desktop and settings daemon racing.  This shouldn't be done here but in the sato image
 pkg_postinst_${PN} () {
Signature · 1 line
1.7.10.4