From 61e56a11122b44830b6675aa625798e0e9689489 Mon Sep 17 00:00:00 2001
From: Ragnar Thomsen <rthomsen@linuxfromscratch.org>
Date: Sat, 3 Mar 2012 21:35:50 +0000
Subject: [PATCH] Updated xchat.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@9575 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  2 +-
 introduction/welcome/changelog.xml |  3 +++
 xsoft/other/xchat.xml              | 26 ++++++++++----------------
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/general.ent b/general.ent
index 185dbecdf6..356ca93d83 100644
--- a/general.ent
+++ b/general.ent
@@ -909,7 +909,7 @@ program you invoke.  Development restarted Feb 12, so commented until a new rele
 <!ENTITY pidgin-version               "2.10.0">
 <!ENTITY rox-filer-version            "2.10">
 <!ENTITY thunderbird-version          "10.0.2">
-<!ENTITY xchat-version                "2.8.4">
+<!ENTITY xchat-version                "2.8.8">
 
 <!-- Part XI -->
 <!-- Chapter 39 -->
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 7a75b4f8fc..82a73bf43b 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -45,6 +45,9 @@
       <para>March 3nd, 2012</para>
       <itemizedlist>
         <listitem>
+          <para>[rthomsen] - Updated to XChat 2.8.8. Thanks to Armin K. for creating the patch.</para>
+        </listitem>
+	<listitem>
           <para>[rthomsen] - Updated to Strigi 0.7.5.</para>
         </listitem>
 	<listitem>
diff --git a/xsoft/other/xchat.xml b/xsoft/other/xchat.xml
index 489c31e4cb..ce93eaa866 100644
--- a/xsoft/other/xchat.xml
+++ b/xsoft/other/xchat.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY xchat-download-http "http://www.xchat.org/files/source/2.8/xchat-&xchat-version;.tar.bz2">
   <!ENTITY xchat-download-ftp  "&gentoo-ftp-repo;/xchat-&xchat-version;.tar.bz2">
-  <!ENTITY xchat-md5sum        "66d60febc62a01bafac9bb3a35fb37ae">
-  <!ENTITY xchat-size          "1.3 MB">
-  <!ENTITY xchat-buildsize     "33 MB">
-  <!ENTITY xchat-time          "0.3 SBU">
+  <!ENTITY xchat-md5sum        "6775c44f38e84d06c06c336b32c4a452">
+  <!ENTITY xchat-size          "1.4 MB">
+  <!ENTITY xchat-buildsize     "40 MB">
+  <!ENTITY xchat-time          "0.4 SBU">
 ]>
 
 <sect1 id="xchat" xreflabel="XChat-&xchat-version;">
@@ -34,6 +34,8 @@
     publicly, have private one-on-one conversations, etc.  File transfers are
     also possible.</para>
 
+    &lfs70_checked;    
+    
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -56,14 +58,6 @@
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Required patch: <ulink
-        url="http://xchat.org/files/source/2.8/patches/xc284-scrollbmkdir.diff"/></para>
-      </listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect3">XChat Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -97,8 +91,7 @@
     <para>Install <application>XChat</application> by running the following
     commands:</para>
 
-<screen><userinput>patch -Np1 -i ../xc284-scrollbmkdir.diff &amp;&amp;
-./configure --prefix=/usr \
+<screen><userinput>./configure --prefix=/usr \
             --sysconfdir=&gnome-etc-dir; \
             --enable-shm &amp;&amp;
 make</userinput></screen>
@@ -108,7 +101,6 @@ make</userinput></screen>
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>make install &amp;&amp;
-
 install -v -m755 -d /usr/share/doc/xchat-&xchat-version; &amp;&amp;
 install -v -m644    README faq.html \
                     /usr/share/doc/xchat-&xchat-version;</userinput></screen>
@@ -123,6 +115,8 @@ install -v -m644    README faq.html \
 
     <para><parameter>--enable-shm</parameter>: This parameter is used to enable
     XShm for fast tinting.</para>
+    
+    <para><parameter>--enable-ipv6</parameter>: Enable IPv6 support in xchat.</para>
 
   </sect2>
 
@@ -130,7 +124,7 @@ install -v -m644    README faq.html \
     <title>Contents</title>
 
     <segmentedlist>
-      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>