Changeset 18b9eae


Ignore:
Timestamp:
01/18/2019 08:36:19 PM (3 years ago)
Author:
Bruce Dubbs <bdubbs@…>
Branches:
10.0, 10.1, 11.0, 11.1, 8.4, 9.0, 9.1, bdubbs/svn, lazarus, qt5new, trunk, upgradedb, xry111/intltool, xry111/test-20220226
Children:
c084a2a
Parents:
b877595
Message:

Update to inkscape-0.92.4.

Upstream seems to have finally gotten this right. No more poppler issues.

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

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • general.ent

    rb877595 r18b9eae  
    11<!-- $LastChangedBy$ $Date$ -->
    22
    3 <!ENTITY day          "17">                   <!-- Always 2 digits -->
     3<!ENTITY day          "18">                   <!-- Always 2 digits -->
    44<!ENTITY month        "01">                   <!-- Always 2 digits -->
    55<!ENTITY year         "2019">
     
    77<!ENTITY copyholder   "The BLFS Development Team">
    88<!ENTITY version      "&year;-&month;-&day;">
    9 <!ENTITY releasedate  "January 17th, &year;">
     9<!ENTITY releasedate  "January 18th, &year;">
    1010<!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
    1111<!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
  • introduction/welcome/changelog.xml

    rb877595 r18b9eae  
    4242    </listitem>
    4343-->
     44    <listitem>
     45      <para>January 18th, 2019</para>
     46      <itemizedlist>
     47        <listitem>
     48          <para>[bdubbbs] - Update to inkscape-0.92.4. Fixes
     49          <ulink url="&blfs-ticket-root;11558">#11558</ulink>.</para>
     50        </listitem>
     51      </itemizedlist>
     52    </listitem>
     53
    4454    <listitem>
    4555      <para>January 17th, 2019</para>
  • packages.ent

    rb877595 r18b9eae  
    870870<!ENTITY icedtea-web-version          "1.7.1">
    871871<!ENTITY inkscape-minor-version       "0.92">
    872 <!ENTITY inkscape-version             "&inkscape-minor-version;.3">
     872<!ENTITY inkscape-version             "&inkscape-minor-version;.4">
    873873<!ENTITY pan-version                  "0.133">
    874874<!ENTITY pidgin-version               "2.13.0">
  • xsoft/other/inkscape.xml

    rb877595 r18b9eae  
    66  <!ENTITY inkscape-download-http "https://media.inkscape.org/dl/resources/file/inkscape-&inkscape-version;.tar.bz2">
    77  <!ENTITY inkscape-download-ftp  " ">
    8   <!ENTITY inkscape-md5sum        "4ef7171cc1de9e1608d8c49b77fed99e">
    9   <!ENTITY inkscape-size          "31 MB">
    10   <!ENTITY inkscape-buildsize     "395 MB (add 8 MB for tests)">
    11   <!ENTITY inkscape-time          "4.9 SBU (add 0.2 SBU for tests, both with parallelism=4)">
     8  <!ENTITY inkscape-md5sum        "ac30f6d5747fd9c620c00dad500f414f">
     9  <!ENTITY inkscape-size          "30 MB">
     10  <!ENTITY inkscape-buildsize     "399 MB (add 135 MB for tests)">
     11  <!ENTITY inkscape-time          "4.5 SBU (add 0.2 SBU for tests, both with parallelism=4)">
    1212]>
    1313
     
    7373    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
    7474    <itemizedlist spacing="compact">
    75       <!--
    7675      <listitem>
    7776        <para>Required patch: <ulink url="&patch-root;/inkscape-&inkscape-version;-use_versioned_ImageMagick6-1.patch"/></para>
    78       </listitem>
    79       <listitem>
    80         <para>Required patch: <ulink url="&patch-root;/inkscape-&inkscape-version;-upstream_poppler_fixes-1.patch"/></para>
    81      </listitem>-->
    82       <listitem>
    83         <para>Required patch: <ulink url="&patch-root;/inkscape-&inkscape-version;-consolidated_fixes-2.patch"/></para>
    8477      </listitem>
    8578    </itemizedlist>
     
    148141  <sect2 role="installation">
    149142    <title>Installation of Inkscape</title>
    150     <!--
    151     <para>Ensure that the libraries from <xref linkend="imagemagick6"/> can be used,
    152     and fix the build for the changes in some recent versions of
    153     <application>poppler</application>:</para>
    154     -->
    155     <para>Fix build problems related to poppler-0.73.0 and allow proper detection
    156     of libraries from <xref linkend="imagemagick6"/>:</para>
    157 <screen><userinput>patch -Np1 -i ../inkscape-&inkscape-version;-consolidated_fixes-2.patch</userinput></screen>
    158 <!--
    159 <screen><userinput>patch -Np1 -i ../inkscape-&inkscape-version;-use_versioned_ImageMagick6-1.patch &amp;&amp;
    160 patch -Np1 -i ../inkscape-&inkscape-version;-upstream_poppler_fixes-1.patch
    161 </userinput></screen>
    162 -->
    163     <para>
    164       Fix build issues with <application>GCC-7.1</application> and
    165        <application>poppler-0.71.0</application>:
    166     </para>
    167 
    168 <screen><userinput>sed -i 's| abs(| std::fabs(|g' src/ui/tools/flood-tool.cpp &amp;&amp;
    169 sed -e 's|gTrue|true|g' -e 's|gFalse|false|g' -e 's|GBool|bool|g' \
    170  -i src/extension/internal/pdfinput/pdf-parser.*</userinput></screen>
     143 
     144    <para>
     145      Ensure that the libraries from <xref linkend="imagemagick6"/> can be used:
     146    </para>
     147
     148<screen><userinput>patch -Np1 -i ../inkscape-&inkscape-version;-use_versioned_ImageMagick6-1.patch</userinput></screen>
    171149
    172150<!-- If there is no test suite, then this is not needed.
Note: See TracChangeset for help on using the changeset viewer.