Changeset 9d4de3fb

Timestamp:

04/27/2014 11:02:27 PM (10 years ago)

Author:

Fernando de Oliveira <fernando@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

dbac0b14

Parents:

e1a7543

Message:

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.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@13000 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general.ent (modified) (2 diffs)
• general/graphlib/poppler.xml (modified) (1 diff)
• general/prog/ruby.xml (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (2 diffs)
• x/lib/cairo.xml (modified) (2 diffs)
• xsoft/other/inkscape.xml (modified) (2 diffs)

general.ent

@@ -1 +1 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "25">                   <!-- Always 2 digits -->
+<!ENTITY day          "27">                   <!-- Always 2 digits -->
 <!ENTITY month        "04">                   <!-- Always 2 digits -->
 <!ENTITY year         "2014">
@@ -7 +7 @@
 <!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 #] -->

general/graphlib/poppler.xml

@@ -151 +151 @@
 
 <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>

general/prog/ruby.xml

@@ -100 +100 @@
     </para>
 
-<screen><userinput>sed -i ext/readline/readline.c \
-    -e "s:(Function \*)readline:(rl_hook_func_t \*)readline:" &amp;&amp;
-./configure --prefix=/usr   \
+<screen><userinput>./configure --prefix=/usr   \
             --enable-shared \
             --docdir=/usr/share/doc/ruby-&ruby-version; &amp;&amp; 
@@ -121 +119 @@
   <sect2 role="commands">
     <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>

introduction/welcome/changelog.xml

@@ -46 +46 @@
 
     <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>
@@ -61 +71 @@
         </listitem>
       </itemizedlist>
-    </listitem>    
+    </listitem>
 
     <listitem>

x/lib/cairo.xml

@@ -125 +125 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
+<screen><userinput>CFLAGS="$CFLAGS -ffat-lto-objects" \
+./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -141 +142 @@
   <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"

xsoft/other/inkscape.xml

@@ -142 +142 @@
     </para>
 
-<screen><userinput>patch -Np1 -i ../inkscape-&inkscape-version;-gc-1.patch                                    &amp;&amp;
+<screen><userinput>sed -i src/extension/internal/pdfinput/pdf-parser.cpp \
+    -e "/GfxColorSpace::parse/s|NULL|&amp;, NULL|g"       \
+    -e "/lookupPattern/s:NULL:&amp;, NULL:g"              \
+    -e "/lookupShading/s:NULL:&amp;, NULL:g"              &amp;&amp;
+patch -Np1 -i ../inkscape-&inkscape-version;-gc-1.patch                                    &amp;&amp;
 patch -Np1 -i ../inkscape-&inkscape-version;-freetype-1.patch                              &amp;&amp;
 sed -e "s@commands_toolbox,@commands_toolbox@" -i src/widgets/desktop-widget.h &amp;&amp;
@@ -165 +169 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <para>
+      <command>sed -i src/extension ...</command>:
+      This <command>sed</command> fixes building with poppler-0.26.0.
+    </para>
 
     <para>