From b46c64c79d3f6ba6dbe7b26d7093a2b076a94c51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20=C5=BDivkovi=C4=87?= <igor@linuxfromscratch.org>
Date: Sun, 7 Jul 2013 20:44:44 +0000
Subject: [PATCH] libxcb: enabled XKB extension and worked around make install
 error

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@11367 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 introduction/welcome/changelog.xml |  3 +++
 x/installing/libxcb.xml            | 17 +++++++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 86b2b738a2..227e40b6d1 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -46,6 +46,9 @@
     <listitem>
       <para>July 7th, 2013</para>
       <itemizedlist>
+        <listitem>
+          <para>[igor] - libxcb: Automake fix and XKB extension.</para>
+        </listitem>
         <listitem>
           <para>[ken] - fixes for firefox built on xulrunner.</para>
         </listitem>
diff --git a/x/installing/libxcb.xml b/x/installing/libxcb.xml
index 56a3c53014..e55af9651c 100644
--- a/x/installing/libxcb.xml
+++ b/x/installing/libxcb.xml
@@ -58,6 +58,14 @@
       </listitem>
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Required patch: <ulink
+        url="&patch-root;/libxcb-&libxcb-version;-automake_bug-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">libxcb Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -85,9 +93,11 @@
     <para>Install <application>libxcb</application> by running the following
     commands:</para>
 
-<screen><userinput>sed -e "s/pthread-stubs//" -i configure.ac &amp;&amp;
+<screen><userinput>patch -Np1 -i ../libxcb-&libxcb-version;-automake_bug-1.patch &amp;&amp;
+sed -e "s/pthread-stubs//" -i configure.ac &amp;&amp;
 autoreconf -fi &amp;&amp;
-./configure $XORG_CONFIG --enable-xinput --docdir='${datadir}'/doc/libxcb-&libxcb-version; &amp;&amp;
+./configure $XORG_CONFIG --docdir='${datadir}'/doc/libxcb-&libxcb-version; \
+            --enable-xinput --enable-xkb &amp;&amp;
 make</userinput></screen>
 
     <para>To test the results, issue: <command>make check</command>.</para>
@@ -108,6 +118,9 @@ make</userinput></screen>
     <para><option>--enable-xinput</option>: This switch enables XCB Xinput
     extension.</para>
 
+    <para><option>--enable-xkb</option>: This switch enables XCB XKB
+    extension.</para>
+
     <para><parameter>--without-doxygen</parameter>: This switch can be used
     to disable the API documentation if <xref linkend="doxygen"/> is
     installed.</para>