Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix for too overall Xdamage and Xrandr client lib removal: Bring back the ↵ | Mike Gabriel | 2015-12-29 | 8 | -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 Gabriel | 2015-12-29 | 27 | -51/+51 |
| | | | | between X11 and nx-X11 namespace regarding header include paths. | ||||
* | nx-X11/lib/X11/Marcos.c: white-space cleanup (EOL blanks). | Mike Gabriel | 2015-12-29 | 1 | -4/+4 |
| | |||||
* | pointer typedef in Xdefs.h: also catch Xdefs.h include in include/misc.h, ↵ | Mike Gabriel | 2015-12-28 | 2 | -6/+17 |
| | | | | make undoing the FIXME more obvious. | ||||
* | libray clean (Xfixes): Provide a fake libXfixes.h header from latest X.Org, ↵ | Mike Gabriel | 2015-12-28 | 4 | -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 Gabriel | 2015-12-28 | 1 | -1/+1 |
| | |||||
* | nxcompshad/X11/include/Xdamage_nxcompshad.h: Update FIXME statement. ↵ | Mike Gabriel | 2015-12-28 | 1 | -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 Gabriel | 2015-12-28 | 21 | -1687/+22 |
| | | | | shared library. | ||||
* | library clean-up: Don't build libNX_Xcomposite anymore. Use system's ↵ | Mike Gabriel | 2015-12-28 | 15 | -643/+23 |
| | | | | libXcomposite shared library. | ||||
* | pointer typedef in Xdefs.h: Define pointer type for building against older ↵ | Mike Gabriel | 2015-12-28 | 1 | -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.x | Mike Gabriel | 2015-12-28 | 531 | -1666/+2203 |
|\ | | | | | | | Attributes GH PR #61: https://github.com/ArcticaProject/nx-libs/pull/61 | ||||
| * | Clear header file namespace separation (<X11/...> vs. <nx-X11/...>). | Mike Gabriel | 2015-12-28 | 531 | -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.x | Mike Gabriel | 2015-12-28 | 1 | -4/+7 |
|\ | | | | | | | Attributes GH PR #58: https://github.com/ArcticaProject/nx-libs/pull/58 | ||||
| * | On realloc failure, free font_path_string instead of leaking it | Mike Gabriel | 2015-12-28 | 1 | -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.x | Mike Gabriel | 2015-12-28 | 206 | -1384/+1395 |
|\ | | | | | | | Attributes GH PR #54: https://github.com/ArcticaProject/nx-libs/pull/54 | ||||
| * | Replace 'pointer' type with 'void *' | Keith Packard | 2015-12-28 | 206 | -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 Gabriel | 2015-10-07 | 1 | -9/+0 |
| | | | | Fixes ArcticaProject/nx-libs#63 | ||||
* | Re-add -sync option back to nxagent to allow synchronous debugging of the ↵ | Mike Gabriel | 2015-10-06 | 3 | -0/+12 |
| | | | | nxagent DDX. | ||||
* | Xinerama symlinking: Create / remove folder containing Xinerama sylinks on ↵ | Mike Gabriel | 2015-09-28 | 2 | -1/+4 |
| | | | | installation/upgrade and removal. | ||||
* | Xinerama symlinking: Attach Xinerama symlinking to nxagent bin:package (and ↵ | Mike Gabriel | 2015-09-28 | 4 | -9/+9 |
| | | | | not libnx-xinerama1). | ||||
* | debian/changelog: Drop unnecessary "~build1" from version string | Mike Gabriel | 2015-09-28 | 1 | -1/+1 |
| | |||||
* | Merge pull request #64 from uli42/pr/add_pkgconfig | Mike Gabriel | 2015-09-28 | 3 | -0/+8 |
|\ | | | | | Various fixes for pkgconfig file creation. | ||||
| * | adapt pkgconfigdir in nxcompshad | Ulrich Sibiller | 2015-08-26 | 1 | -1/+1 |
| | | |||||
| * | Fix "Makefile.in seems to ignore the --datarootdir setting" warning | Ulrich Sibiller | 2015-08-26 | 3 | -0/+6 |
| | | |||||
| * | create pkgcnfig dir before copying anything | Ulrich Sibiller | 2015-08-26 | 3 | -1/+4 |
| | | |||||
* | | Merge branch 'uli42-pr/backported_fixes' into 3.6.x | Mike Gabriel | 2015-09-28 | 2 | -3/+3 |
|\ \ | |||||
| * | | debian/libnx-xinerama1.postinst.in: Enforce symlink creation for Xinerama ↵ | Mike Gabriel | 2015-09-28 | 1 | -3/+3 |
| | | | | | | | | | | | | support. | ||||
| * | | Revert "debian/libnx-xinerama1.*: fix faulty logic when creating symlinks." | Mike Gabriel | 2015-09-28 | 1 | -3/+3 |
| | | | | | | | | | | | | This reverts commit b77b26f4acc3932c29a1e0788e22d24e29e091d5. | ||||
| * | | nx-libs.spec: add xkeyboard-config to nxagent's Requires. | Mihai Moldovan | 2015-09-28 | 2 | -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 Moldovan | 2015-09-28 | 2 | -1/+4 |
| | | | | | | | | | | | | Cherry-picked from 3.5.0.x branch. | ||||
| * | | debian/roll-tarballs.sh: more quotes, more curly braces, replace cd with ↵ | Mihai Moldovan | 2015-09-28 | 1 | -8/+8 |
| | | | | | | | | | | | | pushd and pop. | ||||
| * | | roll-tarball.sh: more quotes (follow-up for previous commit), drop debug code | Mike Gabriel | 2015-09-28 | 1 | -5/+3 |
| | | | |||||
| * | | roll-tarball.sh: Make sure symlinked files are included in tarballs. | Mike Gabriel | 2015-09-28 | 1 | -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 Gabriel | 2015-09-28 | 1 | -0/+3 |
| | | | | | | | | | | | | development packages. | ||||
| * | | debian/libxcomp{,ext,shad}-dev.install.in: Install nxcomp{,ext,shad}.pc file ↵ | Mike Gabriel | 2015-09-28 | 3 | -0/+3 |
| | | | | | | | | | | | | into the corresponding development packages. | ||||
| * | | nxcomp{,ext,shad}/Makefile.in: Create pkgconfigdir before putting files in it. | Mike Gabriel | 2015-09-28 | 3 | -0/+3 |
| | | | |||||
| * | | nxcomp{,shad,ext}: Remove nxcomp*.pc file on clean and distclean. | Mike Gabriel | 2015-09-28 | 3 | -3/+3 |
| | | | |||||
| * | | Makefile: Also remove nxversion.def on distclean. | Mike Gabriel | 2015-09-28 | 1 | -1/+1 |
| | | | |||||
| * | | Add pkg-config support to nxcomp, nxcompext and nxcompshad | Ulrich Sibiller | 2015-09-28 | 9 | -27/+86 |
| | | | |||||
| * | | debian/changelog: sync with master/3.5.0.x branch. | Mihai Moldovan | 2015-09-28 | 1 | -2/+77 |
| | | | |||||
| * | | debian/changelog: sync with master/3.5.0.x branch. | Mihai Moldovan | 2015-09-28 | 1 | -0/+31 |
| | | | |||||
| * | | Correct nxproxy manpage also: --help -> -help | Mike DePaulo | 2015-09-28 | 1 | -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 -> -help | Mike DePaulo | 2015-09-28 | 2 | -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 Gabriel | 2015-09-28 | 31 | -1091/+0 |
| | | | |||||
| * | | doc/examples/run-nxproxy2nxproxy-test: Create NX_COOKIE dynamically using ↵ | Mike Gabriel | 2015-09-28 | 1 | -3/+4 |
| | | | | | | | | | | | | the mcookie tool. | ||||
| * | | COPYING: Replace content with GPL-2 license text, because that is the ↵ | Mike Gabriel | 2015-09-28 | 1 | -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 Gabriel | 2015-09-28 | 1 | -0/+1 |
| | | | |||||
| * | | debian/roll-tarball.sh: Rename README.md to README.NX-Development before ↵ | Mike Gabriel | 2015-09-28 | 1 | -0/+3 |
| | | | | | | | | | | | | moving it into doc/ folder. | ||||
| * | | debian/roll-tarball.sh: Prevent several files/folders from ending up in ↵ | Mike Gabriel | 2015-09-28 | 1 | -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 Gabriel | 2015-09-28 | 1 | -2/+2 |
| | | |