aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'uli42-pr/libX11_xtrans_silence_compiler_warnings' into 3.6.xMike Gabriel2016-11-036-26/+32
|\ | | | | | | Attributes GH PR #278: https://github.com/ArcticaProject/nx-libs/pull/278
| * xtrans: fix const warnings for SocketConnectConnInfoUlrich Sibiller2016-11-031-1/+1
| |
| * xtrans: silence compiler warning regarding is_numericUlrich Sibiller2016-11-032-1/+4
| | | | | | | | | | | | is_numeric is only needed if X11_t is defined. Silences "warning: ‘is_numeric’ defined but not used [-Wunused-function]"
| * libX11 + Xserver: fix missing define warningUlrich Sibiller2016-11-032-2/+5
| | | | | | | | | | | | warning: "XTRANS_SEND_FDS" is not defined [-Wundef] This define came in via the recent xtrans update.
| * xtrans: Fix compile warningUlrich Sibiller2016-11-023-20/+20
| | | | | | | | warning: format ‘%p’ expects argument of type ‘void *’
| * xtrans: fix compilation warnings because of missing XTRANS_SEND_FDSUlrich Sibiller2016-11-022-2/+2
|/
* debian/libnx-x11-6.symbols: Update after upgrade of xtrans library files.Mike Gabriel2016-11-021-12/+12
|
* Merge branch 'uli42-pr/upgrade_xtrans' into 3.6.xMike Gabriel2016-11-0224-5609/+2064
|\ | | | | | | Attributes GH PR #268: https://github.com/ArcticaProject/nx-libs/pull/268
| * Whitespace fixesUlrich Sibiller2016-11-023-4/+4
| |
| * Xtrans: update to Xorg/xtrans upstream (1.3.5+)Ulrich Sibiller2016-11-027-912/+1352
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This lifts xtrans to the state of this commit: commit 560d7550e23e9b14056b4a9b2569c2f256015f8a Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com> Date: Sat Sep 10 22:09:51 2016 -0700 Update strlcpy macro check to also check HAVE_STRLCPY xorg-server moved from HAS_STRLCPY to HAVE_STRLCPY in 2011 cf-xserver: d829a7c5cb42c979b58f3547136df5b05d906423 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
| * Remove __UNIXOS2__ referencesUlrich Sibiller2016-11-023-8/+8
| |
| * remove CLTS codeAdam Jackson2016-11-025-491/+1
| | | | | | | | | | | | | | | | | | | | Remove CLTS code Never been used, as far as I can tell. Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Adam Jackson <ajax@redhat.com> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
| * use %p in format stringsUlrich Sibiller2016-11-022-5/+5
| |
| * replace PRMSG by prmsgUlrich Sibiller2016-11-026-524/+499
| |
| * align license headers with Xorg/xtrans upstreamUlrich Sibiller2016-11-027-22/+29
| |
| * move helper functions to file endUlrich Sibiller2016-11-021-142/+148
| | | | | | | | this simplyfies updating to Xorg/xtrans upstream
| * Fixed #ifdef checks that were using i386 to use __i386__Jeremy Huddleston2016-11-023-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | """ It's simply obsolete, sloppy, compiler namespace pollution. The compiler is not allowed to predefine symbols that might conflict with ordinary identifiers. For backwards compatibility gcc currently predefines i386 when compiling for x86 32-bit (but not 64-bit), but that will go away. It is also not defined if you specify -ansi when invoking the compiler, because then it is seriously standards compliant. Other compilers shouldn't define it either. Correct code shouldn't rely on it being defined. However __i386__ is safe and proper. """ Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
| * whitespace cleanupUlrich Sibiller2016-11-026-107/+108
| | | | | | | | empty lines and trailing whitespace
| * Drastically simplify TRANS_OPEN_MAX.Adam Jackson2016-11-022-54/+3
| | | | | | | | | | | | If your OS doesn't have sysconf(3), then life is already hard for you. Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
| * undef __QNX__Ulrich Sibiller2016-11-022-5/+5
| |
| * undef LynxUlrich Sibiller2016-11-024-21/+5
| |
| * undef AIXV3Ulrich Sibiller2016-11-022-4/+4
| |
| * undef hpuxUlrich Sibiller2016-11-023-91/+4
| |
| * undef __UNIXOS2__Ulrich Sibiller2016-11-024-49/+0
| |
| * Remove OS2PIPECONN transportUlrich Sibiller2016-11-028-903/+10
| |
| * Remove unused TLI ("STREAMSCONN") codeUlrich Sibiller2016-11-0214-1516/+28
| |
| * remove DECnet supportUlrich Sibiller2016-11-0217-925/+25
|/ | | | just as Xorg upstream did
* Makefile: Make sure libNX_X11.so.6.2 does not get installed as symlink but ↵Mike Gabriel2016-11-021-1/+3
| | | | as actual file. (Follow-up for 5a90a63).
* Merge branch 'pr/unused_files' into 3.6.xMike Gabriel2016-11-0282-12487/+6
|\ | | | | | | Attributes GH PR #267: https://github.com/ArcticaProject/nx-libs/pull/267
| * remove unused mkks.shUlrich Sibiller2016-11-021-11/+0
| | | | | | | | although upstream still includes it.
| * remove unused jump_* files from libX11Ulrich Sibiller2016-11-023-1618/+0
| |
| * drop unused xtest1.fragsUlrich Sibiller2016-11-021-90/+0
| |
| * remove unused fb24_32.hUlrich Sibiller2016-11-021-53/+0
| |
| * remove unused registry.hUlrich Sibiller2016-11-021-64/+0
| | | | | | | | might be reintroduced later when upgrading the server
| * remove unused XInput.hUlrich Sibiller2016-11-024-1126/+1
| |
| * Remove unused Xv and XvMC headersUlrich Sibiller2016-11-024-780/+2
| |
| * drop unused glu.hUlrich Sibiller2016-11-022-329/+1
| |
| * drop ap_keysym.hUlrich Sibiller2016-11-024-54/+0
| | | | | | | | was unused
| * remove unused registry fileUlrich Sibiller2016-11-021-1711/+0
| |
| * remove *-def.cppUlrich Sibiller2016-11-023-4134/+0
| | | | | | | | never used
| * nxcomp: remove unused Utils.cppUlrich Sibiller2016-11-021-43/+0
| |
| * Imake: drop DoLoadableServer, MakeDllModules and IHaveModulesUlrich Sibiller2016-11-0242-2109/+2
| | | | | | | | | | | | We do not build loadable modules, so we do not need them anywhere. Also remove the extra files requires for module builds.
| * Remove extmod from nx-X11/programs/Xserver/Xext/.Mike Gabriel2016-11-0217-365/+0
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This backports (in their essence) these X.org Xserver commits: commit a7a2f9f66ddc27df96557093f3dd266e24eb653b Author: Daniel Stone <daniel@fooishbar.org> Date: Tue Jul 10 02:03:13 2012 +0100 Remove the last remnants of extmod extmod was originally a big pointless module. Now it's an empty, pointless module. This commit makes it unexist. Signed-off-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Keith Packard <keithp@keithp.com> commit 7a11b817e770cd2196814f1ac6264c6d87b76c6a Author: Tomas Carnecky <tom@dbservice.com> Date: Tue Jul 10 02:03:06 2012 +0100 Move Xv and XvMC from extmod to built-in Always build these extensions into the core server, rather than letting them languish in extmod. Signed-off-by: Tomas Carnecky <tom@dbservice.com> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Jamey Sharp <jamey@minilop.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Keith Packard <keithp@keithp.com> commit 7d859bd87834dd79c7fa3792075496ece698c082 Author: Tomas Carnecky <tom@dbservice.com> Date: Tue Jul 10 02:03:05 2012 +0100 Move XRes from extmod to built-in Always build XRes support into the core server, rather than letting it languish in extmod. Signed-off-by: Tomas Carnecky <tom@dbservice.com> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Jamey Sharp <jamey@minilop.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Keith Packard <keithp@keithp.com> commit ba21fc29587e4f11320b88a70433beb1fe22cdf3 Author: Tomas Carnecky <tom@dbservice.com> Date: Tue Jul 10 02:03:04 2012 +0100 Move DPMS from extmod to built-in Always build DPMS support into the core server, rather than letting it languish in extmod. Signed-off-by: Tomas Carnecky <tom@dbservice.com> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Jamey Sharp <jamey@minilop.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Keith Packard <keithp@keithp.com> commit 3ed2c6e11298c4299042cfe4578f6cc02e441d58 Author: Tomas Carnecky <tom@dbservice.com> Date: Tue Jul 10 02:03:03 2012 +0100 Move MIT-SCREEN-SAVER from extmod to built-in If we've built MIT-SCREEN-SAVER support, then just build it into the main binary, rather than leaving it in extmod. Signed-off-by: Tomas Carnecky <tom@dbservice.com> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Jamey Sharp <jamey@minilop.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Keith Packard <keithp@keithp.com> Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Conflicts: nx-X11/programs/Xserver/Xext/extmod/Imakefile
* Merge branch 'uli42-pr/add_libX11_links' into 3.6.xMike Gabriel2016-11-021-0/+30
|\ | | | | | | Attributes GH PR #248: https://github.com/ArcticaProject/nx-libs/pull/248
| * libX11/Imakefile: handle libX11 linksUlrich Sibiller2016-11-021-0/+27
| | | | | | | | | | | | | | | | | | | | Create libX11* link in exports/lib. This simplifies running nxagent from the build directory. This also adds a clean rule to remove the libX11 links as well as the libNX_X11 links which was not done before. Fixes ArcticaProject/nx-libs#234
| * libX11/Imakefile: add missing dependencies on ks_tables.hUlrich Sibiller2016-11-021-0/+3
|/
* Merge branch 'sunweaver-pr/clean-up-old-vcs-comments' into 3.6.xMike Gabriel2016-10-3170-227/+2
|\ | | | | | | Attributes GH PR #254: https://github.com/ArcticaProject/nx-libs/pull/254
| * Imakefile cleanup: Delete all ancient Vcs comments stemming from SVN times ↵Mike Gabriel2016-10-3170-227/+2
|/ | | | | | of X.org and XFree86. Fixes ArcticaProject/nx-libs#250.
* Merge branch 'sunweaver-pr/drop-mfb-maskbits-h' into 3.6.xMike Gabriel2016-10-305-946/+33
|\ | | | | | | Attributes GH PR #266: https://github.com/ArcticaProject/nx-libs/pull/266
| * Xserver/Imakefile: Drop references to already removed afb code.Mike Gabriel2016-10-301-2/+1
| |