aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* nx-libs.spec: RPM does not support %elif/%elsif/%elseif/whatever.Mihai Moldovan2017-04-251-1/+3
| | | | Fixes: ArcticaProject/nx-libs#432
* debian/copyright: Update copyright attributions (re-add ↵Mike Gabriel2017-04-211-0/+1
| | | | nx-X11/programs/Xserver/hw/nxagent/NXpicturestr_PictSolidFill.h).
* release 3.5.99.63.5.99.6Mike Gabriel2017-04-214-11/+246
|
* Merge branch 'sunweaver-pr/use-source-tree-nxcomp' into 3.6.xMihai Moldovan2017-04-211-4/+1
|\ | | | | | | Attributes GH PR #437: https://github.com/ArcticaProject/nx-libs/pull/437
| * Xserver/Imakefile: Drop redundant library path option ↵Mike Gabriel2017-04-211-3/+0
| | | | | | | | -L../../../nx-X11/exports/lib when linking nxagent. As -L../../exports/lib is already present and points to the same location.
| * Xserver/Imakefile: Change order of linker options, so that self-built ↵Mike Gabriel2017-04-211-1/+1
|/ | | | components get mentioned first in the nxagent linker command.
* Merge branch 'sunweaver-pr/nxagent-dialog-fixes' into 3.6.xMihai Moldovan2017-04-213-102/+71
|\ | | | | | | Attributes GH PR #436: https://github.com/ArcticaProject/nx-libs/pull/436
| * nxcomp/Children.cpp: Don't generate warnings with duplicated NX paths.Mike Gabriel2017-04-211-61/+70
| | | | | | | | Fixes ArcticaProject/nx-libs#370.
| * hw/nxagent/Dialog.c: Drop unused dialog for DIALOG_DISABLE_XKB_LOCAL.Mike Gabriel2017-04-212-41/+1
|/ | | | Fixes ArcticaProject/nx-libs#383.
* Revert "NXpicturestr_PictSolidFill.h: Drop file and revert db8705. Not an ↵Mike Gabriel2017-04-214-5/+82
| | | | | | | | | | | | issue anymore nowadays." This reverts commit 6c8c950258cf0da0cf24c5e80c2216914ac282a4. Fixes ArcticaProject/nx-libs#433. This patch is still a candidate for being re-implemented without extending the _PictSolidFill struct, but for now, we'll have to re-introduce commit db8705 for the sake of having fonts readable after resumption of remote NX sessions.
* nx-X11/programs/Xserver/os/connection.c: compact display autodetection code.Mihai Moldovan2017-04-201-4/+2
|
* Merge branch 'sunweaver-pr/enhance-displayfd-auto-detection' into 3.6.xMihai Moldovan2017-04-202-2/+37
|\ | | | | | | Attributes GH PR #419: https://github.com/ArcticaProject/nx-libs/pull/419
| * man/nxagent.1: Document the nxagent specific usage pattern of the displayfd ↵Mike Gabriel2017-04-201-2/+17
| | | | | | | | cmdline option.
| * Xserver/os/connection.c: If -displayfd and an explicit display port number ↵Mike Gabriel2017-04-201-0/+11
| | | | | | | | are given, use the explicit display number as a starting point for auto-detecting the next available display number.
| * Xserver/os/connection.c: Accompany display number with some human-readable ↵Mike Gabriel2017-04-201-0/+9
|/ | | | (machine-parseable) text when -displayfd is set to STDERR.
* Merge branch 'uli42-pr/extend_manpage' into 3.6.xMike Gabriel2017-04-201-31/+40
|\ | | | | | | Attributes GH PR #431: https://github.com/ArcticaProject/nx-libs/pull/431
| * nxagent.1: some more rephrasingUlrich Sibiller2017-04-201-6/+6
| |
| * nxagent.1: fix: "tolerancechecks" was documented as "reconnectchecks"Ulrich Sibiller2017-04-201-2/+2
| |
| * nxagent.1: highlight nxagentUlrich Sibiller2017-04-201-17/+17
| |
| * nxagent.1: use nxagent everywhereUlrich Sibiller2017-04-201-13/+13
| | | | | | | | "nx-X11 Agent" looks and sounds ugly.
| * nxagent.1: rephrase descriptionUlrich Sibiller2017-04-201-2/+3
| |
| * nxagent.1: add -options, previously undocumentedUlrich Sibiller2017-04-201-3/+15
| |
| * nxagent.1: fix typoUlrich Sibiller2017-04-201-1/+1
| |
| * nxagent.1: remove no longer existing -co option from manpageUlrich Sibiller2017-04-201-4/+0
|/
* Xserver/GL/glx/glxext.c: Fix for previous commit, re-adding a comment ↵Mike Gabriel2017-04-191-0/+1
| | | | starter '/*'.
* Clearing comments from $XFree86$ (et al.) header lines.Mike Gabriel2017-04-1962-103/+1
|
* Merge branch 'Ionic-add-xkbcomp-dep' into 3.6.xMike Gabriel2017-04-182-7/+22
|\ | | | | | | Attributes GH PR #434: https://github.com/ArcticaProject/nx-libs/pull/434
| * nx-libs.spec: sync up RPM builds after Xext proto change in ↵Mihai Moldovan2017-04-181-6/+5
| | | | | | | | a51cb94559e9228a55e01956f242dabccc5e6b14.
| * {debian/control,nx-libs.spec}: add proper dependencies upon xkbcomp for RPM ↵Mihai Moldovan2017-04-182-0/+16
| | | | | | | | and DEB packages.
| * nx-libs.spec: whitespace only.Mihai Moldovan2017-04-181-1/+1
|/
* debian/control: Add get-orig-source rule as in official Debian package.Mike Gabriel2017-04-141-0/+3
|
* debian/{rules,nx-x11proto-xext-dev}: More Xext header files belong int ↵Mike Gabriel2017-04-142-11/+11
| | | | nx-x11proto-xext-dev (instead of removing them in debian/rules).
* debian/control: Pre-D (nx-x11-common) on versioned dpkg not required anymore.Mike Gabriel2017-04-141-2/+0
|
* debian/control: Pull-over latest changes on these files from the official ↵Mike Gabriel2017-04-141-38/+31
| | | | Debian package. Various improvements several package descriptions.
* debian/copyright{,in}: Pull-over latest changes on these files from the ↵Mike Gabriel2017-04-142-134/+437
| | | | official Debian package.
* Merge branch 'sunweaver-pr/enable-mit-screen-saver-extension' into 3.6.xMihai Moldovan2017-04-134-1/+24
|\ | | | | | | Attributes GH PR #421: https://github.com/ArcticaProject/nx-libs/pull/421
| * Xserver: Build nxagent with MIT-SCREEN-SAVER extension enabled.Mike Gabriel2017-04-134-1/+24
|/ | | | Fixes ArcticaProject/nx-libs#80
* Merge branch 'sunweaver-pr/Mesa-define-USE_IEEE-macro-for-more-platforms' ↵Mihai Moldovan2017-04-132-0/+17
|\ | | | | | | | | | | into 3.6.x Attributes GH PR #428: https://github.com/ArcticaProject/nx-libs/pull/428
| * Mesa.patches: Define USE_IEEE for __aarch64__ and __mc68000__, as well.Mike Gabriel2017-04-132-0/+17
|/
* nx-X11/config/cf: Clean-up left-overs from having our own libNX_Xext shared ↵Mike Gabriel2017-04-132-3/+0
| | | | library.
* Makefile: Make sure that 'make all' only calls 'make build' and _not_ the ↵Mike Gabriel2017-04-131-1/+2
| | | | global '%:' ruleset afterwards.
* Makefile: Remove nx-X11/config/cf/date.def on clean.Mike Gabriel2017-04-131-0/+1
|
* Makefile: Fix comment above special clean rules.Mike Gabriel2017-04-131-1/+1
|
* Merge branch 'sunweaver-pr/fix-ftbfs-on-linux-sparc64' into 3.6.xMihai Moldovan2017-04-131-1/+2
|\ | | | | | | Attributes GH PR #426: https://github.com/ArcticaProject/nx-libs/pull/426
| * nx-X11/config/cf/linux.cf: Fix FTBFS on Linux SPARC64 due to missing ↵Mike Gabriel2017-04-131-1/+2
|/ | | | -D_XSERVER64 definition.
* Merge branch 'sunweaver-pr/fix-ftbfs-on-aarch64' into 3.6.xMihai Moldovan2017-04-131-1/+1
|\ | | | | | | Attributes GH PR #425: https://github.com/ArcticaProject/nx-libs/pull/425
| * nx-X11/config/cf/linux.cf: Fix FTBFS on arm64 (aarch64) due to missing ↵Mike Gabriel2017-04-121-1/+1
|/ | | | -D_XSERVER64 definition.
* release 3.5.99.53.5.99.5Mike Gabriel2017-04-117-2051/+3235
|
* debian/patches: Update 016_nx-X11_install-location.debian.patch (due to ↵Mike Gabriel2017-04-101-2/+2
| | | | fuzziness).
* Regression fix for added libXfont2 API support:Mike Gabriel2017-04-109-24/+14
| | | | | | | | | | - Move FONT_DEFINES and XLIBFONT definition to from Server.tmpl to Imake.tmpl. - Add FONT_DEFINES to ALLDEFINES. - Drop SpecialCObjectRules with FONT_DEFINES from various Imakefiles again, FONT_DEFINES is now set "globally". - Hand over FONT_DEFINES from main Makefile to nx-X11's make BuildEnv to make gccmakedep happy.