x11-wm/fvwm: Sync with upstream.

[gentoo-fixes.git] / x11-wm / fvwm / files / fvwm-2.5.27-translucent-menus.diff

diff --git a/x11-wm/fvwm/files/fvwm-2.5.27-translucent-menus.diff b/x11-wm/fvwm/files/fvwm-2.5.27-translucent-menus.diff
index 1c49f69007d067c74e97ea0ef99fc07ef929cd2a..f3019e6fbec2320f7acca82d1e24f0ed3cd44399 100644 (file)
--- a/x11-wm/fvwm/files/fvwm-2.5.27-translucent-menus.diff
+++ b/x11-wm/fvwm/files/fvwm-2.5.27-translucent-menus.diff
@@ -3,8 +3,8 @@ Index: fvwm/colorset.c
 RCS file: /home/cvs/fvwm/fvwm/fvwm/colorset.c,v
 retrieving revision 1.52
 diff -u -r1.52 colorset.c
---- fvwm/colorset.c    27 Jan 2007 11:33:15 -0000      1.52
-+++ fvwm/colorset.c    5 Feb 2007 19:15:51 -0000
+--- a/fvwm/colorset.c  27 Jan 2007 11:33:15 -0000      1.52
++++ b/fvwm/colorset.c  5 Feb 2007 19:15:51 -0000
 @@ -164,6 +164,8 @@
        "NoIconTint",
        "IconAlpha",
@@ -123,8 +123,8 @@ Index: fvwm/menuroot.h
 RCS file: /home/cvs/fvwm/fvwm/fvwm/menuroot.h,v
 retrieving revision 1.3
 diff -u -r1.3 menuroot.h
---- fvwm/menuroot.h    13 Jan 2007 15:07:14 -0000      1.3
-+++ fvwm/menuroot.h    5 Feb 2007 19:17:37 -0000
+--- a/fvwm/menuroot.h  13 Jan 2007 15:07:14 -0000      1.3
++++ b/fvwm/menuroot.h  5 Feb 2007 19:17:37 -0000
 @@ -146,6 +146,9 @@
                int d_npixels;
        } stored_pixels;
@@ -140,8 +140,8 @@ Index: fvwm/menus.c
 RCS file: /home/cvs/fvwm/fvwm/fvwm/menus.c,v
 retrieving revision 1.409
 diff -u -r1.409 menus.c
---- fvwm/menus.c       27 Jan 2007 11:51:15 -0000      1.409
-+++ fvwm/menus.c       5 Feb 2007 19:17:50 -0000
+--- a/fvwm/menus.c     27 Jan 2007 11:51:15 -0000      1.409
++++ b/fvwm/menus.c     5 Feb 2007 19:17:50 -0000
 @@ -75,6 +75,19 @@
  
  /* ---------------------------- local macros ------------------------------- */
@@ -442,8 +442,8 @@ Index: fvwm/menus.h
 RCS file: /home/cvs/fvwm/fvwm/fvwm/menus.h,v
 retrieving revision 1.111
 diff -u -r1.111 menus.h
---- fvwm/menus.h       27 Jan 2007 11:51:15 -0000      1.111
-+++ fvwm/menus.h       5 Feb 2007 19:17:50 -0000
+--- a/fvwm/menus.h     27 Jan 2007 11:51:15 -0000      1.111
++++ b/fvwm/menus.h     5 Feb 2007 19:17:50 -0000
 @@ -15,6 +15,9 @@
  #define IS_MENU_RETURN(x) \
    ((x)==MENU_DONE || (x)==MENU_ABORTED || (x)==MENU_SUBMENU_TORN_OFF)
@@ -459,8 +459,8 @@ Index: libs/Colorset.h
 RCS file: /home/cvs/fvwm/fvwm/libs/Colorset.h,v
 retrieving revision 1.38
 diff -u -r1.38 Colorset.h
---- libs/Colorset.h    10 Jan 2007 00:34:27 -0000      1.38
-+++ libs/Colorset.h    5 Feb 2007 19:19:00 -0000
+--- a/libs/Colorset.h  10 Jan 2007 00:34:27 -0000      1.38
++++ b/libs/Colorset.h  5 Feb 2007 19:19:00 -0000
 @@ -51,6 +51,10 @@
        Bool dither;
        Bool allows_buffered_transparency;
@@ -497,8 +497,8 @@ Index: libs/PictureGraphics.c
 RCS file: /home/cvs/fvwm/fvwm/libs/PictureGraphics.c,v
 retrieving revision 1.29
 diff -u -r1.29 PictureGraphics.c
---- libs/PictureGraphics.c     27 Jan 2007 11:33:16 -0000      1.29
-+++ libs/PictureGraphics.c     5 Feb 2007 19:19:49 -0000
+--- a/libs/PictureGraphics.c   27 Jan 2007 11:33:16 -0000      1.29
++++ b/libs/PictureGraphics.c   5 Feb 2007 19:19:49 -0000
 @@ -1340,7 +1340,7 @@
        }
  }
@@ -513,8 +513,8 @@ Index: libs/PictureGraphics.h
 RCS file: /home/cvs/fvwm/fvwm/libs/PictureGraphics.h,v
 retrieving revision 1.13
 diff -u -r1.13 PictureGraphics.h
---- libs/PictureGraphics.h     9 May 2006 20:46:29 -0000       1.13
-+++ libs/PictureGraphics.h     5 Feb 2007 19:19:49 -0000
+--- a/libs/PictureGraphics.h   9 May 2006 20:46:29 -0000       1.13
++++ b/libs/PictureGraphics.h   5 Feb 2007 19:19:49 -0000
 @@ -122,7 +122,9 @@
        Display *dpy, Window win, Pixel tint, int tint_percent,
        Drawable dest, Bool dest_is_a_window, GC gc, GC mono_gc, GC alpha_gc,