Changeset 10cbf37 for xsoft

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

Location:

xsoft

Files:

• office/libreoffice.xml (modified) (2 diffs)
• other/inkscape.xml (modified) (2 diffs)

xsoft/office/libreoffice.xml

@@ -147 +147 @@
 
 
-<!-- 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"/>
-        </para>
-      </listitem>
--->
+<!-- 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="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>
@@ -329 +338 @@
 
 <screen><userinput>export LO_PREFIX=<replaceable>&lt;PREFIX&gt;</replaceable></userinput></screen>
-<!--
-    <para>
-     Fix build failures introduced by <xref linkend="icu"/>:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-icu_58-1.patch</userinput></screen>
--->
+<!-- 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;-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

xsoft/other/inkscape.xml

@@ -77 +77 @@
       </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>
@@ -146 +146 @@
 
     <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 &amp;&amp;
-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>:
-    </para>
-
-<screen><userinput>sed -i 's| abs(| std::fabs(|g' src/ui/tools/flood-tool.cpp</userinput></screen>
+      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 &amp;&amp;
+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.