aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorOleksandr Shneyder <o.schneyder@phoca-gmbh.de>2015-02-10 19:26:42 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-10 19:40:56 +0100
commit4f5dc807a7a421aa0c5f52b84cd33ff41505de38 (patch)
treef662a95c99142a2aa8962133059d015eec4d07e8 /debian
parentd26930d59838e2a8305c66b67aaa163db157920c (diff)
downloadnx-libs-4f5dc807a7a421aa0c5f52b84cd33ff41505de38.tar.gz
nx-libs-4f5dc807a7a421aa0c5f52b84cd33ff41505de38.tar.bz2
nx-libs-4f5dc807a7a421aa0c5f52b84cd33ff41505de38.zip
Add -norootlessexit cmdline option to nxagent (203_nxagent_disable-rootless-exit.full.patch).
This change enables to launch an nxagent in rootless mode that waits forever for Xclients to appear. This feature got added when X2Go introduced Published Applications support.
Diffstat (limited to 'debian')
-rw-r--r--debian/patches/203_nxagent_disable-rootless-exit.full.patch63
-rw-r--r--debian/patches/series1
2 files changed, 0 insertions, 64 deletions
diff --git a/debian/patches/203_nxagent_disable-rootless-exit.full.patch b/debian/patches/203_nxagent_disable-rootless-exit.full.patch
deleted file mode 100644
index 74579f4d8..000000000
--- a/debian/patches/203_nxagent_disable-rootless-exit.full.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Description: Add -norootlessexit cmdline option to nxagent
-Author: Oleksandr Shneyder <o.schneyder@phoca-gmbh.de>
-
---- a/nx-X11/programs/Xserver/hw/nxagent/Args.c
-+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c
-@@ -672,6 +672,12 @@
- return 1;
- }
-
-+ if (!strcmp(argv[i], "-norootlessexit")) {
-+ nxagentChangeOption(NoRootlessExit, True);
-+ return 1;
-+ }
-+
-+
- if (!strcmp(argv[i], "-noonce"))
- {
- nxagentOnce = False;
-@@ -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");
-+ ErrorF("-norootlessexit don't exit if there are no clients in rootless mode\n");
- #ifdef RENDER
- ErrorF("-norender disable the use of the render extension\n");
- 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
-@@ -219,7 +219,7 @@
-
- if (nxagentOption(Rootless) &&
- nxagentLastWindowDestroyed && nxagentRootlessDialogPid == 0 &&
-- now > nxagentLastWindowDestroyedTime + 30 * 1000)
-+ now > nxagentLastWindowDestroyedTime + 30 * 1000 && !nxagentOption(NoRootlessExit))
- {
- #ifdef WARNING
- fprintf(stderr, "nxagentBlockHandler: No application running. Closing the session.\n");
---- a/nx-X11/programs/Xserver/hw/nxagent/Options.c
-+++ b/nx-X11/programs/Xserver/hw/nxagent/Options.c
-@@ -56,6 +56,7 @@
- nxagentOptions.Persistent = 1;
- nxagentOptions.Rootless = UNDEFINED;
- nxagentOptions.Fullscreen = UNDEFINED;
-+ nxagentOptions.NoRootlessExit = False;
-
- nxagentOptions.X = 0;
- nxagentOptions.Y = 0;
---- a/nx-X11/programs/Xserver/hw/nxagent/Options.h
-+++ b/nx-X11/programs/Xserver/hw/nxagent/Options.h
-@@ -381,6 +381,13 @@
-
- int ImageRateLimit;
-
-+ /*
-+ * True if agent should not exit if there are no
-+ * clients in rootless mode
-+ */
-+
-+ int NoRootlessExit;
-+
- } AgentOptionsRec;
-
- typedef AgentOptionsRec *AgentOptionsPtr;
diff --git a/debian/patches/series b/debian/patches/series
index 746c6ad43..424c3e990 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-203_nxagent_disable-rootless-exit.full.patch
204_nxagent_repaint-solidpict.full.patch
205_nxagent_refresh-adsl.full.patch
206_nxagent_clipboard-as-nxoption.full.patch