Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>

Makekeys is used to create an optimal hash of the keysyms defined
in x11proto’s keysymdef.h.

The recent addition of new keysyms there has triggered a bug in
makekeys where it tries to use a zero on the rhs of the % (mod)
operator (resulting in a divide by zero error) whenever it fails
to find a solution within its constraints.

Increasing the size of the arrays allows it to find a solution for
the current set of keysyms.

Makekeys is only run durring the build process, so this has no impact
on users of libX11, only on the amount of VM needed to build it.

It still needs a more complete fix, but this allows compiles to
progress until that is completed.

This basically repeats commit bad67799
after the upgrade to libX11 1.3.4.

Upstream has changed the header guards. We adapt them to prevent double inclusion.

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.