From 1e5ee575d4912665dd2356681f0827d5229fa1f5 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Fri, 13 Feb 2015 14:14:26 +0100
Subject: nx-X11 vs. X.Org 6.9 patches for further studying / documentation

  NoMachine kept all original X.Org 6.9 files in the nx-X11 source
  tree. These files have been removed in Feb 2015 during a major
  code cleanup.

  For later studying we provide all diffs of the changes that
  NoMachine employed on the original X.Org X11 code tree in the
  doc/nx-X11_vs_XOrg69_patches folder.
---
 doc/nx-X11_vs_XOrg69_patches/Xrender.h.NX.patch | 39 +++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 doc/nx-X11_vs_XOrg69_patches/Xrender.h.NX.patch

(limited to 'doc/nx-X11_vs_XOrg69_patches/Xrender.h.NX.patch')

diff --git a/doc/nx-X11_vs_XOrg69_patches/Xrender.h.NX.patch b/doc/nx-X11_vs_XOrg69_patches/Xrender.h.NX.patch
new file mode 100644
index 000000000..8bda13795
--- /dev/null
+++ b/doc/nx-X11_vs_XOrg69_patches/Xrender.h.NX.patch
@@ -0,0 +1,39 @@
+--- ./nx-X11/lib/Xrender/Xrender.h.X.original	2015-02-13 14:03:44.652443320 +0100
++++ ./nx-X11/lib/Xrender/Xrender.h	2015-02-10 19:13:12.596731149 +0100
+@@ -25,6 +25,8 @@
+ #ifndef _XRENDER_H_
+ #define _XRENDER_H_
+ 
++#define NX_CLEANUP
++
+ #include <X11/extensions/render.h>
+ 
+ #include <X11/Xlib.h>
+@@ -32,6 +34,10 @@
+ #include <X11/Xosdefs.h>
+ #include <X11/Xutil.h>
+ 
++#ifdef NX_CLEANUP
++#include "renderproto.h"
++#endif
++
+ typedef struct {
+     short   red;
+     short   redMask;
+@@ -296,6 +302,16 @@
+ void
+ XRenderFreeGlyphSet (Display *dpy, GlyphSet glyphset);
+ 
++#ifdef NX_CLEANUP
++
++void XRenderCleanGlyphs (xGlyphInfo  *gi,
++                         int         nglyphs,
++                         CARD8       *images,
++                         int         depth,
++                         Display     *dpy);
++
++#endif /* #ifdef NX_CLEANUP */
++
+ void
+ XRenderAddGlyphs (Display		*dpy,
+ 		  GlyphSet		glyphset,
-- 
cgit v1.2.3