nx-libs, branch 3.5.99.11

release 3.5.99.11

2017-12-15T10:20:53+00:00

Merge branch 'sunweaver-pr/more-X-memory-macro-fixes' into 3.6.x

2017-12-15T10:15:22+00:00

Attributes GH PR #605: https://github.com/ArcticaProject/nx-libs/pull/605 Reviewed-by: Ulrich Sibiller -- Thu, 14 Dec 2017 13:15:12 +0000

Xserver/hw/nxagent/Clipboard.c: Fix free calls (free back to XFree).

2017-12-15T09:37:03+00:00

They have been flawed ever since nxagent came up, as they were Xfree (non-capital f) always, but should have been XFree (capital F, defined in Xlibint.h and part of libNX_X11). . Probably this all should be free() all over the code (bearing in mind, that XFree() returns int, not void. But still... Fixes ArcticaProject/nx-libs#553.

Xserver/hw/nxagent/compext: Xfree -> free and Xmalloc -> malloc.

2017-12-15T09:37:02+00:00

nx-libs.spec: actually use a weak dependency for xkeyboard-config.

2017-12-15T07:26:31+00:00

At least on platforms that support weak dependencies.

nx-libs.spec: add back erroneously dropped xkeyboard-config dependency.

2017-12-15T07:10:32+00:00

Merge branch 'sunweaver-pr/fix-compiler-warnings' into 3.6.x

2017-12-14T09:49:21+00:00

Attributes GH PR #333: https://github.com/ArcticaProject/nx-libs/pull/333

Xserver/GL/glx/glxcmds.c: Cast small-int values through intptr_t when passed as pointers

2017-12-14T09:40:32+00:00

Picked from this X.org commit: commit b0dd6be2c8703f7062d45ac9fd646550c7d54e3b Author: Jamey Sharp Date: Thu Oct 8 13:38:44 2009 +1100 Cast small-int values through intptr_t when passed as pointers On 64-bit systems, int and pointers don't have the same size, so GCC gives warnings about casts between int and pointer types. However, in the cases covered by this patch, it's always a value that fits in int being stored temporarily as a pointer and then converted back later, which is safe. Casting through the pointer-sized integer type intptr_t convinces the compiler that this is OK. Signed-off-by: Jamey Sharp Signed-off-by: Daniel Stone Backported-to-NX-by: Mike Gabriel (Only appropriate location for backporting: Xserver/GL/glx/glxcmds.c).

lib/X11/Xrm.c: Compiler warning fix: logical-not-parentheses

2017-12-14T09:40:32+00:00

Xrm.c: In function 'PutEntry': Xrm.c:900:15: warning: logical not is only applied to the left hand side of comparison [-Wlogical-not-parentheses] !quarks[2] != table->leaf) ^~

glx: warning fixes

2017-12-14T09:40:32+00:00

commit 63ccaec2c39f4b5742383472c951ee2cd35c9e14 Author: Adam Jackson Date: Tue Oct 19 11:59:23 2010 -0400 render2.c: In function ‘__glXDisp_Map2d’: render2.c:127: warning: ‘u1’ may be used uninitialized in this function render2.c: In function ‘__glXDisp_Map1d’: render2.c:90: warning: ‘u1’ may be used uninitialized in this function Remove unnecessary test, and change memcpy to memmove as all users were doing overlapping copies. Signed-off-by: Adam Jackson Reviewed-by: Daniel Stone Backported-to-NX-by: Mike Gabriel