Changeset f76286d

Timestamp:

08/24/2012 05:47:26 PM (12 years ago)

Author:

Krejzi <krejzi@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 12.2, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gimp3, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/for-12.3, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/spidermonkey128, xry111/test-20220226, xry111/xf86-video-removal

Children:

6d5683f

Parents:

a385460

Message:

Mark Libreoffice as LFS 7.2 checked. Add a patch that fixes compilation with system poppler.

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

File:

• xsoft/office/libreoffice.xml (modified) (5 diffs)

xsoft/office/libreoffice.xml

@@ -37 +37 @@
     </para>
 
-    &lfs71_checked;
+    &lfs72_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -76 +76 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Optional patch (required if you have Boost 1.50): <ulink
+        <para>Optional patch (required if you have Boost 1.50+): <ulink
         url="&patch-root;/libreoffice-core-&libreoffice-version;.4-boost_fix-1.patch"/></para>
+      </listitem>
+      <listitem>
+        <para>Optional patch (required if you are using system version of Poppler): <ulink
+        url="&patch-root;/libreoffice-core-&libreoffice-version;.4-poppler_fix-1.patch"/></para>
       </listitem>
     </itemizedlist>
@@ -119 +123 @@
       <xref linkend="neon"/>,
       <xref linkend="nss"/>,
-      <!-- LibreOffice 3.6.0.4 doesn't build with current poppler, using internal version
-      <xref linkend="poppler"/>, -->
+      <xref linkend="poppler"/>,
       <xref linkend="openssl"/> and
       <xref linkend="redland"/>.
@@ -178 +181 @@
 
 <screen><userinput>patch -Np1 -i ../libreoffice-core-&libreoffice-version;.4-boost_fix-1.patch &amp;&amp;
+patch -Np1 -i ../libreoffice-core-&libreoffice-version;.4-poppler_fix-1.patch &amp;&amp;
 ./autogen.sh --prefix=/usr  \
   --disable-binfilter       \
@@ -196 +200 @@
   --with-system-neon        \
   --with-system-nss         \
-  --with-system-openssl     \<!--  - -with-system-poppler     \ -->
+  --with-system-openssl     \
+  --with-system-poppler     \
   --with-system-redland     \
   --with-system-zlib        \