Author: pierre Date: Sat May 16 11:23:41 2020 New Revision: 23151 Log: 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)
Modified: trunk/BOOK/general.ent trunk/BOOK/general/genlib/boost.xml trunk/BOOK/introduction/welcome/changelog.xml trunk/BOOK/server/major/vsftpd.xml trunk/BOOK/xsoft/office/libreoffice.xml trunk/BOOK/xsoft/other/rox-filer.xml Modified: trunk/BOOK/general.ent ============================================================================== --- trunk/BOOK/general.ent Sat May 16 07:07:34 2020 (r23150) +++ trunk/BOOK/general.ent Sat May 16 11:23:41 2020 (r23151) @@ -1,12 +1,12 @@ <!-- $LastChangedBy$ $Date$ --> -<!ENTITY day "15"> <!-- Always 2 digits --> +<!ENTITY day "16"> <!-- Always 2 digits --> <!ENTITY month "05"> <!-- Always 2 digits --> <!ENTITY year "2020"> <!ENTITY copyrightdate "2001-&year;"> <!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 #] --> <!ENTITY lfs-version "development"> <!-- x.y|development --> Modified: trunk/BOOK/general/genlib/boost.xml ============================================================================== --- trunk/BOOK/general/genlib/boost.xml Sat May 16 07:07:34 2020 (r23150) +++ trunk/BOOK/general/genlib/boost.xml Sat May 16 11:23:41 2020 (r23151) @@ -72,6 +72,16 @@ </listitem> </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> <bridgehead renderas="sect4">Recommended</bridgehead> @@ -92,14 +102,14 @@ <sect2 role="installation"> <title>Installation of Boost</title> -<!-- + <para> - First, fix a bug with the header files path, when Python3 is used: + First, apply a patch wwhich allows to build libreoffice with GCC 10 + and later: </para> -<screen><userinput>sed -e '/using python/ s@;@: /usr/include/python${PYTHON_VERSION/3*/${PYTHON_VERSION}m} ;@' \ - -i bootstrap.sh</userinput></screen> ---> +<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 the instructions below, <parameter><N></parameter> stands for the Modified: trunk/BOOK/introduction/welcome/changelog.xml ============================================================================== --- trunk/BOOK/introduction/welcome/changelog.xml Sat May 16 07:07:34 2020 (r23150) +++ trunk/BOOK/introduction/welcome/changelog.xml Sat May 16 11:23:41 2020 (r23151) @@ -42,6 +42,26 @@ </listitem> --> <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> <listitem> Modified: trunk/BOOK/server/major/vsftpd.xml ============================================================================== --- trunk/BOOK/server/major/vsftpd.xml Sat May 16 07:07:34 2020 (r23150) +++ trunk/BOOK/server/major/vsftpd.xml Sat May 16 11:23:41 2020 (r23151) @@ -110,6 +110,13 @@ 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)&/" -i sysstr.c</userinput></screen> + + <para> Build <application>vsftpd</application> as an unprivileged user using the following command: </para> Modified: trunk/BOOK/xsoft/office/libreoffice.xml ============================================================================== --- trunk/BOOK/xsoft/office/libreoffice.xml Sat May 16 07:07:34 2020 (r23150) +++ trunk/BOOK/xsoft/office/libreoffice.xml Sat May 16 11:23:41 2020 (r23151) @@ -167,15 +167,13 @@ <!-- 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"/> + Required patch to fix building with GCC 10 and later: + <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-format_overflow-1.patch"/> </para> </listitem> ---> </itemizedlist> <bridgehead renderas="sect3">LibreOffice Dependencies</bridgehead> @@ -323,14 +321,12 @@ <screen role="nodump"><userinput>tar -xf libreoffice-&libreoffice-dlversion;.tar.xz --no-overwrite-dir && cd libreoffice-&libreoffice-dlversion;</userinput></screen> -<!-- keep a commented instruction if no patches are currently required +<!-- 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"/>: + Fix build failures introduced by GCC 10 and later: </para> -<screen><userinput>patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-consolidated_fixes-1.patch</userinput></screen> ---> +<screen><userinput>patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-format_overflow-1.patch</userinput></screen> <para> If you have downloaded the dictionaries, help and translations tarballs, Modified: trunk/BOOK/xsoft/other/rox-filer.xml ============================================================================== --- trunk/BOOK/xsoft/other/rox-filer.xml Sat May 16 07:07:34 2020 (r23150) +++ trunk/BOOK/xsoft/other/rox-filer.xml Sat May 16 11:23:41 2020 (r23151) @@ -114,6 +114,7 @@ <screen><userinput>cd ROX-Filer && sed -i 's:g_strdup(getenv("APP_DIR")):"/usr/share/rox":' src/main.c && +sed -i 's/gboolean/extern &/' src/session.h && mkdir build && pushd build && @@ -159,6 +160,12 @@ </para> <para> + <command>sed -i 's/gboolean/extern &/' 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 <application>rox-filer</application> would just display the default -- http://lists.linuxfromscratch.org/listinfo/blfs-book FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page