aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'sunweaver-pr/backport-Xorg-memory-handling' into 3.6.xMike Gabriel2016-07-02173-2715/+1699
|\ | | | | | | | | Attributes GH PR #159: https://github.com/ArcticaProject/nx-libs/pull/159 Reviewed by: Vadim Troshchinskiy <vadim@qindel.com> -- Fri, 01 Jul 2016 12:47:46 -0700
| * debian/patches: Refresh patches after changes in upstream code.Mike Gabriel2016-07-022-2/+2
| |
| * nx-X11/include/extensions/XKBsrv.h: Different memory handling when built ↵Mike Gabriel2016-07-021-2/+18
| | | | | | | | with Xserver and with Xlib.
| * os: Remove deprecated malloc/free wrappers, clean ↵Mike Gabriel2016-07-022-145/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | {X,XNF}{alloc,calloc,realloc,free,strdup} from pre-C89 baggage Backported from X.org: commit cad9b053d52f62432dfd70e42e0240de77027cae Author: Adam Jackson <ajax@redhat.com> Date: Tue Jul 8 13:24:25 2014 -0400 os: Remove deprecated malloc/free wrappers Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Adam Jackson <ajax@redhat.com> commit e983848ab44b0769f97f6207f1aa8b4f127be6a9 Author: Mikhail Gusarov <dottedmag@dottedmag.net> Date: Thu May 6 00:16:24 2010 +0700 Clean {X,XNF}{alloc,calloc,realloc,free,strdup} from pre-C89 baggage C89 guarantees alignment of pointers returned from malloc/calloc/realloc, so stop fiddling with alignment manually and just pass the arguments to library functions. Also convert silent error when negative size is passed into function into warning in log file. Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Backport to nx-libs: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
| * nx-X11/programs/Xserver: Drop {X,x}calloc() macros, use calloc() instead.Mike Gabriel2016-07-0223-62/+53
| |
| * nx-X11/programs/Xserver: Drop {X,x}realloc() macros, use realloc() instead.Mike Gabriel2016-07-0243-96/+95
| |
| * nx-X11/programs/Xserver: Drop {X,x}alloc() macros, use malloc() instead.Mike Gabriel2016-07-02148-1403/+513
| |
| * nx-X11/programs/Xserver: Drop {X,x}free() macros, use free() instead.Mike Gabriel2016-07-02148-1006/+1001
|/ | | | Fixes ArcticaProject/nx-libs#105
* Merge branch 'sunweaver-pr/protocols-version-h' into 3.6.xMike Gabriel2016-07-0230-87/+319
|\ | | | | | | | | Attributes GH PR #160: https://github.com/ArcticaProject/nx-libs/pull/160 Reviewed by: Vadim Troshchinskiy <vadim@qindel.com> -- Fri, 01 Jul 2016 12:42:42 -0700
| * Xserver/include/protocol-versions.h: Switch to having an Xserver-specific ↵Mike Gabriel2016-07-0221-75/+257
| | | | | | | | header file containing all use protocol versions.
| * Xserver Imakefiles: Make sure NXAGENT_SERVER is defined for all extensions.Mike Gabriel2016-07-029-12/+62
|/
* Merge branch 'sunweaver-pr/ld-loading-libX11-hack' into 3.6.xMike Gabriel2016-07-016-21/+21
|\ | | | | | | | | | | Attributes GH PR #172: https://github.com/ArcticaProject/nx-libs/pull/172 Reviewed by: Mihai Moldovan <ionic@ionic.de> -- Fri Jul 1 00:38:00 CEST 2016 Reviewed by: Ulrich Sibiller <uli42@gmx.de> -- Fri Jul 1 00:38:00 CEST 2016
| * Rework nxagent and nxproxy wrapper scripts.Mike Gabriel2016-07-016-21/+21
|/ | | | | | | | | | | | | | | | | | | o Install nxagent/nxproxy executables into multi-arch path. o Fake libNX_X11.so* as $LIBDIR/nx-X11/libX11.so*. o Allow injecting different $NXAPP containing the executable name. o For e.g. x2goagent this requires the following changes: - Move x2goagent symlink from /usr/lib/x2go/bin/x2goagent to $LIBDIR/nx/bin/x2goagent - Replace /usr/bin/x2goagent by a two-liner... ``` #!/bin/sh export NXAPP=x2goagent nxagent ```
* Merge branch 'uli42-pr/drop_libNX_Xext' into 3.6.xMike Gabriel2016-07-0139-2723/+48
|\ | | | | | | Attributes GH PR #175: https://github.com/ArcticaProject/nx-libs/pull/175
| * finally drop libNX_XextUlrich Sibiller2016-07-0119-962/+30
| |
| * remove shm code from libNX_XextUlrich Sibiller2016-07-0113-832/+9
| |
| * avoid conflicts when mixing own includes with upstream includesUlrich Sibiller2016-07-012-2/+5
| | | | | | | | | | We might better change all guard defines with the ones upstream is using but for now this should also work.
| * remove XShape code from libNX_XextUlrich Sibiller2016-07-0114-933/+10
|/ | | | use system libXext instead
* Merge branch 'sunweaver-pr/libXau-cleanup' into 3.6.xMike Gabriel2016-07-0155-5515/+33
|\ | | | | | | | | Attributes GH PR #152: https://github.com/ArcticaProject/nx-libs/pull/152 Reviewed by: Vadim Troshchinskiy <vadim@qindel.com> -- Fri, 01 Jul 2016 14:55:00 +0200
| * nxagent Xserver: Drop Kerberos code. Not used in nxagent.Mike Gabriel2016-07-0115-976/+7
| |
| * library-cleanup: Don't build libNX_Xau anymore. Use system's libXau shared ↵Mike Gabriel2016-07-0128-1062/+12
| | | | | | | | library.
| * nxauth: Drop nxauth tool completely, xauth can be successfully used with ↵Mike Gabriel2016-07-0119-3477/+14
|/ | | | nxagent / nxproxy instead.
* Merge branch 'sunweaver-pr/debian-packaging-updates' into 3.6.xMike Gabriel2016-07-0135-561/+171
|\ | | | | | | | | Attributes GH PR: https://github.com/ArcticaProject/nx-libs/pull/151 Self-reviewed: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -- Fri, 01 Jul 2016 14:03:44 +0200
| * debian/*.dirs: Don't create directories in the Debian package. All handled ↵Mike Gabriel2016-07-012-5/+0
| | | | | | | | well by the upstream Makefile.
| * roll-tarball.sh: Move out of debian/ folder into project's base folder.Mike Gabriel2016-07-011-1/+1
| |
| * debian/libxcompext3.symbols: Add symbols file for libXcompext3.Mike Gabriel2016-07-011-0/+103
| |
| * nx-X11/extras/Mesa/src/mesa/shader/arbprogparse.c: Fix typo (grammer -> ↵Mike Gabriel2016-07-011-3/+3
| | | | | | | | | | | | grammar). ... detected by Debian's lintian tool.
| * debian/rules: Use buildflags.mk from dpkg-dev. Enable bindnow hardening flag.Mike Gabriel2016-07-011-4/+3
| |
| * debian/control: Versioned B-D: dpkg-dev (>= 1.16.1.1).Mike Gabriel2016-07-011-0/+1
| |
| * debian/control: Remove all Pre-Depends: fields from all bin:pkgs.Mike Gabriel2016-07-011-24/+0
| |
| * debian/control: Bump Standards: to 3.9.8. (Various changes were needed).Mike Gabriel2016-07-011-1/+1
| |
| * debian/{control,compat}: Bump to DH compat level 9.Mike Gabriel2016-07-012-2/+2
| |
| * debian/control: Use my DD address in Uploaders: field.Mike Gabriel2016-07-011-1/+1
| |
| * debian/changelog: Suppress warnings from lintian about -0 revision in ↵Mike Gabriel2016-07-011-1/+1
| | | | | | | | version string.
| * debian/control: Drop various not-used-anymore libNX_* related packages. Add ↵Mike Gabriel2016-07-011-506/+54
| | | | | | | | B:/R: to libnx-x11-{6,dev,6-dbg) to uninstall those package when upgrading to nx-libs 3.6.x.
| * roll-tarball.sh: Don't ship doc/X11-symbols/ in the lite (proxy-only) ↵Mike Gabriel2016-07-011-0/+1
| | | | | | | | tarball derived from the nx-libs code tree.
| * debian/rules: Don't attempt at removing $(CURDIR)/.preserve/. Not needed ↵Mike Gabriel2016-07-011-1/+0
| | | | | | | | anymore since we removed the CODE-REDUCTION_* hacks from debian/rules.
| * debian/*: Drop non-multi-arch support (i.e. Debian squeeze, Ubuntu 10.04 and ↵Mike Gabriel2016-07-0121-12/+0
| | | | | | | | earlier).
| * debian/*: Drop not-use-anymore CODE-REDUCTION_* files.Mike Gabriel2016-07-016-0/+0
|/
* Merge branch 'sunweaver-pr/define-default-source-not-bsd+svid-source' into 3.6.xMike Gabriel2016-07-012-2/+2
|\ | | | | | | | | Attributes GH PR #150: https://github.com/ArcticaProject/nx-libs/pull/150 Reviewed by: Vadim Troshchinskiy <vadim@qindel.com> -- Fri, 01 Jul 2016 04:33:22 -0700
| * build flags: Use -D_DEFAULT_SOURCE instead of deprecated -D_BSD_SOURCE and ↵Mike Gabriel2016-07-012-2/+2
| | | | | | | | | | | | | | | | | | | | -D_SVID_SOURCE. Note: This breaks building on ancient Linux distro versions, e.g. Ubuntu 10.04 LTS. For details see: http://man7.org/tlpi/code/faq.html#use_default_source
| * nx-X11/lib/X10: Drop really ancient X10 API code. Not used within nxagent.Mike Gabriel2016-06-3016-1310/+0
| |
| * OPTFLAGS: Properly propagate build option flags to nxcomp{,ext,shad} and the ↵Mike Gabriel2016-06-3013-85/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nx-X11 build scripts. Note: - The "normal" way to inject CFLAGS (and CPPFLAGS) into nx-X11 builds is copying those options over into the variable CDEBUGFLAGS. - LDFLAGS have to be handed to nx-X11 via LOCAL_LDFLAGS. This change also includes a slight change in the nx-X11 build order. Old build order: Main Makefile: - [...] - libNX_X11 + implicitly building nxcomp + implicitly building nxcompext - [...] - nxagent + implicitly building nxcompshad - [...] New build ordner: Main Makefile: - [...] - nxcomp - setup nx-X11 build env + cd nx-X11 && make BuildEnv - nxcompext - nxcompshad - nx-X11/lib/* - [...] - nxagent - [...] Fixes ArcticaProject/nx-libs#141 Fixes X2GoBTS#84
* | Merge branch 'sunweaver-pr/drop-really-old-X10-API-code' into 3.6.xMike Gabriel2016-07-0116-1310/+0
|\ \ | | | | | | | | | | | | Attributes GH PR #148: https://github.com/ArcticaProject/nx-libs/pull/148 Reviewed by Vadim Troshchinskiy <vadim@qindel.com> -- Fri, 01 Jul 2016 03:12:26 -0700
| * | nx-X11/lib/X10: Drop really ancient X10 API code. Not used within nxagent.Mike Gabriel2016-07-0116-1310/+0
|/ /
* | Merge branch 'sunweaver-pr/properly-apply-optflags-at-buildtime' into 3.6.xMike Gabriel2016-07-0113-85/+62
|\ \ | |/ |/| | | | | Attributes GH PR #149: https://github.com/ArcticaProject/nx-libs/pull/149 Reviewed by Vadim Troshchinskiy <vadim@qindel.com> -- Fri, 01 Jul 2016 02:02:49 -0700
| * OPTFLAGS: Properly propagate build option flags to nxcomp{,ext,shad} and the ↵Mike Gabriel2016-07-0113-85/+62
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nx-X11 build scripts. Note: - The "normal" way to inject CFLAGS (and CPPFLAGS) into nx-X11 builds is copying those options over into the variable CDEBUGFLAGS. - LDFLAGS have to be handed to nx-X11 via LOCAL_LDFLAGS. This change also includes a slight change in the nx-X11 build order. Old build order: Main Makefile: - [...] - libNX_X11 + implicitly building nxcomp + implicitly building nxcompext - [...] - nxagent + implicitly building nxcompshad - [...] New build ordner: Main Makefile: - [...] - nxcomp - setup nx-X11 build env + cd nx-X11 && make BuildEnv - nx-X11/lib/* - nxcompext - nxcompshad - [...] - nxagent - [...] Fixes ArcticaProject/nx-libs#141 Fixes X2GoBTS#84
* debian/libnx-x11-6.symbols: Update symbols (added: _XEatDataWords@Base ↵Mike Gabriel2016-06-301-0/+2
| | | | 3.5.99.0, _XGetRequest@Base 3.5.99.0).
* Merge branch 'sunweaver-pr/drop-embedded-imake-and-makedepend' into 3.6.xMike Gabriel2016-06-3028-8306/+12
|\ | | | | | | | | Attributes GH PR #146: https://github.com/ArcticaProject/nx-libs/pull/146 Reviewed by: Vadim Troshchinskiy <vadim@qindel.com> -- Thu, 30 Jun 2016 06:30:46 -0700
| * nx-X11/Makefile: Drop build support for World.Win32 and World.OS2. Not our ↵Mike Gabriel2016-06-301-49/+0
| | | | | | | | target platforms.