diff options
11 files changed, 43 insertions, 46 deletions
diff --git a/debian/changelog b/debian/changelog index 4d21afede..1959e3b4c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,8 @@ nx-libs (2:3.5.0-0~x2go2) UNRELEASED; urgency=low - 108_nxagent_wine-close-delay.patch - 109_nxagent_locale-utf8-compound-text.patch - 200_nxagent_unbrand-agent.patch + * Adapt path names in FreeNX patches to meet requirements for source tree of this + package. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 28 Dec 2011 19:06:26 +0100 diff --git a/debian/patches/101_nxagent_set-rgb-path.patch b/debian/patches/101_nxagent_set-rgb-path.patch index db4116884..bcbfa0c85 100644 --- a/debian/patches/101_nxagent_set-rgb-path.patch +++ b/debian/patches/101_nxagent_set-rgb-path.patch @@ -3,8 +3,8 @@ ## All lines beginning with `## DP:' are a description of the patch. ## DP: Change the path to the keyboard configuration file ---- a/programs/Xserver/os/oscolor.c -+++ b/programs/Xserver/os/oscolor.c +--- a/nx-X11/programs/Xserver/os/oscolor.c ++++ b/nx-X11/programs/Xserver/os/oscolor.c @@ -53,7 +53,7 @@ #include <sys/stat.h> #include <unistd.h> diff --git a/debian/patches/102_xserver-xext_set-securitypolicy-path.patch b/debian/patches/102_xserver-xext_set-securitypolicy-path.patch index c0978c9ee..4e04dfd32 100644 --- a/debian/patches/102_xserver-xext_set-securitypolicy-path.patch +++ b/debian/patches/102_xserver-xext_set-securitypolicy-path.patch @@ -3,8 +3,8 @@ ## All lines beginning with `## DP:' are a description of the patch. ## DP: Change the path to the keyboard configuration file ---- a/programs/Xserver/Xext/security.c -+++ b/programs/Xserver/Xext/security.c +--- a/nx-X11/programs/Xserver/Xext/security.c ++++ b/nx-X11/programs/Xserver/Xext/security.c @@ -86,7 +86,7 @@ #ifdef NXAGENT_SERVER diff --git a/debian/patches/103_nxagent_set-X0-config-path.patch b/debian/patches/103_nxagent_set-X0-config-path.patch index 326c91b57..d99eae8a2 100644 --- a/debian/patches/103_nxagent_set-X0-config-path.patch +++ b/debian/patches/103_nxagent_set-X0-config-path.patch @@ -1,5 +1,5 @@ ---- a/nxagent/programs/Xserver/hw/nxagent/Keyboard.c -+++ b/nxagent/programs/Xserver/hw/nxagent/Keyboard.c +--- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c ++++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c @@ -136,7 +136,7 @@ #define XKB_ALTERNATE_BASE_DIRECTORY "/usr/X11R6/lib/X11/xkb" #endif @@ -9,7 +9,7 @@ #endif #ifndef XKB_DFLT_RULES_FILE #define XKB_DFLT_RULES_FILE "xfree86" -@@ -978,8 +978,7 @@ +@@ -985,8 +985,7 @@ XkbGetControls(nxagentDisplay, XkbAllControlsMask, xkb); @@ -19,7 +19,7 @@ nxagentXkbConfigFilePath = malloc((nxagentXkbConfigFilePathSize + 1) * sizeof(char)); -@@ -988,9 +987,7 @@ +@@ -995,9 +994,7 @@ FatalError("nxagentKeyboardProc: malloc failed."); } diff --git a/debian/patches/104_nxagent_enable_debug.patch b/debian/patches/104_nxagent_enable_debug.patch index 6debbaf91..e1f4c06cd 100644 --- a/debian/patches/104_nxagent_enable_debug.patch +++ b/debian/patches/104_nxagent_enable_debug.patch @@ -1,17 +1,12 @@ -## 90_enable_debug.dpatch by <marceloshima@gmail.com> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - ---- a/nxagent/programs/Xserver/hw/nxagent/Imakefile 2010-09-17 14:49:52.000000000 +0200 -+++ b/nxagent/programs/Xserver/hw/nxagent/Imakefile 2010-09-17 15:02:43.113911514 +0200 -@@ -205,7 +205,8 @@ +--- a/nx-X11/programs/Xserver/hw/nxagent/Imakefile ++++ b/nx-X11/programs/Xserver/hw/nxagent/Imakefile +@@ -203,7 +203,8 @@ -DNXAGENT_ONSTART \ -DNXAGENT_SPLASH \ -DNXAGENT_ARTSD \ - -UNX_DEBUG_INPUT \ + -DNX_DEBUG_INPUT \ + -DDEBUG \ + -DRANDR_10_INTERFACE \ + -DRANDR_12_INTERFACE \ -UPANORAMIX \ - -UDEBUG_TREE - diff --git a/debian/patches/105_nxagent_export-remote-keyboard-config.patch b/debian/patches/105_nxagent_export-remote-keyboard-config.patch index efd6e5353..9ee4fc2f4 100644 --- a/debian/patches/105_nxagent_export-remote-keyboard-config.patch +++ b/debian/patches/105_nxagent_export-remote-keyboard-config.patch @@ -4,8 +4,8 @@ ## All lines beginning with `## DP:' are a description of the patch. ## DP: Export the client keyboard configurations to a file ---- a/nxagent/programs/Xserver/hw/nxagent/Error.c -+++ b/nxagent/programs/Xserver/hw/nxagent/Error.c +--- a/nx-X11/programs/Xserver/hw/nxagent/Error.c ++++ b/nx-X11/programs/Xserver/hw/nxagent/Error.c @@ -497,7 +497,7 @@ return rootPath; } @@ -15,17 +15,17 @@ { char *rootPath; ---- a/nxagent/programs/Xserver/hw/nxagent/Error.h -+++ b/nxagent/programs/Xserver/hw/nxagent/Error.h +--- 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__ */ ---- a/nxagent/programs/Xserver/hw/nxagent/Keyboard.c -+++ b/nxagent/programs/Xserver/hw/nxagent/Keyboard.c +--- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c ++++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c @@ -52,6 +52,7 @@ #include "Keyboard.h" #include "Events.h" diff --git a/debian/patches/106_nxagent_utf8-copy-clipboard.patch b/debian/patches/106_nxagent_utf8-copy-clipboard.patch index 08b0c1039..21a8ec094 100644 --- a/debian/patches/106_nxagent_utf8-copy-clipboard.patch +++ b/debian/patches/106_nxagent_utf8-copy-clipboard.patch @@ -1,5 +1,5 @@ ---- a/nxagent/programs/Xserver/hw/nxagent/Clipboard.c -+++ b/nxagent/programs/Xserver/hw/nxagent/Clipboard.c +--- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c ++++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c @@ -166,7 +166,9 @@ if (target == XA_STRING) return True; diff --git a/debian/patches/107_nxagent_clipboard-compound-text+small-bed-sheets.patch b/debian/patches/107_nxagent_clipboard-compound-text+small-bed-sheets.patch index 1388bf932..bde9356bf 100644 --- a/debian/patches/107_nxagent_clipboard-compound-text+small-bed-sheets.patch +++ b/debian/patches/107_nxagent_clipboard-compound-text+small-bed-sheets.patch @@ -1,5 +1,5 @@ ---- a/nxagent/programs/Xserver/hw/nxagent/Clipboard.c -+++ b/nxagent/programs/Xserver/hw/nxagent/Clipboard.c +--- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c ++++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c @@ -1226,10 +1226,11 @@ Atom xa_STRING[4]; xEvent x; @@ -15,8 +15,8 @@ ChangeWindowProperty(pWin, property, ---- a/nxagent/programs/Xserver/hw/nxagent/Image.c -+++ b/nxagent/programs/Xserver/hw/nxagent/Image.c +--- a/nx-X11/programs/Xserver/hw/nxagent/Image.c ++++ b/nx-X11/programs/Xserver/hw/nxagent/Image.c @@ -644,6 +644,10 @@ pDrawable -> depth != 1 && nxagentOption(DeferLevel) >= 1) diff --git a/debian/patches/108_nxagent_wine-close-delay.patch b/debian/patches/108_nxagent_wine-close-delay.patch index 4ea4cd69c..f45910dee 100644 --- a/debian/patches/108_nxagent_wine-close-delay.patch +++ b/debian/patches/108_nxagent_wine-close-delay.patch @@ -1,5 +1,5 @@ ---- a/nxagent/programs/Xserver/hw/nxagent/Window.c -+++ b/nxagent/programs/Xserver/hw/nxagent/Window.c +--- a/nx-X11/programs/Xserver/hw/nxagent/Window.c ++++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c @@ -176,6 +176,14 @@ static int nxagentForceExposure(WindowPtr pWin, pointer ptr); diff --git a/debian/patches/109_nxagent_locale-utf8-compound-text.patch b/debian/patches/109_nxagent_locale-utf8-compound-text.patch index fe4893019..8f084750f 100644 --- a/debian/patches/109_nxagent_locale-utf8-compound-text.patch +++ b/debian/patches/109_nxagent_locale-utf8-compound-text.patch @@ -1,5 +1,5 @@ ---- a/nxagent/programs/Xserver/hw/nxagent/Init.c -+++ b/nxagent/programs/Xserver/hw/nxagent/Init.c +--- a/nx-X11/programs/Xserver/hw/nxagent/Init.c ++++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c @@ -64,6 +64,9 @@ #include "NX.h" #include "NXlib.h" @@ -31,8 +31,8 @@ } void InitInput(argc, argv) ---- a/nxagent/programs/Xserver/hw/nxagent/Rootless.c -+++ b/nxagent/programs/Xserver/hw/nxagent/Rootless.c +--- a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c ++++ b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c @@ -32,6 +32,10 @@ #include "NXlib.h" diff --git a/debian/patches/200_nxagent_unbrand-agent.patch b/debian/patches/200_nxagent_unbrand-agent.patch index 7a2b4d022..b38d89d53 100644 --- a/debian/patches/200_nxagent_unbrand-agent.patch +++ b/debian/patches/200_nxagent_unbrand-agent.patch @@ -1,5 +1,5 @@ ---- a/nxagent/programs/Xserver/hw/nxagent/Screen.c -+++ b/nxagent/programs/Xserver/hw/nxagent/Screen.c +--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c ++++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -1539,7 +1539,20 @@ #ifdef TEST fprintf(stderr, "nxagentOpenScreen: Created new default window with id [%ld].\n", @@ -21,8 +21,8 @@ if (nxagentOption(Fullscreen)) { ---- a/nxagent/programs/Xserver/hw/nxagent/Screen.h -+++ b/nxagent/programs/Xserver/hw/nxagent/Screen.h +--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.h ++++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.h @@ -36,6 +36,8 @@ #define MIN_NXAGENT_HEIGHT 60 #define NXAGENT_FRAME_WIDTH 2000 @@ -32,8 +32,8 @@ #define nxagentSetPrintGeometry(screen) \ nxagentPrintGeometryFlags = (1 << (screen)); ---- a/nxagent/programs/Xserver/hw/nxagent/Display.c -+++ b/nxagent/programs/Xserver/hw/nxagent/Display.c +--- 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); @@ -43,8 +43,8 @@ strcat(default_path,icon_filename); if ((icon_fp = fopen(default_path, "r")) == NULL) ---- a/nxagent/programs/Xserver/hw/nxagent/Splash.c -+++ b/nxagent/programs/Xserver/hw/nxagent/Splash.c +--- a/nx-X11/programs/Xserver/hw/nxagent/Splash.c ++++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.c @@ -204,6 +204,7 @@ nxagentPixmapLogo = XCreatePixmap(nxagentDisplay, win, width, height, nxagentLogoDepth); |