[oe-commits] org.oe.dev mboxkbd-layouts-gui: Sane-itize and add desktop icon.

[pfalcon commit]

mboxkbd-layouts-gui: Sane-itize and add desktop icon.
* Icon was shamelessly hacked up from matchbox-keyboards' and gpe-conf-time's.

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 81f7a9419340c5b95049b469ee7afe7b044285c9
ViewMTN: http://monotone.openembedded.org/revision/info/81f7a9419340c5b95049b469ee7afe7b044285c9
Files:
1
packages/matchbox-keyboard/mboxkbd-layouts-gui
packages/matchbox-keyboard/mboxkbd-layouts-gui/auto-mkdir.patch
packages/matchbox-keyboard/mboxkbd-layouts-gui/mboxkbd-layouts-gui.png
packages/matchbox-keyboard/mboxkbd-layouts-gui/sanitize-desktop-file.patch
packages/matchbox-keyboard/mboxkbd-layouts-gui_git.bb
mtn:manual_merge
true
Diffs:

#
# mt diff -r1dd9239c31e9fef0dc0181e828512c35f83bf5ce -r81f7a9419340c5b95049b469ee7afe7b044285c9
#
# 
# 
# add_dir "packages/matchbox-keyboard/mboxkbd-layouts-gui"
# 
# add_file "packages/matchbox-keyboard/mboxkbd-layouts-gui/auto-mkdir.patch"
#  content [74bbaabad86fc467bc01de331c18f0797a56169c]
# 
# add_file "packages/matchbox-keyboard/mboxkbd-layouts-gui/mboxkbd-layouts-gui.png"
#  content [3a64c92f7f036bca12c7b29c3b3c7b73acab7912]
# 
# add_file "packages/matchbox-keyboard/mboxkbd-layouts-gui/sanitize-desktop-file.patch"
#  content [4eb896267100555d1575098445ea7771e42000a9]
# 
# patch "packages/matchbox-keyboard/mboxkbd-layouts-gui_git.bb"
#  from [829c07ddef2c0dc2984f49728495a7e1af8a3422]
#    to [bbcb55b0aede344f191888cc951afcea162de62d]
# 
#   set "packages/matchbox-keyboard/mboxkbd-layouts-gui/mboxkbd-layouts-gui.png"
#  attr "mtn:manual_merge"
# value "true"
# 
============================================================
--- packages/matchbox-keyboard/mboxkbd-layouts-gui/auto-mkdir.patch	74bbaabad86fc467bc01de331c18f0797a56169c
+++ packages/matchbox-keyboard/mboxkbd-layouts-gui/auto-mkdir.patch	74bbaabad86fc467bc01de331c18f0797a56169c
@@ -0,0 +1,16 @@
+diff -r cccb513c808c src/interface.c
+--- a/src/interface.c	Wed Nov 28 01:22:54 2007 +0200
++++ b/src/interface.c	Wed Nov 28 01:43:12 2007 +0200
+@@ -93,8 +93,12 @@ static void fill_user_list(GtkListStore 
+  strcpy(linkpath, home_dir);
+  strcat(linkpath, "/");
+  strcat(linkpath, USR_LAYOUT_SUFFIX);
++ if (access(linkpath, X_OK)) {
++    mkdir(linkpath, 0711);
++ }
+  dir = opendir(linkpath);
+  if(!dir) {
++    fprintf(stderr, "Cannot read %s directory: ", linkpath);
+     perror("opendir");
+     exit(1);
+  }
============================================================
# packages/matchbox-keyboard/mboxkbd-layouts-gui/mboxkbd-layouts-gui.png is binary
============================================================
--- packages/matchbox-keyboard/mboxkbd-layouts-gui/sanitize-desktop-file.patch	4eb896267100555d1575098445ea7771e42000a9
+++ packages/matchbox-keyboard/mboxkbd-layouts-gui/sanitize-desktop-file.patch	4eb896267100555d1575098445ea7771e42000a9
@@ -0,0 +1,18 @@
+diff -r a6959d06b0fb mk-layouts-gui.desktop
+--- a/mk-layouts-gui.desktop	Wed Nov 28 02:07:06 2007 +0200
++++ b/mk-layouts-gui.desktop	Wed Nov 28 02:08:49 2007 +0200
+@@ -1,9 +1,9 @@
+ [Desktop Entry]
+ Name=MK Layout Manager
+ Comment=Manage matchbox-keyboard layouts
+-Exec=mk-layouts-gui
++Exec=mboxkbd-layouts-gui
+ Type=Application
+-Icon=mk-layouts-gui.png
+-Categories=Application;SystemSettings;MB
+-StartupNotify=True
+-SingleInstance=True
++Icon=mboxkbd-layouts-gui
++Categories=Application;SystemSettings;MB;
++StartupNotify=true
++SingleInstance=true
============================================================
--- packages/matchbox-keyboard/mboxkbd-layouts-gui_git.bb	829c07ddef2c0dc2984f49728495a7e1af8a3422
+++ packages/matchbox-keyboard/mboxkbd-layouts-gui_git.bb	bbcb55b0aede344f191888cc951afcea162de62d
@@ -1,14 +1,22 @@ DEPENDS = "gtk+"
 DESCRIPTION = "matchbox-keyboard layouts control application"
 AUTHOR = "Sergey Lapin"
 SECTION = "x11"
 LICENSE = "GPL"
 DEPENDS = "gtk+"
-PR = "r3"
+PR = "r4"
 
-PV = "0.0+git${SRCDATE}"
+PV = "0.0+git5b42aeff36d930dc3a9b75eedc74dacfec45f43f"
 
-SRC_URI = "git://ossfans.org/home/slapin/git/mk-layouts-gui.git;protocol=git"
+SRC_URI = "git://ossfans.org/home/slapin/git/mk-layouts-gui.git;protocol=git;tag=5b42aeff36d930dc3a9b75eedc74dacfec45f43f \
+           file://auto-mkdir.patch;patch=1 \
+	   file://sanitize-desktop-file.patch;patch=1 \
+	   file://mboxkbd-layouts-gui.png"
 
 S = "${WORKDIR}/git"
 
 inherit autotools
+
+do_install_append() {
+        install -d ${D}${datadir}/pixmaps
+        install -m 0644 ${WORKDIR}/mboxkbd-layouts-gui.png ${D}${datadir}/pixmaps/
+}