aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2011-12-29 10:42:42 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2011-12-29 10:42:42 +0100
commit43c04dbfd48025bf6eda40e9b82c812f44290188 (patch)
treead31e5c5af7401644e06bbfb7ca27d3b78761bdd
parent9f226601ff68e75b2baa68bbf08da369c62527e1 (diff)
downloadnx-libs-43c04dbfd48025bf6eda40e9b82c812f44290188.tar.gz
nx-libs-43c04dbfd48025bf6eda40e9b82c812f44290188.tar.bz2
nx-libs-43c04dbfd48025bf6eda40e9b82c812f44290188.zip
Rework FreeNX patches to be applicable to latest NX sources.
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/105_nxagent_export-remote-keyboard-config.patch6
-rw-r--r--debian/patches/108_nxagent_wine-close-delay.patch4
-rw-r--r--debian/patches/109_nxagent_locale-utf8-compound-text.patch2
-rw-r--r--debian/patches/200_nxagent_unbrand-agent.patch24
5 files changed, 19 insertions, 18 deletions
diff --git a/debian/changelog b/debian/changelog
index 1959e3b4c..075ff4e98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ nx-libs (2:3.5.0-0~x2go2) UNRELEASED; urgency=low
- 200_nxagent_unbrand-agent.patch
* Adapt path names in FreeNX patches to meet requirements for source tree of this
package.
+ * Rework FreeNX patches to be applicable to latest NX sources.
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 28 Dec 2011 19:06:26 +0100
diff --git a/debian/patches/105_nxagent_export-remote-keyboard-config.patch b/debian/patches/105_nxagent_export-remote-keyboard-config.patch
index 9ee4fc2f4..ec8575efb 100644
--- a/debian/patches/105_nxagent_export-remote-keyboard-config.patch
+++ b/debian/patches/105_nxagent_export-remote-keyboard-config.patch
@@ -18,9 +18,9 @@
--- a/nx-X11/programs/Xserver/hw/nxagent/Error.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Error.h
@@ -34,4 +34,6 @@
-
+
void nxagentEndRedirectToClientsLog(void);
-
+
+char *nxagentGetSessionPath(void);
+
#endif /* __Error_H__ */
@@ -34,7 +34,7 @@
#include "NXlib.h"
-@@ -1770,6 +1771,42 @@
+@@ -1790,6 +1791,42 @@
}
#endif
diff --git a/debian/patches/108_nxagent_wine-close-delay.patch b/debian/patches/108_nxagent_wine-close-delay.patch
index f45910dee..ede84730f 100644
--- a/debian/patches/108_nxagent_wine-close-delay.patch
+++ b/debian/patches/108_nxagent_wine-close-delay.patch
@@ -15,7 +15,7 @@
/*
* This is currently unused.
*/
-@@ -1640,6 +1648,17 @@
+@@ -1858,6 +1866,17 @@
nxagentAddConfiguredWindow(pWin, CWStackingOrder);
nxagentAddConfiguredWindow(pWin, CW_Shape);
@@ -33,7 +33,7 @@
#ifdef SHAPE
/*
-@@ -1686,6 +1705,17 @@
+@@ -1904,6 +1923,17 @@
return True;
}
diff --git a/debian/patches/109_nxagent_locale-utf8-compound-text.patch b/debian/patches/109_nxagent_locale-utf8-compound-text.patch
index 8f084750f..248e6577c 100644
--- a/debian/patches/109_nxagent_locale-utf8-compound-text.patch
+++ b/debian/patches/109_nxagent_locale-utf8-compound-text.patch
@@ -10,7 +10,7 @@
/*
* Set here the required log level.
*/
-@@ -339,6 +342,20 @@
+@@ -348,6 +351,20 @@
*/
blackRoot = TRUE;
diff --git a/debian/patches/200_nxagent_unbrand-agent.patch b/debian/patches/200_nxagent_unbrand-agent.patch
index b38d89d53..8e441ca7b 100644
--- a/debian/patches/200_nxagent_unbrand-agent.patch
+++ b/debian/patches/200_nxagent_unbrand-agent.patch
@@ -1,6 +1,6 @@
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
-@@ -1539,7 +1539,20 @@
+@@ -1754,7 +1754,20 @@
#ifdef TEST
fprintf(stderr, "nxagentOpenScreen: Created new default window with id [%ld].\n",
nxagentDefaultWindows[pScreen->myNum]);
@@ -32,17 +32,6 @@
#define nxagentSetPrintGeometry(screen) \
nxagentPrintGeometryFlags = (1 << (screen));
---- a/nx-X11/programs/Xserver/hw/nxagent/Display.c
-+++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c
-@@ -1861,7 +1861,7 @@
- strncpy(default_path, "", 255);
-
- strcat(icon_filename, NXAGENT_ICON_NAME);
-- strcat(default_path,"/usr/NX/share/images/");
-+ strcat(default_path,"/usr/share/pixmaps/");
- strcat(default_path,icon_filename);
-
- if ((icon_fp = fopen(default_path, "r")) == NULL)
--- a/nx-X11/programs/Xserver/hw/nxagent/Splash.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.c
@@ -204,6 +204,7 @@
@@ -53,3 +42,14 @@
if (!nxagentPixmapLogo)
{
return;
+--- a/nx-X11/programs/Xserver/hw/nxagent/Display.c
++++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c
+@@ -1919,7 +1919,7 @@
+ XlibPixmap IconPixmap;
+ XlibPixmap IconShape;
+
+- snprintf(default_path, PATH_MAX-1, "/usr/NX/share/images/%s", NXAGENT_ICON_NAME);
++ snprintf(default_path, PATH_MAX-1, "/usr/share/pixmaps/%s", NXAGENT_ICON_NAME);
+
+ if ((icon_fp = fopen(default_path, "r")) == NULL)
+ {