From fa215a27b8e143e202499dcf4b962efa9476d4e0 Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Thu, 3 Apr 2014 11:46:31 +0200
Subject: [PATCH] Revert "matchbox-keyboard: fix virtual keyboard on graphical
 images"

The fix was added upstream (Poky)

This reverts commit 67f5c8b103a2de7e015b735e3077195aa8b7dd62.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 .../files/80matchboxkeyboard.sh               | 27 -------------------
 .../matchbox-keyboard_git.bbappend            | 13 ---------
 2 files changed, 40 deletions(-)
 delete mode 100644 meta-digi-dey/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh
 delete mode 100644 meta-digi-dey/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bbappend

diff --git a/meta-digi-dey/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh b/meta-digi-dey/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh
deleted file mode 100644
index 3733a5f79..000000000
--- a/meta-digi-dey/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-. /etc/formfactor/config
-
-CMD=""
-
-# Group the commands in a function so they can be run in background
-run_keyboard() {
-    # Delay to make sure the window manager is active
-    # by waiting for the desktop to say its finished loading
-    dbus-wait org.matchbox_project.desktop Loaded
-    exec $CMD
-}
-
-if [ "$HAVE_KEYBOARD" = "0" ]; then
-    CMD="matchbox-keyboard -d"
-elif [ "$DISPLAY_CAN_ROTATE" = "1" ]; then
-    if [ "$HAVE_KEYBOARD_PORTRAIT" = "1" -a "$HAVE_KEYBOARD_LANDSCAPE" = "0" ]; then
-        CMD="matchbox-keyboard -d -o landscape"
-    elif [ "$HAVE_KEYBOARD_LANDSCAPE" = "1" -a "$HAVE_KEYBOARD_PORTRAIT" = "0" ]; then
-        CMD="matchbox-keyboard -d -o portrait"
-    fi
-fi
-
-if [ "$CMD" ]; then
-    run_keyboard &
-fi
diff --git a/meta-digi-dey/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bbappend b/meta-digi-dey/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bbappend
deleted file mode 100644
index 65045a7ba..000000000
--- a/meta-digi-dey/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bbappend
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (C) 2014 Digi International.
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-SRC_URI += " \
-    file://80matchboxkeyboard.sh \
-"
-
-do_install_append () {
-	# Remove upstream '80matchboxkeyboard.shbg' file and install ours
-	rm -f ${D}/${sysconfdir}/X11/Xsession.d/80matchboxkeyboard.shbg
-	install -m 0755 ${WORKDIR}/80matchboxkeyboard.sh ${D}/${sysconfdir}/X11/Xsession.d/
-}