Author: barbier
Date: 2006-09-13 18:54:51 -0400 (Wed, 13 Sep 2006)
New Revision: 3211
Added:
trunk/lib/libx11/debian/patches/017_FTBFS_makekeys.diff
Modified:
trunk/lib/libx11/debian/changelog
trunk/lib/libx11/debian/patches/series
Log:
Add 017_FTBFS_makekeys.diff. Fix a FTBFS when compiling with
x11proto-core-dev >= 7.0.3, backported from upstream.
Thanks Goswin von Brederlow. (closes: #387133)
Modified: trunk/lib/libx11/debian/changelog
===================================================================
--- trunk/lib/libx11/debian/changelog 2006-09-13 21:20:07 UTC (rev 3210)
+++ trunk/lib/libx11/debian/changelog 2006-09-13 22:54:51 UTC (rev 3211)
@@ -7,6 +7,9 @@
* Add 016_greek_polytonic_Compose.diff. Add compose sequences with the
right breathing signs U0313/U0314 to el_GR.UTF-8/Compose.
Thanks Jan Willem Stumpel. (closes: #386471)
+ * Add 017_FTBFS_makekeys.diff. Fix a FTBFS when compiling with
+ x11proto-core-dev >= 7.0.3, backported from upstream.
+ Thanks Goswin von Brederlow. (closes: #387133)
-- Denis Barbier <[EMAIL PROTECTED]> Wed, 13 Sep 2006 23:01:36 +0200
Added: trunk/lib/libx11/debian/patches/017_FTBFS_makekeys.diff
===================================================================
--- trunk/lib/libx11/debian/patches/017_FTBFS_makekeys.diff
(rev 0)
+++ trunk/lib/libx11/debian/patches/017_FTBFS_makekeys.diff 2006-09-13
22:54:51 UTC (rev 3211)
@@ -0,0 +1,23 @@
+Stolen from HEAD, commit d6fba1f44d404362d3be1b421f57d7ccc3c8cdac
+Closes: #387133
+
+Index: libx11/src/util/makekeys.c
+===================================================================
+--- libx11.orig/src/util/makekeys.c
++++ libx11/src/util/makekeys.c
+@@ -1,5 +1,5 @@
+ /* $Xorg: makekeys.c,v 1.5 2001/02/09 02:03:40 $ */
+-/* $XdotOrg: xc/lib/X11/util/makekeys.c,v 1.4 2004/09/26 20:46:17 kuhn Exp $
*/
++/* $XdotOrg: lib/X11/src/util/makekeys.c,v 1.5 2005-07-03 07:00:56 daniels
Exp $ */
+ /*
+
+ Copyright 1990, 1998 The Open Group
+@@ -49,7 +49,7 @@
+ KeySym val;
+ } info[KTNUM];
+
+-#define MIN_REHASH 10
++#define MIN_REHASH 15
+ #define MATCHES 10
+
+ char tab[KTNUM];
Modified: trunk/lib/libx11/debian/patches/series
===================================================================
--- trunk/lib/libx11/debian/patches/series 2006-09-13 21:20:07 UTC (rev
3210)
+++ trunk/lib/libx11/debian/patches/series 2006-09-13 22:54:51 UTC (rev
3211)
@@ -14,3 +14,4 @@
014_add_Khmer_digraphs.diff
015_russian_locale_alias.diff
016_greek_polytonic_Compose.diff
+017_FTBFS_makekeys.diff
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
