summaryrefslogtreecommitdiff
path: root/packages/matchbox-keyboard
diff options
context:
space:
mode:
Diffstat (limited to 'packages/matchbox-keyboard')
-rw-r--r--packages/matchbox-keyboard/matchbox-keyboard_svn.bb8
-rw-r--r--packages/matchbox-keyboard/mboxkbd-layouts-gui/.mtn2git_empty0
-rw-r--r--packages/matchbox-keyboard/mboxkbd-layouts-gui/auto-mkdir.patch16
-rw-r--r--packages/matchbox-keyboard/mboxkbd-layouts-gui/mboxkbd-layouts-gui.pngbin0 -> 739 bytes
-rw-r--r--packages/matchbox-keyboard/mboxkbd-layouts-gui/sanitize-desktop-file.patch18
-rw-r--r--packages/matchbox-keyboard/mboxkbd-layouts-gui_git.bb15
6 files changed, 50 insertions, 7 deletions
diff --git a/packages/matchbox-keyboard/matchbox-keyboard_svn.bb b/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
index 27ea4aea1d..696486b6ef 100644
--- a/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
+++ b/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
@@ -5,13 +5,13 @@ RCONFLICTS = matchbox-keyboard-inputmethod
RPROVIDES_${PN} = matchbox-keyboard-inputmethod
SECTION = "x11"
PV = "0.0+svnr${SRCREV}"
-PR="r6"
+PR="r7"
SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
file://smallscreen-fontsize.patch;patch=1 \
-# file://2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch;patch=1 \
-# file://3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch;patch=1 \
-# file://4-Add-rendering-debug-logging.patch;patch=1 \
+ file://2-Add-new-modifier--layout--Used-to-cycle-thru-all-available-layouts.patch;patch=1 \
+ file://3-Changes-to-improve-layout-rendering--especially-after-adding-support-for.patch;patch=1 \
+ file://4-Add-rendering-debug-logging.patch;patch=1 \
file://5-Add-support-for-loading-multiple-independent-layouts.patch;patch=1 \
file://6-Add-layout-switch-key-to-all-layouts.patch;patch=1 \
"
diff --git a/packages/matchbox-keyboard/mboxkbd-layouts-gui/.mtn2git_empty b/packages/matchbox-keyboard/mboxkbd-layouts-gui/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/matchbox-keyboard/mboxkbd-layouts-gui/.mtn2git_empty
diff --git a/packages/matchbox-keyboard/mboxkbd-layouts-gui/auto-mkdir.patch b/packages/matchbox-keyboard/mboxkbd-layouts-gui/auto-mkdir.patch
new file mode 100644
index 0000000000..82f6cb50b9
--- /dev/null
+++ b/packages/matchbox-keyboard/mboxkbd-layouts-gui/auto-mkdir.patch
@@ -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);
+ }
diff --git a/packages/matchbox-keyboard/mboxkbd-layouts-gui/mboxkbd-layouts-gui.png b/packages/matchbox-keyboard/mboxkbd-layouts-gui/mboxkbd-layouts-gui.png
new file mode 100644
index 0000000000..d08be372ac
--- /dev/null
+++ b/packages/matchbox-keyboard/mboxkbd-layouts-gui/mboxkbd-layouts-gui.png
Binary files differ
diff --git a/packages/matchbox-keyboard/mboxkbd-layouts-gui/sanitize-desktop-file.patch b/packages/matchbox-keyboard/mboxkbd-layouts-gui/sanitize-desktop-file.patch
new file mode 100644
index 0000000000..095a8d337a
--- /dev/null
+++ b/packages/matchbox-keyboard/mboxkbd-layouts-gui/sanitize-desktop-file.patch
@@ -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
diff --git a/packages/matchbox-keyboard/mboxkbd-layouts-gui_git.bb b/packages/matchbox-keyboard/mboxkbd-layouts-gui_git.bb
index 2dfba07fc7..6a466a1e9a 100644
--- a/packages/matchbox-keyboard/mboxkbd-layouts-gui_git.bb
+++ b/packages/matchbox-keyboard/mboxkbd-layouts-gui_git.bb
@@ -3,12 +3,21 @@ AUTHOR = "Sergey Lapin"
SECTION = "x11"
LICENSE = "GPL"
DEPENDS = "gtk+"
-PR = "r3"
+PR = "r5"
-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 = "http://linux-h4000.sourceforge.net/mirror/mk-layouts-gui.git_5b42aeff36d930dc3a9b75eedc74dacfec45f43f.tar.gz \
+#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/
+}