Changeset 0209dd4

Timestamp:

04/26/2018 01:43:30 AM (6 years ago)

Author:

Ken Moffat <ken@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, perl-modules, 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:

91a82cb

Parents:

987aff0

Message:

Fix libreoffice for poppler-0.64.0

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

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• xsoft/office/libreoffice.xml (modified) (3 diffs)

introduction/welcome/changelog.xml

@@ -46 +46 @@
       <itemizedlist>
         <listitem>
+          <para>[ken] - Patch libreoffice-6.0.1.1 to build with poppler-0.64.0.</para>
+        </listitem>
+        <listitem>
           <para>[timtas] - Update to vlc-3.0.2. Fixes
           <ulink url="&blfs-ticket-root;10695">#10695</ulink>.</para>

xsoft/office/libreoffice.xml

@@ -5 +5 @@
   %general-entities;
 
-<!-- FIXME please retest system poppler with versions of LO > 6.0.0.1
- or poppler > 0.62.0, the build fails within a few minutes on broken versions -->
   <!ENTITY libreoffice-dl "http://download.documentfoundation.org/libreoffice/src/&libreoffice-version;">
 
@@ -142 +140 @@
         </para>
       </listitem>
+
+      <listitem>
+        <para>Required patch to fix building with system <xref linkend="poppler"/>:
+         <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-poppler64-1.patch"/></para>
+      </listitem>
+
 <!--
       <listitem>
@@ -347 +351 @@
 
 sed -e "/distro-install-file-lists/d" -i Makefile.in &amp;&amp;
+
+patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-poppler64-1.patch &amp;&amp;
 
 ./autogen.sh --prefix=$LO_PREFIX         \