Changeset a6a3fa6 for general/genutils

Timestamp:

02/20/2018 04:40:33 AM (6 years ago)

Author:

Ken Moffat <ken@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.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:

ee85ab4

Parents:

f0e8534

Message:

ImageMagick: 7.0.7-23, and 6.9.9-35 for its libs.

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

Location:

general/genutils

Files:

• imagemagick.xml (modified) (1 diff)
• imagemagick6.xml (modified) (3 diffs)

general/genutils/imagemagick.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY imagemagick-patch-version "22">
+  <!ENTITY imagemagick-patch-version "23">
 
   <!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        "980c249173d0e97cb62c21e15c89e52a">
+  <!ENTITY imagemagick-md5sum        "e016b49bb861bd16803828b92cb0f486">
   <!ENTITY imagemagick-size          "8.3 MB">
-  <!ENTITY imagemagick-buildsize     "188 MB, with typical dependencies (add 30MB for make check)">
-  <!ENTITY imagemagick-time          "0.9 SBU - typical build with parallelism=4 (add 2.8 SBU for make check and the validation suite)">
+  <!ENTITY imagemagick-buildsize     "189 MB, with typical dependencies (add 29MB for make check)">
+  <!ENTITY imagemagick-time          "0.9 SBU - typical build with parallelism=4 (add 2.9 SBU for make check and the validation suite)">
 ]>
 

general/genutils/imagemagick6.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY imagemagick6-patch-version "34">
+  <!ENTITY imagemagick6-patch-version "35">
 
   <!ENTITY imagemagick6-download-http "https://www.imagemagick.org/download/releases/ImageMagick-&imagemagick6-version;-&imagemagick6-patch-version;.tar.xz">
   <!ENTITY imagemagick6-download-ftp  "ftp://ftp.imagemagick.org/pub/ImageMagick/releases/ImageMagick-&imagemagick6-version;-&imagemagick6-patch-version;.tar.xz">
-  <!ENTITY imagemagick6-md5sum        "a75fda1534ec7f90cd46eebc0d3f816">
-  <!ENTITY imagemagick6-size          "8.5 MB">
-  <!ENTITY imagemagick6-buildsize     "181 MB, with typical dependencies (add 32 MB for the tests)">
-  <!ENTITY imagemagick6-time          "2.0 SBU - typical build (add 1.6 SBU for the tests)">
+  <!ENTITY imagemagick6-md5sum        "85d5a523e3fe27105242f87dc39ae2cd">
+  <!ENTITY imagemagick6-size          "8.6 MB">
+  <!ENTITY imagemagick6-buildsize     "182 MB, with typical dependencies (add 32 MB for the tests)">
+  <!ENTITY imagemagick6-time          "2.1 SBU - typical build (add 1.6 SBU for the tests)">
 ]>
 
@@ -105 +105 @@
         <para>
           Required patch:
-          <ulink url="&patch-root;/ImageMagick-&imagemagick6-version;-&imagemagick6-patch-version;-libs_only-2.patch"/>
+          <ulink url="&patch-root;/ImageMagick-&imagemagick6-version;-&imagemagick6-patch-version;-libs_only-1.patch"/>
         </para>
       </listitem>
@@ -243 +243 @@
 
 <screen><userinput>patch -Np1 -i ../ImageMagick-&imagemagick6-version;-&imagemagick6-patch-version;-libs_only-1.patch &amp;&amp;
+autoreconf -fi                                          &amp;&amp;
 ./configure --prefix=/usr     \
             --sysconfdir=/etc \