Changeset 10cbf37


Ignore:
Timestamp:
11/27/2018 01:34:56 AM (5 years ago)
Author:
Ken Moffat <ken@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 8.4, 9.0, 9.1, bdubbs/svn, elogind, 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:
8ccc682
Parents:
c45eca2
Message:

Fix build breakage with poppler-0.70.0 and 0.71.0.

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

Files:
6 edited

Legend:

Unmodified
Added
Removed

  • general.ent

    rc45eca2 r10cbf37  
    11<!-- $LastChangedBy$ $Date$ -->
    22
    3 <!ENTITY day          "25">                   <!-- Always 2 digits -->
     3<!ENTITY day          "26">                   <!-- Always 2 digits -->
    44<!ENTITY month        "11">                   <!-- Always 2 digits -->
    55<!ENTITY year         "2018">
    … …  
    77<!ENTITY copyholder   "The BLFS Development Team">
    88<!ENTITY version      "&year;-&month;-&day;">
    9 <!ENTITY releasedate  "November 25th, &year;">
     9<!ENTITY releasedate  "November 26th, &year;">
    1010<!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
    1111<!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->

  • introduction/welcome/changelog.xml

    rc45eca2 r10cbf37  
    4242    </listitem>
    4343-->
     44    <listitem>
     45      <para>November 25th, 2018</para>
     46      <itemizedlist>
     47        <listitem>
     48          <para>[ken] - Fix breakage from poppler versions 70,71 in
     49          cups-filters, libreoffice and inkscape, and in so-doing
     50          update to cups-filters-1.21.4. Fixes
     51          <ulink url="&blfs-ticket-root;11096">#11096</ulink>,
     52          <ulink url="&blfs-ticket-root;11245">#11245</ulink> and
     53          <ulink url="&blfs-ticket-root;11383">#11383</ulink>.</para>
     54        </listitem>
     55      </itemizedlist>
     56    </listitem>
    4457
    4558    <listitem>

  • packages.ent

    rc45eca2 r10cbf37  
    981981<!-- Chapter 50 -->
    982982<!ENTITY cups-version                 "2.2.8">
    983 <!ENTITY cups-filters-version         "1.21.1">
     983<!ENTITY cups-filters-version         "1.21.4">
    984984<!ENTITY gs-version                   "9.25">
    985985<!ENTITY gutenprint-version           "5.2.14">

  • pst/printing/cups-filters.xml

    rc45eca2 r10cbf37  
    88  "https://www.openprinting.org/download/cups-filters/cups-filters-&cups-filters-version;.tar.xz">
    99  <!ENTITY cups-filters-download-ftp  " ">
    10   <!ENTITY cups-filters-md5sum        "60a27b6420703a33332f3243f43c9a62">
    11   <!ENTITY cups-filters-size          "1.4 MB">
    12   <!ENTITY cups-filters-buildsize     "42 MB (with tests)">
     10  <!ENTITY cups-filters-md5sum        "75b07268abe64a0f15caced8d33c3cc2">
     11  <!ENTITY cups-filters-size          "1.5 MB">
     12  <!ENTITY cups-filters-buildsize     "57 MB (with tests), 15MB installed">
    1313  <!ENTITY cups-filters-time          "0.4 SBU (with tests)">
    1414]>
    … …  
    7070        <para>
    7171          Estimated build time: &cups-filters-time;
     72        </para>
     73      </listitem>
     74
     75      <listitem>
     76        <para>
     77          Required patch to fix building with recent versions of <xref linkend="poppler"/>:
     78          <ulink url="&patch-root;/cups-filters-&cups-filters-version;-poppler71-1.patch"/>
    7279        </para>
    7380      </listitem>
    … …  
    8289      <xref linkend="gs"/>,
    8390      <xref linkend="lcms2"/>,
    84       <xref linkend="mupdf"/> (mutool),
    8591      <xref linkend="poppler"/>, and
    8692      <xref linkend="qpdf"/>
    … …  
    9096    <para role="recommended">
    9197      <xref linkend="libjpeg"/>,
    92       <xref linkend="libpng"/> and
    93       <xref linkend="libtiff"/>
     98      <xref linkend="libpng"/>,
     99      <xref linkend="libtiff"/> and
     100      <xref linkend="mupdf"/> (mutool),
    94101    </para>
    95102
    … …  
    126133
    127134<screen revision="systemd"><userinput>sed -i "s:cups.service:org.cups.cupsd.service:g" utils/cups-browsed.service</userinput></screen>
     135
     136    <para>
     137      Fix the build for the changes in some recent versions of
     138      <application>poppler</application>:
     139    </para>
     140
     141<screen><userinput>patch -Np1 -i ../cups-filters-&cups-filters-version;-poppler71-1.patch</userinput></screen>
    128142
    129143    <para>
    … …  
    177191  <sect2 role="commands">
    178192    <title>Command Explanations</title>
    179 <!-- no patch today
    180     <para>
    181       <parameter>patch -Np1 -i ../cups-filters-&cups-filters-version;-poppler67-1.patch</parameter>:
     193<!-- please comment this if no patches are currently needed -->
     194    <para>
     195      <parameter>patch -Np1 -i ../cups-filters-&cups-filters-version;-poppler71-1.patch</parameter>:
    182196      Conditionally apply changes for recent versions of poppler.
    183197    </para>
    184 -->
    185198    <para>
    186199      <parameter>--disable-avahi</parameter>: This switch is needed

  • xsoft/office/libreoffice.xml

    rc45eca2 r10cbf37  
    147147
    148148
    149 <!-- keep one commented patch, it's sure to again need one or more in a few months
    150       <listitem>
    151         <para>
    152           Required patch to fix building with system <xref linkend="icu"/>:
    153           <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-icu_58-1.patch"/>
    154         </para>
    155       </listitem>
    156 -->
     149<!-- keep one commented patch, it's sure to again need one or more in a few months -->
     150      <listitem>
     151        <para>
     152          Required patch to fix building with system <xref linkend="poppler"/> (all
     153          recent versions):
     154          <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-poppler70-1.patch"/>
     155        </para>
     156      </listitem>
     157
     158      <listitem>
     159        <para>
     160          Required patch to fix building with system <xref linkend="poppler"/>
     161          (only if using that version or a later version):
     162          <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-poppler71-1.patch"/>
     163        </para>
     164      </listitem>
     165
    157166    </itemizedlist>
    158167    <bridgehead renderas="sect3">LibreOffice Dependencies</bridgehead>
    … …  
    329338
    330339<screen><userinput>export LO_PREFIX=<replaceable>&lt;PREFIX&gt;</replaceable></userinput></screen>
    331 <!--
    332     <para>
    333      Fix build failures introduced by <xref linkend="icu"/>:
    334     </para>
    335 
    336 <screen><userinput>patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-icu_58-1.patch</userinput></screen>
    337 -->
     340<!-- keep a commented instruction if no patches are currently required -->
     341    <para> <!-- for all recent versions -->
     342     Fix build failures introduced by recent versions of <xref linkend="poppler"/>:
     343    </para>
     344
     345<screen><userinput>patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-poppler70-1.patch</userinput></screen>
     346
     347    <para> <!-- for 0.71.0, not tested on earlier versions -->
     348     Similarly, fix build failures introduced with <xref linkend="poppler"/>:
     349    </para>
     350
     351<screen><userinput>patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-poppler71-1.patch</userinput></screen>
     352
    338353    <para>
    339354      Locales "fr" and "en-GB", you will find below, are just examples; you

  • xsoft/other/inkscape.xml

    rc45eca2 r10cbf37  
    7777      </listitem>
    7878      <listitem>
    79         <para>Required patch: <ulink url="&patch-root;/inkscape-&inkscape-version;-poppler65-1.patch"/></para>
     79        <para>Required patch: <ulink url="&patch-root;/inkscape-&inkscape-version;-upstream_poppler_fixes-1.patch"/></para>
    8080      </listitem>
    8181    </itemizedlist>
    … …  
    146146
    147147    <para>Ensure that the libraries from <xref linkend="imagemagick6"/> can be used,
    148     and fix the build for the changes in <literal>poppler-0.65.0</literal>:</para>
     148    and fix the build for the changes in some recent versions of
     149    <application>poppler</application>:</para>
    149150
    150151<screen><userinput>patch -Np1 -i ../inkscape-&inkscape-version;-use_versioned_ImageMagick6-1.patch &amp;&amp;
    151 patch -Np1 -i ../inkscape-&inkscape-version;-poppler65-1.patch
     152patch -Np1 -i ../inkscape-&inkscape-version;-upstream_poppler_fixes-1.patch
    152153</userinput></screen>
    153154
    154155    <para>
    155       Fix a build issue with <application>GCC-7.1</application>:
    156     </para>
    157 
    158 <screen><userinput>sed -i 's| abs(| std::fabs(|g' src/ui/tools/flood-tool.cpp</userinput></screen>
     156      Fix build issues with <application>GCC-7.1</application> and
     157       <application>poppler-0.71.0</application>:
     158    </para>
     159
     160<screen><userinput>sed -i 's| abs(| std::fabs(|g' src/ui/tools/flood-tool.cpp &amp;&amp;
     161sed -e 's|gTrue|true|g' -e 's|gFalse|false|g' -e 's|GBool|bool|g' \
     162 -i src/extension/internal/pdfinput/pdf-parser.*</userinput></screen>
    159163
    160164<!-- If there is no test suite, then this is not needed.
Note: See TracChangeset for help on using the changeset viewer.