This patch isn't necessary in Xlib 1.4 and later since the keysymdb has been
made redunant. While we're on 1.3.x, we need it.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

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

Per-file copyright notices: Update copyright information in file headers that NoMachine placed there own copyright statement in.

Remove defines of NEED_EVENTS and NEED_REPLIES because they are never
used anywhere.

Basically these three commits, but as they are newer and to not match
the code structure the patches have not been applied but replaced by
sed + manual intervention:

   From cb95642dc8edebb2935dd471f8b339cb98aa8481 Mon Sep 17 00:00:00 2001
   From: Peter Hutterer <peter.hutterer@redhat.com>
   Date: Fri, 28 Nov 2008 22:28:32 +1000
   Subject: Remove #define NEED_EVENTS and NEED_REPLIES

   A grep on xorg/* revealed there's no consumer of this define.

   Quote Alan Coopersmith:
   "The consumer was in past versions of the headers now located
   in proto/x11proto - for instance, in X11R6.0's xc/include/Xproto.h,
   all the event definitions were only available if NEED_EVENTS were
   defined, and all the reply definitions required NEED_REPLIES.

   Looks like Xproto.h dropped them by X11R6.3, which didn't have
   the #ifdef's anymore, so these are truly ancient now."
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>

--

   From 6de368c9aa7ccd2fcd62fca5a2b278913db4d03d Mon Sep 17 00:00:00 2001
   From: Fernando Carrijo <fcarrijo@yahoo.com.br>
   Date: Thu, 1 Jul 2010 06:50:47 -0300
   Subject: Purge macros NEED_EVENTS and NEED_REPLIES
Signed-off-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>

--

   From 57c03e52e6b4e3ed54df5fdd778865467d08e119 Mon Sep 17 00:00:00 2001
   From: Fernando Carrijo <fcarrijo@yahoo.com.br>
   Date: Thu, 1 Jul 2010 06:59:48 -0300
   Subject: Purge macro NEED_EVENTS
Signed-off-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>

nx-X11/lib/X11/imInsClbk.c: Fix warning 'right-hand operand of comma expression has no effect' in _XimFilterPropertyNotify.

 Backported from X.org, patch found in janitor cleanup commit...

 commit 8ba0ca32a63c532f128bdca7f1bf982cab8e12be
 Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
 Date:   Wed Jan 28 20:31:42 2009 -0200

 Backported from X.org, patch found in janitor cleanup commit...

 commit 8ba0ca32a63c532f128bdca7f1bf982cab8e12be
 Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
 Date:   Wed Jan 28 20:31:42 2009 -0200

 Backported from X.org (libX11). Host.c has mainly been copied over from
 libX11, contaning 7db7451 as the top commit (which also contains the
 greatest change and silences the resp. compiler warning.

 commit 7db74514e454d3fc4ff70aa08ddac66bfffda4dd
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Tue Jul 23 22:18:46 2013 -0700

    Refactor common code from XAddHost & XRemoveHost into single function

    On the Xlib side, the only real difference is the mode flag we send
    to the server with the address, so just make that an argument to the
    function with the common code for packing the address into the request.

    (Aside from labels, gcc 4.7.2 generates identical code before & after
     this change due to inlining, verified via diff of gcc -S output.)
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

  - Update XErrorDB to latest X.org version.
  - Install XErrorDB, XKeysymDB and Xcms.txt to /usr/{local/}share/nx/.
  - Assure that libNX_X11 finds those files at the
    named location.
  - Update debian/ packaging files.
  - Update nx-libs.spec packaging file.

Fixes ArcticaProject/nx-libs#153

We might better change all guard defines with the ones upstream is
using but for now this should also work.

 Note:

  - The "normal" way to inject CFLAGS (and CPPFLAGS) into nx-X11 builds is copying those
    options over into the variable CDEBUGFLAGS.
  - LDFLAGS have to be handed to nx-X11 via LOCAL_LDFLAGS.

 This change also includes a slight change in the nx-X11 build order.

 Old build order:

  Main Makefile:

      - [...]
      - libNX_X11
        + implicitly building nxcomp
        + implicitly building nxcompext
      - [...]
      - nxagent
        + implicitly building nxcompshad
      - [...]

 New build ordner:

  Main Makefile:

      - [...]
      - nxcomp
      - setup nx-X11 build env
        + cd nx-X11 && make BuildEnv
      - nx-X11/lib/*
      - nxcompext
      - nxcompshad
      - [...]
      - nxagent
      - [...]

 Fixes ArcticaProject/nx-libs#141
 Fixes X2GoBTS#84

 Note:

  - The "normal" way to inject CFLAGS (and CPPFLAGS) into nx-X11 builds is copying those
    options over into the variable CDEBUGFLAGS.
  - LDFLAGS have to be handed to nx-X11 via LOCAL_LDFLAGS.

 This change also includes a slight change in the nx-X11 build order.

 Old build order:

  Main Makefile:

      - [...]
      - libNX_X11
        + implicitly building nxcomp
        + implicitly building nxcompext
      - [...]
      - nxagent
        + implicitly building nxcompshad
      - [...]

 New build ordner:

  Main Makefile:

      - [...]
      - nxcomp
      - setup nx-X11 build env
        + cd nx-X11 && make BuildEnv
      - nxcompext
      - nxcompshad
      - nx-X11/lib/*
      - [...]
      - nxagent
      - [...]

 Fixes ArcticaProject/nx-libs#141
 Fixes X2GoBTS#84

This required for successful linking of libXrender against libNX_X11.

Port from libXfixes commit b031e3b60fa1af9e49449f23d4a84395868be3ab We
need this here to enable linking of current libXrender against
libNX_X11 instead of the system's libX11

The original implementation of this function (libX11 commit
9f5d83706543696fc944c1835a403938c06f2cc5) uses xcb stuff which we do
not have in libNX_X11. So we take a workaround from another lib. This
workaround had been added temporarily to a couple of X extension libs,
see
e.g. https://lists.x.org/archives/xorg-devel/2013-July/036763.html.

To enable linking of a current libXrender libNX_X11 needs that symbol.

This is a (manual) backport of the following upstream libX11 commit
available at
https://cgit.freedesktop.org/xorg/lib/libX11/commit/src/XlibInt.c?id=4a060f993bf676cf21ad9784e010f54134da7b40:

     Commit: 4a060f993bf676cf21ad9784e010f54134da7b40
     Author: Peter Hutterer <peter.hutterer@who-t.net>
     Date: Mon, 17 Oct 2011 09:45:15 +1000
     Subject: Add _XGetRequest as substitute for GetReq/GetReqExtra

To allow for suspend/resume NX has changed _XReadEvents() and
_XIOError(). _XIOError() does not simply exit but returns. And
_XReadEvents() returns after _XIOError(). But as the original
_XReadEvents() is supposed to block until at least one event is there
calling functions are not prepared for situations where no event is
available. These calling functions have to check that condition.,

Some of the calling functions already had that check but the
UnlockDisplay() call was missing.

Fixes https://github.com/ArcticaProject/nx-libs/issues/118

To allow for suspend/resume NX has changed _XReadEvents() and
_XIOError(). _XIOError() does not simply exit but returns. And
_XReadEvents() returns after _XIOError(). But as the original
_XReadEvents() is supposed to block until at least one event is there
calling functions are not prepared for situations where no event is
available. These calling functions have to check that condition.,

Some of the calling functions already had that check but the
UnlockDisplay() call was missing.

Fixes https://github.com/ArcticaProject/nx-libs/issues/118

nx-X11/programs/Xserver: Include nxcomp{,ext,shad} headers like one would do with system-wide shared libraries.

X11/nx-X11 clear-up: More places where we need to explicitly distinguish between X11 and nx-X11 namespace regarding header include paths.

 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.

 The client-side library libNX_GL.{a,so} is not built when building nx-libs.

 However, nx-X11/lib/GL/** ships several imake include files
 (Imakefile.inc) that are also used in nx-X11/programs/Xserver/GL/**.
 These files have been moved from the nx-X11/lib/GL/ code subtree to the
 nx-X11/programs/Xserver/GL/.

 Furthermore, we don't provide module builds of the GL extension anymore,
 as that feature is neither used in nx-libs.

 The client-side library libNX_GL.{a,so} is not built when building nx-libs.

 However, nx-X11/lib/GL/** ships several imake include files
 (Imakefile.inc) that are also used in nx-X11/programs/Xserver/GL/**.
 These files have been moved from the nx-X11/lib/GL/ code subtree to the
 nx-X11/programs/Xserver/GL/.

 Furthermore, we don't provide module builds of the GL extension anymore,
 as that feature is neither used in nx-libs.

 MakeBigReq inserts a length field after the first 4 bytes of the request
 (after req->length), pushing everything else back by 4 bytes.

 The current memmove moves everything but the first 4 bytes back. If a
 request aligns to the end of the buffer pointer when MakeBigReq is
 invoked for that request, this runs over the buffer. Instead, we need to
 memmove minus the first 4 bytes (which aren't moved), minus the last 4
 bytes (so we still align to the previous tail).

 The 4 bytes that fell out are already handled with Data32, which will
 handle the buffermax correctly.

 The case where req->length = 1 was already not functional.

 Reported by Abhishek Arya <inferno@chromium.org> (against X.Org BTS).

 https://bugzilla.mozilla.org/show_bug.cgi?id=803762Reviewed-by: Jeff Muizelaar <jmuizelaar@mozilla.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 Rebased-for-NX: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

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

  We really want to make use of rpm's automatic dependency finding.
  Binaries are scanned for DT_NEEDED entries, the latter of which are
  then used for populating the "Requires"-type deps. The "nxagent"
  binary for example would require libX11.so.6. That incurs problems:

  1. A package manager told to install nxagent could select xorg-x11
  rather than nx-libs, even though nxagent depends on the NX version.

  2. A package manager told to install $some_program could select nx-libs
  rather than xorg-x11 (since both provide libX11.so.6), but, since
  the NX library is in an obscure directory, running $some_program
  would fail as libX11.so.6 is not found.

  To solve this, give the NX libraries unique names different from the
  Xorg ones.

Avoid building libXcomp.so.1 (which is identical to libXcomp.so.3), (053_nx-X11_no-xcomp1-install-target.full.patch).

 Restore ability to build things in parallel.
 (${MAKE} must always appear in the rule directly, and not be
 hidden through expansions of other variables to get this to work.)