[blfs-book] r12326 - in trunk/BOOK: introduction/welcome xsoft/other

fernando at higgs.linuxfromscratch.org fernando at higgs.linuxfromscratch.org
Mon Dec 2 05:13:08 PST 2013


Author: fernando
Date: Mon Dec  2 05:13:08 2013
New Revision: 12326

Log:
inkscape-0.48.4: fixes to build with GC-7.4.0 and FreeType-2.5.1. Thanks Armin K. for reporting the problem with GC and for the respective patch to fix it.

Modified:
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/xsoft/other/inkscape.xml

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	Mon Dec  2 04:17:23 2013	(r12325)
+++ trunk/BOOK/introduction/welcome/changelog.xml	Mon Dec  2 05:13:08 2013	(r12326)
@@ -47,8 +47,14 @@
       <para>December 2nd, 2013</para>
       <itemizedlist>
         <listitem>
-          <para>[fernando] - Update to gc-7.4.0. Thanks Armin Krejzi for
-          reporting. Fixes
+          <para>[fernando] - inkscape-0.48.4: fixes to build with GC-7.4.0 and
+          FreeType-2.5.1. Thanks Armin K. for reporting the problem with GC and
+          for the respective patch to fix it. Fixes
+          <ulink url="&blfs-ticket-root;4397">#4397</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to gc-7.4.0. Thanks Armin K. for reporting.
+          Fixes
           <ulink url="&blfs-ticket-root;4395">#4395</ulink>.</para>
         </listitem>
         <listitem>

Modified: trunk/BOOK/xsoft/other/inkscape.xml
==============================================================================
--- trunk/BOOK/xsoft/other/inkscape.xml	Mon Dec  2 04:17:23 2013	(r12325)
+++ trunk/BOOK/xsoft/other/inkscape.xml	Mon Dec  2 05:13:08 2013	(r12326)
@@ -71,6 +71,22 @@
       </listitem>
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/inkscape-&inkscape-version;-gc-1.patch"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/inkscape-&inkscape-version;-freetype-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">Inkscape Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -112,20 +128,24 @@
   <sect2 role="installation">
     <title>Installation of Inkscape</title>
 
+<!--
     <para>If <application>Xorg</application> is installed in a prefix other
     than <filename class='directory'>/usr</filename>, the build will fail. Fix
     this by issuing the following command:</para>
 
 <screen><userinput>export LIBRARY_PATH=$XORG_PREFIX/lib</userinput></screen>
+-->
 
     <para>
       Install <application>Inkscape</application> by running the following
       commands:
     </para>
 
-<screen><userinput>sed -e "s at commands_toolbox, at commands_toolbox@" -i src/widgets/desktop-widget.h &&
-./configure --prefix=/usr &&
-make &&
+<screen><userinput>patch -Np1 -i ../inkscape-&inkscape-version;-gc-1.patch                                    &&
+patch -Np1 -i ../inkscape-&inkscape-version;-freetype-1.patch                              &&
+sed -e "s at commands_toolbox, at commands_toolbox@" -i src/widgets/desktop-widget.h &&
+./configure --prefix=/usr                                                      &&
+make                                                                           &&
 unset LIBRARY_PATH</userinput></screen>
 
     <para>



More information about the blfs-book mailing list