Changeset b12ae7c

Timestamp:

01/30/2016 10:26:47 AM (9 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

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

Children:

ada4e5f5

Parents:

2b102681

Message:

Add Boost patch to libreoffice

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

File:

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

xsoft/office/libreoffice.xml

@@ -151 +151 @@
         </para>
       </listitem>
-<!--
+
       <listitem>
         <para>
           Required patch to use <xref linkend="boost"/>:
-          <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-boost_1_59_0-1.patch"/>
-        </para>
-      </listitem>-->
+          <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-boost_1_60_0-1.patch"/>
+        </para>
+      </listitem>
     </itemizedlist>
 
@@ -181 +181 @@
 
     <para role="recommended">
-      <xref linkend="boost"/> (currently, broken with boost-1.60.0),
+      <xref linkend="boost"/> <!--(currently, broken with boost-1.60.0)-->,
       <xref linkend="clucene"/>,
       <xref linkend="cups"/>,
@@ -363 +363 @@
 
 <screen><userinput>export LO_PREFIX=<replaceable>&lt;PREFIX&gt;</replaceable></userinput></screen>
-<!--
+
     <para>
      Fix build failures introduced by <application>boost-&boost-version;</application>:
     </para>
 
-<screen><userinput>patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-boost_1_59_0-1.patch</userinput></screen>-->
+<screen><userinput>patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-boost_1_60_0-1.patch</userinput></screen>
 
     <para>
@@ -400 +400 @@
              --with-alloc=system         \
              --without-java              \
-             --without-system-boost      \
              --without-system-dicts      \
              --disable-gconf             \
@@ -407 +406 @@
              --enable-release-build=yes  \
              --enable-python=system      \
+             --with-system-boost         \
              --with-system-clucene       \
              --with-system-cairo         \