From b48e1d448556ed397586d4cec21b7b0a94f39cac Mon Sep 17 00:00:00 2001
From: Fernando de Oliveira <fernando@linuxfromscratch.org>
Date: Mon, 18 Nov 2013 18:50:18 +0000
Subject: [PATCH] Update to icewm-1.3.8.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@12250 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  2 +-
 introduction/welcome/changelog.xml |  4 ++++
 x/wm/icewm.xml                     | 13 ++++++-------
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/general.ent b/general.ent
index 1662111175..7e620c864f 100644
--- a/general.ent
+++ b/general.ent
@@ -573,7 +573,7 @@ export -f as_root</userinput></screen>
 
 <!-- Chapter 26 -->
 <!ENTITY fluxbox-version              "1.3.5">
-<!ENTITY icewm-version                "1.3.7">
+<!ENTITY icewm-version                "1.3.8">
 <!ENTITY openbox-version              "3.5.2">
 <!ENTITY sawfish-version              "1.10">
 
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index de11fe31f3..fd7cfe6262 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -46,6 +46,10 @@
     <listitem>
       <para>November 18th, 2013</para>
       <itemizedlist>
+        <listitem>
+          <para>[fernando] - Update to icewm-1.3.8. Fixes
+          <ulink url="&blfs-ticket-root;4340">#4340</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[igor] - Update to harfbuzz-0.9.24. Fixes
           <ulink url="&blfs-ticket-root;4337">#4337</ulink>.</para>
diff --git a/x/wm/icewm.xml b/x/wm/icewm.xml
index a171244f36..26bc1d734d 100644
--- a/x/wm/icewm.xml
+++ b/x/wm/icewm.xml
@@ -5,10 +5,13 @@
   %general-entities;
 
   <!ENTITY icewm-download-http "&sourceforge-repo;/icewm/icewm-&icewm-version;.tar.gz">
+  <!ENTITY icewm-download-ftp  " ">
+<!--
   <!ENTITY icewm-download-ftp  "&gentoo-ftp-repo;/icewm-&icewm-version;.tar.gz">
-  <!ENTITY icewm-md5sum        "224695231aedb2b91db3254a13e1c8dd">
-  <!ENTITY icewm-size          "878 KB">
-  <!ENTITY icewm-buildsize     "39 MB">
+-->
+  <!ENTITY icewm-md5sum        "6d61aced3bd20b9e7caeb7e8380368c8">
+  <!ENTITY icewm-size          "888 KB">
+  <!ENTITY icewm-buildsize     "33 MB">
   <!ENTITY icewm-time          "0.3 SBU">
 ]>
 
@@ -82,7 +85,6 @@
     commands:</para>
 
 <screen><userinput>sed -i '/^LIBS/s/\(.*\)/\1 -lfontconfig/' src/Makefile.in &amp;&amp;
-sed -i 's/define deprecated/define ICEWM_deprecated/' src/base.h &amp;&amp;
 ./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
@@ -104,9 +106,6 @@ make install-desktop</userinput></screen>
     this fixes the build with recent versions of <application>binutils</application>.
     </para>
 
-    <para><parameter>sed -i 's/define deprecated/define ICEWM_deprecated/' src/base.h</parameter>:
-    this fixes the build with current <application>libX11</application>.</para>
-
   </sect2>
 
   <sect2 role="configuration">