commit a73e0f8cdfec1c9199ffe696146ba7d677c4c10d
  Author: Daniel Stone <daniel@fooishbar.org>
  Date:   Thu Jun 1 18:47:47 2006 +0000

    Die XTESTEXT1, die!

Citing an email from the xorg-modular mailing list:

On Tuesday 21 February 2006 23:04, Enrico Weigelt wrote:
> Hi folks,
>
> I'm wondering what's the difference between XTEST and XTESTEXT1
> (the second one can be configured w/ my current patch ...)
> Are they both the same ( -> XTest extension ) ?
> Can I put both symbols together ?

They're not the same extension.  XTest is the one you want, if you want
either.  The other hasn't been built by default in ages and I should probably
go ahead and nuke it from the tree.

- ajax

Fixes ArcticaProject/nx-libs#704

Backport from kbproto:

  commit 2306fcd4c511d41ae4b31b9cbd9f79cf69287730
  Author: Dirk Wallenstein <halsmit@t-online.de>
  Date:   Fri Feb 5 20:42:43 2010 +0100

      Use the correct value for XkbAllAccessXEventsMask
Signed-off-by: Dirk Wallenstein <halsmit@t-online.de>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>

 Fixes ArcticaProject/nx-libs#250.

randrproto: It was discovered that nx-libs shipped two different version of randr.h and randrproto.h. This commit leaves the newer file versions in the package and let's the build process use those everywhere.

Upstream does not use xkbfile but has own copies of the required
files. It was not used elsewhere.

 This has already been started while replacing copyright info in file
 headers and has now been completed with this commit.

nx-X11/include/extensions/XKBsrv.h: Different memory handling when built with Xserver and with Xlib.

use system libXext instead

  include/extensions: Xag.h, Xagsrv.h, Xagstr.h
  Xserver/Xext: appgroup.c, appgroup.h
  lib/Xext: XAppgroup.c

  include/extensions: Xcup.h, Xcupstr.h,
  Xserver/Xext: cup.c
  lib/Xext: cup.c

  include/extensions: Xdbe.h
  Xserver/Xext: Xdbe.c

  Xserver/Xext:  dgaproc.h, xf86dga.c, xf86dga2.c, xf86dgaext.h

  include/extensions: Xevie.h, Xeviestr.h
  include/extensions: XEVI.h, XEVIstr.h
  Xserver/Xext: EVI.c, EVIstruct.h, sampleEVI.c
  lib/Xext: XEVI.c

  include/extensions: fontcache.h, fontcacheP.h, fontcachstr.h
  Xserver/Xext: fontcache.c

  include/extensions: lbxbuf.h, lbxbufstr.h, lbxdeltastr.h, lbximage.h, lbxopts.h, lbxstr.h, lbxzlib.h
  lib/Xext: XLbx.c

  include/extensions: multibuf.h, multibufst.h
  lib/Xext: XMultibuf.c
  Xserver/Xext: mbuf.c, mbufbf.c, mbufpx.c

  include/extensions: xf86vmode.h, xf86vmstr.h
  Xserver/Xext: vidmodeproc.h, xf86vmode.c

  lib/Xext: MITMisc.c
  Xserver/Xext: mitmisc.c

  Xserver/Xext: xf86misc.c, xf86miscproc.h

  Xserver/XTrap: xf86XTrapModule.c, xtrapddmi.c, xtrapdi.c, xtrapdiswp.c, xtrapditbl.c
  include/extensions: xtrapbits.h xtrapddmi.h xtrapdi.h xtrapemacros.h xtraplib.h xtraplibp.h xtrapproto.h
  Fixes: ArcticaProject/nx-libs#116
  X.org: https://cgit.freedesktop.org/xorg/xserver/commit/?id=cbc20d92de92aad5ca240310a9156ccf97c24a01

  Plus: Drop various Imake'ish defines where not needed anymore.

misc nx-X11/{programs/Xserver/composite,include/extensions}: update to Composite 0.4 - with changes where neccessary and rough edges.

misc nx-X11/{programs/Xserver/composite,include/extensions}: update to Composite 0.4 - with changes where neccessary and rough edges.

library clean-up: Don't build libNX_Xinerama anymore. Use system's libXinerama shared library. (Fixes ArcticaProject/nx-libs#49).

 This commit goes along with a patch from Ulrich Sibiller who managed to
 move the Xinerama awareness for NX sessions into the Xserver code. This
 makes Xinerama support for NX in libNX_Xinerama.so obsolete.

 Fixes ArcticaProject/nx-libs#49

library clean-up: Don't build libNX_Xtst anymore. Use system's libXtst shared library. (Fixes ArcticaProject/nx-libs#32).

Fix for too overall Xdamage and Xrandr client lib removal: Bring back the nx-x11proto-{randr,damage} header files and use those at compile time.

 In the process of building nxagent against more and more system-wide installed
 X.org libraries, we come to the limit of including structs from this (bundled
 nx-X11) and that (system-wide X.Org) library.

 This commit introduces a clear namespace separation of headers provided by
 nx-X11 and headers provided by X.Org. This approach is only temporary as we
 want to drop all nx-X11 bundled libraries from nx-libs.

 However, for a while we need to make this separation clear and also ship
 some reduced fake X.Org headers that avoid pulling in libX* and libNX_X*
 symbols at the same time.

 This patch has been tested on Debian jessie and unstable and requires no
 overall testing on various distros and distro versions, as we finally will
 drop all libNX_X* libraries and build against X.org's client libs.

 For now, this hack eases our development / cleanup process.

 This lets us stop using the 'pointer' typedef in Xdefs.h as 'pointer'
 is used throughout the X server for other things, and having duplicate
 names generates compiler warnings.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
 Rebased against NX: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

library clean-up: Don't build libNX_Xdamage anymore. Use system's libXdamage shared library. (Fixes ArcticaProject/nx-libs#6, X2GoBTS#826).

imake cleanup: Break up multiple vars into invidual lines to ease further work on patches / pull requests.

library clean-up: Don't build and link libXfont.a anymore. Use system's libXfont shared library and link dynamically.

old-arch cleanup: Drop CRAY support (i.e., drop code related to CRAY, _CRAY, WORD64, WORD64ALIGN, MUSTCOPY, UNSIGNEDBITFIELDS definitions).