diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-03-29 18:24:58 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-03-29 18:24:58 +0000 |
| commit | c9fb0e6b677050e621003e6d1b47d5e44b7ef5ba (patch) | |
| tree | 572e20585eb7a4bef5bac4ca96a29cecdfd92b35 | |
| parent | 22e75d829f89c309957e96fe2e61ddb8f7b977f4 (diff) | |
disapproval of revision '3747999334cad4bb22159396976a802d18c50703'
| -rw-r--r-- | packages/xorg-xserver/xserver-kdrive-1.2.0/optional-xkb.patch | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/packages/xorg-xserver/xserver-kdrive-1.2.0/optional-xkb.patch b/packages/xorg-xserver/xserver-kdrive-1.2.0/optional-xkb.patch deleted file mode 100644 index 7efc70820f..0000000000 --- a/packages/xorg-xserver/xserver-kdrive-1.2.0/optional-xkb.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- /tmp/bar/Makefile.am 2007-03-29 20:12:38.000000000 +0200 -+++ xorg-server-1.2.0/Makefile.am 2007-03-29 20:12:49.325251000 +0200 -@@ -30,6 +30,10 @@ - XINPUT_DIR=Xi - endif - -+if XKB -+XKB_DIR=xkb -+endif -+ - if DBE - DBE_DIR=dbe - endif -@@ -46,7 +50,7 @@ - randr \ - render \ - $(XINPUT_DIR) \ -- xkb \ -+ $(XKB_DIR) \ - $(DBE_DIR) \ - $(MFB_DIR) \ - $(AFB_DIR) \ ---- /tmp/bar/configure.ac 2007-03-29 20:12:38.000000000 +0200 -+++ xorg-server-1.2.0/configure.ac 2007-03-29 20:12:49.325251000 +0200 -@@ -428,6 +428,7 @@ - AC_ARG_ENABLE(dpms, AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMSExtension=$enableval], [DPMSExtension=yes]) - AC_ARG_ENABLE(xinput, AS_HELP_STRING([--disable-xinput], [Build XInput Extension (default: enabled)]), [XINPUT=$enableval], [XINPUT=yes]) - AC_ARG_ENABLE(xfree86-utils, AS_HELP_STRING([--enable-xfree86-utils], [Build xfree86 DDX utilities (default: enabled)]), [XF86UTILS=$enableval], [XF86UTILS=yes]) -+AC_ARG_ENABLE(xkb, AS_HELP_STRING([--disable-xkb], [Build XKB (default: enabled)]), [XKB=$enableval], [XKB=yes]) - - dnl DDXes. - AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto]) -@@ -754,12 +755,15 @@ - - AC_DEFINE(SHAPE, 1, [Support SHAPE extension]) - --AC_DEFINE(XKB, 1, [Build XKB]) --AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server]) --AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default]) --REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" --XKB_LIB='$(top_builddir)/xkb/libxkb.la' --XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' -+AM_CONDITIONAL(XKB, [test "x$XKB" = xyes]) -+if test "x$XKB" = xyes; then -+ AC_DEFINE(XKB, 1, [Build XKB]) -+ AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server]) -+ AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default]) -+ REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" -+ XKB_LIB='$(top_builddir)/xkb/libxkb.la' -+ XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' -+fi - - AC_CHECK_FUNC(strcasecmp, [], AC_DEFINE([NEED_STRCASECMP], 1, - [Do not have `strcasecmp'.])) |