Author: ken
Date: Mon Nov 26 17:34:56 2018
New Revision: 20751
Log:
Fix build breakage with poppler-0.70.0 and 0.71.0.
Modified:
trunk/BOOK/general.ent
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/packages.ent
trunk/BOOK/pst/printing/cups-filters.xml
trunk/BOOK/xsoft/office/libreoffice.xml
trunk/BOOK/xsoft/other/inkscape.xml
Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent Mon Nov 26 09:03:19 2018 (r20750)
+++ trunk/BOOK/general.ent Mon Nov 26 17:34:56 2018 (r20751)
@@ -1,12 +1,12 @@
<!-- $LastChangedBy$ $Date$ -->
-<!ENTITY day "25"> <!-- Always 2 digits -->
+<!ENTITY day "26"> <!-- Always 2 digits -->
<!ENTITY month "11"> <!-- Always 2 digits -->
<!ENTITY year "2018">
<!ENTITY copyrightdate "2001-&year;">
<!ENTITY copyholder "The BLFS Development Team">
<!ENTITY version "&year;-&month;-&day;">
-<!ENTITY releasedate "November 25th, &year;">
+<!ENTITY releasedate "November 26th, &year;">
<!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
<!ENTITY blfs-version "svn"> <!-- svn|[release #] -->
<!ENTITY lfs-version "development"> <!-- x.y|development -->
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Mon Nov 26 09:03:19
2018 (r20750)
+++ trunk/BOOK/introduction/welcome/changelog.xml Mon Nov 26 17:34:56
2018 (r20751)
@@ -41,6 +41,19 @@
</itemizedlist>
</listitem>
-->
+ <listitem>
+ <para>November 25th, 2018</para>
+ <itemizedlist>
+ <listitem>
+ <para>[ken] - Fix breakage from poppler versions 70,71 in
+ cups-filters, libreoffice and inkscape, and in so-doing
+ update to cups-filters-1.21.4. Fixes
+ <ulink url="&blfs-ticket-root;11096">#11096</ulink>,
+ <ulink url="&blfs-ticket-root;11245">#11245</ulink> and
+ <ulink url="&blfs-ticket-root;11383">#11383</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
<listitem>
<para>November 25th, 2018</para>
Modified: trunk/BOOK/packages.ent
==============================================================================
--- trunk/BOOK/packages.ent Mon Nov 26 09:03:19 2018 (r20750)
+++ trunk/BOOK/packages.ent Mon Nov 26 17:34:56 2018 (r20751)
@@ -980,7 +980,7 @@
<!-- Part XII -->
<!-- Chapter 50 -->
<!ENTITY cups-version "2.2.8">
-<!ENTITY cups-filters-version "1.21.1">
+<!ENTITY cups-filters-version "1.21.4">
<!ENTITY gs-version "9.25">
<!ENTITY gutenprint-version "5.2.14">
Modified: trunk/BOOK/pst/printing/cups-filters.xml
==============================================================================
--- trunk/BOOK/pst/printing/cups-filters.xml Mon Nov 26 09:03:19 2018
(r20750)
+++ trunk/BOOK/pst/printing/cups-filters.xml Mon Nov 26 17:34:56 2018
(r20751)
@@ -7,9 +7,9 @@
<!ENTITY cups-filters-download-http
"https://www.openprinting.org/download/cups-filters/cups-filters-&cups-filters-version;.tar.xz";>
<!ENTITY cups-filters-download-ftp " ">
- <!ENTITY cups-filters-md5sum "60a27b6420703a33332f3243f43c9a62">
- <!ENTITY cups-filters-size "1.4 MB">
- <!ENTITY cups-filters-buildsize "42 MB (with tests)">
+ <!ENTITY cups-filters-md5sum "75b07268abe64a0f15caced8d33c3cc2">
+ <!ENTITY cups-filters-size "1.5 MB">
+ <!ENTITY cups-filters-buildsize "57 MB (with tests), 15MB installed">
<!ENTITY cups-filters-time "0.4 SBU (with tests)">
]>
@@ -71,6 +71,13 @@
Estimated build time: &cups-filters-time;
</para>
</listitem>
+
+ <listitem>
+ <para>
+ Required patch to fix building with recent versions of <xref
linkend="poppler"/>:
+ <ulink
url="&patch-root;/cups-filters-&cups-filters-version;-poppler71-1.patch"/>
+ </para>
+ </listitem>
</itemizedlist>
<bridgehead renderas="sect3">CUPS Filters Dependencies</bridgehead>
@@ -81,7 +88,6 @@
<xref linkend="glib2"/>,
<xref linkend="gs"/>,
<xref linkend="lcms2"/>,
- <xref linkend="mupdf"/> (mutool),
<xref linkend="poppler"/>, and
<xref linkend="qpdf"/>
</para>
@@ -89,8 +95,9 @@
<bridgehead renderas="sect4">Recommended</bridgehead>
<para role="recommended">
<xref linkend="libjpeg"/>,
- <xref linkend="libpng"/> and
- <xref linkend="libtiff"/>
+ <xref linkend="libpng"/>,
+ <xref linkend="libtiff"/> and
+ <xref linkend="mupdf"/> (mutool),
</para>
<bridgehead renderas="sect4">Optional</bridgehead>
@@ -127,6 +134,13 @@
<screen revision="systemd"><userinput>sed -i
"s:cups.service:org.cups.cupsd.service:g"
utils/cups-browsed.service</userinput></screen>
<para>
+ Fix the build for the changes in some recent versions of
+ <application>poppler</application>:
+ </para>
+
+<screen><userinput>patch -Np1 -i
../cups-filters-&cups-filters-version;-poppler71-1.patch</userinput></screen>
+
+ <para>
Install <application>CUPS Filters</application> by running the following
commands:
</para>
@@ -176,12 +190,11 @@
<sect2 role="commands">
<title>Command Explanations</title>
-<!-- no patch today
+<!-- please comment this if no patches are currently needed -->
<para>
- <parameter>patch -Np1 -i
../cups-filters-&cups-filters-version;-poppler67-1.patch</parameter>:
+ <parameter>patch -Np1 -i
../cups-filters-&cups-filters-version;-poppler71-1.patch</parameter>:
Conditionally apply changes for recent versions of poppler.
</para>
--->
<para>
<parameter>--disable-avahi</parameter>: This switch is needed
if the optional <xref linkend="avahi"/> is not installed. Remove
Modified: trunk/BOOK/xsoft/office/libreoffice.xml
==============================================================================
--- trunk/BOOK/xsoft/office/libreoffice.xml Mon Nov 26 09:03:19 2018
(r20750)
+++ trunk/BOOK/xsoft/office/libreoffice.xml Mon Nov 26 17:34:56 2018
(r20751)
@@ -146,14 +146,23 @@
</listitem>
-<!-- keep one commented patch, it's sure to again need one or more in a few
months
+<!-- keep one commented patch, it's sure to again need one or more in a few
months -->
<listitem>
<para>
- Required patch to fix building with system <xref linkend="icu"/>:
- <ulink
url="&patch-root;/libreoffice-&libreoffice-dlversion;-icu_58-1.patch"/>
+ Required patch to fix building with system <xref linkend="poppler"/>
(all
+ recent versions):
+ <ulink
url="&patch-root;/libreoffice-&libreoffice-dlversion;-poppler70-1.patch"/>
</para>
</listitem>
--->
+
+ <listitem>
+ <para>
+ Required patch to fix building with system <xref linkend="poppler"/>
+ (only if using that version or a later version):
+ <ulink
url="&patch-root;/libreoffice-&libreoffice-dlversion;-poppler71-1.patch"/>
+ </para>
+ </listitem>
+
</itemizedlist>
<bridgehead renderas="sect3">LibreOffice Dependencies</bridgehead>
@@ -328,13 +337,19 @@
</para>
<screen><userinput>export
LO_PREFIX=<replaceable><PREFIX></replaceable></userinput></screen>
-<!--
- <para>
- Fix build failures introduced by <xref linkend="icu"/>:
+<!-- keep a commented instruction if no patches are currently required -->
+ <para> <!-- for all recent versions -->
+ Fix build failures introduced by recent versions of <xref
linkend="poppler"/>:
</para>
-<screen><userinput>patch -Np1 -i
../libreoffice-&libreoffice-dlversion;-icu_58-1.patch</userinput></screen>
--->
+<screen><userinput>patch -Np1 -i
../libreoffice-&libreoffice-dlversion;-poppler70-1.patch</userinput></screen>
+
+ <para> <!-- for 0.71.0, not tested on earlier versions -->
+ Similarly, fix build failures introduced with <xref linkend="poppler"/>:
+ </para>
+
+<screen><userinput>patch -Np1 -i
../libreoffice-&libreoffice-dlversion;-poppler71-1.patch</userinput></screen>
+
<para>
Locales "fr" and "en-GB", you will find below, are just examples; you
should change them to suit your needs - you might want to read the
Modified: trunk/BOOK/xsoft/other/inkscape.xml
==============================================================================
--- trunk/BOOK/xsoft/other/inkscape.xml Mon Nov 26 09:03:19 2018 (r20750)
+++ trunk/BOOK/xsoft/other/inkscape.xml Mon Nov 26 17:34:56 2018 (r20751)
@@ -76,7 +76,7 @@
<para>Required patch: <ulink
url="&patch-root;/inkscape-&inkscape-version;-use_versioned_ImageMagick6-1.patch"/></para>
</listitem>
<listitem>
- <para>Required patch: <ulink
url="&patch-root;/inkscape-&inkscape-version;-poppler65-1.patch"/></para>
+ <para>Required patch: <ulink
url="&patch-root;/inkscape-&inkscape-version;-upstream_poppler_fixes-1.patch"/></para>
</listitem>
</itemizedlist>
@@ -145,17 +145,21 @@
<title>Installation of Inkscape</title>
<para>Ensure that the libraries from <xref linkend="imagemagick6"/> can be
used,
- and fix the build for the changes in
<literal>poppler-0.65.0</literal>:</para>
+ and fix the build for the changes in some recent versions of
+ <application>poppler</application>:</para>
<screen><userinput>patch -Np1 -i
../inkscape-&inkscape-version;-use_versioned_ImageMagick6-1.patch &&
-patch -Np1 -i ../inkscape-&inkscape-version;-poppler65-1.patch
+patch -Np1 -i ../inkscape-&inkscape-version;-upstream_poppler_fixes-1.patch
</userinput></screen>
<para>
- Fix a build issue with <application>GCC-7.1</application>:
+ Fix build issues with <application>GCC-7.1</application> and
+ <application>poppler-0.71.0</application>:
</para>
-<screen><userinput>sed -i 's| abs(| std::fabs(|g'
src/ui/tools/flood-tool.cpp</userinput></screen>
+<screen><userinput>sed -i 's| abs(| std::fabs(|g' src/ui/tools/flood-tool.cpp
&&
+sed -e 's|gTrue|true|g' -e 's|gFalse|false|g' -e 's|GBool|bool|g' \
+ -i src/extension/internal/pdfinput/pdf-parser.*</userinput></screen>
<!-- If there is no test suite, then this is not needed.
There is none if the command below is not run. -->
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
