In NXAGENT_SERVER we can also fully rely on libXfont
 for handling fpe internals.

 Backported from X.org:

 commit 75536ee80595c79bba95a1fb6844126ee08486d4
 Author: Tiago Vignatti <tiago.vignatti@nokia.com>
 Date:   Wed Jun 23 15:18:03 2010 +0300

    dix: use one single function to register fpe fonts

    X server doesn't need to understand fpe internals, so use
    register_fpe_functions from libXfont.

    It's required to get new version of libXfont, therefore adjust it to be passed
    to autoconf.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

nx-libs.spec: Handle fonts dir symlinking and install /usr/share/nx/fonts symlink into nxagent bin:pkg. This change probably needs more fine-tuning for the various other RPM distros and versions out there.

 Thanks to Orion Poplawski for providing a code
 snippet with a general approach of handling this.

For consistency, apply patch from previous commit (630a7c3) to the original Xserver/dix/dixfonts.c file, although the code is undef'ed when NXAGENT_SERVER is defined.

{dix/,hw/nxagent/NX}dixfont.{c,h}: Support using builtin-fonts. Makes dependency on X11's misc fonts package obsolete.

 This backports a mixture of these X.org commits (only focusing
 on SetDefaultFontPath() function):

 commit 03e8bfa1d122f7dea905d48c93cfd54afd991dfd
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Sat Nov 27 20:09:04 2010 -0800

    Convert existing Xprintf style calls to asprintf style
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>

 commit 12e46e83733b47d2704e1509960192365102af46
 Author: Tiago Vignatti <tiago.vignatti@nokia.com>
 Date:   Fri Mar 25 22:07:31 2011 +0200

    dix: fix memory leak in SetDefaultFontPath
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Nicolas Peninguy <nico@lostgeeks.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>

 commit 6592db6bb526f0c43b4c7b55859c629709e039b4
 Author: Mikhail Gusarov <dottedmag@dottedmag.net>
 Date:   Fri Jun 4 16:58:58 2010 +0700

    Get rid of xstrdup when argument is definitely non-NULL

    Replace xstrdup with strdup when either constant string is
    being duplicated or argument is guarded by conditionals and
    obviously can't be NULL
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>

 commit f56cbe1ef24415d0142b9a7d0ab0a031069ccb52
 Author: Rémi Cardona <remi@gentoo.org>
 Date:   Mon Sep 14 17:09:59 2009 +0200

    dix: append "built-ins" to the font path in SetDefaultFontPath

    49b93df8a3002db7196aa3fc1fd8dca1c12a55d6 made the hard dependency on
    a "fixed" font go away but only Xorg could use the built-ins fonts by
    default.

    With this commit, all DDXs get "built-ins" appended to their FontPath, not
    just Xorg.

    Tested with Xorg, Xvfb and Xnest.
Signed-off-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Tested-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

 commit 49b93df8a3002db7196aa3fc1fd8dca1c12a55d6
 Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
 Date:   Wed Jan 7 19:37:03 2009 -0200

    Default to use standard bitmap fonts, with builtins as fallback

      The builtin-fonts configure option was removed, as it at best should
    have been a runtime option. Instead, now it always register all "font
    path element" backends, and adds built-ins fonts at the end of the
    default font path.
      This should be a more reasonable solution, to "correct" the most
    common Xorg FAQ (could not open default font 'fixed'), and also don't
    break by default applications that use only the standard/historical
    X Font rendering.
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

 Fixes ArcticaProject/nx-libs#84.
 Fixes ArcticaProject/nx-libs#285.

debian/nx-x11-common.{links,dirs}: Make sure /usr/share/fonts/X11 are reachable for nxagent (via placing a symlink to /usr/share/nx/fonts).

Xserver/hw/nxagent/Font.c: Drop references to /usr/NX/share/fonts/base as default font path, entirely.

Xserver/hw/nxagent/Font.c: Change (alternative) default font path order to make font path search compliant with latest FHS for X11 fonts (though, prefer /usr/share/nx/fonts as default path).

Xserver/hw/nxagent/Font.c: Drop NXAGENT_ALTERNATE_FONT_PATH_4 (pointing to /usr/NX/share/fonts/base) entirely.

nx-X11/config/cf/X11.tmpl: Set a more appropriate font directory (recommended: /usr/{,local/}share/nx/fonts).

 Note for distribution maintainers: your normally want to
 symlink /usr/share/nx/fonts to /usr/share/fonts/X11 in
 your packaging.

Xserver/os/oscolor.c: Follow X.org in dropping the rgb.txt file entirely. Content of that file is now hard-coded.

 Adopting an exact copy of os/oscolor.c from X.org leads to this compiler warning:

 ```
 oscolor.c:844:1: warning: string length ‘7614’ is greater than the length ‘4095’ ISO C99 compilers are required to support [-Woverlength-strings]
 };
 ^
 ```

 This will be address later in coordination with X.org.

 Note: there is a tiny change in oscolor.c as we ship it. The original X.org file includes <X11/keysym.h> which seems
 unneeded. We drop that one line from oscolor.c.

 Fixes ArcticaProject/nx-libs#259.

The following commit turned out to be incomplete. This commit makes it
complete by removing client->lastDrawable/lastGC everywhere thus
fixing ArcticaProject/nx-libs#306 and #322

    commit e6f2f642
    Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
    Date:   Mon Jun 20 16:45:38 2016 +0200

        dix: remove caching of drawables and graphics contexts. The security checks simply bypass the cached values so they are unused.

         Backported from X.org:

         commit 9a183d7ba50e31afa133cc03aee7991517a283ea
         Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
         Date:   Tue Aug 14 11:39:26 2007 -0400

            dix: remove caching of drawables and graphics contexts.  The security checks
            simply bypass the cached values so they are unused.

         Backport to nx-libs: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

 Backported from X.org:

 commit 6c46645cfc1afda8aeabfe0ed4d9342673b702f1
 Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
 Date:   Thu Dec 14 14:45:42 2006 -0500

    Naming change: Security*Access -> Dix*Access
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

Switch from using libNX_X11's deprecated XKeycodeToKeysym() function to using XGetKeyboardMapping().

 Fixes ArcticaProject/nx-libs#229.

 Backported from X.org:

 commit 9f9268821b13038556fbc029df54ab0e9b2aa77f
 Author: Mathieu Bérard <mathieu.berard@crans.org>
 Date:   Mon Aug 11 13:52:38 2008 -0400

    The smart scheduler is not optional.
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

Makefile: Fix flawed uninstall-* targets. Spotted by Ionic while reviewing the nxagent RPATH changeset. Thanks!

debian/patches: Update 016_nx-X11_install-location.debian.patch. Adapt path to recent upstream changes.

Load libNX_X11 / faked libX11 via RPATH setting rather than fidgeting with LD_LIBRARY_PATH in the nxagent wrapper script.

 Fixes ArcticaProject/nx-libs#225.

  SHLIBDIR -> Points to the system's official library folder.
  USRLIBDIR -> In NX, this variable (amongst others) is used to set
               the executables RPATH (if enabled), so pointing this
               to SHLIBDIR/nx-X11.

debian/rules: Don't manually override SHLIBDIR via the dh_auto_build call. The default in the main Makefile should work fine.

nx-libs.spec: Don't manually override SHLIBDIR via the .spec file. The default in the main Makefile should work fine.

Makefile: Align variable names USRLIBDIR, SHLIBDIR (and NX_DIR) with nx-X11 internal naming schemes (and use /usr/<lib>/nx/X11 rather than /usr/<lib>/nx-X11).

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

 Backported from X.org:

 From f93d10ce9bb4a6de83b561f44fb7b046def16234 Mon Sep 17 00:00:00 2001
 From: Daniel Stone <daniel@fooishbar.org>
 Date: Mon, 6 Nov 2006 18:33:45 +0200
 Subject: dix: remove staggeringly broken vendor workarounds
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

 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.

Fixes ArcticaProject/nx-libs#293