diff options
| -rw-r--r-- | packages/xserver-common/files/default.xmodmap | 123 | ||||
| -rw-r--r-- | packages/xserver-common/files/fixes-fix-fix.patch | 20 | ||||
| -rw-r--r-- | packages/xserver-common/files/kdrive-1.4-fixes-fix.patch | 22 | ||||
| -rw-r--r-- | packages/xserver-common/files/kdrive-1.4-fixes.patch | 264 | ||||
| -rw-r--r-- | packages/xserver-common/xserver-common_1.22.bb | 10 |
5 files changed, 129 insertions, 310 deletions
diff --git a/packages/xserver-common/files/default.xmodmap b/packages/xserver-common/files/default.xmodmap new file mode 100644 index 0000000000..005257d7d2 --- /dev/null +++ b/packages/xserver-common/files/default.xmodmap @@ -0,0 +1,123 @@ +keycode 9 = Escape +keycode 10 = 1 exclam +keycode 11 = 2 at +keycode 12 = 3 numbersign +keycode 13 = 4 dollar +keycode 14 = 5 percent +keycode 15 = 6 asciicircum +keycode 16 = 7 ampersand braceleft +keycode 17 = 8 asterisk bracketleft +keycode 18 = 9 parenleft bracketright +keycode 19 = 0 parenright braceright +keycode 20 = minus underscore backslash +keycode 21 = equal plus +keycode 22 = BackSpace +keycode 23 = Tab +keycode 24 = q Q q +keycode 25 = w W w +keycode 26 = e E +keycode 27 = r R r +keycode 28 = t T t +keycode 29 = y Y y +keycode 30 = u U u +keycode 31 = i I i +keycode 32 = o O o +keycode 33 = p P p +keycode 34 = bracketleft braceleft +keycode 35 = bracketright braceright asciitilde +keycode 36 = Return +keycode 37 = Control_L +keycode 38 = a A +keycode 39 = s S s +keycode 40 = d D +keycode 41 = f F +keycode 42 = g G g +keycode 43 = h H h +keycode 44 = j J j +keycode 45 = k K k +keycode 46 = l L l +keycode 47 = semicolon colon +keycode 48 = apostrophe quotedbl +keycode 49 = grave asciitilde +keycode 50 = Shift_L +keycode 51 = backslash bar +keycode 52 = z Z z +keycode 53 = x X x +keycode 54 = c C +keycode 55 = v V v +keycode 56 = b B +keycode 57 = n N n +keycode 58 = m M m +keycode 59 = comma less +keycode 60 = period greater +keycode 61 = slash question +keycode 62 = Shift_R +keycode 63 = KP_Multiply +keycode 64 = Alt_L +keycode 65 = space +keycode 66 = Caps_Lock +keycode 67 = F1 F11 +keycode 68 = F2 F12 +keycode 69 = F3 F13 +keycode 70 = F4 F14 +keycode 71 = F5 F15 +keycode 72 = F6 F16 +keycode 73 = F7 F17 +keycode 74 = F8 F18 +keycode 75 = F9 F19 +keycode 76 = F10 F20 +keycode 77 = Num_Lock +keycode 78 = Scroll_Lock +keycode 79 = KP_7 +keycode 80 = KP_8 +keycode 81 = KP_9 +keycode 82 = KP_Subtract +keycode 83 = KP_4 +keycode 84 = KP_5 +keycode 85 = KP_6 +keycode 86 = KP_Add +keycode 87 = KP_1 +keycode 88 = KP_2 +keycode 89 = KP_3 +keycode 90 = KP_0 +keycode 91 = KP_Decimal +keycode 94 = less greater bar +keycode 95 = F11 +keycode 96 = F12 +keycode 104 = KP_Enter +keycode 105 = Control_R +keycode 106 = KP_Divide +keycode 108 = Mode_switch +keycode 109 = Break +keycode 110 = Home +keycode 111 = Up +keycode 112 = Prior +keycode 113 = Left +keycode 114 = Right +keycode 115 = End +keycode 116 = Down +keycode 117 = Next +keycode 118 = Insert +keycode 119 = Delete +keycode 120 = Menu +keycode 121 = F13 +keycode 122 = F14 +keycode 123 = Help +keycode 124 = Execute +keycode 125 = F17 +keycode 126 = KP_Subtract +keycode 127 = Pause +keycode 198 = Up +keycode 200 = Left +keycode 201 = Right +keycode 204 = Down + +add shift = Shift_L +add shift = Shift_R +add shift = Menu +add lock = Caps_Lock +add control = Control_L +add control = Control_R +add mod1 = Alt_L +add mod2 = Num_Lock +add mod4 = Mode_switch diff --git a/packages/xserver-common/files/fixes-fix-fix.patch b/packages/xserver-common/files/fixes-fix-fix.patch deleted file mode 100644 index c44e0277b5..0000000000 --- a/packages/xserver-common/files/fixes-fix-fix.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- /tmp/default.xmodmap 2008-08-10 20:06:35.000000000 +0200 -+++ xserver-common-1.22/X11/default.xmodmap 2008-08-10 20:07:04.000000000 +0200 -@@ -188,13 +188,13 @@ - keycode 195 = - keycode 196 = - keycode 197 = --keycode 198 = -+keycode 198 = Up - keycode 199 = --keycode 200 = --keycode 201 = -+keycode 200 = Left -+keycode 201 = Right - keycode 202 = - keycode 203 = --keycode 204 = -+keycode 204 = Down - keycode 205 = - keycode 206 = - keycode 207 = diff --git a/packages/xserver-common/files/kdrive-1.4-fixes-fix.patch b/packages/xserver-common/files/kdrive-1.4-fixes-fix.patch deleted file mode 100644 index 14b77e20e9..0000000000 --- a/packages/xserver-common/files/kdrive-1.4-fixes-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- /tmp/12keymap 2008-06-07 12:24:24.425525517 +0200 -+++ xserver-common-1.22/X11/Xinit.d/12keymap 2008-06-07 12:27:35.152175933 +0200 -@@ -2,9 +2,6 @@ - - MACHINE=`awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo` - --# since kdrive 1.4 there is no default keymap in server --xmodmap - </etc/X11/default.xmodmap -- - case $MACHINE in - "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi") - xmodmap - < /etc/X11/shepherd.xmodmap -@@ -28,5 +25,9 @@ - "Simpad" | "HP iPAQ"* | "Asus MyPal"*) - xmodmap - < /etc/X11/keyboardless.xmodmap - ;; -+ *) -+ # since kdrive 1.4 there is no default keymap in server -+ xmodmap - </etc/X11/default.xmodmap -+ ;; - esac - diff --git a/packages/xserver-common/files/kdrive-1.4-fixes.patch b/packages/xserver-common/files/kdrive-1.4-fixes.patch index 1526e73098..25562b5218 100644 --- a/packages/xserver-common/files/kdrive-1.4-fixes.patch +++ b/packages/xserver-common/files/kdrive-1.4-fixes.patch @@ -49,267 +49,3 @@ diff -Nurd xserver-common-1.22.old/X11/Xserver xserver-common-1.22/X11/Xserver +echo "tslib: $TSLIB_TSDEVICE" +echo "exec $XSERVER $ARGS $*" exec $XSERVER $ARGS $* -diff -Nurd xserver-common-1.22.old/X11/default.xmodmap xserver-common-1.22/X11/default.xmodmap ---- xserver-common-1.22.old/X11/default.xmodmap 1970-01-01 01:00:00.000000000 +0100 -+++ xserver-common-1.22/X11/default.xmodmap 2008-05-04 17:30:48.278316443 +0200 -@@ -0,0 +1,260 @@ -+keycode 8 = -+keycode 9 = Escape -+keycode 10 = 1 exclam -+keycode 11 = 2 at -+keycode 12 = 3 numbersign -+keycode 13 = 4 dollar -+keycode 14 = 5 percent -+keycode 15 = 6 asciicircum -+keycode 16 = 7 ampersand braceleft -+keycode 17 = 8 asterisk bracketleft -+keycode 18 = 9 parenleft bracketright -+keycode 19 = 0 parenright braceright -+keycode 20 = minus underscore backslash -+keycode 21 = equal plus -+keycode 22 = BackSpace -+keycode 23 = Tab -+keycode 24 = q Q q -+keycode 25 = w W w -+keycode 26 = e E -+keycode 27 = r R r -+keycode 28 = t T t -+keycode 29 = y Y y -+keycode 30 = u U u -+keycode 31 = i I i -+keycode 32 = o O o -+keycode 33 = p P p -+keycode 34 = bracketleft braceleft -+keycode 35 = bracketright braceright asciitilde -+keycode 36 = Return -+keycode 37 = Control_L -+keycode 38 = a A -+keycode 39 = s S s -+keycode 40 = d D -+keycode 41 = f F -+keycode 42 = g G g -+keycode 43 = h H h -+keycode 44 = j J j -+keycode 45 = k K k -+keycode 46 = l L l -+keycode 47 = semicolon colon -+keycode 48 = apostrophe quotedbl -+keycode 49 = grave asciitilde -+keycode 50 = Shift_L -+keycode 51 = backslash bar -+keycode 52 = z Z z -+keycode 53 = x X x -+keycode 54 = c C -+keycode 55 = v V v -+keycode 56 = b B -+keycode 57 = n N n -+keycode 58 = m M m -+keycode 59 = comma less -+keycode 60 = period greater -+keycode 61 = slash question -+keycode 62 = Shift_R -+keycode 63 = KP_Multiply -+keycode 64 = Alt_L -+keycode 65 = space -+keycode 66 = Caps_Lock -+keycode 67 = F1 F11 -+keycode 68 = F2 F12 -+keycode 69 = F3 F13 -+keycode 70 = F4 F14 -+keycode 71 = F5 F15 -+keycode 72 = F6 F16 -+keycode 73 = F7 F17 -+keycode 74 = F8 F18 -+keycode 75 = F9 F19 -+keycode 76 = F10 F20 -+keycode 77 = Num_Lock -+keycode 78 = Scroll_Lock -+keycode 79 = KP_7 -+keycode 80 = KP_8 -+keycode 81 = KP_9 -+keycode 82 = KP_Subtract -+keycode 83 = KP_4 -+keycode 84 = KP_5 -+keycode 85 = KP_6 -+keycode 86 = KP_Add -+keycode 87 = KP_1 -+keycode 88 = KP_2 -+keycode 89 = KP_3 -+keycode 90 = KP_0 -+keycode 91 = KP_Decimal -+keycode 92 = -+keycode 93 = -+keycode 94 = less greater bar -+keycode 95 = F11 -+keycode 96 = F12 -+keycode 97 = -+keycode 98 = -+keycode 99 = -+keycode 100 = -+keycode 101 = -+keycode 102 = -+keycode 103 = -+keycode 104 = KP_Enter -+keycode 105 = Control_R -+keycode 106 = KP_Divide -+keycode 107 = -+keycode 108 = Mode_switch -+keycode 109 = Break -+keycode 110 = Home -+keycode 111 = Up -+keycode 112 = Prior -+keycode 113 = Left -+keycode 114 = Right -+keycode 115 = End -+keycode 116 = Down -+keycode 117 = Next -+keycode 118 = Insert -+keycode 119 = Delete -+keycode 120 = Menu -+keycode 121 = F13 -+keycode 122 = F14 -+keycode 123 = Help -+keycode 124 = Execute -+keycode 125 = F17 -+keycode 126 = KP_Subtract -+keycode 127 = Pause -+keycode 128 = -+keycode 129 = -+keycode 130 = -+keycode 131 = -+keycode 132 = -+keycode 133 = -+keycode 134 = -+keycode 135 = -+keycode 136 = -+keycode 137 = -+keycode 138 = -+keycode 139 = -+keycode 140 = -+keycode 141 = -+keycode 142 = -+keycode 143 = -+keycode 144 = -+keycode 145 = -+keycode 146 = -+keycode 147 = -+keycode 148 = -+keycode 149 = -+keycode 150 = -+keycode 151 = -+keycode 152 = -+keycode 153 = -+keycode 154 = -+keycode 155 = -+keycode 156 = -+keycode 157 = -+keycode 158 = -+keycode 159 = -+keycode 160 = -+keycode 161 = -+keycode 162 = -+keycode 163 = -+keycode 164 = -+keycode 165 = -+keycode 166 = -+keycode 167 = -+keycode 168 = -+keycode 169 = -+keycode 170 = -+keycode 171 = -+keycode 172 = -+keycode 173 = -+keycode 174 = -+keycode 175 = -+keycode 176 = -+keycode 177 = -+keycode 178 = -+keycode 179 = -+keycode 180 = -+keycode 181 = -+keycode 182 = -+keycode 183 = -+keycode 184 = -+keycode 185 = -+keycode 186 = -+keycode 187 = -+keycode 188 = -+keycode 189 = -+keycode 190 = -+keycode 191 = -+keycode 192 = -+keycode 193 = -+keycode 194 = -+keycode 195 = -+keycode 196 = -+keycode 197 = -+keycode 198 = -+keycode 199 = -+keycode 200 = -+keycode 201 = -+keycode 202 = -+keycode 203 = -+keycode 204 = -+keycode 205 = -+keycode 206 = -+keycode 207 = -+keycode 208 = -+keycode 209 = -+keycode 210 = -+keycode 211 = -+keycode 212 = -+keycode 213 = -+keycode 214 = -+keycode 215 = -+keycode 216 = -+keycode 217 = -+keycode 218 = -+keycode 219 = -+keycode 220 = -+keycode 221 = -+keycode 222 = -+keycode 223 = -+keycode 224 = -+keycode 225 = -+keycode 226 = -+keycode 227 = -+keycode 228 = -+keycode 229 = -+keycode 230 = -+keycode 231 = -+keycode 232 = -+keycode 233 = -+keycode 234 = -+keycode 235 = -+keycode 236 = -+keycode 237 = -+keycode 238 = -+keycode 239 = -+keycode 240 = -+keycode 241 = -+keycode 242 = -+keycode 243 = -+keycode 244 = -+keycode 245 = -+keycode 246 = -+keycode 247 = -+keycode 248 = -+keycode 249 = -+keycode 250 = -+keycode 251 = -+keycode 252 = -+keycode 253 = -+keycode 254 = -+ -+add shift = Shift_L -+add shift = Shift_R -+add shift = Menu -+add lock = Caps_Lock -+add control = Control_L -+add control = Control_R -+add mod1 = Alt_L -+add mod2 = Num_Lock -+!mod3 -+add mod4 = Mode_switch -+!mod5 -+ diff --git a/packages/xserver-common/xserver-common_1.22.bb b/packages/xserver-common/xserver-common_1.22.bb index 9ef4e457d2..6dcbc6862d 100644 --- a/packages/xserver-common/xserver-common_1.22.bb +++ b/packages/xserver-common/xserver-common_1.22.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files" LICENSE = "GPL" SECTION = "x11" RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo" -PR = "r6" +PR = "r7" PACKAGE_ARCH = "all" @@ -11,10 +11,12 @@ inherit gpe SRC_URI_append = " file://setDPI.sh " SRC_URI_append_angstrom = " file://kdrive-1.4-fixes.patch;patch=1 \ - file://kdrive-1.4-fixes-fix.patch;patch=1 \ - file://fixes-fix-fix.patch;patch=1 \ -" + file://default.xmodmap " do_install_append() { install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi" } + +do_install_append_angstrom() { + install -m 0644 ${WORKDIR}/default.xmodmap ${D}/etc/X11/ +} |