commit 2d2d38d17cc2558f8a41166a4a1578bc4c663c37
 Author: Kristian Høgsberg <krh@redhat.com>
 Date:   Fri Mar 17 01:47:25 2006 +0000

        Check for glproto when building GLX and make sure we have at least 1.4.6.
        Drop glx_ansic.h wrapper and call xalloc, xrealloc, xfree and str-funcs
            directly.

     We don't check the glproto version as we know what it is (we have our own proto file).

     Furthermore, we skip the switch from --glX<func> -> x<func> and directly switch to
     <func> (e.g. __glXMalloc() -> malloc()).
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

 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).

 Fixes ArcticaProject/nx-libs#276.

Remove check for the remote side operating system because the evdev
check will only succeed on Linux (and in future FreeBSD?) anyway.
Besides, this makes keycode conversion work when using nxagent without
nx transport (as an xnest replacement) or when not providing
client=linux in the options.

This fixes the second issue mentioned in ArcticaProject/nx-libs#239
(keyboard not working correctly).

Also abort reconnect on strndup failure.

Fixes ArcticaProject/nx-libs#239

keyboard config file for nxagent/x2goagent was broken from the moment
it got implemented. nxagentXkbConfigFilePath had never been filled.

just as Xorg upstream did

 Fixes ArcticaProject/nx-libs#250.

Window.c: In function ‘nxagentFrameBufferPaintWindow’:
Window.c:1968:31: warning: ISO C forbids assignment between function pointer and ‘void *’ [-Wpedantic]
   PaintWindowBackgroundBackup = pWin->drawable.pScreen -> PaintWindowBackground;

Display.c: In function ‘nxagentCheckForPixmapFormatsCompatibility’:
Display.c:2471:8: warning: variable ‘one_match’ set but not used [-Wunused-but-set-variable]
   bool one_match = false;
        ^

Colormap.c: In function ‘nxagentSetInstalledColormapWindows’:
Colormap.c:314:27: warning: format ‘%p’ expects argument of type ‘void *’, but argument 3 has type ‘WindowPtr’ [-Wformat=]
                           pWin, pWin -> drawable.class);
                           ^

warning: format ‘%u’ expects argument of type ‘unsigned int’, but argument 5 has type ‘long int’ [-Wformat=]

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

just as upstream did

just like upstream does

just like upstream does

hw/nxagent/X11/include/Xrandr_nxagent.h: Reduce injected libXrandr(_nxagent) header file, so that it only contains the XRRScreenChangeNotifyEvent typedef.

This fixes ArcticaProject/nx-libs#204.

However, this fix does not address the root of the problem, it simply avoids
it. We could run into it again... See bugreport for an explanation.

After commit cbf3ef0f219a7d5c94a7f5d5b46c9a0e26cc6588 this no longer
necessary.

This reverts commit 9a4bb50a.

hw/nxagent/Init.c: Fix copy+paste flaw when re-arranging copyright information as display by nxagent.