[oe-commits] org.oe.dev xserver-common 1.18: Unreak Simpad power button handling.

[pfalcon commit]

xserver-common 1.18: Unreak Simpad power button handling.
* Should fix #2598.

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: d3486b4ff2eccd9818a0e6a56a50e123c6528dfa
ViewMTN: http://monotone.openembedded.org/revision/info/d3486b4ff2eccd9818a0e6a56a50e123c6528dfa
Files:
1
packages/xserver-common/files/unbreak-simpad.patch
packages/xserver-common/xserver-common_1.18.bb
Diffs:

#
# mt diff -r87caae2907d7ea9c2073fdb7643ff7b317a29621 -rd3486b4ff2eccd9818a0e6a56a50e123c6528dfa
#
# 
# 
# add_file "packages/xserver-common/files/unbreak-simpad.patch"
#  content [52af625aa3d8a233a99575211661571e46945840]
# 
# patch "packages/xserver-common/xserver-common_1.18.bb"
#  from [14f7d103bf373a302fc67211bc1c91f71605d7fb]
#    to [3409a8ba366a252767d2dd923e81b9c7ea5c824d]
# 
============================================================
--- packages/xserver-common/files/unbreak-simpad.patch	52af625aa3d8a233a99575211661571e46945840
+++ packages/xserver-common/files/unbreak-simpad.patch	52af625aa3d8a233a99575211661571e46945840
@@ -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
============================================================
--- packages/xserver-common/xserver-common_1.18.bb	14f7d103bf373a302fc67211bc1c91f71605d7fb
+++ packages/xserver-common/xserver-common_1.18.bb	3409a8ba366a252767d2dd923e81b9c7ea5c824d
@@ -1,15 +1,15 @@ RDEPENDS_${PN} = "xmodmap xrandr xdpyinf
 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"