Index: xsoft/other/inkscape.xml
===================================================================
--- xsoft/other/inkscape.xml	(revision c627795c5ad2cc0ba0405757f5524a8194c4aade)
+++ xsoft/other/inkscape.xml	(revision bc6e56dc6675fe52a37b9f8e342a7315fc70090b)
@@ -7,8 +7,8 @@
   <!ENTITY inkscape-download-http "&sourceforge-repo;/inkscape/inkscape-&inkscape-version;.tar.bz2">
   <!ENTITY inkscape-download-ftp  " ">
-  <!ENTITY inkscape-md5sum        "f60b98013bd1121b2cc301f3485076ba">
-  <!ENTITY inkscape-size          "18.7 MB">
-  <!ENTITY inkscape-buildsize     "1.9 GB">
-  <!ENTITY inkscape-time          "16 SBU">
+  <!ENTITY inkscape-md5sum        "f0fcc02088cc643634806064e7ab4ec3">
+  <!ENTITY inkscape-size          "19 MB">
+  <!ENTITY inkscape-buildsize     "1.5 GB">
+  <!ENTITY inkscape-time          "18 SBU">
 ]>
 
@@ -24,5 +24,5 @@
 
   <indexterm zone="inkscape">
-    <primary sortas="a-inkscape">Inkscape</primary>
+    <primary sortas="a-Inkscape">Inkscape</primary>
   </indexterm>
 
@@ -76,8 +76,4 @@
       <listitem>
         <para>
-          Required patch:
-          <ulink url="&patch-root;/inkscape-&inkscape-version;_gcc-4.7-1.patch"/>
-        </para>
-        <para>
           Optional patch:
           <ulink url="&patch-root;/inkscape-&inkscape-version;-poppler-0.20-1.patch"/>
@@ -90,22 +86,24 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gtkmm2"/>,
+      <xref linkend="boost"/>,
       <xref linkend="gc"/>,
-      <xref linkend="gsl"/>,
-      <xref linkend="boost"/>,
-      <xref linkend="libpng"/> and
-      <xref linkend="intltool"/>.
+      <xref linkend="gsl"/> and
+      <xref linkend="gtkmm2"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="lcms"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="lcms"/>,
-      <xref linkend="poppler"/>,
+      <xref linkend="aspell"/>,
+      <xref linkend="doxygen"/>,
       <xref linkend="gnome-vfs"/>,
       <xref linkend="imagemagick"/>,
-      <xref linkend="popt"/>,
-      <xref linkend="doxygen"/>,
-      <xref linkend="aspell"/> and
-      <ulink url="http://libwpg.sourceforge.net/">Libwpg</ulink>.
+      <ulink url="http://libwpg.sourceforge.net/">libwpg</ulink>,
+      <xref linkend="poppler"/> and
+      <xref linkend="popt"/>
     </para>
 
@@ -123,45 +121,14 @@
     </para>
 
-<screen><userinput>patch -p1 &lt; ../inkscape-&inkscape-version;-poppler-0.20-1.patch</userinput></screen>
-
-    <para>
-      Fix a bug that would otherwise prevent compiling with
-      <application>Libpng 1.5</application>:
+<screen><userinput>patch -Np1 -i ../inkscape-&inkscape-version;-poppler-0.20-1.patch</userinput></screen>
+
+    <para>
+      Fix a bug that will prevent from compiling with
+      <application>libpng 1.5</application>:
     </para>
 
 <screen><userinput>sed -i 's/ptr->jmpbuf/jmpbuf(png_ptr)/' \
-    src/{extension/internal/pdfinput/svg-builder,helper/png-write}.cpp</userinput></screen>
-
-    <para>
-      Fix a bug that would otherwise prevent compiling with
-      <application>Libpng 1.5.7</application> or greater:
-    </para>
-
-<screen><userinput>sed -i 's#if ( png_get_iCCP.*#if (0) {#' src/sp-image.cpp</userinput></screen>
-
-    <para>
-      If you have <emphasis>not</emphasis> installed <xref linkend="lcms"/> fix
-      a bug that will otherwise break the build:
-    </para>
-
-<screen><userinput>sed -i '/&lt;io\/sys.h&gt;/d
-    /preferences.h/a#include "io/sys.h"' src/color-profile.cpp</userinput></screen>
-
-    <para>
-      Fix a bug that would otherwise prevent compiling with
-      <application>Gcc 4.7</application>:
-    </para>
-
-<screen><userinput>patch -p1 &lt; ../inkscape-&inkscape-version;_gcc-4.7-1.patch</userinput></screen>
-
-    <para>
-      Fix many bugs that would otherwise prevent compiling with
-      <application>Glib 2.32</application> or greater:
-    </para>
-
-<screen><userinput>for thing in array convert dir error fileutils hash list macros main mem \
-    messages quark slist strfuncs string types urifuncs utils
-do sed -i "/^#include /s#/g${thing}##" $(grep -rl "include .glib/g${thing}" .)
-done</userinput></screen>
+    src/{extension/internal/pdfinput/svg-builder,helper/png-write}.cpp &amp;&amp;
+sed -i 's#if ( png_get_iCCP.*#if (0) {#' src/sp-image.cpp</userinput></screen>
 
     <para>
@@ -170,5 +137,5 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr --disable-lcms &amp;&amp;
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
@@ -182,14 +149,5 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--disable-lcms</option>: This is required if you've not installed
-      <xref linkend="lcms"/>. If you have installed
-      <application>Lcms</application> remove this option.
-    </para>
+
   </sect2>
 
@@ -202,6 +160,10 @@
 
       <seglistitem>
-        <seg>inkscape and inkview.</seg>
-        <seg>/usr/share/inkscape.</seg>
+        <seg>
+          inkscape and inkview
+        </seg>
+        <seg>
+          /usr/share/inkscape
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -235,5 +197,8 @@
         </listitem>
       </varlistentry>
+
     </variablelist>
+
   </sect2>
+
 </sect1>
