Changeset 199671b8 for xsoft/office

Timestamp:

09/09/2015 01:13:25 AM (9 years ago)

Author:

Ken Moffat <ken@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, 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/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

9912ce81

Parents:

a4354244

Message:

Patch libreoffice-5.0.1.2 to use system boost_1_59_0.

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

File:

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

xsoft/office/libreoffice.xml

@@ -28 +28 @@
   dependencies (with-system... -->
 
-  <!ENTITY libreoffice-buildsize          "12 GB (649 MB installed)">
-  <!ENTITY libreoffice-time               "62 SBU (using parallelism=4) estimated 170 SBU with one core">
+  <!ENTITY libreoffice-buildsize          "9.8 GB (649 MB installed)">
+  <!ENTITY libreoffice-time               "64 SBU (using parallelism=4) estimated 170 SBU with one core">
 
   <!-- [bdubbs]  For version 4.3.2.2 Built on x86_64 using -\-with-parallelism=4 -->
@@ -153 +153 @@
       </listitem>
 
-<!--      <listitem>
-        <para>
-          Required patch for i686 systems, in order to fix a problem introduced
-          by <application>&gcc-490;</application>:
-          <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-gcc_4_9_0-2.patch"/>
-        </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>
     </itemizedlist>
 
@@ -183 +182 @@
 
     <para role="recommended">
-      <!-- currently broken <xref linkend="boost"/>,-->
+      <xref linkend="boost"/>,
       <xref linkend="clucene"/>,
       <xref linkend="cups"/>,
@@ -366 +365 @@
 <screen><userinput>export LO_PREFIX=<replaceable>&lt;PREFIX&gt;</replaceable></userinput></screen>
 
-<!--    <para>
-     For i686 systems, fix a problem introduced by <application>&gcc-490;</application>:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-gcc_4_9_0-2.patch</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>
+
     <para>
       Locales "fr" and "en-GB", you will find below, are just examples; you
@@ -408 +407 @@
              --enable-release-build=yes  \
              --enable-python=system      \
-             --without-system-boost      \
+             --with-system-boost         \
              --with-system-clucene       \
              --with-system-cairo         \
@@ -544 +543 @@
     </para>
 
-    <para>
-      <parameter>--without-system-boost</parameter>: This switch disables use
+<!--    <para>
+      <parameter>\-\-without-system-boost</parameter>: This switch disables use
       of system boost, so bundled one is used, because currently, the build is
       broken with <xref linkend="boost"/>.
-    </para>
+    </para> -->
 
     <para>