diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-01-11 17:34:18 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-01-11 17:34:18 +0100 |
commit | 0d3a820b3ed1f76860cdee8dc0532674d621f1e3 (patch) | |
tree | 2f95fad7007138ea71e22588646f232afd7b3910 /debian/patches/202_nxagent_set-rgb-path-x2go-flavour-aware.patch | |
parent | d9d49b5d8606df5d400c34726cdc5fb9cccaa47b (diff) | |
download | nx-libs-0d3a820b3ed1f76860cdee8dc0532674d621f1e3.tar.gz nx-libs-0d3a820b3ed1f76860cdee8dc0532674d621f1e3.tar.bz2 nx-libs-0d3a820b3ed1f76860cdee8dc0532674d621f1e3.zip |
Revert "Drop patch: 101_nxagent_set-rgb-path.path, add patch: 202_nxagent_set-rgb-path-x2go-flavour-aware.patch."
This reverts commit d9d49b5d8606df5d400c34726cdc5fb9cccaa47b.
Diffstat (limited to 'debian/patches/202_nxagent_set-rgb-path-x2go-flavour-aware.patch')
-rw-r--r-- | debian/patches/202_nxagent_set-rgb-path-x2go-flavour-aware.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/debian/patches/202_nxagent_set-rgb-path-x2go-flavour-aware.patch b/debian/patches/202_nxagent_set-rgb-path-x2go-flavour-aware.patch deleted file mode 100644 index c4f043357..000000000 --- a/debian/patches/202_nxagent_set-rgb-path-x2go-flavour-aware.patch +++ /dev/null @@ -1,33 +0,0 @@ -Description: FHS path fix for rgb file - This patch is needed on Debian only, not reporting this path - addition to upstream. - . - This patch also is X2Go-flavour-aware. - . - Originally contributed by Marcelo Boveto Shima <marceloshima@gmail.com>. -Forwarded: not-needed -Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -Last-Update: 2011-12-31 ---- a/nx-X11/programs/Xserver/os/oscolor.c -+++ b/nx-X11/programs/Xserver/os/oscolor.c -@@ -47,13 +47,19 @@ - ******************************************************************/ - /* $Xorg: oscolor.c,v 1.4 2001/02/09 02:05:23 xorgcvs Exp $ */ - -+#include "Init.h" -+ - #ifdef NX_TRANS_SOCKET - - #include <sys/types.h> - #include <sys/stat.h> - #include <unistd.h> - --static char* nxAltRgbPaths[] = {"/usr/NX/share/rgb", "/usr/share/X11/rgb", "/etc/X11/rgb"}; -+if (nxagentX2go) { -+ static char* nxAltRgbPaths[] = {"/usr/share/x2go/rgb", "/usr/NX/share/rgb", "/usr/share/X11/rgb", "/etc/X11/rgb"}; -+} else { -+ static char* nxAltRgbPaths[] = {"/usr/share/nx/rgb", "/usr/NX/share/rgb", "/usr/share/X11/rgb", "/etc/X11/rgb"}; -+} - static char _NXRgbPath[1024]; - - #endif |