Follow-up for 2a5364d5

  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>

Fix FTBFS on Linux based HP-PARisc 32-bit systems. Thanks to John Paul Adrian Glaubitz from FU Berlin for providing access to a corresponding porters' machine.

 This partially reverts nx-libs commit f6dcf2fe. The 'hpux' stuff stays
 out, the __hppa__ gets re-introduced.

nx-X11/include/Xos_r.h: Drop one _POSIX_REENTRANT_FUNCTIONS macro block, where offenders AIXV3, AIXV4 and __osf__ are gone now.

 Relates to ArcticaProject/nx-libs#275.

 Relates to ArcticaProject/nx-libs#275.

 Relates to ArcticaProject/nx-libs#275.

 Fixes ArcticaProject/nx-libs#288.

 Fixes ArcticaProject/nx-libs#274.

 Fixes ArcticaProject/nx-libs#273.

 Fixes ArcticaProject/nx-libs#272.

 Fixes ArcticaProject/nx-libs#271.

nx-X11/include/Xos_r.h: Drop one _POSIX_REENTRANT_FUNCTIONS macro block, where offenders AIXV3, AIXV4 and __osf__ are gone now.

 Relates to ArcticaProject/nx-libs#275.

 Relates to ArcticaProject/nx-libs#275.

 Relates to ArcticaProject/nx-libs#275.

 Fixes ArcticaProject/nx-libs#288.

 Fixes ArcticaProject/nx-libs#274.

 Fixes ArcticaProject/nx-libs#273.

 Fixes ArcticaProject/nx-libs#272.

 Fixes ArcticaProject/nx-libs#271.

 From c3d14036729fd186d4ec7ca1de603e1f2d174e2f Mon Sep 17 00:00:00 2001
 From: Eric Anholt <anholt@freebsd.org>
 Date: Fri, 10 Feb 2006 22:00:30 +0000
 Subject: Remove libcwrapper usage from xorg server modules. The libcwrapper is
   only of (marginal) use in the drivers, and that usage remains.
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

 Fixes ArcticaProject/nx-libs#246 (together with merge commit
 ecd335fa).

was unused

 Fixes ArcticaProject/nx-libs#250.

Imake unsets __APPLE__ and sets __DARWIN__ instead while autoconf seems to use
__APPLE__ and not __DARWIN__ anymore.

This way we should stay safe for now. Can be changed to __APPLE__ when
we switch to modular.