diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index e41080e1..67d2d4d0 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -31,7 +31,7 @@ gstreamer: harfbuzz: - '6' icu: -- '70' +- '72' krb5: - '1.20' libevent: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 84f367e4..46df28ea 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -35,7 +35,7 @@ gstreamer: harfbuzz: - '6' icu: -- '70' +- '72' krb5: - '1.20' libevent: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 95c7c601..1af2d667 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -31,7 +31,7 @@ gstreamer: harfbuzz: - '6' icu: -- '70' +- '72' krb5: - '1.20' libevent: diff --git a/.ci_support/migrations/gstreamer122.yaml b/.ci_support/migrations/icu72.yaml similarity index 56% rename from .ci_support/migrations/gstreamer122.yaml rename to .ci_support/migrations/icu72.yaml index 5bd76066..465adac9 100644 --- a/.ci_support/migrations/gstreamer122.yaml +++ b/.ci_support/migrations/icu72.yaml @@ -2,6 +2,6 @@ __migrator: build_number: 1 kind: version migration_number: 1 -gstreamer: -- '1.22' -migrator_ts: 1674863713.3234591 +icu: +- '72' +migrator_ts: 1679327092.7504842 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 36375d54..34185252 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -19,7 +19,7 @@ glib: gstreamer: - '1.22' icu: -- '70' +- '72' krb5: - '1.20' libjpeg_turbo: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index bdb76f96..211f7d12 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -17,7 +17,7 @@ glib: gstreamer: - '1.22' icu: -- '70' +- '72' krb5: - '1.20' libjpeg_turbo: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 7b4f058f..7ffb735b 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -13,7 +13,7 @@ glib: gstreamer: - '1.22' icu: -- '70' +- '72' krb5: - '1.20' libjpeg_turbo: diff --git a/conda-forge.yml b/conda-forge.yml index b7e60b57..38498d53 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -7,6 +7,7 @@ bot: - qt6 build_platform: linux_aarch64: linux_aarch64 + linux_ppc64le: linux_ppc64le osx_arm64: osx_64 conda_build: pkg_format: '2' @@ -19,7 +20,6 @@ os_version: provider: linux_aarch64: default linux_ppc64le: default - # Note: linux_ppc64le is currently build manually by @matthiasdiener remote_ci_setup: - liblief=0.11.5 - conda-forge-ci-setup=3 diff --git a/recipe/build.sh b/recipe/build.sh index 4e32f159..1217a502 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -164,6 +164,10 @@ if [[ $(uname) == "Linux" ]]; then fi if [[ ${HOST} =~ .*darwin.* ]]; then + # This flag helps compatibility between qt and CXX17 + # https://github.com/conda-forge/qt-main-feedstock/pull/136 + # https://github.com/conda-forge/libcxx-feedstock/issues/114#issuecomment-1490672500 + CXXFLAGS="${CXXFLAGS:-} -D_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY" # Avoid Xcode cp "${RECIPE_DIR}"/xcrun . cp "${RECIPE_DIR}"/xcodebuild . diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 0f8f9b03..b124ac02 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -36,7 +36,7 @@ source: folder: opengl32sw # [win64] build: - number: 7 + number: 8 detect_binary_files_with_prefix: true run_exports: - {{ pin_subpackage('qt-main', max_pin='x.x') }}