summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Nigbur <pyrania@gentoo.org>2004-03-06 10:12:08 +0000
committerMarkus Nigbur <pyrania@gentoo.org>2004-03-06 10:12:08 +0000
commitd7841486b52b0f08d6af422b1b0b59a69ed879dc (patch)
tree1003816d03e10d2522ebd232059885a49b6f53fe /x11-misc/xrootconsole/files
parentAdded to ~ppc (Manifest recommit) (diff)
downloadgentoo-2-d7841486b52b0f08d6af422b1b0b59a69ed879dc.tar.gz
gentoo-2-d7841486b52b0f08d6af422b1b0b59a69ed879dc.tar.bz2
gentoo-2-d7841486b52b0f08d6af422b1b0b59a69ed879dc.zip
Added patch to enable RGB color parsing. Thanks to Martin Parm <parmus@diku.dk> (bug #41969).
Diffstat (limited to 'x11-misc/xrootconsole/files')
-rw-r--r--x11-misc/xrootconsole/files/digest-xrootconsole-0.4-r11
-rw-r--r--x11-misc/xrootconsole/files/xrootconsole-0.4.parse-color.patch23
2 files changed, 24 insertions, 0 deletions
diff --git a/x11-misc/xrootconsole/files/digest-xrootconsole-0.4-r1 b/x11-misc/xrootconsole/files/digest-xrootconsole-0.4-r1
new file mode 100644
index 000000000000..461eaa33aea4
--- /dev/null
+++ b/x11-misc/xrootconsole/files/digest-xrootconsole-0.4-r1
@@ -0,0 +1 @@
+MD5 528feb9dd856712fd022ba0a5b586129 xrootconsole-0.4.tar.gz 15397
diff --git a/x11-misc/xrootconsole/files/xrootconsole-0.4.parse-color.patch b/x11-misc/xrootconsole/files/xrootconsole-0.4.parse-color.patch
new file mode 100644
index 000000000000..78114de4df5b
--- /dev/null
+++ b/x11-misc/xrootconsole/files/xrootconsole-0.4.parse-color.patch
@@ -0,0 +1,23 @@
+diff -u xrootconsole-0.4/util.c xrootconsole-0.4.new/util.c
+--- xrootconsole-0.4/util.c 2000-10-10 04:17:53.000000000 +0200
++++ xrootconsole-0.4.new/util.c 2004-02-17 23:59:45.000000000 +0100
+@@ -53,16 +53,16 @@
+
+
+ unsigned long load_color(const char* s, Display *dpy) {
+- XColor ce, cs;
++ XColor ce;
+ Colormap colormap = DefaultColormap(dpy, DefaultScreen(dpy));
+
+- if (XLookupColor(dpy, colormap, s, &ce, &cs)) {
++ if (XParseColor(dpy, colormap, s, &ce)) {
+ if (XAllocColor(dpy, colormap, &ce)) return ce.pixel;
+
+ fprintf(stderr, "Warning: could not allocate color\n");
+ return WhitePixel(dpy, DefaultScreen(dpy));
+ }
+
+- fprintf(stderr, "Warning: could not lookup color\n");
++ fprintf(stderr, "Warning: could not parse color\n");
+ return WhitePixel(dpy, DefaultScreen(dpy));
+ }