[blfs-book] r13000 - in trunk/BOOK: . general/graphlib general/prog introduction/welcome x/lib xsoft/other

fernando at higgs.linuxfromscratch.org fernando at higgs.linuxfromscratch.org
Sun Apr 27 16:02:27 PDT 2014


Author: fernando
Date: Sun Apr 27 16:02:27 2014
New Revision: 13000

Log:
Fixes to Inkscape-0.48.4, Cairo-1.12.16, Poppler-0.26.0 and Ruby-2.1.1. Thanks Igor Z and Armin K.

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/graphlib/poppler.xml
   trunk/BOOK/general/prog/ruby.xml
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/x/lib/cairo.xml
   trunk/BOOK/xsoft/other/inkscape.xml

Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent	Sat Apr 26 16:43:29 2014	(r12999)
+++ trunk/BOOK/general.ent	Sun Apr 27 16:02:27 2014	(r13000)
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "25">                   <!-- Always 2 digits -->
+<!ENTITY day          "27">                   <!-- Always 2 digits -->
 <!ENTITY month        "04">                   <!-- Always 2 digits -->
 <!ENTITY year         "2014">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "April 25th, &year;">
+<!ENTITY releasedate  "April 27th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- x.y|development] -->

Modified: trunk/BOOK/general/graphlib/poppler.xml
==============================================================================
--- trunk/BOOK/general/graphlib/poppler.xml	Sat Apr 26 16:43:29 2014	(r12999)
+++ trunk/BOOK/general/graphlib/poppler.xml	Sun Apr 27 16:02:27 2014	(r13000)
@@ -152,14 +152,6 @@
 <screen><userinput>git clone git://git.freedesktop.org/git/poppler/test ../test</userinput></screen>
 
     <para>
-      If you are building <application>Qt5</application> library, fix
-      <application>Qt5</application> detection by running the
-      following command:
-    </para>
-
-<screen><userinput>sed -i -e "s:grep \"Qt 5\":grep \" 5\\\\.\":g" configure</userinput></screen>
-
-    <para>
       If you are not building both  <application>Qt</application> libraries,
       jump to the following paragraph. In order to build both
       <application>Qt4</application> and <application>Qt5</application>

Modified: trunk/BOOK/general/prog/ruby.xml
==============================================================================
--- trunk/BOOK/general/prog/ruby.xml	Sat Apr 26 16:43:29 2014	(r12999)
+++ trunk/BOOK/general/prog/ruby.xml	Sun Apr 27 16:02:27 2014	(r13000)
@@ -99,9 +99,7 @@
       commands:
     </para>
 
-<screen><userinput>sed -i ext/readline/readline.c \
-    -e "s:(Function \*)readline:(rl_hook_func_t \*)readline:" &&
-./configure --prefix=/usr   \
+<screen><userinput>./configure --prefix=/usr   \
             --enable-shared \
             --docdir=/usr/share/doc/ruby-&ruby-version; && 
 make</userinput></screen>
@@ -122,12 +120,6 @@
     <title>Command Explanations</title>
 
     <para>
-      <command>sed -i  ext/readline/readline.c ...</command>: This
-      <command>sed</command> fixes building with
-      <application>Readline</application> 6.x (x>2).
-    </para>
-
-    <para>
       <parameter>--enable-shared</parameter>: This switch enables building of
       the <filename class="libraryfile">libruby</filename> shared library.
     </para>

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	Sat Apr 26 16:43:29 2014	(r12999)
+++ trunk/BOOK/introduction/welcome/changelog.xml	Sun Apr 27 16:02:27 2014	(r13000)
@@ -45,6 +45,16 @@
 -->
 
     <listitem>
+      <para>April 27th, 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[fernando] - Fixes to Inkscape-0.48.4, Cairo-1.12.16,
+          Poppler-0.26.0 and Ruby-2.1.1. Thanks Igor Z and Armin K.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>April 24th, 2014</para>
       <itemizedlist>
         <listitem>
@@ -60,7 +70,7 @@
           <ulink url="&blfs-ticket-root;4991">#4991</ulink>.</para>
         </listitem>
       </itemizedlist>
-    </listitem>    
+    </listitem>
 
     <listitem>
       <para>April 24th, 2014</para>

Modified: trunk/BOOK/x/lib/cairo.xml
==============================================================================
--- trunk/BOOK/x/lib/cairo.xml	Sat Apr 26 16:43:29 2014	(r12999)
+++ trunk/BOOK/x/lib/cairo.xml	Sun Apr 27 16:02:27 2014	(r13000)
@@ -124,7 +124,8 @@
       commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr --disable-static &&
+<screen><userinput>CFLAGS="$CFLAGS -ffat-lto-objects" \
+./configure --prefix=/usr --disable-static &&
 make</userinput></screen>
 
     <para>
@@ -141,6 +142,11 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
+    <para>
+      <command>CFLAGS="$CFLAGS -ffat-lto-objects"</command>: Fixes building
+      with GCC 4.9.
+    </para>
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
 

Modified: trunk/BOOK/xsoft/other/inkscape.xml
==============================================================================
--- trunk/BOOK/xsoft/other/inkscape.xml	Sat Apr 26 16:43:29 2014	(r12999)
+++ trunk/BOOK/xsoft/other/inkscape.xml	Sun Apr 27 16:02:27 2014	(r13000)
@@ -141,7 +141,11 @@
       commands:
     </para>
 
-<screen><userinput>patch -Np1 -i ../inkscape-&inkscape-version;-gc-1.patch                                    &&
+<screen><userinput>sed -i src/extension/internal/pdfinput/pdf-parser.cpp \
+    -e "/GfxColorSpace::parse/s|NULL|&, NULL|g"       \
+    -e "/lookupPattern/s:NULL:&, NULL:g"              \
+    -e "/lookupShading/s:NULL:&, NULL:g"              &&
+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                                                      &&
@@ -166,6 +170,11 @@
     <title>Command Explanations</title>
 
     <para>
+      <command>sed -i src/extension ...</command>:
+      This <command>sed</command> fixes building with poppler-0.26.0.
+    </para>
+
+    <para>
       <command>sed -e "s at commands_toolbox, at commands_toolbox@" ...</command>:
       This <command>sed</command> fixes building with GCC 4.8.
     </para>


More information about the blfs-book mailing list