xcolmix (1.07-10) 0_xcolmix-compilation-fixes

Summary

 src/design.c  |    2 +-
 src/usage.c   |    2 +-
 src/xcolmix.1 |    4 ++--
 src/xcolmix.c |    2 +-
 src/xcolmix.h |    2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

    
download this patch

Patch contents

Description: Upstream changes to fix compilation.
  Track XForms header file.
  Track rgb.txt file.
Author: Peter S Galbraith <psg@debian.org>
Last-Update: 2010-05-27

--- xcolmix-1.07.orig/src/xcolmix.c
+++ xcolmix-1.07/src/xcolmix.c
@@ -49,7 +49,7 @@ int
     foreground_selected = 0,
     lookup_on_screen = 0;
 char
-    *rgbfile = "/usr/lib/X11/rgb.txt";
+    *rgbfile = "/etc/X11/rgb.txt";
 
 void main (int argc, char **argv)
 {
--- xcolmix-1.07.orig/src/xcolmix.1
+++ xcolmix-1.07/src/xcolmix.1
@@ -6,7 +6,7 @@ xcolmix \- an RGB colour mixer
 .I "[-display host:dpy] [-name appname] [-visual class] [-depth d] [-private] [-shared] [-stdcmap] [-debug d] [-sync] rgb-database-file"
 
 The rgb-database-file is the file which holds the X-windows colour
-definitions, when absent: /usr/lib/X11/rgb.txt is used.
+definitions, when absent: /etc/X11/rgb.txt is used.
 .SH "DESCRIPTION"
 This manual page documents briefly the
 .BR xcolmix ,
@@ -64,7 +64,7 @@ or the background. Then, use the three s
 `blue' to change the colour.
 
 The button `lookup' starts a second window, with a browser showing the
-system colour database. The default database name is /usr/lib/X11/rgb.txt,
+system colour database. The default database name is /etc/X11/rgb.txt,
 though you can overrule this filename with a file argument in the command
 that starts up xcolmix.
 
--- xcolmix-1.07.orig/src/design.c
+++ xcolmix-1.07/src/design.c
@@ -27,7 +27,7 @@
 /* <<< End of information >>>                                               */
 /* Form definition file generated with fdesign. */
 
-#include <X11/forms.h>
+#include <forms.h>
 #include <stdlib.h>
 #include "design.h"
 
--- xcolmix-1.07.orig/src/usage.c
+++ xcolmix-1.07/src/usage.c
@@ -41,7 +41,7 @@ void usage ()
  "Usage: xcolmix [X options] \n"
  "   or: xcolmix [X options] rgb-database-file\n"
  "The rgb-database-file is the file which holds the X-windows color\n"
- "definitions, when absent: /usr/lib/X11/rgb.txt is used.\n"
+ "definitions, when absent: /etc/X11/rgb.txt is used.\n"
  "Options may be:\n"
  "    -display host:display - the display, default: $DISPLAY\n"
  "    -name applicationname - application name for X resource managing\n"
--- xcolmix-1.07.orig/src/xcolmix.h
+++ xcolmix-1.07/src/xcolmix.h
@@ -26,7 +26,7 @@
 /* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA */
 /* <<< End of information >>>                                               */
 
-#include <X11/forms.h>
+#include <forms.h>
 #include <malloc.h>
 #include <stdio.h>
 #include <unistd.h>