diff options
Diffstat (limited to 'meta-extras/packages/xorg-xserver/xserver-kdrive-xomap/disable-xkb.patch')
-rw-r--r-- | meta-extras/packages/xorg-xserver/xserver-kdrive-xomap/disable-xkb.patch | 82 |
1 files changed, 0 insertions, 82 deletions
diff --git a/meta-extras/packages/xorg-xserver/xserver-kdrive-xomap/disable-xkb.patch b/meta-extras/packages/xorg-xserver/xserver-kdrive-xomap/disable-xkb.patch deleted file mode 100644 index 9c38156cd2..0000000000 --- a/meta-extras/packages/xorg-xserver/xserver-kdrive-xomap/disable-xkb.patch +++ /dev/null | |||
@@ -1,82 +0,0 @@ | |||
1 | Index: xorg-server-1.1.99.3/Makefile.am | ||
2 | =================================================================== | ||
3 | --- xorg-server-1.1.99.3.orig/Makefile.am 2008-02-20 22:22:56.000000000 +0000 | ||
4 | +++ xorg-server-1.1.99.3/Makefile.am 2008-02-20 22:23:22.000000000 +0000 | ||
5 | @@ -34,6 +34,11 @@ | ||
6 | XSP_DIR=xsp | ||
7 | endif | ||
8 | |||
9 | +if XKB | ||
10 | +XKB_DIR=xkb | ||
11 | +endif | ||
12 | + | ||
13 | + | ||
14 | SUBDIRS = \ | ||
15 | doc \ | ||
16 | include \ | ||
17 | @@ -46,7 +51,7 @@ | ||
18 | randr \ | ||
19 | render \ | ||
20 | Xi \ | ||
21 | - xkb \ | ||
22 | + $(XKB_DIR) \ | ||
23 | $(DBE_DIR) \ | ||
24 | $(MFB_DIR) \ | ||
25 | $(AFB_DIR) \ | ||
26 | Index: xorg-server-1.1.99.3/configure.ac | ||
27 | =================================================================== | ||
28 | --- xorg-server-1.1.99.3.orig/configure.ac 2008-02-20 22:04:15.000000000 +0000 | ||
29 | +++ xorg-server-1.1.99.3/configure.ac 2008-02-20 22:28:35.000000000 +0000 | ||
30 | @@ -434,6 +434,7 @@ | ||
31 | AC_ARG_ENABLE(dbus, AS_HELP_STRING([--disable-dbus], [Build D-BUS support (default: auto)]), [DBUS=$enableval], [DBUS=auto]) | ||
32 | AC_ARG_ENABLE(xsp, AS_HELP_STRING([--disable-xsp], [Build XSP support (default: auto)]), [XSP=$enableval], [XSP=auto]) | ||
33 | AC_ARG_ENABLE(tslib, AS_HELP_STRING([--disable-tslib], [Build embedded touchscreen support (default: auto)]), [TSLIB=$enableval], [TSLIB=auto]) | ||
34 | +AC_ARG_ENABLE(xkb, AS_HELP_STRING([--disable-xkb], [Build XKB (default: enabled)]), [XKB=$enableval], [XKB=yes]) | ||
35 | |||
36 | dnl DDXes. | ||
37 | AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto]) | ||
38 | @@ -751,12 +752,15 @@ | ||
39 | |||
40 | AC_DEFINE(SHAPE, 1, [Support SHAPE extension]) | ||
41 | |||
42 | -AC_DEFINE(XKB, 1, [Build XKB]) | ||
43 | -AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server]) | ||
44 | -AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default]) | ||
45 | -REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" | ||
46 | -XKB_LIB='$(top_builddir)/xkb/libxkb.la' | ||
47 | -XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' | ||
48 | +AM_CONDITIONAL(XKB, [test "x$XKB" = xyes]) | ||
49 | +if test "x$XKB" = xyes; then | ||
50 | + AC_DEFINE(XKB, 1, [Build XKB]) | ||
51 | + AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server]) | ||
52 | + AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default]) | ||
53 | + REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" | ||
54 | + XKB_LIB='$(top_builddir)/xkb/libxkb.la' | ||
55 | + XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' | ||
56 | +fi | ||
57 | |||
58 | AC_CHECK_FUNC(strcasecmp, [], AC_DEFINE([NEED_STRCASECMP], 1, | ||
59 | [Do not have `strcasecmp'.])) | ||
60 | Index: xorg-server-1.1.99.3/hw/kdrive/src/Makefile.am | ||
61 | =================================================================== | ||
62 | --- xorg-server-1.1.99.3.orig/hw/kdrive/src/Makefile.am 2008-02-20 22:28:04.000000000 +0000 | ||
63 | +++ xorg-server-1.1.99.3/hw/kdrive/src/Makefile.am 2008-02-20 22:28:31.000000000 +0000 | ||
64 | @@ -39,4 +39,4 @@ | ||
65 | libkdrivestubs_a_SOURCES = \ | ||
66 | $(top_srcdir)/fb/fbcmap.c | ||
67 | |||
68 | -libkdrivexkb_a_SOURCES = kxkb.c | ||
69 | +libkdrivexkb_a_SOURCES = | ||
70 | Index: xorg-server-1.1.99.3/hw/kdrive/src/kinput.c | ||
71 | =================================================================== | ||
72 | --- xorg-server-1.1.99.3.orig/hw/kdrive/src/kinput.c 2008-02-20 22:25:58.000000000 +0000 | ||
73 | +++ xorg-server-1.1.99.3/hw/kdrive/src/kinput.c 2008-02-20 22:27:29.000000000 +0000 | ||
74 | @@ -777,7 +777,7 @@ | ||
75 | KdInitModMap(ki); | ||
76 | KdInitAutoRepeats(ki); | ||
77 | |||
78 | -#ifndef XKB | ||
79 | +#ifdef XKB | ||
80 | if (!noXkbExtension) { | ||
81 | memset(&names, 0, sizeof(XkbComponentNamesRec)); | ||
82 | if (XkbInitialMap) | ||