Changeset 8da27b5

Timestamp:

01/28/2023 03:47:57 PM (15 months ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18, xry111/xf86-video-removal

Children:

8b281cb6

Parents:

2215e98

Message:

Restore system-boost to libreoffice

File:

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

xsoft/office/libreoffice.xml

@@ -179 +179 @@
       </listitem>
 
-<!-- Does not work for version 7.4.5.1.  Removing -system-boost
       <listitem>
         <para>
@@ -187 +186 @@
         </para>
       </listitem>
--->
+
 <!-- keep one commented patch, it's sure to again need one or more in a few months:-->
 
@@ -222 +221 @@
     <para role="recommended">
       <xref linkend="apache-ant"/>,
+      <xref linkend="boost"/>, 
       <xref linkend="clucene"/>,
       <xref linkend="cups"/>,
@@ -253 +253 @@
       <xref linkend="unixodbc"/>
     </para>
-<!--      <xref linkend="boost"/>, -->
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -357 +356 @@
 <screen><userinput>patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-poppler_22_09_fixes-1.patch</userinput></screen>
 -->
-<!--
+
     <para>
      First, fix a build failure introduced by the latest boost version:
@@ -363 +362 @@
 
 <screen><userinput>patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-boost1810-1.patch</userinput></screen>
--->
+
     <para>
       If you have downloaded the dictionaries, help and translations tarballs,
@@ -465 +464 @@
              --enable-python=system      \
              --with-jdk-home=/opt/jdk    \
+             --with-system-boost         \ 
              --with-system-clucene       \
              --with-system-curl          \
@@ -489 +489 @@
              --with-system-libwebp       \
              --with-system-zlib</userinput></screen>
-<!--             - -with-system-boost         \ -->
 <!--
     <para>