Changeset 9851978

Timestamp:

04/14/2020 02:02:26 AM (4 years ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, 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:

654fe2b

Parents:

2c7493c7

Message:

Update to inkscape-0.92.5
Update to WebKitGTK+-2.28.1
Update some URLs in ImageMagick6

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

Files:

• general/genutils/imagemagick6.xml (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• packages.ent (modified) (2 diffs)
• x/lib/webkitgtk.xml (modified) (2 diffs)
• xsoft/other/inkscape.xml (modified) (9 diffs)

general/genutils/imagemagick6.xml

@@ -23 +23 @@
      [bdubbs 2019-92-09]  Reduced SBU and disk space for libraries only.
      
-     [bdubbs 2918-08-26] I upddated the above stats slightly for 8.3. All BLFS
+     [bdubbs 2018-08-26] I upddated the above stats slightly for 8.3. All BLFS
      dependencies were installed except gimp and texlive. Note that at this 
-     writing the only packagges in the book that use this are gimp and 
+     writing the only packages in the book that use this are gimp and 
      inkscape. 
 
-     [pierre 2017-02-14]] For a build of 6.9.7-8 with dependencies available in
+     [pierre 2017-02-14] For a build of 6.9.7-8 with dependencies available in
      the book, but with the configure command as below, I got 179 MB (2.3 SBU)
      (and 472 KB (0.8 SBU) for the validation suite).
@@ -242 +242 @@
       GeoExpress Command Line Utilities, AKA MrSID Utilities (binary package)</ulink>,
       <ulink url="http://www.gnu.org/software/hp2xx/">hp2xx</ulink>,
-      <ulink url="http://user.it.uu.se/~jan/html2ps.html">html2ps</ulink>,
+      <ulink url="https://fossies.org/linux/www/old/html2ps-1.0b7.tar.gz/">html2ps</ulink>,
       <ulink url="http://wvware.sourceforge.net/">libwmf</ulink>,
-      <ulink url="http://sk1project.org/modules.php?name=products&amp;product=uniconvertor">
-      UniConvertor</ulink>, and
+      <ulink url="https://sk1project.net/uc2/">UniConvertor</ulink>, and
       <ulink url="http://www.cs.utah.edu/gdc/projects/urt/">Utah Raster Toolkit</ulink>
       (or <ulink url="http://www.mcmurchy.com/urt/urt-3.1b.tar.gz">URT-3.1b</ulink>)

introduction/welcome/changelog.xml

@@ -46 +46 @@
       <itemizedlist>
         <listitem>
+          <para>[renodr] - Update to webkitgtk-2.28.1. Fixes
+          <ulink url="&blfs-ticket-root;13408">#13408</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to inkscape-0.92.5. Fixes
+          <ulink url="&blfs-ticket-root;13406">#13406</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Update to xfwm4-4.14.1. Fixes
           <ulink url="&blfs-ticket-root;13407">#13407</ulink>.</para>

packages.ent

@@ -745 +745 @@
 <!ENTITY startup-notification-version "0.12">
 <!ENTITY tepl-version                 "4.4.0">
-<!ENTITY webkitgtk-version            "2.28.0">    <!-- Even minors only -->
+<!ENTITY webkitgtk-version            "2.28.1">    <!-- Even minors only -->
 
 <!ENTITY gtk2-libdir                  "2.0/2.10.0">
@@ -918 +918 @@
 <!ENTITY icedtea-web-version          "1.7.1">
 <!ENTITY inkscape-minor-version       "0.92">
-<!ENTITY inkscape-version             "&inkscape-minor-version;.4">
+<!ENTITY inkscape-version             "&inkscape-minor-version;.5">
 <!ENTITY pan-version                  "0.133">
 <!ENTITY pidgin-version               "2.13.0">

x/lib/webkitgtk.xml

@@ -7 +7 @@
   <!ENTITY webkitgtk-download-http "https://webkitgtk.org/releases/webkitgtk-&webkitgtk-version;.tar.xz">
   <!ENTITY webkitgtk-download-ftp  " ">
-  <!ENTITY webkitgtk-md5sum        "0bf11df8117ea64f6b8de59d278a2c78">
+  <!ENTITY webkitgtk-md5sum        "866a40ac4f365ecfd2d28face651ab6e">
   <!ENTITY webkitgtk-size          "20 MB">
-  <!ENTITY webkitgtk-buildsize     "674 MB (107 MB installed)">
-  <!ENTITY webkitgtk-time          "20 SBU (using parallelism=4, iestimated 68 SBUs using one core)">
+  <!ENTITY webkitgtk-buildsize     "790 MB (115 MB installed)">
+  <!ENTITY webkitgtk-time          "21 SBU (using parallelism=4, estimated 70 SBUs using one core)">
 ]>
 
@@ -110 +110 @@
       <xref linkend="wayland"/>,
       <xref linkend="woff2"/>,
+      <ulink url="https://ccache.dev/">ccache</ulink>,
       <ulink url="http://sourceforge.net/projects/hunspell/files/Hyphen/">Hyphen</ulink>,
       <ulink url="http://xsltml.sourceforge.net/">MathML</ulink>, 

xsoft/other/inkscape.xml

@@ -6 +6 @@
   <!ENTITY inkscape-download-http "https://media.inkscape.org/dl/resources/file/inkscape-&inkscape-version;.tar.bz2">
   <!ENTITY inkscape-download-ftp  " ">
-  <!ENTITY inkscape-md5sum        "ac30f6d5747fd9c620c00dad500f414f">
-  <!ENTITY inkscape-size          "30 MB">
-  <!ENTITY inkscape-buildsize     "534 MB (134 MB installed, add 8 MB for tests)">
-  <!ENTITY inkscape-time          "4.8 SBU (add 0.2 SBU for tests, both with parallelism=4)">
+  <!ENTITY inkscape-md5sum        "592c0e94cf00ea9e0a8901883d8f06fd">
+  <!ENTITY inkscape-size          "31 MB">
+  <!ENTITY inkscape-buildsize     "538 MB (138 MB installed, add 9 MB for tests)">
+  <!ENTITY inkscape-time          "4.1 SBU (add 0.1 SBU for tests, both with parallelism=4)">
 ]>
 
@@ -79 +79 @@
         </para>
       </listitem>
+      <!-- These are not needed right now. Inkscape builds/runs fine with the
+           latest poppler as of this update (0.87.0). However, history says
+           that almost every poppler version has broke inkscape, and history
+           tends to repeat itself ;-). Keep these patches commented until
+           they are inevitably needed.
       <listitem>
         <para>
@@ -91 +96 @@
         </para>
       </listitem>
+      -->
     </itemizedlist>
 
@@ -134 +140 @@
       <!--<ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libcdr">libcdr</ulink>,
       <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libvisio">libvisio</ulink>,-->
+      <ulink url="https://gtkspell.sourceforge.net">gtkspell</ulink>,
       <ulink url="https://github.com/LibreOffice/libcdr">libcdr</ulink>,
       <ulink url="https://github.com/LibreOffice/libvisio">libvisio</ulink>,
@@ -158 +165 @@
     <title>Installation of Inkscape</title>
 
+    <!-- Not needed with 0.92.5, but let's keep the template instead.
     <para>
       First, fix a problem introduced by Poppler-0.76.1.
@@ -175 +183 @@
 
 <screen><userinput remap="pre">patch -Np1 -i ../inkscape-&inkscape-version;-poppler_0_83_0_fixes-1.patch</userinput></screen>
+    -->
 
     <para>
@@ -182 +191 @@
 <screen><userinput>patch -Np1 -i ../inkscape-&inkscape-version;-use_versioned_ImageMagick6-1.patch</userinput></screen>
 
+<!--
     <para>
       Apply a patch to prevent out-of-bounds writes in the text and fill-bucket
@@ -188 +198 @@
 
 <screen><userinput>patch -Np1 -i ../inkscape-&inkscape-version;-upstream_fixes-1.patch</userinput></screen>
+-->
 
 <!-- If there is no test suite, then this is not needed.
@@ -285 +296 @@
         <listitem>
           <para>
-            an SVG (Scalable Vector Graphics) editing program.
+            is a SVG (Scalable Vector Graphics) editing program.
           </para>
           <indexterm zone="inkscape inkscape-prog">