From abd6cf1bdd661f126af2a721cb3f467f3a6db9f7 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Fri, 26 Feb 2016 08:14:28 +0100
Subject: rename original NX patches, so that we can see the patched file's
 name in the patch file name.

---
 .../nx-X11_lib_X11_XKBMAlloc.c.X.original          | 84 ++++++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_XKBMAlloc.c.X.original

(limited to 'doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_XKBMAlloc.c.X.original')

diff --git a/doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_XKBMAlloc.c.X.original b/doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_XKBMAlloc.c.X.original
new file mode 100644
index 000000000..de5574c32
--- /dev/null
+++ b/doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_X11_XKBMAlloc.c.X.original
@@ -0,0 +1,84 @@
+--- ./nx-X11/lib/X11/XKBMAlloc.c.X.original	2015-02-13 14:03:44.620443950 +0100
++++ ./nx-X11/lib/X11/XKBMAlloc.c	2015-02-10 19:13:12.836722141 +0100
+@@ -738,8 +738,13 @@
+ 		    _XkbFree(prev_key_sym_map);
+ 		    return BadAlloc;
+ 		}
++#ifdef NXAGENT_SERVER
++                bzero((char *)&xkb->map->key_sym_map[xkb->max_key_code+1],
++                                        tmp*sizeof(XkbSymMapRec));
++#else
+ 		bzero((char *)&xkb->map->key_sym_map[xkb->max_key_code],
+ 					tmp*sizeof(XkbSymMapRec));
++#endif
+ 		if (changes) {
+ 		    changes->map.changed= _ExtendRange(changes->map.changed,
+ 		    				XkbKeySymsMask,maxKC,
+@@ -756,7 +761,11 @@
+ 		    _XkbFree(prev_modmap);
+ 		    return BadAlloc;
+ 		}
++#ifdef NXAGENT_SERVER
++                bzero((char *)&xkb->map->modmap[xkb->max_key_code+1],tmp);
++#else
+ 		bzero((char *)&xkb->map->modmap[xkb->max_key_code],tmp);
++#endif
+ 		if (changes) {
+ 		    changes->map.changed= _ExtendRange(changes->map.changed,
+ 		    				XkbModifierMapMask,maxKC,
+@@ -775,8 +784,13 @@
+ 		    _XkbFree(prev_behaviors);
+ 		    return BadAlloc;
+ 		}
++#ifdef NXAGENT_SERVER
++                bzero((char *)&xkb->server->behaviors[xkb->max_key_code+1],
++                                                tmp*sizeof(XkbBehavior));
++#else
+ 		bzero((char *)&xkb->server->behaviors[xkb->max_key_code],
+ 						tmp*sizeof(XkbBehavior));
++#endif
+ 		if (changes) {
+ 		    changes->map.changed= _ExtendRange(changes->map.changed,
+ 		    			XkbKeyBehaviorsMask,maxKC,
+@@ -793,8 +807,13 @@
+ 		    _XkbFree(prev_key_acts);
+ 		    return BadAlloc;
+ 		}
++#ifdef NXAGENT_SERVER
++                bzero((char *)&xkb->server->key_acts[xkb->max_key_code+1],
++                                                tmp*sizeof(unsigned short));
++#else
+ 		bzero((char *)&xkb->server->key_acts[xkb->max_key_code],
+ 						tmp*sizeof(unsigned short));
++#endif
+ 		if (changes) {
+ 		    changes->map.changed= _ExtendRange(changes->map.changed,
+ 		    			XkbKeyActionsMask,maxKC,
+@@ -811,8 +830,13 @@
+ 		    _XkbFree(prev_vmodmap);
+ 		    return BadAlloc;
+ 		}
++#ifdef NXAGENT_SERVER
++                bzero((char *)&xkb->server->vmodmap[xkb->max_key_code+1],
++                                                tmp*sizeof(unsigned short));
++#else
+ 		bzero((char *)&xkb->server->vmodmap[xkb->max_key_code],
+ 						tmp*sizeof(unsigned short));
++#endif
+ 		if (changes) {
+ 		    changes->map.changed= _ExtendRange(changes->map.changed,
+ 		    			XkbVirtualModMapMask,maxKC,
+@@ -830,8 +854,13 @@
+ 		_XkbFree(prev_keys);
+ 		return BadAlloc;
+ 	    }
++#ifdef NXAGENT_SERVER
++            bzero((char *)&xkb->names->keys[xkb->max_key_code+1],
++                                                tmp*sizeof(XkbKeyNameRec));
++#else
+ 	    bzero((char *)&xkb->names->keys[xkb->max_key_code],
+ 	    					tmp*sizeof(XkbKeyNameRec));
++#endif
+ 	    if (changes) {
+ 		changes->names.changed= _ExtendRange(changes->names.changed,
+ 					XkbKeyNamesMask,maxKC,
-- 
cgit v1.2.3