Changeset 06c23e6

Timestamp:

01/04/2023 08:10:58 PM (16 months ago)

Author:

Ken Moffat <ken@…>

Branches:

11.3, 12.0, 12.1, 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, xry111/llvm18, xry111/xf86-video-removal

Children:

6ad6bac

Parents:

811d39b

Message:

Fix building libreoffice with system boost.

Apply a sed to boost (or if already built, the installed
header can be edited).

Apply a patch to libreoffice for a different change.

Files:

• general/genlib/boost.xml (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• xsoft/office/libreoffice.xml (modified) (4 diffs)

general/genlib/boost.xml

@@ -102 +102 @@
   <sect2 role="installation">
     <title>Installation of Boost</title>
+
+    <para>
+      A change in this version of <application>boost</application> breaks
+      the few packages which use the <application>phoenix</application>
+      module when compiled with current <application>GCC</application>. In BLFS,
+      that affects <xref linkend="libreoffice"/>. Fix this with the following
+      command:
+    </para>
+
+<screen><userinput>sed -i '/#include.*phoenix.*tuple.hpp.*/d' \
+  boost/phoenix/stl.hpp</userinput></screen>
 
     <para>
@@ -157 +168 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <para>
+      <parameter>sed -i '/#include ...</parameter>: This removes the inclusion
+      of <filename>boost/phoenix/stl/tuple.hpp</filename> from this header-only
+      library, allowing applications which use it to link using recent C++.
+      <!-- FIXME: remove before 11.3 is we still use 1.81.0 and LO-7.4,
+      this alternative is only for people working through the development book.-->
+      An alternative is to edit
+      <filename>/usr/include/boost/phoenix/stl.hpp</filename> if this version of
+      boost has already been installed without this <command>sed</command>.
+    </para>
 
     <para>

introduction/welcome/changelog.xml

@@ -40 +40 @@
     -->
     <listitem>
+      <para>January 4th, 2023</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Fix a header in boost-1.81.0 and patch libreoffice to
+          accomodate another change in this version of boost, so that system
+          boost can again be used. Fixes
+          <ulink url="&blfs-ticket-root;17461">#17461</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>January 3rd, 2023</para>
       <itemizedlist>

xsoft/office/libreoffice.xml

@@ -179 +179 @@
       </listitem>
 
+      <listitem>
+        <para>
+          Required patch to fix building with fixed version of <xref
+          linkend="boost"/>:
+          <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-boost1810-1.patch"/>
+        </para>
+      </listitem>
+
 <!-- keep one commented patch, it's sure to again need one or more in a few months:-->
 
@@ -214 +222 @@
       <xref linkend="apache-ant"/>,
 <!--  <xref linkend="apr"/>, -->
-      <xref linkend="boost"/> (broken with boost-1.81.0),
+      <xref linkend="boost"/>,
       <xref linkend="clucene"/>,
       <xref linkend="cups"/>,
@@ -354 +362 @@
 -->
     <para>
+     First, fix a build failure introduced by the latest boost version:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-boost1810-1.patch</userinput></screen>
+
+    <para>
       If you have downloaded the dictionaries, help and translations tarballs,
       create symlinks to them from the source directory so they won't get
@@ -454 +468 @@
              --enable-python=system      \
              --with-jdk-home=/opt/jdk    \
-             --without-system-boost      \
+             --with-system-boost         \
              --with-system-clucene       \
              --with-system-curl          \