Changeset 96a0bdc3 for x/lib

Timestamp:

06/20/2024 04:27:33 AM (3 months ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

12.2, gimp3, lazarus, trunk, xry111/for-12.3, xry111/spidermonkey128

Children:

829cbf1a

Parents:

8087ca44

git-author:

Xi Ruoyao <xry111@…> (06/20/2024 04:19:18 AM)

git-committer:

Xi Ruoyao <xry111@…> (06/20/2024 04:27:33 AM)

Message:

qt5: Remove qtlocation

Let's just get rid of this particularly problematic module instead of
using a long list of sed's.

Note that "s;c++14;c++17;" is just incorrect: mapbox-gl-native really
uses C++ features *removed* (not simply "deprecated") in C++ 17. Thus
it just happens to work and it may break any time when we update GCC
again. And it's bad from the educational perspective to tell the users
doing this.

Also remove it from the qt5-component page. The qt5-component page
already says if qtlocation is needed it will be mentioned explicitly in
the dependency section, and "grep qtlocation" returns nothing else than
the qt5-component page itself. This suggests nothing in BLFS ever needs
qtlocation so removing it shouldn't cause any trouble (we can revert if
something unexpected happens...)

Location:

x/lib

Files:

• qt5-components.xml (modified) (2 diffs)
• qt5.xml (modified) (4 diffs)

x/lib/qt5-components.xml

@@ -125 +125 @@
       These are
       <emphasis role="bold">qtimageformats</emphasis>,
-      <emphasis role="bold">qtlocation</emphasis>,
       <emphasis role="bold">qtwebchannel</emphasis>,
       <emphasis role="bold">qtdoc</emphasis>, and
@@ -139 +138 @@
 
 <screen><userinput remap="pre">patch -Np1 -i ../qt-everywhere-opensource-src-&qt5-version;-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>
-      Next, if you are installing <emphasis role="bold">qtlocation</emphasis>,
-      fix the build with ICU-75:
-    </para>
-
-<screen><userinput>sed -e "/c++1z/s;^CONFIG;#CONFIG;" \
-    -e "s;c++14;c++17;"            \
-    -i qtlocation/src/3rdparty/mapbox-gl-native/native-gl-native.pro</userinput></screen>
 
     <para>

x/lib/qt5.xml

@@ -305 +305 @@
 
     <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>
-      Add a fix for building with ICU-75:
-    </para>
-
-<screen><userinput>sed -e "/c++1z/s;^CONFIG;#CONFIG;" \
-    -e "s;c++14;c++17;"            \
-    -i qtlocation/src/3rdparty/mapbox-gl-native/mapbox-gl-native.pro</userinput></screen>
-
-    <para>
       Fix a security vulnerability in qtbase:
     </para>
@@ -342 +325 @@
             -no-rpath                                 \
             -syslog                                   \
+            -skip qtlocation                          \
             -skip qtwebengine                         &amp;&amp;
 make</userinput></screen>
@@ -356 +340 @@
             -no-rpath                                 \
             -journald                                 \
+            -skip qtlocation                          \
             -skip qtwebengine                         &amp;&amp;
 make</userinput></screen>
@@ -517 +502 @@
       <parameter>-journald</parameter>: This switch allows to send Qt messages
       to the <command>journald</command> logging system.
+    </para>
+
+    <para>
+      <parameter>-skip qtlocation</parameter>: This switch disables building
+      the Qt5 location module.  Some dependencies of this module are
+      shipped in the tarball but the copies are outdated, so these
+      dependencies won't build with <xref linkend='gcc'/> and
+      <xref linkend='icu'/>.  Nothing in BLFS needs this module.
     </para>