Changeset 9db4ae7

Timestamp:

01/10/2017 06:02:22 AM (7 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

7fb12e19

Parents:

8ec6f82

Message:

Update to inkscape-0.92.
Update to ImageMagick-7.0.4-3.

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

Files:

• general/genutils/imagemagick.xml (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• packages.ent (modified) (2 diffs)
• xsoft/other/inkscape.xml (modified) (6 diffs)

general/genutils/imagemagick.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY imagemagick-patch-version "10">
+  <!ENTITY imagemagick-patch-version "3">
 
   <!ENTITY imagemagick-download-http "https://www.imagemagick.org/download/releases/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.xz">
   <!ENTITY imagemagick-download-ftp  "ftp://ftp.imagemagick.org/pub/ImageMagick/releases/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.xz">
-  <!ENTITY imagemagick-md5sum        "7040da7ec6a30f105d2c5db674523645">
-  <!ENTITY imagemagick-size          "8.0 MB">
-  <!ENTITY imagemagick-buildsize     "200 MB, with typical dependencies">
-  <!ENTITY imagemagick-time          "2.1 SBU - typical build (add 1.1 SBU for the the validation suite)">
+  <!ENTITY imagemagick-md5sum        "94ccdcf91ce0a156ca5335fbc16536b1">
+  <!ENTITY imagemagick-size          "7.9 MB">
+  <!ENTITY imagemagick-buildsize     "141 MB, with typical dependencies">
+  <!ENTITY imagemagick-time          "2.6 SBU - typical build (add 1.1 SBU for the the validation suite)">
 ]>
 
@@ -23 +23 @@
      Marked as 'typical' because nobody builds ALL the optional extras [ken]
    
-     [bdubbs] I do; at least the internal ones.  I still got only 200 MB.
+     [bdubbs] I do; at least the internal ones.  I still got only 141 MB.
 
      Saved the "full" 450MB as a comment - feel free to update this iff you

introduction/welcome/changelog.xml

@@ -48 +48 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Update to inkscape-0.92. Fixes
+          <ulink url="&blfs-ticket-root;8656">#8656</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to ImageMagick-7.0.4-3. Fixes
+          <ulink url="&blfs-ticket-root;8528">#8528</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[ken] - Commit the new page for ImageMagick-6.</para>
         </listitem>

packages.ent

@@ -217 +217 @@
 <!ENTITY ibus-version                 "1.5.14">
 <!ENTITY imagemagick6-version          "6.9.6">
-<!ENTITY imagemagick-version          "7.0.3">
+<!ENTITY imagemagick-version          "7.0.4">
 <!ENTITY intltool-version             "0.50.2">
 <!ENTITY lsof-version                 "4.89">
@@ -707 +707 @@
 <!ENTITY hexchat-version              "2.12.4">
 <!ENTITY icedtea-web-version          "1.6.2">
-<!ENTITY inkscape-version             "0.91">
+<!ENTITY inkscape-version             "0.92">
 <!ENTITY pan-version                  "0.133">
 <!ENTITY pidgin-version               "2.11.0">

xsoft/other/inkscape.xml

@@ -5 +5 @@
   %general-entities;
   <!-- inkscape.org appears to point to launchpad, sf is out of date -->
-  <!ENTITY inkscape-download-http "https://launchpad.net/inkscape/0.91.x/0.91/+download/inkscape-&inkscape-version;.tar.bz2">
+  <!ENTITY inkscape-download-http "https://launchpad.net/inkscape/&inkscape-version;.x/&inkscape-version;/+download/inkscape-&inkscape-version;.tar.bz2">
   <!ENTITY inkscape-download-ftp  " ">
-  <!ENTITY inkscape-md5sum        "278dfa4514adcde23546370ec2c84581">
-  <!ENTITY inkscape-size          "25 MB">
-  <!ENTITY inkscape-buildsize     "1.9 GB">
-  <!ENTITY inkscape-time          "16 SBU">
+  <!ENTITY inkscape-md5sum        "52117503fcf9aad43cf091c6401571d0">
+  <!ENTITY inkscape-size          "29 MB">
+  <!ENTITY inkscape-buildsize     "1.3 GB (add 39 MB for tests)">
+  <!ENTITY inkscape-time          "18 SBU (add 0.8 SBU for tests)">
 ]>
 
@@ -68 +68 @@
         <para>
           Estimated build time: &inkscape-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Optional patch:
-          <ulink url="&patch-root;/inkscape-&inkscape-version;-testfiles-1.patch"/>
-          for full test coverage.
         </para>
       </listitem>
@@ -143 +132 @@
     <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
@@ -156 +137 @@
     </para>
 
-<screen><userinput>patch -Np1 -i ../inkscape-&inkscape-version;-testfiles-1.patch &amp;&amp;
-
-sed -e 's/ScopedPtr&lt;char&gt;/make_unique_ptr_gfree/' \
-    -i src/ui/clipboard.cpp  &amp;&amp;
-
-CXXFLAGS="-g -O2 -std=c++11" \
-IMAGEMAGICK_CFLAGS=-I/usr/include/ImageMagick-6 \
+<screen><userinput>IMAGEMAGICK_CFLAGS=-I/usr/include/ImageMagick-6 \
 IMAGEMAGICK_LIBS="-lMagickCore-6.Q16HDRI -lMagick++-6.Q16HDRI -lMagickWand-6.Q16HDRI" \
 ./configure --prefix=/usr &amp;&amp;
@@ -184 +159 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <para>
-      <command>sed  ... </command>: This <command>sed</command> fixes a 
-      build problem identified upstream.
-    </para>
 
     <para>
@@ -197 +167 @@
       these variables will allow <command>configure</command> to find
       the things it needs.
-    </para>
-
-    <para>
-      <command>CXXFLAGS="-g -O2 -std=c++11" </command>: Inkscape
-      has not yet been ported to the 2011 ISO C++ standard, one of its
-      dependencies is compiled with this standard.
-      <command>-std=c++11</command> has
-      to be used as an option to <command>g++</command>. We pass it into
-      <envar>CXXFLAGS</envar> together with the default options.
     </para>