linux-from-scratch/glfs
1
0
Fork 0
mirror of https://github.com/Zeckmathederg/glfs.git synced 2025-01-26 08:42:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

qt-components: Fix building qtlocation with gcc-13.

Browse Source 
It's not in qt5-alternate though, so we can remove the fix from that
page.
This commit is contained in:
Douglas R. Reno 2023-07-17 13:08:53 -05:00
parent 6895424949
commit 81a1d5fbda
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
x/lib/qt5-alternate.xml
View File

@ -240,15 +240,6 @@ ln -sfnv qt-&qt5-version; /opt/qt5</userinput></screen>
<screen><userinput remap="pre">mkdir -pv qtbase/.git</userinput></screen>
<para>
Add another fix for building with GCC-13:
</para>
<screen><userinput>sed -e "/pragma once/a#include &lt;cstdint&gt;" \
-i qtlocation/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp \
qtlocation/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp \
qtlocation/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp</userinput></screen>
<para>
At this point we want to set up skipping most components. Do that with:
</para>

10
x/lib/qt5-components.xml
View File

@ -143,6 +143,16 @@
<screen><userinput remap="pre">patch -Np1 -i ../qt-everywhere-opensource-src-5.15.10-kf5-1.patch</userinput></screen>
<para>
Next, if you are installing <emphasis role="bold">qtlocation</emphasis>,
fix the build with GCC-13:
</para>
<screen><userinput>sed -e "/pragma once/a#include &lt;cstdint&gt;" \
-i qtlocation/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp \
qtlocation/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp \
qtlocation/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp</userinput></screen>
<para>
Install each desired component by running the following commands:
</para>