012_Xaw_StripChart_fix.diff -- already present
013_xkb_symbols_euro_support.diff -- missing. Rediffed patch attached
014_startx_hostname_fix.diff -- already present
015_vesa_ifdef_afb_calls.diff -- already present and ported
016_ICE_subprotocol_reply_fix.diff -- already present
017_fix_Xlib_depend_target.diff -- already present and ported
018_xtt_1.4.1.diff -- missing, but not needed anymore as X-TrueType now
is not shipped.
019_iso8859-15_Compose_fix.diff -- already present and ported, but xorg
version has "acute" and xfree86 has "apostrophe". Patch changed
to xfree86 variant attached.
020_conditionalize_xie_headers.diff -- missing, but no longer needed, as
xie headers are no longer shipped
021_riscpc_ioport_fix.diff -- already present
022_ati_r128_support_800_byte_pitch.diff -- upstream
023_specs_doc_fixes.diff -- already present and ported
024_ati_r128_and_radeon_enable_build_without_vgahw.diff -- present but
changed a lot. Needs more investigation
025_fix_dri_resume.diff -- missing, but affected files (radeon kernel
driver) are not shipped anymore
$Id: 013_xkb_symbols_euro_support.diff 1535 2004-06-15 17:03:25Z branden $
This patch by Mike A. Harris.
Not submitted upstream yet.
Index: xc/programs/xkbcomp/symbols/hu
===================================================================
--- xc.orig/programs/xkbcomp/symbols/hu 2005-06-26 06:51:37.000000000 +0800
+++ xc/programs/xkbcomp/symbols/hu 2005-06-26 12:12:46.000000000 +0800
@@ -246,6 +246,8 @@
[ backslash ] };
key <AD02> { [ w, W ],
[ bar ] };
+ key <AD07> { [ u, U ],
+ [ EuroSign ] };
key <AD08> { [ i, I ],
[ Iacute ] };
key <AD12> { [ uacute, Uacute ],
Index: xc/programs/xkbcomp/symbols/hu_US
===================================================================
--- xc.orig/programs/xkbcomp/symbols/hu_US 2005-06-26 06:51:37.000000000
+0800
+++ xc/programs/xkbcomp/symbols/hu_US 2005-06-26 12:12:46.000000000 +0800
@@ -44,6 +44,8 @@
key <AD02> { [ w, W ],
[ bar ] };
key <AD06> { [ z, Z ] };
+ key <AD07> { [ u, U ],
+ [ EuroSign ] };
key <AD08> { [ i, I ],
[ Iacute ] };
// key <AD11> { [ odoubleacute, Odoubleacute ],
Index: xc/programs/xkbcomp/symbols/pl
===================================================================
--- xc.orig/programs/xkbcomp/symbols/pl 2005-06-26 06:51:37.000000000 +0800
+++ xc/programs/xkbcomp/symbols/pl 2005-06-26 12:12:46.000000000 +0800
@@ -25,6 +25,8 @@
[ lstroke, Lstroke ] };
key <AB06> { [ ],
[ nacute, Nacute ] };
+ key <AD07> { [ ],
+ [ EuroSign ] };
key <AD09> { [ ],
[ oacute, Oacute ] };
key <AC02> { [ ],
Index: xc/programs/xkbcomp/symbols/pl2
===================================================================
--- xc.orig/programs/xkbcomp/symbols/pl2 2005-06-26 06:51:37.000000000
+0800
+++ xc/programs/xkbcomp/symbols/pl2 2005-06-26 12:12:46.000000000 +0800
@@ -45,7 +45,8 @@
key <AD04> { [ r, R ] };
key <AD05> { [ t, T ] };
key <AD06> { [ z, Z ] };
- key <AD07> { [ u, U ] };
+ key <AD07> { [ u, U ],
+ [ EuroSign ] };
key <AD08> { [ i, I ] };
key <AD09> { [ o, O ] };
key <AD10> { [ p, P ] };
Index: xc/programs/xkbcomp/symbols/tr
===================================================================
--- xc.orig/programs/xkbcomp/symbols/tr 2005-06-26 06:51:37.000000000 +0800
+++ xc/programs/xkbcomp/symbols/tr 2005-06-26 12:12:46.000000000 +0800
@@ -37,6 +37,8 @@
key <AE11> { [ asterisk, question ],
[ backslash ] };
key <AE12> { [ minus, underscore ] };
+ key <AD03> { [ e, E ],
+ [ EuroSign ] };
key <AD08> { [ idotless, I ] };
key <AD11> { [ gbreve, Gbreve ] };
key <AD12> { [ udiaeresis, Udiaeresis ],
$Id: 019_iso8859-15_Compose_fix.diff 189 2005-06-11 00:04:27Z branden $
This patch by Wolfgang Sourdeau and Rüdiger Kuhlmann.
Account for lack of spacing diaeresis key and codepoint.
http://bugs.debian.org/97433
diff -ruN xc-old/nls/Compose/iso8859-15 xc/nls/Compose/iso8859-15
--- xc-old/nls/Compose/iso8859-15 2004-04-23 18:44:33.000000000 +0000
+++ xc/nls/Compose/iso8859-15 2004-10-26 08:39:31.103606792 +0000
@@ -153,8 +153,7 @@
<Multi_key> <minus> <colon> : "\367" division
<Multi_key> <colon> <minus> : "\367" division
<Multi_key> <x> <x> : "\327" multiply
-<Multi_key> <apostrophe> <apostrophe> : "\264" acute
-<Multi_key> <comma> <comma> : "\270" cedilla
+<Multi_key> <apostrophe> <apostrophe> : "'" apostrophe
<Multi_key> <quotedbl> <quotedbl> : "\"" quotedbl
XCOMM Accented Alphabet
<Multi_key> <A> <grave> : "\300" Agrave
@@ -173,8 +172,6 @@
<Multi_key> <minus> <A> : "\303" Atilde
<Multi_key> <A> <quotedbl> : "\304" Adiaeresis
<Multi_key> <quotedbl> <A> : "\304" Adiaeresis
-<Multi_key> <A> <diaeresis> : "\304" Adiaeresis
-<Multi_key> <diaeresis> <A> : "\304" Adiaeresis
<Multi_key> <A> <asterisk> : "\305" Aring
<Multi_key> <asterisk> <A> : "\305" Aring
<Multi_key> <A> <A> : "\305" Aring
@@ -196,8 +193,6 @@
<Multi_key> <minus> <a> : "\343" atilde
<Multi_key> <a> <quotedbl> : "\344" adiaeresis
<Multi_key> <quotedbl> <a> : "\344" adiaeresis
-<Multi_key> <a> <diaeresis> : "\344" adiaeresis
-<Multi_key> <diaeresis> <a> : "\344" adiaeresis
<Multi_key> <a> <asterisk> : "\345" aring
<Multi_key> <asterisk> <a> : "\345" aring
<Multi_key> <a> <a> : "\345" aring
@@ -225,8 +220,6 @@
<Multi_key> <greater> <E> : "\312" Ecircumflex
<Multi_key> <E> <quotedbl> : "\313" Ediaeresis
<Multi_key> <quotedbl> <E> : "\313" Ediaeresis
-<Multi_key> <E> <diaeresis> : "\313" Ediaeresis
-<Multi_key> <diaeresis> <E> : "\313" Ediaeresis
<Multi_key> <e> <grave> : "\350" egrave
<Multi_key> <grave> <e> : "\350" egrave
<Multi_key> <e> <acute> : "\351" eacute
@@ -239,8 +232,6 @@
<Multi_key> <greater> <e> : "\352" ecircumflex
<Multi_key> <e> <quotedbl> : "\353" ediaeresis
<Multi_key> <quotedbl> <e> : "\353" ediaeresis
-<Multi_key> <e> <diaeresis> : "\353" ediaeresis
-<Multi_key> <diaeresis> <e> : "\353" ediaeresis
<Multi_key> <I> <grave> : "\314" Igrave
<Multi_key> <grave> <I> : "\314" Igrave
<Multi_key> <I> <acute> : "\315" Iacute
@@ -253,8 +244,6 @@
<Multi_key> <greater> <I> : "\316" Icircumflex
<Multi_key> <I> <quotedbl> : "\317" Idiaeresis
<Multi_key> <quotedbl> <I> : "\317" Idiaeresis
-<Multi_key> <I> <diaeresis> : "\317" Idiaeresis
-<Multi_key> <diaeresis> <I> : "\317" Idiaeresis
<Multi_key> <i> <grave> : "\354" igrave
<Multi_key> <grave> <i> : "\354" igrave
<Multi_key> <i> <acute> : "\355" iacute
@@ -267,8 +256,6 @@
<Multi_key> <greater> <i> : "\356" icircumflex
<Multi_key> <i> <quotedbl> : "\357" idiaeresis
<Multi_key> <quotedbl> <i> : "\357" idiaeresis
-<Multi_key> <i> <diaeresis> : "\357" idiaeresis
-<Multi_key> <diaeresis> <i> : "\357" idiaeresis
<Multi_key> <N> <asciitilde> : "\321" Ntilde
<Multi_key> <asciitilde> <N> : "\321" Ntilde
<Multi_key> <N> <minus> : "\321" Ntilde
@@ -293,8 +280,6 @@
<Multi_key> <minus> <O> : "\325" Otilde
<Multi_key> <O> <quotedbl> : "\326" Odiaeresis
<Multi_key> <quotedbl> <O> : "\326" Odiaeresis
-<Multi_key> <O> <diaeresis> : "\326" Odiaeresis
-<Multi_key> <diaeresis> <O> : "\326" Odiaeresis
<Multi_key> <O> <slash> : "\330" Ooblique
<Multi_key> <slash> <O> : "\330" Ooblique
<Multi_key> <O> <E> : "\274" OE
@@ -314,8 +299,6 @@
<Multi_key> <minus> <o> : "\365" otilde
<Multi_key> <o> <quotedbl> : "\366" odiaeresis
<Multi_key> <quotedbl> <o> : "\366" odiaeresis
-<Multi_key> <o> <diaeresis> : "\366" odiaeresis
-<Multi_key> <diaeresis> <o> : "\366" odiaeresis
<Multi_key> <o> <slash> : "\370" oslash
<Multi_key> <slash> <o> : "\370" oslash
<Multi_key> <o> <e> : "\275" oe
@@ -335,8 +318,6 @@
<Multi_key> <greater> <U> : "\333" Ucircumflex
<Multi_key> <U> <quotedbl> : "\334" Udiaeresis
<Multi_key> <quotedbl> <U> : "\334" Udiaeresis
-<Multi_key> <U> <diaeresis> : "\334" Udiaeresis
-<Multi_key> <diaeresis> <U> : "\334" Udiaeresis
<Multi_key> <u> <grave> : "\371" ugrave
<Multi_key> <grave> <u> : "\371" ugrave
<Multi_key> <u> <acute> : "\372" uacute
@@ -349,8 +330,6 @@
<Multi_key> <greater> <u> : "\373" ucircumflex
<Multi_key> <u> <quotedbl> : "\374" udiaeresis
<Multi_key> <quotedbl> <u> : "\374" udiaeresis
-<Multi_key> <u> <diaeresis> : "\374" udiaeresis
-<Multi_key> <diaeresis> <u> : "\374" udiaeresis
<Multi_key> <s> <s> : "\337" ssharp
<Multi_key> <T> <H> : "\336" THORN
<Multi_key> <t> <h> : "\376" thorn
@@ -360,16 +339,12 @@
<Multi_key> <apostrophe> <Y> : "\335" Yacute
<Multi_key> <Y> <quotedbl> : "\276" Ydiaeresis
<Multi_key> <quotedbl> <Y> : "\276" Ydiaeresis
-<Multi_key> <Y> <diaeresis> : "\276" Ydiaeresis
-<Multi_key> <diaeresis> <Y> : "\276" Ydiaeresis
<Multi_key> <y> <acute> : "\375" yacute
<Multi_key> <acute> <y> : "\375" yacute
<Multi_key> <y> <apostrophe> : "\375" yacute
<Multi_key> <apostrophe> <y> : "\375" yacute
<Multi_key> <y> <quotedbl> : "\377" ydiaeresis
<Multi_key> <quotedbl> <y> : "\377" ydiaeresis
-<Multi_key> <y> <diaeresis> : "\377" ydiaeresis
-<Multi_key> <diaeresis> <y> : "\377" ydiaeresis
<Multi_key> <Z> <less> : "\264" Zcaron
<Multi_key> <less> <Z> : "\264" Zcaron
<Multi_key> <z> <less> : "\270" zcaron
@@ -398,8 +373,7 @@
<dead_cedilla> <minus> : "\254" notsign
<dead_circumflex> <minus> : "\257" macron
<dead_circumflex> <underscore> : "\257" macron
-<dead_acute> <apostrophe> : "\264" acute
-<dead_cedilla> <comma> : "\270" cedilla
+<dead_acute> <apostrophe> : "'" apostrophe
<dead_diaeresis> <quotedbl> : "\"" quotedbl
XCOMM Accented Alphabet
<dead_abovering> <A> : "\305" Aring
