aboutsummaryrefslogtreecommitdiffstats
path: root/packages/xserver-common
diff options
context:
space:
mode:
authorPaul Sokolovsky <pmiscml@gmail.com>2007-12-22 13:14:45 +0000
committerPaul Sokolovsky <pmiscml@gmail.com>2007-12-22 13:14:45 +0000
commit194b355c79ea1747081112ba798b83b5fb8d83c2 (patch)
tree97cdedf23fa7e2a9674337cde7cf532f985a5493 /packages/xserver-common
parent44ef8aee5df1b3f6d4595c660f2f772e9e0d484c (diff)
downloadopenembedded-194b355c79ea1747081112ba798b83b5fb8d83c2.tar.gz
xserver-common 1.18: Unreak Simpad power button handling.
* Should fix #2598.
Diffstat (limited to 'packages/xserver-common')
-rw-r--r--packages/xserver-common/files/unbreak-simpad.patch18
-rw-r--r--packages/xserver-common/xserver-common_1.18.bb4
2 files changed, 20 insertions, 2 deletions
diff --git a/packages/xserver-common/files/unbreak-simpad.patch b/packages/xserver-common/files/unbreak-simpad.patch
new file mode 100644
index 0000000000..7f557c317d
--- /dev/null
+++ b/packages/xserver-common/files/unbreak-simpad.patch
@@ -0,0 +1,18 @@
+--- xserver-common-1.18/X11/Xinit.d/12keymap.org 2007-08-24 14:14:31.000000000 +0300
++++ xserver-common-1.18/X11/Xinit.d/12keymap 2007-12-22 15:06:52.000000000 +0200
+@@ -15,14 +15,11 @@
+ "Sharp-Collie")
+ xmodmap - < /etc/X11/collie.xmodmap
+ ;;
+- "Simpad")
+- xmodmap - < /etc/X11/simpad.xmodmap
+- ;;
+ "HP iPAQ h6300")
+ xmodmap - < /etc/X11/h6300.xmodmap
+ ;;
+ # All the rest of keyboardless PDA machines use common buttonmap
+- "HP iPAQ"* | "Asus MyPal"*)
++ "Simpad" | "HP iPAQ"* | "Asus MyPal"*)
+ xmodmap - < /etc/X11/keyboardless.xmodmap
+ ;;
+ esac
diff --git a/packages/xserver-common/xserver-common_1.18.bb b/packages/xserver-common/xserver-common_1.18.bb
index a30a37c893..bf7b049939 100644
--- a/packages/xserver-common/xserver-common_1.18.bb
+++ b/packages/xserver-common/xserver-common_1.18.bb
@@ -2,14 +2,14 @@ DESCRIPTION = "Common X11 scripts and support files"
LICENSE = "GPL"
SECTION = "x11"
RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-PR = "r0"
+PR = "r1"
PACKAGE_ARCH = "all"
# we are using a gpe-style Makefile
inherit gpe
-SRC_URI_append = " file://setDPI.sh "
+SRC_URI_append = " file://unbreak-simpad.patch;patch=1 file://setDPI.sh "
do_install_append() {
install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"