From 67fcdc13149aa98a8e72c1bdcf449bc17bb97fe3 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Mon, 30 Apr 2012 23:36:19 +0000
Subject: [PATCH] Update to xsane-0.998

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@10039 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  2 +-
 introduction/welcome/changelog.xml |  4 ++++
 pst/scanning/xsane.xml             | 27 ++++++++++++++++-----------
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/general.ent b/general.ent
index 77d24f0aa0..163202d0c8 100644
--- a/general.ent
+++ b/general.ent
@@ -1048,7 +1048,7 @@ $Date$
 <!-- Chapter 43 -->
 <!ENTITY sane-version                 "1.0.22">
 <!ENTITY sane-fe-version              "1.0.14">
-<!ENTITY xsane-version                "0.994">
+<!ENTITY xsane-version                "0.998">
 
 <!-- Chapter 44 -->
 <!ENTITY sgml-common-version          "0.6.3">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 31b41ab078..fc4ef25db6 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,10 @@
     <listitem>
       <para>April 30th, 2012</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to xsane-0.998. Fixes
+          <ulink url="&blfs-ticket-root;2790">#2790</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Update to SANE-1.0.22. Fixes
           <ulink url="&blfs-ticket-root;2935">#2935</ulink>.</para>
diff --git a/pst/scanning/xsane.xml b/pst/scanning/xsane.xml
index bde37919f8..10b4b296aa 100644
--- a/pst/scanning/xsane.xml
+++ b/pst/scanning/xsane.xml
@@ -4,10 +4,10 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY xsane-download-http "http://gd.tuwien.ac.at/hci/sane/xsane/xsane-&xsane-version;.tar.gz">
+  <!ENTITY xsane-download-http " ">
   <!ENTITY xsane-download-ftp  "ftp://ftp2.sane-project.org/pub/sane/xsane/xsane-&xsane-version;.tar.gz">
-  <!ENTITY xsane-md5sum        "7d02656026797a46a84bda63006f5668">
-  <!ENTITY xsane-size          "3.3 MB">
+  <!ENTITY xsane-md5sum        "936f1cc76b37caa8f285e1e15ac7e0aa">
+  <!ENTITY xsane-size          "2.8 MB">
   <!ENTITY xsane-buildsize     "23 MB">
   <!ENTITY xsane-time          "0.2 SBU">
 ]>
@@ -59,13 +59,17 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gtk2"/> and <xref linkend="sane"/> (back ends)</para>
+      <xref linkend="gtk2"/> and 
+      <xref linkend="sane"/> (back ends)
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="libtiff"/>,
-    <xref linkend="libjpeg"/>,
-    <xref linkend="lcms"/>, and
-    <xref linkend="gimp"/></para>
+    <para role="optional">
+      <xref linkend="libtiff"/>,
+      <xref linkend="libjpeg"/>,
+      <xref linkend="lcms"/>, and
+      <xref linkend="gimp"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/xsane"/></para>
@@ -78,7 +82,9 @@
     <para>Install <application>XSane</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>sed -i -e 's/netscape/xdg-open/'                   src/xsane.h      &amp;&amp;
+sed -i -e 's/png_ptr->jmpbuf/png_jmpbuf(png_ptr)/' src/xsane-save.c &amp;&amp;
+./configure --prefix=/usr                                           &amp;&amp;
 make</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
@@ -86,8 +92,7 @@ make</userinput></screen>
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>make xsanedocdir=/usr/share/doc/xsane-&xsane-version; install &amp;&amp;
-ln -v -s ../../doc/xsane-&xsane-version; \
-         /usr/share/sane/xsane/doc</userinput></screen>
+ln -v -s ../../doc/xsane-&xsane-version; /usr/share/sane/xsane/doc</userinput></screen>
 
     <para>If <application>GIMP</application> is installed, issue the following
     command as the <systemitem class="username">root</systemitem> user:</para>