Changeset 9214104 for xsoft/office/libreoffice.xml

Timestamp:

05/16/2020 06:23:41 PM (4 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 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, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

e32a0bb

Parents:

e4b4cda

Message:

Last fixes for GCC 10:

• patch boost to help libreoffice
• patch libreoffice
• fix multiple def in rox-filer
• fix implicit type cas in vsftpd (sed by thomas)

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

File:

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

xsoft/office/libreoffice.xml

@@ -168 +168 @@
 
 <!-- keep one commented patch, it's sure to again need one or more in a few months:
-For libreoffice 6.2.0.4, almost blfs 8.4: no patch needed, only a sed below
-      <listitem>
-        <para>
-          Required patch to fix building with system <xref linkend="poppler"/> (all
-          recent versions) and <xref linkend="boost"/>:
-          <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-consolidated_fixes-1.patch"/>
-        </para>
-      </listitem>
 -->
+      <listitem>
+        <para>
+          Required patch to fix building with GCC 10 and later:
+          <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-format_overflow-1.patch"/>
+        </para>
+      </listitem>
 
     </itemizedlist>
@@ -324 +322 @@
 cd libreoffice-&libreoffice-dlversion;</userinput></screen>
 
-<!-- keep a commented instruction if no patches are currently required
-    <para>
-     Fix build failures introduced by recent versions of <xref linkend="poppler"/>
-     and <xref linkend="boost"/>:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-consolidated_fixes-1.patch</userinput></screen>
--->
+<!-- keep a commented instruction if no patches are currently required -->
+    <para>
+     Fix build failures introduced by GCC 10 and later:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-format_overflow-1.patch</userinput></screen>
 
     <para>