linux-from-scratch/glfs
1
0
Fork 0
mirror of https://github.com/Zeckmathederg/glfs.git synced 2025-02-03 23:07:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Restore system-boost to libreoffice

Browse Source
This commit is contained in:
Bruce Dubbs 2023-01-28 09:47:57 -06:00
parent 2215e98f72
commit 8da27b5f7c
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
xsoft/office/libreoffice.xml
View File

@ -178,7 +178,6 @@
</para>
</listitem>
<!-- Does not work for version 7.4.5.1. Removing -system-boost
<listitem>
<para>
Required patch to fix building with fixed version of <xref
@ -186,7 +185,7 @@
<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:-->
<!--
@ -221,6 +220,7 @@
<para role="recommended">
<xref linkend="apache-ant"/>,
<xref linkend="boost"/>,
<xref linkend="clucene"/>,
<xref linkend="cups"/>,
<xref linkend="curl"/>,
@ -252,7 +252,6 @@
<xref linkend="redland"/>, and
<xref linkend="unixodbc"/>
</para>
<!-- <xref linkend="boost"/>, -->
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
@ -356,13 +355,13 @@ cd libreoffice-&libreoffice-dlversion;</userinput></screen>
<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:
</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
@ -464,6 +463,7 @@ sed -e "/distro-install-file-lists/d" -i Makefile.in &amp;&amp;
--enable-release-build=yes \
--enable-python=system \
--with-jdk-home=/opt/jdk \
--with-system-boost \
--with-system-clucene \
--with-system-curl \
--with-system-epoxy \
@ -488,7 +488,6 @@ sed -e "/distro-install-file-lists/d" -i Makefile.in &amp;&amp;
--with-system-libtiff \
--with-system-libwebp \
--with-system-zlib</userinput></screen>
<!-- - -with-system-boost \ -->
<!--
<para>
The instructions below will only build the package without running