Changeset 9214104

Timestamp:

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

Author:

Pierre Labastie <pieere@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, ken/inkscape-core-mods, lazarus, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226

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

Files:

• general.ent (modified) (2 diffs)
• general/genlib/boost.xml (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• server/major/vsftpd.xml (modified) (1 diff)
• xsoft/office/libreoffice.xml (modified) (2 diffs)
• xsoft/other/rox-filer.xml (modified) (2 diffs)

general.ent

@@ -1 +1 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "15">                   <!-- Always 2 digits -->
+<!ENTITY day          "16">                   <!-- Always 2 digits -->
 <!ENTITY month        "05">                   <!-- Always 2 digits -->
 <!ENTITY year         "2020">
@@ -7 +7 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "May 15th, &year;">
+<!ENTITY releasedate  "May 16th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->

general/genlib/boost.xml

@@ -73 +73 @@
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Recommended patch, required to build <xref linkend="libreoffice"/>:
+          <ulink url="&patch-root;/boost-&boost-version;-gcc_10-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">Boost Dependencies</bridgehead>
 
@@ -93 +103 @@
   <sect2 role="installation">
     <title>Installation of Boost</title>
-<!--
-    <para>
-      First, fix a bug with the header files path, when Python3 is used:
-    </para>
-
-<screen><userinput>sed -e '/using python/ s@;@: /usr/include/python${PYTHON_VERSION/3*/${PYTHON_VERSION}m} ;@' \
-    -i bootstrap.sh</userinput></screen>
--->
+
+    <para>
+      First, apply a patch wwhich allows to build libreoffice with GCC 10
+      and later:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../boost-&boost-version;-gcc_10-1.patch</userinput></screen>
+
     <para>
       This package can be built with several jobs running in parallel. In

introduction/welcome/changelog.xml

@@ -43 +43 @@
     -->
     <listitem>
+      <para>May 16th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[pierre] - Patch libreoffice to build with GCC 10.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Patch boost to allow building libreoffice with
+          GCC 10.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Fix rox-filer for GCC 10.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Fix vsftpd for GCC 10. Thanks to Thomas
+          Trepl for the sed.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>May 15th, 2020</para>
       <itemizedlist>

server/major/vsftpd.xml

@@ -109 +109 @@
 useradd -c "vsftpd User"  -d /dev/null -g vsftpd -s /bin/false -u 47 vsftpd &&
 useradd -c anonymous_user -d /home/ftp -g ftp    -s /bin/false -u 45 ftp</userinput></screen>
+
+    <para>
+      Gcc-10 and later flags an error for an implicit type cast. Make it
+      explicit:
+    </para>
+
+<screen><userinput>sed -e "s/kVSFSysStrOpenUnknown;/(enum EVSFSysUtilOpenMode)&amp;/" -i sysstr.c</userinput></screen>
 
     <para>

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>

xsoft/other/rox-filer.xml

@@ -115 +115 @@
 <screen><userinput>cd ROX-Filer                                                        &amp;&amp;
 sed -i 's:g_strdup(getenv("APP_DIR")):"/usr/share/rox":' src/main.c &amp;&amp;
+sed -i 's/gboolean/extern &amp;/' src/session.h                     &amp;&amp;
 
 mkdir build                        &amp;&amp;
@@ -160 +161 @@
 
     <para>
+      <command>sed -i 's/gboolean/extern &amp;/' src/session.h</command>:
+      This command fixes a multiple definition flagged as an error
+      by GCC 10 and higher.
+    </para>
+
+    <para>
       <command>ln -sv application-...</command>: These commands duplicate the
       icons for some common mime types. Without these links