- one more fix

[packages/debrix.git] / debrix-many_fixes.patch

diff --git a/debrix-many_fixes.patch b/debrix-many_fixes.patch
index 1f8c60da1ef7369b6806a2bf76f8826ee231658e..4c9ffbccbc5f5108de0cfc7225a7fb4e2c22e33a 100644 (file)
--- a/debrix-many_fixes.patch
+++ b/debrix-many_fixes.patch
@@ -4,7 +4,7 @@ RCS file: /cvs/xserver/debrix/composite/compalloc.c,v
 retrieving revision 1.7
 diff -u -r1.7 compalloc.c
 --- composite/compalloc.c      20 Nov 2003 03:31:29 -0000      1.7
-+++ composite/compalloc.c      28 Jun 2004 00:03:04 -0000
++++ composite/compalloc.c      28 Jun 2004 01:02:43 -0000
 @@ -57,6 +57,7 @@
      CompWindowPtr     cw = GetCompWindow (pWin);
      CompClientWindowPtr       ccw;
@@ -27,7 +27,7 @@ RCS file: /cvs/xserver/debrix/hw/xorg/common/xf86KbdLnx.c,v
 retrieving revision 1.2
 diff -u -r1.2 xf86KbdLnx.c
 --- hw/xorg/common/xf86KbdLnx.c        10 Jun 2004 19:40:04 -0000      1.2
-+++ hw/xorg/common/xf86KbdLnx.c        28 Jun 2004 00:03:05 -0000
++++ hw/xorg/common/xf86KbdLnx.c        28 Jun 2004 01:02:43 -0000
 @@ -73,7 +73,6 @@
  #include "atKeynames.h"
  
@@ -36,13 +36,25 @@ diff -u -r1.2 xf86KbdLnx.c
  
  /*
   * LegalModifier --
+Index: hw/xorg/include/X11/extensions/Makefile.am
+===================================================================
+RCS file: /cvs/xserver/debrix/hw/xorg/include/X11/extensions/Makefile.am,v
+retrieving revision 1.1
+diff -u -r1.1 Makefile.am
+--- hw/xorg/include/X11/extensions/Makefile.am 11 Jun 2004 17:07:30 -0000      1.1
++++ hw/xorg/include/X11/extensions/Makefile.am 28 Jun 2004 01:02:43 -0000
+@@ -1,3 +1,3 @@
+-ext_INCLUDES = xf86bigfont.h xf86bigfstr.h xf86dga.h xf86dga1.h \
++ext_HEADERS = xf86bigfont.h xf86bigfstr.h xf86dga.h xf86dga1.h \
+                xf86dga1str.h xf86dgastr.h xf86misc.h xf86mscstr.h \
+              xf86rush.h xf86rushstr.h xf86vmode.h xf86vmstr.h
 Index: hw/xorg/os-support/linux/lnx_KbdMap.c
 ===================================================================
 RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/lnx_KbdMap.c,v
 retrieving revision 1.3
 diff -u -r1.3 lnx_KbdMap.c
 --- hw/xorg/os-support/linux/lnx_KbdMap.c      10 Jun 2004 19:40:55 -0000      1.3
-+++ hw/xorg/os-support/linux/lnx_KbdMap.c      28 Jun 2004 00:03:05 -0000
++++ hw/xorg/os-support/linux/lnx_KbdMap.c      28 Jun 2004 01:02:44 -0000
 @@ -24,7 +24,6 @@
  #include "atKeynames.h"
  
@@ -57,7 +69,7 @@ RCS file: /cvs/xserver/debrix/hw/xorg/os-support/shared/drm/kernel/drm.h,v
 retrieving revision 1.2
 diff -u -r1.2 drm.h
 --- hw/xorg/os-support/shared/drm/kernel/drm.h 10 Jun 2004 19:41:11 -0000      1.2
-+++ hw/xorg/os-support/shared/drm/kernel/drm.h 28 Jun 2004 00:03:05 -0000
++++ hw/xorg/os-support/shared/drm/kernel/drm.h 28 Jun 2004 01:02:44 -0000
 @@ -41,7 +41,6 @@
  #define _DRM_H_
  
@@ -72,7 +84,7 @@ RCS file: /cvs/xserver/debrix/os/xdmauth.c,v
 retrieving revision 1.3
 diff -u -r1.3 xdmauth.c
 --- os/xdmauth.c       10 Jun 2004 19:41:59 -0000      1.3
-+++ os/xdmauth.c       28 Jun 2004 00:03:06 -0000
++++ os/xdmauth.c       28 Jun 2004 01:02:45 -0000
 @@ -52,7 +52,7 @@
  #ifdef XDMCP
  #include <X11/Xmd.h>