From 3325222ba24d9cea2c8f5f639b50df88d80a0bb2 Mon Sep 17 00:00:00 2001
From: Ken Moffat <ken@linuxfromscratch.org>
Date: Wed, 27 Feb 2008 00:29:27 +0000
Subject: [PATCH] Update kbd to 1.13.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8494 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml |  1 +
 chapter01/whatsnew.xml  |  8 ++++++--
 chapter03/patches.xml   |  8 --------
 chapter06/kbd.xml       |  5 -----
 packages.ent            | 10 +++++-----
 patches.ent             |  8 ++------
 6 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 2e8d24b47..8a79a2020 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -41,6 +41,7 @@
       <itemizedlist>
         <listitem>
           <para>[ken] - Corrected typo in name of ru-ms keymap.</para>
+	  <para>[ken] - Updated Kbd to 1.13.</para>
         </listitem>
       </itemizedlist>
     </listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 72c1b575c..f71c26ea6 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -107,9 +107,9 @@
     <listitem>
       <para>IPRoute2 &iproute2-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Kbd &kbd-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Less &less-version;</para>
     </listitem>
@@ -261,6 +261,10 @@
       <para>grep-2.5.1-redhat_fixes-2.patch</para>
    </listitem>
 
+   <listitem>
+     <para>kbd-1.12-gcc4_fixes-1.patch</para>
+   </listitem>
+
     <listitem>
       <para>man-db-2.4.4-fixes-1.patch</para>
     </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index e850c074a..80565b084 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -130,14 +130,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Kbd GCC-4.x Fix Patch - <token>&kbd-gcc4_fixes-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&kbd-gcc4_fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&kbd-gcc4_fixes-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry>
       <term>Module-init-tools Man-Pages Patch - <token>&module-init-manpages-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml
index ffe9de637..cfff54ef3 100644
--- a/chapter06/kbd.xml
+++ b/chapter06/kbd.xml
@@ -49,11 +49,6 @@
     <para>After patching, the Backspace key generates the character with code 127,
     and the Delete key generates a well-known escape sequence.</para>
 
-    <para>Patch Kbd to fix a bug in <command>setfont</command> that is triggered
-    when compiling with GCC-&gcc-version;:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&kbd-gcc4_fixes-patch;</userinput></screen>
-
     <para>Prepare Kbd for compilation:</para>
 
 <screen><userinput remap="configure">./configure --datadir=/lib/kbd</userinput></screen>
diff --git a/packages.ent b/packages.ent
index 704ee6532..7e247824a 100644
--- a/packages.ent
+++ b/packages.ent
@@ -267,12 +267,12 @@
 <!ENTITY iproute2-ch6-du "4.8 MB">
 <!ENTITY iproute2-ch6-sbu "0.2 SBU">
 
-<!ENTITY kbd-version "1.12">
-<!ENTITY kbd-size "618 KB">
-<!ENTITY kbd-url "&kernel;linux/utils/kbd/kbd-&kbd-version;.tar.bz2">
-<!ENTITY kbd-md5 "069d1175b4891343b107a8ac2b4a39f6">
+<!ENTITY kbd-version "1.13">
+<!ENTITY kbd-size "652 KB">
+<!ENTITY kbd-url "http://ftp.altlinux.com/pub/people/legion/kbd/kbd-&kbd-version;.tar.bz2">
+<!ENTITY kbd-md5 "2639fdfe2412b29cbf6936d7db91cee3">
 <!ENTITY kbd-home " ">
-<!ENTITY kbd-ch6-du "12.3 MB">
+<!ENTITY kbd-ch6-du "12.5 MB">
 <!ENTITY kbd-ch6-sbu "less than 0.1 SBU">
 
 <!ENTITY less-version "418">
diff --git a/patches.ent b/patches.ent
index 7741156c4..5d5f0b775 100644
--- a/patches.ent
+++ b/patches.ent
@@ -64,12 +64,8 @@
 
 
 <!ENTITY kbd-backspace-patch "kbd-&kbd-version;-backspace-1.patch">
-<!ENTITY kbd-backspace-patch-md5 "692c88bb76906d99cc20446fadfb6499">
-<!ENTITY kbd-backspace-patch-size "11 KB">
-
-<!ENTITY kbd-gcc4_fixes-patch "kbd-&kbd-version;-gcc4_fixes-1.patch">
-<!ENTITY kbd-gcc4_fixes-patch-md5 "615bc1e381ab646f04d8045751ed1f69">
-<!ENTITY kbd-gcc4_fixes-patch-size "1.4 KB">
+<!ENTITY kbd-backspace-patch-md5 "fe51ec685687ce9d29463d786ba0c2d4">
+<!ENTITY kbd-backspace-patch-size "13 KB">
 
 
 <!ENTITY mktemp-tempfile-patch "mktemp-&mktemp-version;-add_tempfile-3.patch">