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

Last fixes for GCC 10:

Browse Source 
- 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
This commit is contained in:
Pierre Labastie 2020-05-16 18:23:41 +00:00
parent e4b4cda0f1
commit 921410405b
6 changed files with 57 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
general.ent
View File

@ -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 -->

20
general/genlib/boost.xml
View File

@ -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>&lt;N&gt;</parameter> stands for the

20
introduction/welcome/changelog.xml
View File

@ -41,6 +41,26 @@
</itemizedlist>
</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>

7
server/major/vsftpd.xml
View File

@ -109,6 +109,13 @@ groupadd -g 45 ftp &amp;&amp;
useradd -c "vsftpd User" -d /dev/null -g vsftpd -s /bin/false -u 47 vsftpd &amp;&amp;
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>
Build <application>vsftpd</application> as an unprivileged user
using the following command:

16
xsoft/office/libreoffice.xml
View File

@ -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 @@ For libreoffice 6.2.0.4, almost blfs 8.4: no patch needed, only a sed below
<screen role="nodump"><userinput>tar -xf libreoffice-&libreoffice-dlversion;.tar.xz --no-overwrite-dir &amp;&amp;
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,

7
xsoft/other/rox-filer.xml
View File

@ -114,6 +114,7 @@
<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;
pushd build &amp;&amp;
@ -158,6 +159,12 @@ ln -sv application-{msword,rtf}.png</userinput></screen>
Without this sed rox needs the environment variable ${APP_DIR} to be set.
</para>
<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