Changeset 7b51d98 for x


Ignore:
Timestamp:
05/29/2024 04:53:39 PM (6 weeks ago)
Author:
Douglas R. Reno <renodr@…>
Branches:
trunk
Children:
768a7aa
Parents:
4193c10
Message:

Qt5 + Components: fix building QtLocation with ICU-75

Location:
x/lib
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • x/lib/qt5-components.xml

    r4193c10 r7b51d98  
    149149       qtlocation/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp   \
    150150       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>
    151160
    152161    <para>

  • x/lib/qt5.xml

    r4193c10 r7b51d98  
    312312       qtlocation/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp   \
    313313       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/native-gl-native.pro</userinput></screen>
    314322
    315323    <para>
Note: See TracChangeset for help on using the changeset viewer.