Miscellaneous Xenocara quirks

[Tiago Silva]

Hello!

Here are five miscellaneous Xenocara quirks caught up.
The first three were also found on upstream, but the last two seem to be 
specific to your distro.

Thanks,
Tiago Silva


--- /app/xcmsdb/xcmsdb.c        Fri Apr 17 05:49:30 2015
+++ /app/xcmsdb/xcmsdb.c        Sat Mar 26 03:39:46 2016
@@ -71,8 +71,8 @@
             "    -query                       query Screen Color 
Characterization Data\n"
             "    -remove                      remove Screen Color 
Characterization Data\n"
 #ifdef GRAY
-            "    -color                       use color as default\n");
-            "    -gray                        use gray-scale as default\n");
+            "    -color                       use color as default\n"
+            "    -gray                        use gray-scale as default\n"
 #endif /* GRAY */
             "    -version                     print program version\n"
             "\n");

--- /driver/x86-video-ast/src/ast_accel.c       Wed Aug 19 01:24:48 2015
+++ /driver/x86-video-ast/src/ast_accel.c       Sat Mar 26 04:21:48 2016
@@ -273,7 +273,7 @@
         infoPtr->ClippingFlags = HARDWARE_CLIP_SCREEN_TO_SCREEN_COPY   |
                                 HARDWARE_CLIP_MONO_8x8_FILL            |
                                 HARDWARE_CLIP_COLOR_8x8_FILL           |
-                                HARDWARE_CLIP_SOLID_LINE               |
+                                HARDWARE_CLIP_SOLID_FILL               |
                                 HARDWARE_CLIP_DASHED_LINE              |
                                 HARDWARE_CLIP_SOLID_LINE;
     }


--- /lib/libXmu/src/ShapeWidg.c Sun Sep 08 04:28:18 2013
+++ /lib/libXmu/src/ShapeWidg.c Sat Mar 26 04:14:17 2016
@@ -201,7 +201,7 @@
     GC gc;
   unsigned long mask;
 
-  if (width < 3 || width < 3)
+  if (width < 3 || height < 3)
     return;
   width += w->core.border_width << 1;
   height += w->core.border_width << 1;

--- /app/xlockmore/modes/life.c Sun Nov 26 17:13:23 2006
+++ /app/xlockmore/modes/life.c Sat Mar 26 04:53:58 2016
@@ -1641,7 +1641,7 @@
                                hsp = 0;
                                vsp = (int) (lp->nrows - (lp->ncols - temp) * 
1.35) / 2;
                        }
-                       switch NRAND(4) {
+                       switch (NRAND(4)) {
                                case 0:  /* Upper left */
                                        break;
                                case 1:  /* Upper right */

--- /dist/Mesa/src/gallium/drivers/nouveau/nv50/nv50_state_validate.c   Sat Feb 
21 08:18:05 2015
+++ /dist/Mesa/src/gallium/drivers/nouveau/nv50/nv50_state_validate.c   Sat Mar 
26 04:59:30 2016
@@ -231,12 +231,12 @@
       BEGIN_NV04(push, NV50_3D(SCISSOR_HORIZ(i)), 2);
       PUSH_DATA (push, (maxx << 16) | minx);
       PUSH_DATA (push, (maxy << 16) | miny);
+   }
 #else
       BEGIN_NV04(push, NV50_3D(SCISSOR_HORIZ(i)), 2);
       PUSH_DATA (push, (s->maxx << 16) | s->minx);
       PUSH_DATA (push, (s->maxy << 16) | s->miny);
 #endif
-   }
 
    nv50->scissors_dirty = 0;
 }