This fixes all remaining offset bugs in the patch-audit target
(after:
* my additions of upstream patches to 0000_backport_from_upstream.diff
* my patch to 000_stolen_from linuxwacom_wacom_driver.diff
* Eugene Konev's ports of 003b and 099u, as modified by me
* My patch to 044
* Eugene Konev's patch to 304
)
Index: 058_support_external_Xcursor_Xft_Xrender_libs.diff
===================================================================
--- 058_support_external_Xcursor_Xft_Xrender_libs.diff (revision 309)
+++ 058_support_external_Xcursor_Xft_Xrender_libs.diff (working copy)
@@ -731,7 +731,7 @@
diff -ruN xc-old/programs/xterm/Imakefile xc/programs/xterm/Imakefile
--- xc-old/programs/xterm/Imakefile 2004-08-13 12:57:19.000000000 +0000
+++ xc/programs/xterm/Imakefile 2004-10-26 09:59:37.322950392 +0000
-@@ -97,7 +97,7 @@
+@@ -99,7 +99,7 @@
UTF8SRC = charclass.c precompose.c wcwidth.c xutf8.c
UTF8OBJ = charclass.o precompose.o wcwidth.o xutf8.o
#endif
Index: 000_backport_from_author_xterm.diff
===================================================================
--- 000_backport_from_author_xterm.diff (revision 309)
+++ 000_backport_from_author_xterm.diff (working copy)
@@ -14252,7 +14252,7 @@
/*
* $Xorg: input.c,v 1.3 2000/08/17 19:55:08 cpqbld Exp $
*/
-@@ -2,6 +4,6 @@
+@@ -4,6 +6,6 @@
-/* $XFree86: xc/programs/xterm/input.c,v 3.71 2004/12/01 01:27:46 dickey Exp
$ */
+/* $XFree86: xc/programs/xterm/input.c,v 3.72 2005/01/14 01:50:03 dickey Exp
$ */
Index: 045_chips_default_to_swcursor_on_69k.diff
===================================================================
--- 045_chips_default_to_swcursor_on_69k.diff (revision 309)
+++ 045_chips_default_to_swcursor_on_69k.diff (working copy)
@@ -4,7 +4,7 @@
--- xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.c~ 2004-08-12
17:31:33.000000000 -0500
+++ xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.c 2004-08-12
17:31:41.000000000 -0500
-@@ -1519,6 +1519,18 @@
+@@ -1525,6 +1525,18 @@
} else {
cPtr->Accel.UseHWCursor = TRUE;
}
Index: 099c_support_loadable_external_Xcursor_lib.diff
===================================================================
--- 099c_support_loadable_external_Xcursor_lib.diff (revision 309)
+++ 099c_support_loadable_external_Xcursor_lib.diff (working copy)
@@ -25,7 +25,7 @@
diff -ruN xc-old/lib/X11/Imakefile xc/lib/X11/Imakefile
--- xc-old/lib/X11/Imakefile 2004-10-27 08:40:37.114775000 +0000
+++ xc/lib/X11/Imakefile 2004-10-27 08:41:15.188986920 +0000
-@@ -133,7 +133,10 @@
+@@ -131,7 +131,10 @@
THRSTUBSRCS = UIThrStubs.c
THRSTUBOBJS = UIThrStubs.o
#endif
Index: 099g_xkb_symbols_polish_fix_keypad_separator.diff
===================================================================
--- 099g_xkb_symbols_polish_fix_keypad_separator.diff (revision 309)
+++ 099g_xkb_symbols_polish_fix_keypad_separator.diff (working copy)
@@ -1,4 +1,4 @@
-$Id: 099g_xkb_symbols_polish_fix_keypad_separator.diff 1735 2004-08-13
06:43:54Z branden $
+$Id$
This patch by Branden Robinson, based on a report from Emil Novak.
@@ -34,7 +34,7 @@
diff -ruN xc-old/programs/xkbcomp/symbols/pl xc/programs/xkbcomp/symbols/pl
--- xc-old/programs/xkbcomp/symbols/pl 2004-04-23 19:54:52.000000000 +0000
+++ xc/programs/xkbcomp/symbols/pl 2004-10-26 12:35:38.879777432 +0000
-@@ -35,8 +35,12 @@
+@@ -37,8 +37,12 @@
[ zabovedot, Zabovedot ] };
// End alphanumeric section
@@ -52,7 +52,7 @@
diff -ruN xc-old/programs/xkbcomp/symbols/pl2 xc/programs/xkbcomp/symbols/pl2
--- xc-old/programs/xkbcomp/symbols/pl2 2003-11-14 16:49:23.000000000
+0000
+++ xc/programs/xkbcomp/symbols/pl2 2004-10-26 12:36:05.506729520 +0000
-@@ -94,6 +94,10 @@
+@@ -95,6 +95,10 @@
// End alphanumeric section
Index: 803_gnu_xterm_openpty.diff
===================================================================
--- 803_gnu_xterm_openpty.diff (revision 309)
+++ 803_gnu_xterm_openpty.diff (working copy)
@@ -1,4 +1,4 @@
-$Id: 803_gnu_xterm_openpty.diff 1706 2004-07-29 19:16:40Z branden $
+$Id$
On glibc-based systems, openpty needs -lutil.
@@ -8,7 +8,7 @@
--- xc/programs/xterm/Imakefile~ 2004-03-15 01:22:17.000000000 +0100
+++ xc/programs/xterm/Imakefile 2004-03-15 02:01:31.000000000 +0100
-@@ -58,6 +58,7 @@
+@@ -60,6 +60,7 @@
#endif
#if defined(NetBSDArchitecture) || defined(OpenBSDArchitecture) || \
Index: 823_gnu-freebsd_xterm.diff
===================================================================
--- 823_gnu-freebsd_xterm.diff (revision 309)
+++ 823_gnu-freebsd_xterm.diff (working copy)
@@ -1,4 +1,4 @@
-$Id: 823_gnu-freebsd_xterm.diff 1400 2004-05-13 17:23:09Z branden $
+$Id$
GNU/FreeBSD needs the termios.h header included to know what "B38400" is.
@@ -8,7 +8,7 @@
--- xc/programs/xterm/main.c~ 2004-05-12 02:25:06.000000000 -0500
+++ xc/programs/xterm/main.c 2004-05-12 02:29:08.000000000 -0500
-@@ -490,6 +490,7 @@
+@@ -491,6 +491,7 @@
* about padding generally store the code in a short, which does not have
* enough bits for the extended values.
*/
--
Don't say I didn't warn you.
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
