Skip to content

Rebuild icu72 0 1 hde268e -- with patch for c++17 #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hmaarrfk merged 3 commits into from
Apr 1, 2023
Merged

Rebuild icu72 0 1 hde268e -- with patch for c++17 #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
641f111
Rebuild for icu72
regro-cf-autotick-bot Mar 28, 2023
c343af6
MNT: Re-rendered with conda-build 3.24.0, conda-smithy 3.23.1, and co…
regro-cf-autotick-bot Mar 28, 2023
0758b98
Add patch for unary_operator for osx compatibility
hmaarrfk Apr 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci_support/linux_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ gstreamer:
harfbuzz:
- '6'
icu:
- '70'
- '72'
krb5:
- '1.20'
libevent:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ gstreamer:
harfbuzz:
- '6'
icu:
- '70'
- '72'
krb5:
- '1.20'
libevent:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ gstreamer:
harfbuzz:
- '6'
icu:
- '70'
- '72'
krb5:
- '1.20'
libevent:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/migrations/gstreamer122.yaml → .ci_support/migrations/icu72.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .ci_support/osx_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ glib:
gstreamer:
- '1.22'
icu:
- '70'
- '72'
krb5:
- '1.20'
libjpeg_turbo:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ glib:
gstreamer:
- '1.22'
icu:
- '70'
- '72'
krb5:
- '1.20'
libjpeg_turbo:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ glib:
gstreamer:
- '1.22'
icu:
- '70'
- '72'
krb5:
- '1.20'
libjpeg_turbo:
Expand Down
2 changes: 1 addition & 1 deletion conda-forge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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
Expand Down
7 changes: 6 additions & 1 deletion recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: 7
number: 9
detect_binary_files_with_prefix: true
run_exports:
- {{ pin_subpackage('qt-main', max_pin='x.x') }}
Expand Down
12 changes: 12 additions & 0 deletions recipe/patches/0014-remove-usage-of-unary-operator.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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<AVCaptureDeviceFormat *, bool>
+struct FormatHasNoFPSRange
{
bool operator() (AVCaptureDeviceFormat *format)
{