No cdts + traversaro's stuff

.ci_support/linux_64_.yaml

@@ -3,7 +3,7 @@ alsa_lib:
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '13'
 c_stdlib:
 - sysroot
 c_stdlib_version:
@@ -17,7 +17,7 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 dbus:
 - '1'
 docker_image:
@@ -35,9 +35,11 @@ gstreamer:
 harfbuzz:
 - '9'
 icu:
-- '73'
+- '75'
 krb5:
 - '1.21'
+libboost_headers:
+- '1.84'
 libevent:
 - 2.1.12
 libjpeg_turbo:

.ci_support/linux_aarch64_.yaml

@@ -5,7 +5,7 @@ alsa_lib:
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '13'
 c_stdlib:
 - sysroot
 c_stdlib_version:
@@ -21,7 +21,7 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 dbus:
 - '1'
 docker_image:
@@ -39,9 +39,11 @@ gstreamer:
 harfbuzz:
 - '9'
 icu:
-- '73'
+- '75'
 krb5:
 - '1.21'
+libboost_headers:
+- '1.84'
 libevent:
 - 2.1.12
 libjpeg_turbo:

.ci_support/linux_ppc64le_.yaml

@@ -3,7 +3,7 @@ alsa_lib:
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '13'
 c_stdlib:
 - sysroot
 c_stdlib_version:
@@ -17,7 +17,7 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 dbus:
 - '1'
 docker_image:
@@ -35,9 +35,11 @@ gstreamer:
 harfbuzz:
 - '9'
 icu:
-- '73'
+- '75'
 krb5:
 - '1.21'
+libboost_headers:
+- '1.84'
 libevent:
 - 2.1.12
 libjpeg_turbo:

.ci_support/migrations/icu75.yaml

@@ -0,0 +1,8 @@
+__migrator:
+  build_number: 1
+  commit_message: Rebuild for icu 75
+  kind: version
+  migration_number: 1
+icu:
+- '75'
+migrator_ts: 1720864544.533804

.ci_support/osx_64_.yaml

@@ -23,9 +23,11 @@ glib:
 gstreamer:
 - '1.24'
 icu:
-- '73'
+- '75'
 krb5:
 - '1.21'
+libboost_headers:
+- '1.84'
 libjpeg_turbo:
 - '3'
 libpng:

.ci_support/osx_arm64_.yaml

@@ -23,9 +23,11 @@ glib:
 gstreamer:
 - '1.24'
 icu:
-- '73'
+- '75'
 krb5:
 - '1.21'
+libboost_headers:
+- '1.84'
 libjpeg_turbo:
 - '3'
 libpng:

.ci_support/win_64_.yaml

@@ -15,9 +15,11 @@ glib:
 gstreamer:
 - '1.24'
 icu:
-- '73'
+- '75'
 krb5:
 - '1.21'
+libboost_headers:
+- '1.84'
 libjpeg_turbo:
 - '3'
 libpng:

conda-forge.yml

@@ -3,14 +3,6 @@ azure:
   settings_win:
     variables:
       CONDA_BLD_PATH: C:\bld\
-  # These timeout settings are set to avoid a rebuild of
-  # build 24 for osx and windows
-  # since build 24 was triggered in order to address the
-  # inability to download build 23 on linux-64
-  # https://github.com/conda-forge/qt-main-feedstock/issues/280
-    timeoutInMinutes: 1
-  settings_osx:
-    timeoutInMinutes: 1
 bot:
   abi_migration_branches:
   - qt6
@@ -29,7 +21,4 @@ os_version:
 provider:
   linux_aarch64: default
   linux_ppc64le: default
-remote_ci_setup:
-- liblief=0.11.5
-- conda-forge-ci-setup=3
 test: native_and_emulated

recipe/meta.yaml

@@ -48,12 +48,23 @@ source:
       - patches/0017-Backport-fixes-for-compatibility-with-mysql-8.3.patch
       - patches/0018-Avoid-usage-of-mysql_ssl_set.patch
 
+      # https://github.com/conda-forge/qt-main-feedstock/pull/282#issuecomment-2349349013
+      # icu 75 requires C++17, so enable it also in the dummy compilation of a icu snippet that qmake does for configuration
+      - patches/0019-use-cxx17-for-icu-config-tests.patch
+      # similarly, mapbox-gl-native uses icu, so we need to make sure that it compiles with C++17
+      - patches/0020-compile-mapbox-gl-native-with-cxx17-for-icu75-compat.patch
+      # mapbox-gl-native uses a old vendored boost, make sure that we used an up-to-date boost instead
+      - patches/0021-unvendor-boost-from-mapbox-gl-native.patch
+      # Taken from debian for gcc 13 compatibility
+      # https://github.com/conda-forge/qt-main-feedstock/pull/289#issuecomment-2354739087
+      - patches/0022-gcc_13.patch
+
   - url: https://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-64-mesa_12_0_rc2.7z     # [win64]
     sha256: 2a0d2f92c60e0962ef5f6039d3793424c6f39e49ba27ac04a5b21ca4ae012e15                                      # [win64]
     folder: opengl32sw                                                                                            # [win64]
 
 build:
-  number: 24
+  number: 25
   detect_binary_files_with_prefix: true
   run_exports:
     - {{ pin_subpackage('qt-main', max_pin='x.x') }}
@@ -67,14 +78,8 @@ build:
 requirements:
   build:
     - {{ compiler('c') }}
-    - {{ stdlib("c") }}
+    - {{ stdlib('c') }}
     - {{ compiler('cxx') }}
-    - {{ cdt('mesa-libgl-devel') }}      # [linux]
-    - {{ cdt('mesa-libegl-devel') }}     # [linux]
-    - {{ cdt('mesa-dri-drivers') }}      # [linux]
-    - {{ cdt('libdrm-devel') }}          # [linux]
-    - {{ cdt('libglvnd-glx') }}          # [linux]
-    - {{ cdt('libglvnd-egl') }}          # [linux]
     # For fontconfig + freetype
     - pkg-config                         # [unix]
     - make                               # [unix]
@@ -102,7 +107,13 @@ requirements:
     - llvmdev                           # [arm64]
     # pin llvm<16 because of: https://bugreports.qt.io/browse/PYSIDE-2288
     - clangdev >=9, <16                 # [arm64]
+    # llvm<16 require we manually add libcxx-devel on osx,
+    # see https://github.com/conda-forge/qt-main-feedstock/pull/288#issuecomment-2351649435
+    - libcxx-devel                       # [osx]
   host:
+    - libgl-devel                        # [linux]
+    - libegl-devel                       # [linux]
+    - libdrm                             # [linux]
     # For pkg-config gl, fontconfig + freetype
     - pthread-stubs                      # [linux]
     - dbus                               # [linux]
@@ -133,6 +144,9 @@ requirements:
     - llvm
     # pin llvm<16 because of: https://bugreports.qt.io/browse/PYSIDE-2288
     - clangdev >=9, <16
+    # llvm<16 require we manually add libcxx-devel on osx,
+    # see https://github.com/conda-forge/qt-main-feedstock/pull/288#issuecomment-2351649435
+    - libcxx-devel                       # [osx]
     # Ensure that build and host have the same clang version on osx
     # otherwise qt6 may be out of sync compared to the pinned compiler
     # version
@@ -163,6 +177,8 @@ requirements:
     # https://github.com/conda-forge/staged-recipes/pull/22084
     - xorg-libxxf86vm                    # [linux]
     - xorg-xf86vidmodeproto              # [linux]
+    # qtlocation requires mapbox-gl-native that uses libbost-headers
+    - libboost-headers
   run:
     - {{ pin_compatible("nss") }}        # [unix]
     - {{ pin_compatible("nspr") }}       # [unix]
@@ -189,12 +205,8 @@ requirements:
 test:
   requires:
     - {{ compiler('cxx') }}
-    - {{ cdt('mesa-libgl-devel') }}      # [linux]
-    - {{ cdt('mesa-libegl-devel') }}     # [linux]
-    - {{ cdt('mesa-dri-drivers') }}      # [linux]
-    - {{ cdt('libdrm-devel') }}          # [linux]
-    - {{ cdt('libglvnd-glx') }}          # [linux]
-    - {{ cdt('libglvnd-egl') }}          # [linux]
+    - libgl-devel                        # [linux]
+    - libegl-devel                       # [linux]
     - make                               # [unix]
     - xcb-util                           # [linux]
     - xorg-libxdamage                    # [linux]