aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Support building with legacy (pre-1.4.2) libXfont(1) versions.Mihai Moldovan2017-12-167-2/+30
| | | | | | | | Partly reverts ec30a857eb0d67b232f8d43e63a6370023f4c4d0, but in a forward-compatible manner. Legacy libXfont1 versions are automatically detected by the main Makefile.
* debian/rules: execute new debian/compat.sh file before the actual build.Mihai Moldovan2017-12-161-1/+1
|
* debian/: add compat.sh file containing compatibility logic for older Debian ↵Mihai Moldovan2017-12-161-0/+46
| | | | and Ubuntu versions.
* nx-libs.spec: also own %{_datadir}/nx/X11, since %dir explicitly does not ↵Mihai Moldovan2017-12-161-0/+1
| | | | recurse down.
* nxcompshad/Makefile.am: also correctly call aclocal here.Mihai Moldovan2017-12-151-0/+2
|
* {nx-X11/lib,nxproxy}/Makefile.am: also use correct aclocal flags in the ↵Mihai Moldovan2017-12-152-1/+5
| | | | other locations.
* nxcomp/test/logging_test.cpp: return a value in non-void function.Mihai Moldovan2017-12-151-0/+2
| | | | Failed *SUSE checks.
* nx-X11/config/cf/linux.cf: recursive macros aren't a thing.Mihai Moldovan2017-12-151-1/+1
| | | | Just copy-paste the initial definition to avoid recursion.
* nxcomp/Makefile.am: call aclocal with the correct include dir argument.Mihai Moldovan2017-12-151-0/+2
|
* nx-libs.spec: only remove files in the BuildRoot.Mihai Moldovan2017-12-151-1/+1
| | | | We have no intention to remove system libraries.
* nx-X11/config/cf/linux.cf: don't override default CC options for ↵Mihai Moldovan2017-12-151-4/+1
| | | | | | {ARM,PPC}{32,64}. We need -std=c99 to be passed through to the build process.
* Merge branch '3.6.x'Mihai Moldovan2017-12-1511699-2883615/+873699
|\
| * release 3.5.99.123.5.99.12Mike Gabriel2017-12-156-9/+28
| |
| * Xserver/hw/nxagent/Image.c: Fix regression FTBFS after d4465b71 got merged in.Mike Gabriel2017-12-151-4/+4
| |
| * debian/changelog: post-release version bump to 3.5.99.11Mike Gabriel2017-12-151-0/+7
| |
| * release 3.5.99.113.5.99.11Mike Gabriel2017-12-155-23/+755
| |
| * Merge branch 'sunweaver-pr/more-X-memory-macro-fixes' into 3.6.xMike Gabriel2017-12-155-124/+117
| |\ | | | | | | | | | | | | | | | Attributes GH PR #605: https://github.com/ArcticaProject/nx-libs/pull/605 Reviewed-by: Ulrich Sibiller <uli42@gmx.de> -- Thu, 14 Dec 2017 13:15:12 +0000
| | * Xserver/hw/nxagent/Clipboard.c: Fix free calls (free back to XFree).Mike Gabriel2017-12-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.Mike Gabriel2017-12-154-121/+114
| |/
| * nx-libs.spec: actually use a weak dependency for xkeyboard-config.Mihai Moldovan2017-12-151-0/+10
| | | | | | | | At least on platforms that support weak dependencies.
| * nx-libs.spec: add back erroneously dropped xkeyboard-config dependency.Mihai Moldovan2017-12-151-0/+4
| |
| * Merge branch 'sunweaver-pr/fix-compiler-warnings' into 3.6.xMihai Moldovan2017-12-148-28/+40
| |\ | | | | | | | | | 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 ↵Mike Gabriel2017-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as pointers Picked from this X.org commit: commit b0dd6be2c8703f7062d45ac9fd646550c7d54e3b Author: Jamey Sharp <jamey@minilop.net> 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 <jamey@minilop.net> Signed-off-by: Daniel Stone <daniel@fooishbar.org> Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> (Only appropriate location for backporting: Xserver/GL/glx/glxcmds.c).
| | * lib/X11/Xrm.c: Compiler warning fix: logical-not-parenthesesMike Gabriel2017-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | 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 fixesMike Gabriel2017-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 63ccaec2c39f4b5742383472c951ee2cd35c9e14 Author: Adam Jackson <ajax@redhat.com> 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 <ajax@redhat.com> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
| | * Xserver/GL/glx/glxfb.c: Fix compiler warning: pointer-sign.Mike Gabriel2017-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | glxfb.c: In function '__glXFBMemSwapBuffers': glxfb.c:117:5: warning: pointer targets in passing argument 10 of 'pGC->ops->PutImage' differ in signedness [-Wpointer-sign] buf); ^~~ glxfb.c:117:5: note: expected 'char *' but argument is of type 'GLubyte * {aka unsigned char *}'
| | * hw/nxagent/Events.c: Fix compiler warnings (with NX_DEBUG_INPUT): format.Mike Gabriel2017-12-141-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Events.c: In function 'nxagentDumpInputDevicesState': Events.c:4662:58: warning: format '%p' expects argument of type 'void *', but argument 3 has type 'DeviceIntPtr {aka struct _DeviceIntRec *}' [-Wformat=] fprintf(stderr, "\nKeyboard device state: \n\tdevice [%p]\n\tlast grab time [%lu]" ^ Events.c:4662:82: warning: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'CARD32 {aka unsigned int}' [-Wformat=] fprintf(stderr, "\nKeyboard device state: \n\tdevice [%p]\n\tlast grab time [%lu]" ^ Events.c:4662:19: warning: format '%p' expects argument of type 'void *', but argument 7 has type 'GrabPtr {aka struct _GrabRec *}' [-Wformat=] fprintf(stderr, "\nKeyboard device state: \n\tdevice [%p]\n\tlast grab time [%lu]" ^ Events.c:4675:66: warning: format '%p' expects argument of type 'void *', but argument 3 has type 'WindowPtr {aka struct _Window *}' [-Wformat=] fprintf(stderr, "\nKeyboard grab state: \n\twindow pointer [%p]" ^ Events.c:4689:59: warning: format '%p' expects argument of type 'void *', but argument 3 has type 'DeviceIntPtr {aka struct _DeviceIntRec *}' [-Wformat=] fprintf(stderr, "\nPassive grab state: \n\tdevice [%p]\n\towner events flag [%s]" ^ Events.c:4689:23: warning: format '%lx' expects argument of type 'long unsigned int', but argument 10 has type 'Mask {aka unsigned int}' [-Wformat=] fprintf(stderr, "\nPassive grab state: \n\tdevice [%p]\n\towner events flag [%s]" ^ Events.c:4722:57: warning: format '%p' expects argument of type 'void *', but argument 3 has type 'DeviceIntPtr {aka struct _DeviceIntRec *}' [-Wformat=] fprintf(stderr, "\nPointer device state: \n\tdevice [%p]\n\tlast grab time [%lu]" ^ Events.c:4722:81: warning: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'CARD32 {aka unsigned int}' [-Wformat=] fprintf(stderr, "\nPointer device state: \n\tdevice [%p]\n\tlast grab time [%lu]" ^ Events.c:4722:19: warning: format '%p' expects argument of type 'void *', but argument 7 has type 'GrabPtr {aka struct _GrabRec *}' [-Wformat=] fprintf(stderr, "\nPointer device state: \n\tdevice [%p]\n\tlast grab time [%lu]" ^ Events.c:4735:65: warning: format '%p' expects argument of type 'void *', but argument 3 has type 'WindowPtr {aka struct _Window *}' [-Wformat=] fprintf(stderr, "\nPointer grab state: \n\twindow pointer [%p]" ^ Events.c:4750:61: warning: format '%p' expects argument of type 'void *', but argument 3 has type 'DeviceIntPtr {aka struct _DeviceIntRec *}' [-Wformat=] fprintf(stderr, "\nPassive grab state: \n\tdevice [%p]\n\towner events flag [%s]" ^ Events.c:4750:25: warning: format '%lx' expects argument of type 'long unsigned int', but argument 10 has type 'Mask {aka unsigned int}' [-Wformat=] fprintf(stderr, "\nPassive grab state: \n\tdevice [%p]\n\towner events flag [%s]" ^
| | * hw/nxagent/NXxvdisp.c: Fix compiler warnings: misleading-indentationMike Gabriel2017-12-141-8/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NXxvdisp.c: In function 'ProcXvDispatch': NXxvdisp.c:96:9: warning: this 'else' clause does not guard... [-Wmisleading-indentation] else ^~~~ NXxvdisp.c:99:13: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'else' break; ^~~~~ NXxvdisp.c:104:9: warning: this 'else' clause does not guard... [-Wmisleading-indentation] else ^~~~ NXxvdisp.c:107:10: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'else' break; ^~~~~ NXxvdisp.c:118:2: warning: this 'else' clause does not guard... [-Wmisleading-indentation] else ^~~~ NXxvdisp.c:121:13: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'else' break; ^~~~~ NXxvdisp.c:126:2: warning: this 'else' clause does not guard... [-Wmisleading-indentation] else ^~~~ NXxvdisp.c:129:13: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'else' break; ^~~~~ NXxvdisp.c:137:2: warning: this 'else' clause does not guard... [-Wmisleading-indentation] else ^~~~ NXxvdisp.c:140:13: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'else' break; ^~~~~ NXxvdisp.c:146:2: warning: this 'else' clause does not guard... [-Wmisleading-indentation] else ^~~~ NXxvdisp.c:149:6: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'else' break; ^~~~~
| | * hw/nxagent/NXdispatch.c: Fix compiler warning: misleading-indentationMike Gabriel2017-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NXdispatch.c: In function 'Dispatch': NXdispatch.c:309:3: warning: this 'if' clause does not guard... [-Wmisleading-indentation] if (!(dispatchException & DE_TERMINATE)) ^~ NXdispatch.c:312:5: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'if' while (!dispatchException) ^~~~~
| | * Xserver/Xi/chgfctl.c: Fix compiler warning: misleading-indentation.Mike Gabriel2017-12-141-3/+3
| |/ | | | | | | | | | | | | | | | | | | chgfctl.c: In function 'ChangeKbdFeedback': chgfctl.c:359:6: warning: this 'else' clause does not guard... [-Wmisleading-indentation] else ^~~~ chgfctl.c:361:3: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'else' kctrl.autoRepeats[inx] = ^~~~~
| * debian/rules: Neither overzealously remove nx-X11/Makefile.Mike Gabriel2017-12-141-1/+0
| |
| * debian/rules: Don't remove our main Makefile.Mike Gabriel2017-12-141-1/+0
| |
| * debian/rules: Fix override_dh_clean target for older Debian/Ubuntu versions.Mike Gabriel2017-12-141-44/+64
| |
| * Add missing/renamed patches. (Ouch!).Mike Gabriel2017-12-142-0/+56
| |
| * nx-libs.spec: Add missing BuildRequires and fix paths to files.Mike DePaulo2017-12-141-2/+8
| | | | | | | | Fixes ArcticaProject/nx-libs#516.
| * debian/control: Set Section: to "libs" for libnx-x11-6.Mike Gabriel2017-12-141-0/+1
| |
| * debian/control: All Priority: extras packages are required to be changed to ↵Mike Gabriel2017-12-141-1/+1
| | | | | | | | Priority: optional by recent Debian Policy.
| * Merge branch 'uli42-pr/improve_keyboard_light' into 3.6.xMike Gabriel2017-12-144-113/+181
| |\ | | | | | | | | | Attributes GH PR #591: https://github.com/ArcticaProject/nx-libs/pull/591
| | * nxagent manpage: extend description of keyboard optionUlrich Sibiller2017-12-141-4/+7
| | |
| | * Events.c/h: Rename & restructure some Xkb functionsUlrich Sibiller2017-12-142-22/+22
| | | | | | | | | | | | | | | nxagentInitKeyboardState -> nxagentInitXkbKeyboardState nxagentHandleKeyboardEvent -> nxagentHandleXkbKeyboardStateEvent
| | * Keyboard.c: Replace some memsets by zero initializationUlrich Sibiller2017-12-141-6/+3
| | |
| | * Keyboard.c: Fix indentationUlrich Sibiller2017-12-141-13/+13
| | |
| | * Keyboard.c: set variables to NULL after freeUlrich Sibiller2017-12-141-0/+3
| | |
| | * Keyboard.c: XkbDfltRepeatDelay and XkbDfltRepeatIntervall are int not uintUlrich Sibiller2017-12-141-1/+1
| | |
| | * Keyboard.c: Use calloc instead of malloc + memsetUlrich Sibiller2017-12-141-5/+1
| | |
| | * nxagent manpage: Extend keyboard documentationUlrich Sibiller2017-12-141-5/+23
| | |
| | * Keyboard.c: Make xkblock more robustUlrich Sibiller2017-12-141-1/+21
| | | | | | | | | | | | | | | | | | | | | If xorg upstream xkb gets extended one day the previous code would not block new xkb calls even if they would change keyboard settings. So only act on the currently known calls and throw an error for all unknown calls.
| | * Keyboard.c: Some code cleanupsUlrich Sibiller2017-12-141-57/+46
| | |
| | * nxagent manpage: Improve explanation of -noignore and -noxkblockUlrich Sibiller2017-12-141-2/+8
| | | | | | | | | | | | Fixes ArcticaProject/nx-libs#257
| | * Keyboard.c: Add some comments with changelog explanationsUlrich Sibiller2017-12-141-0/+21
| | | | | | | | | | | | This helps understanding the intention of the following code.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 10:07:55 +0000