Changeset 81a1d5fb

Timestamp:

07/17/2023 06:08:53 PM (10 months ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

12.0, 12.1, ken/TL2024, ken/tuningfonts, lazarus, lxqt, plabs/newcss, python3.11, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18

Children:

48b40684

Parents:

68954249

Message:

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

It's not in qt5-alternate though, so we can remove the fix from that
page.

Location:

x/lib

Files:

• qt5-alternate.xml (modified) (1 diff)
• qt5-components.xml (modified) (1 diff)

x/lib/qt5-alternate.xml

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

x/lib/qt5-components.xml

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