From 641f11105f977da9e54f09ef55d2d7acd32002be Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 28 Mar 2023 04:44:47 +0000 Subject: [PATCH 1/3] Rebuild for icu72 --- .ci_support/migrations/icu72.yaml | 7 +++++++ conda-forge.yml | 2 +- recipe/meta.yaml | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 .ci_support/migrations/icu72.yaml diff --git a/.ci_support/migrations/icu72.yaml b/.ci_support/migrations/icu72.yaml new file mode 100644 index 00000000..465adac9 --- /dev/null +++ b/.ci_support/migrations/icu72.yaml @@ -0,0 +1,7 @@ +__migrator: + build_number: 1 + kind: version + migration_number: 1 +icu: +- '72' +migrator_ts: 1679327092.7504842 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/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') }} From c343af6d9c57c354f65840586c38f58f041c2bad Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 28 Mar 2023 04:45:12 +0000 Subject: [PATCH 2/3] MNT: Re-rendered with conda-build 3.24.0, conda-smithy 3.23.1, and conda-forge-pinning 2023.03.27.19.48.24 --- .ci_support/linux_64_.yaml | 2 +- .ci_support/linux_aarch64_.yaml | 2 +- .ci_support/linux_ppc64le_.yaml | 2 +- .ci_support/migrations/gstreamer122.yaml | 7 ------- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- .ci_support/win_64_.yaml | 2 +- 7 files changed, 6 insertions(+), 13 deletions(-) delete mode 100644 .ci_support/migrations/gstreamer122.yaml 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/gstreamer122.yaml deleted file mode 100644 index 5bd76066..00000000 --- a/.ci_support/migrations/gstreamer122.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -gstreamer: -- '1.22' -migrator_ts: 1674863713.3234591 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: From 0758b98854a3a3b9c99cded856176e96c9b8c0c5 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sat, 1 Apr 2023 11:47:03 -0400 Subject: [PATCH 3/3] Add patch for unary_operator for osx compatibility --- recipe/meta.yaml | 7 ++++++- .../0014-remove-usage-of-unary-operator.patch | 12 ++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 recipe/patches/0014-remove-usage-of-unary-operator.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b124ac02..1f5ab659 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -31,12 +31,17 @@ source: # https://git.launchpad.net/ubuntu/+source/qtbase-opensource-src/commit/?h=applied/ubuntu/devel&id=6f147c166539b23792515445beadc02fb5565d0c - patches/0013-upstream-fixes-to-support-OpenSSL-3.0.patch + # This 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 + - patches/0014-remove-usage-of-unary-operator.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: 8 + number: 9 detect_binary_files_with_prefix: true run_exports: - {{ pin_subpackage('qt-main', max_pin='x.x') }} diff --git a/recipe/patches/0014-remove-usage-of-unary-operator.patch b/recipe/patches/0014-remove-usage-of-unary-operator.patch new file mode 100644 index 00000000..2ccb6fe3 --- /dev/null +++ b/recipe/patches/0014-remove-usage-of-unary-operator.patch @@ -0,0 +1,12 @@ +diff -ur a/qtmultimedia/src/plugins/avfoundation/camera/avfcamerautility.mm b/qtmultimedia/src/plugins/avfoundation/camera/avfcamerautility.mm +--- a/qtmultimedia/src/plugins/avfoundation/camera/avfcamerautility.mm 2023-04-01 11:51:14.736887185 -0400 ++++ b/qtmultimedia/src/plugins/avfoundation/camera/avfcamerautility.mm 2023-04-01 11:54:19.979498301 -0400 +@@ -101,7 +101,7 @@ + } + }; + +-struct FormatHasNoFPSRange : std::unary_function ++struct FormatHasNoFPSRange + { + bool operator() (AVCaptureDeviceFormat *format) + {