diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-05-22 00:57:21 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-05-22 00:57:21 +0200 |
| commit | e2e7008b3e4f7283b135a9fc2821a64386253ee0 (patch) | |
| tree | ebf106831e58c319b759c0314331b11f8384fa3f /debian/patches/203_nxagent_disable-rootless-exit.full.patch | |
| parent | fdaa240434e4b5022f2bc6b6aa7f590c0dcdc794 (diff) | |
| download | nx-libs-e2e7008b3e4f7283b135a9fc2821a64386253ee0.tar.gz nx-libs-e2e7008b3e4f7283b135a9fc2821a64386253ee0.tar.bz2 nx-libs-e2e7008b3e4f7283b135a9fc2821a64386253ee0.zip | |
New upstream release of nxagent (3.5.0-9).
* New upstream release of nxagent (3.5.0-9).
* Adapt patch series (all hunks succeeded automatically).
* Drop patch: 120_nxagent_libcairo-null-source-drawables.full.patch, the issue
has been fixed by NoMachine (TR05J02703).
Diffstat (limited to 'debian/patches/203_nxagent_disable-rootless-exit.full.patch')
| -rw-r--r-- | debian/patches/203_nxagent_disable-rootless-exit.full.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/debian/patches/203_nxagent_disable-rootless-exit.full.patch b/debian/patches/203_nxagent_disable-rootless-exit.full.patch index 03154bb07..fcdecc010 100644 --- a/debian/patches/203_nxagent_disable-rootless-exit.full.patch +++ b/debian/patches/203_nxagent_disable-rootless-exit.full.patch @@ -1,6 +1,6 @@ --- a/nx-X11/programs/Xserver/hw/nxagent/Args.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c -@@ -656,6 +656,12 @@ +@@ -672,6 +672,12 @@ return 1; } @@ -13,7 +13,7 @@ if (!strcmp(argv[i], "-noonce")) { nxagentOnce = False; -@@ -1837,6 +1843,7 @@ +@@ -1855,6 +1861,7 @@ ErrorF("The NX system adds the following arguments:\n"); ErrorF("-forcenx force use of NX protocol messages assuming communication through nxproxy\n"); ErrorF("-timeout int auto-disconnect timeout in seconds (minimum allowed: 60)\n"); @@ -23,7 +23,7 @@ ErrorF("-nocomposite disable the use of the composite extension\n"); --- a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c -@@ -217,7 +217,7 @@ +@@ -219,7 +219,7 @@ if (nxagentOption(Rootless) && nxagentLastWindowDestroyed && nxagentRootlessDialogPid == 0 && @@ -44,9 +44,9 @@ nxagentOptions.Y = 0; --- a/nx-X11/programs/Xserver/hw/nxagent/Options.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Options.h -@@ -369,6 +369,13 @@ +@@ -381,6 +381,13 @@ - int CopyBufferSize; + int ImageRateLimit; + /* + * True if agent should not exit if there are no |