- Timestamp:
- 06/20/2024 04:27:33 AM (4 months ago)
- 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)
- Location:
- x/lib
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
x/lib/qt5-components.xml
r8087ca44 r96a0bdc3 125 125 These are 126 126 <emphasis role="bold">qtimageformats</emphasis>, 127 <emphasis role="bold">qtlocation</emphasis>,128 127 <emphasis role="bold">qtwebchannel</emphasis>, 129 128 <emphasis role="bold">qtdoc</emphasis>, and … … 139 138 140 139 <screen><userinput remap="pre">patch -Np1 -i ../qt-everywhere-opensource-src-&qt5-version;-kf5-1.patch</userinput></screen> 141 142 <para>143 Next, if you are installing <emphasis role="bold">qtlocation</emphasis>,144 fix the build with GCC-13:145 </para>146 147 <screen><userinput>sed -e "/pragma once/a#include <cstdint>" \148 -i qtlocation/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp \149 qtlocation/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp \150 qtlocation/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp</userinput></screen>151 152 <para>153 Next, if you are installing <emphasis role="bold">qtlocation</emphasis>,154 fix the build with ICU-75:155 </para>156 157 <screen><userinput>sed -e "/c++1z/s;^CONFIG;#CONFIG;" \158 -e "s;c++14;c++17;" \159 -i qtlocation/src/3rdparty/mapbox-gl-native/native-gl-native.pro</userinput></screen>160 140 161 141 <para> -
x/lib/qt5.xml
r8087ca44 r96a0bdc3 305 305 306 306 <para> 307 Add another fix for building with GCC-13:308 </para>309 310 <screen><userinput>sed -e "/pragma once/a#include <cstdint>" \311 -i qtlocation/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp \312 qtlocation/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp \313 qtlocation/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp</userinput></screen>314 315 <para>316 Add a fix for building with ICU-75:317 </para>318 319 <screen><userinput>sed -e "/c++1z/s;^CONFIG;#CONFIG;" \320 -e "s;c++14;c++17;" \321 -i qtlocation/src/3rdparty/mapbox-gl-native/mapbox-gl-native.pro</userinput></screen>322 323 <para>324 307 Fix a security vulnerability in qtbase: 325 308 </para> … … 342 325 -no-rpath \ 343 326 -syslog \ 327 -skip qtlocation \ 344 328 -skip qtwebengine && 345 329 make</userinput></screen> … … 356 340 -no-rpath \ 357 341 -journald \ 342 -skip qtlocation \ 358 343 -skip qtwebengine && 359 344 make</userinput></screen> … … 517 502 <parameter>-journald</parameter>: This switch allows to send Qt messages 518 503 to the <command>journald</command> logging system. 504 </para> 505 506 <para> 507 <parameter>-skip qtlocation</parameter>: This switch disables building 508 the Qt5 location module. Some dependencies of this module are 509 shipped in the tarball but the copies are outdated, so these 510 dependencies won't build with <xref linkend='gcc'/> and 511 <xref linkend='icu'/>. Nothing in BLFS needs this module. 519 512 </para> 520 513
Note:
See TracChangeset
for help on using the changeset viewer.