aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix for too overall Xdamage and Xrandr client lib removal: Bring back the ↵Mike Gabriel2015-12-298-0/+505
| | | | nx-x11proto-{randr,damage} header files and use those at compile time.
* X11/nx-X11 clear-up: More places where we need to explicitly distinguish ↵Mike Gabriel2015-12-2927-51/+51
| | | | between X11 and nx-X11 namespace regarding header include paths.
* nx-X11/lib/X11/Marcos.c: white-space cleanup (EOL blanks).Mike Gabriel2015-12-291-4/+4
|
* pointer typedef in Xdefs.h: also catch Xdefs.h include in include/misc.h, ↵Mike Gabriel2015-12-282-6/+17
| | | | make undoing the FIXME more obvious.
* libray clean (Xfixes): Provide a fake libXfixes.h header from latest X.Org, ↵Mike Gabriel2015-12-284-3/+93
| | | | that includes headers from our Xlib version. This avoids FTBFS caused by type redefinitions and should really be a temporary measure.
* Xrandr_nxagent.h: When faking Xrandr.h, we better include our own Xfuncproto.h.Mike Gabriel2015-12-281-1/+1
|
* nxcompshad/X11/include/Xdamage_nxcompshad.h: Update FIXME statement. ↵Mike Gabriel2015-12-281-1/+1
| | | | Work-around needs to persist until libX11 from X.Org gets used by nxagent.
* library clean-up: Don't build libNX_Xfixes anymore. Use system's libXfixes ↵Mike Gabriel2015-12-2821-1687/+22
| | | | shared library.
* library clean-up: Don't build libNX_Xcomposite anymore. Use system's ↵Mike Gabriel2015-12-2815-643/+23
| | | | libXcomposite shared library.
* pointer typedef in Xdefs.h: Define pointer type for building against older ↵Mike Gabriel2015-12-281-2/+8
| | | | Xlib versions that still expect the pointer type to exist (e.g. Ubuntu <= 14.04, Debian <= 7.0).
* Merge branch 'sunweaver-pr/NX-include-path' into 3.6.xMike Gabriel2015-12-28531-1666/+2203
|\ | | | | | | Attributes GH PR #61: https://github.com/ArcticaProject/nx-libs/pull/61
| * Clear header file namespace separation (<X11/...> vs. <nx-X11/...>).Mike Gabriel2015-12-28531-1666/+2203
|/ | | | | | | | | | | | | | | | | | | | In the process of building nxagent against more and more system-wide installed X.org libraries, we come to the limit of including structs from this (bundled nx-X11) and that (system-wide X.Org) library. This commit introduces a clear namespace separation of headers provided by nx-X11 and headers provided by X.Org. This approach is only temporary as we want to drop all nx-X11 bundled libraries from nx-libs. However, for a while we need to make this separation clear and also ship some reduced fake X.Org headers that avoid pulling in libX* and libNX_X* symbols at the same time. This patch has been tested on Debian jessie and unstable and requires no overall testing on various distros and distro versions, as we finally will drop all libNX_X* libraries and build against X.org's client libs. For now, this hack eases our development / cleanup process.
* Merge branch 'sunweaver-pr/dixfont-fix' into 3.6.xMike Gabriel2015-12-281-4/+7
|\ | | | | | | Attributes GH PR #58: https://github.com/ArcticaProject/nx-libs/pull/58
| * On realloc failure, free font_path_string instead of leaking itMike Gabriel2015-12-281-4/+7
|/ | | | | | | | | | | Flagged by cppcheck 1.62: [dix/dixfonts.c:1792]: (error) Common realloc mistake: 'font_path_string' nulled but not freed upon failure Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Keith Packard <keithp@keithp.com> Rebased against NX: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
* Merge branch 'sunweaver-pr/change-pointer-into-void' into 3.6.xMike Gabriel2015-12-28206-1384/+1395
|\ | | | | | | Attributes GH PR #54: https://github.com/ArcticaProject/nx-libs/pull/54
| * Replace 'pointer' type with 'void *'Keith Packard2015-12-28206-1384/+1395
|/ | | | | | | | | | This lets us stop using the 'pointer' typedef in Xdefs.h as 'pointer' is used throughout the X server for other things, and having duplicate names generates compiler warnings. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Eric Anholt <eric@anholt.net> Rebased against NX: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
* Drop all references to printver.c. Not provided in source tree anymore.Mike Gabriel2015-10-071-9/+0
| | | | Fixes ArcticaProject/nx-libs#63
* Re-add -sync option back to nxagent to allow synchronous debugging of the ↵Mike Gabriel2015-10-063-0/+12
| | | | nxagent DDX.
* Xinerama symlinking: Create / remove folder containing Xinerama sylinks on ↵Mike Gabriel2015-09-282-1/+4
| | | | installation/upgrade and removal.
* Xinerama symlinking: Attach Xinerama symlinking to nxagent bin:package (and ↵Mike Gabriel2015-09-284-9/+9
| | | | not libnx-xinerama1).
* debian/changelog: Drop unnecessary "~build1" from version stringMike Gabriel2015-09-281-1/+1
|
* Merge pull request #64 from uli42/pr/add_pkgconfigMike Gabriel2015-09-283-0/+8
|\ | | | | Various fixes for pkgconfig file creation.
| * adapt pkgconfigdir in nxcompshadUlrich Sibiller2015-08-261-1/+1
| |
| * Fix "Makefile.in seems to ignore the --datarootdir setting" warningUlrich Sibiller2015-08-263-0/+6
| |
| * create pkgcnfig dir before copying anythingUlrich Sibiller2015-08-263-1/+4
| |
* | Merge branch 'uli42-pr/backported_fixes' into 3.6.xMike Gabriel2015-09-282-3/+3
|\ \
| * | debian/libnx-xinerama1.postinst.in: Enforce symlink creation for Xinerama ↵Mike Gabriel2015-09-281-3/+3
| | | | | | | | | | | | support.
| * | Revert "debian/libnx-xinerama1.*: fix faulty logic when creating symlinks."Mike Gabriel2015-09-281-3/+3
| | | | | | | | | | | | This reverts commit b77b26f4acc3932c29a1e0788e22d24e29e091d5.
| * | nx-libs.spec: add xkeyboard-config to nxagent's Requires.Mihai Moldovan2015-09-282-0/+7
| | | | | | | | | | | | | | | | | | Should be a weak dependency, but RPM doesn't support that too well yet. Cherry-picked from 3.5.0.x branch.
| * | debian/control: add xkb-data to nxagent's Recommends.Mihai Moldovan2015-09-282-1/+4
| | | | | | | | | | | | Cherry-picked from 3.5.0.x branch.
| * | debian/roll-tarballs.sh: more quotes, more curly braces, replace cd with ↵Mihai Moldovan2015-09-281-8/+8
| | | | | | | | | | | | pushd and pop.
| * | roll-tarball.sh: more quotes (follow-up for previous commit), drop debug codeMike Gabriel2015-09-281-5/+3
| | |
| * | roll-tarball.sh: Make sure symlinked files are included in tarballs.Mike Gabriel2015-09-281-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As the system a tarball gets extracted on may potentially be unable to handle symlinks, we ship symlinks as files in the rolled tarball. By transforming symlinks into real files, we also assure that all VERSION files/symlinks get shipped in the tarballs. Fixes ArcticaProject/nx-libs#27
| * | nx-libs.spec: Install nxcomp{,ext,shad}.pc into the corresponding ↵Mike Gabriel2015-09-281-0/+3
| | | | | | | | | | | | development packages.
| * | debian/libxcomp{,ext,shad}-dev.install.in: Install nxcomp{,ext,shad}.pc file ↵Mike Gabriel2015-09-283-0/+3
| | | | | | | | | | | | into the corresponding development packages.
| * | nxcomp{,ext,shad}/Makefile.in: Create pkgconfigdir before putting files in it.Mike Gabriel2015-09-283-0/+3
| | |
| * | nxcomp{,shad,ext}: Remove nxcomp*.pc file on clean and distclean.Mike Gabriel2015-09-283-3/+3
| | |
| * | Makefile: Also remove nxversion.def on distclean.Mike Gabriel2015-09-281-1/+1
| | |
| * | Add pkg-config support to nxcomp, nxcompext and nxcompshadUlrich Sibiller2015-09-289-27/+86
| | |
| * | debian/changelog: sync with master/3.5.0.x branch.Mihai Moldovan2015-09-281-2/+77
| | |
| * | debian/changelog: sync with master/3.5.0.x branch.Mihai Moldovan2015-09-281-0/+31
| | |
| * | Correct nxproxy manpage also: --help -> -helpMike DePaulo2015-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | xorg-server does not follow the convention of using 2 dashes, and apparently nx-libs doesn't either. Note that --help does produce the help output. However, it produces this additional output after it: Error: NX transport initialization failed. Therefore, we should instruct users to call -help instead.
| * | Correct manpages: --help -> -helpMike DePaulo2015-09-282-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | xorg-server does not follow the convention of using 2 dashes. Note that --help does produce the help output. However, it produces this additional output after it: Error: Aborting session with 'Unrecognized option: --help'. Session: Aborting session at 'Sun Jun 28 01:35:35 2015'. Session: Session aborted at 'Sun Jun 28 01:35:35 2015'. It also causes a return code of 1 rather than 0. Therefore, we should instruct users to call -help instead.
| * | library clean-up: No autotools cruft in nx-libs.Mike Gabriel2015-09-2831-1091/+0
| | |
| * | doc/examples/run-nxproxy2nxproxy-test: Create NX_COOKIE dynamically using ↵Mike Gabriel2015-09-281-3/+4
| | | | | | | | | | | | the mcookie tool.
| * | COPYING: Replace content with GPL-2 license text, because that is the ↵Mike Gabriel2015-09-281-56/+339
| | | | | | | | | | | | overall (i.e., strictest) license we have to deal with in nx-libs.
| * | debian/roll-tarball.sh: Auto-generate ChangeLog from Git history.Mike Gabriel2015-09-281-0/+1
| | |
| * | debian/roll-tarball.sh: Rename README.md to README.NX-Development before ↵Mike Gabriel2015-09-281-0/+3
| | | | | | | | | | | | moving it into doc/ folder.
| * | debian/roll-tarball.sh: Prevent several files/folders from ending up in ↵Mike Gabriel2015-09-281-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nx-libs-lite tarball. * bin/{nxagent,nxauth,x2goagent} * etc/ * doc/nx-X11_vs_XOrg69_patches * README.keystrokes" * nx-libs.spec
| * | debian/roll-tarball.sh: Support tarring up the HEAD of the current branch.Mike Gabriel2015-09-281-2/+2
| | |