diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-01-28 11:28:38 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-01-28 11:38:09 +0100 |
| commit | fc2dcc9c3092e8cc5f0b32716d5efe535d2c4f12 (patch) | |
| tree | 6b0baee4b14f97d326e7215c9f7ace0478ebcd7b | |
| parent | bb70adf75aa95c94db3b4d7df5d2c526aa012cee (diff) | |
| download | nx-libs-fc2dcc9c3092e8cc5f0b32716d5efe535d2c4f12.tar.gz nx-libs-fc2dcc9c3092e8cc5f0b32716d5efe535d2c4f12.tar.bz2 nx-libs-fc2dcc9c3092e8cc5f0b32716d5efe535d2c4f12.zip | |
Extend 999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch. Let rgb file shipped with x2goagent supersede rgb file shipped with nxagent. FIXME: a better approach would be to decide at runtime if to use /etc/x2go/rgb or /etc/nxagent/rgb.
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch | 23 |
2 files changed, 27 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index a8cb9d8ae..2883c3e03 100644 --- a/debian/changelog +++ b/debian/changelog @@ -42,6 +42,10 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium far). (The debian/rules file is a Makefile and Makefiles don't understand shell globbing with curly braces). * Modify 101_nxagent_set-rgb-path.full.patch. Allow configurable rgb files. + * Extend 999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch. Let rgb + file shipped with x2goagent supersede rgb file shipped with nxagent. + FIXME: a better approach would be to decide at runtime if to use + /etc/x2go/rgb or /etc/nxagent/rgb. [ Horst Schirmeier ] * Update 320_nxagent_configurable-keystrokes.full.patch. Fix a typo that diff --git a/debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch b/debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch index 4b18aa552..db5997685 100644 --- a/debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch +++ b/debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch @@ -294,3 +294,26 @@ Last-Update: 2012-01-11 extern Window nxagentSplashWindow; +--- a/nx-X11/programs/Xserver/os/oscolor.c ++++ b/nx-X11/programs/Xserver/os/oscolor.c +@@ -53,7 +53,19 @@ + #include <sys/stat.h> + #include <unistd.h> + +-static char* nxAltRgbPaths[] = {"/etc/nxagent/rgb", "/usr/share/nx/rgb", "/usr/local/share/nx/rgb", "/usr/NX/share/rgb", "/usr/share/X11/rgb", "/etc/X11/rgb"}; ++/* FIXME: we need more intelligent code (like provided by the nxagentX2go ++ * var in hw/nxagent/Init.h) to detect our current runtime mode (running ++ * as x2goagent, running as nxagent) ++ */ ++static char* nxAltRgbPaths[] = {"/etc/x2go/rgb", \ ++ "/usr/share/x2go/rgb", \ ++ "/usr/local/share/x2go/rgb", \ ++ "/etc/nxagent/rgb", \ ++ "/usr/share/nx/rgb", \ ++ "/usr/local/share/nx/rgb", \ ++ "/usr/NX/share/rgb", \ ++ "/usr/share/X11/rgb", \ ++ "/etc/X11/rgb"}; + static char _NXRgbPath[1024]; + + #endif |