Skip to content
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.

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

[qt5] icu 75 rebuild with additional patches and remove use of cdts #288

Merged
merged 8 commits into from
Sep 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .azure-pipelines/azure-pipelines-osx.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 28 additions & 3 deletions .azure-pipelines/azure-pipelines-win.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ alsa_lib:
c_compiler:
- gcc
c_compiler_version:
- '12'
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
Expand All @@ -17,7 +17,7 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
dbus:
- '1'
docker_image:
Expand All @@ -35,9 +35,11 @@ gstreamer:
harfbuzz:
- '9'
icu:
- '73'
- '75'
krb5:
- '1.21'
libboost_headers:
- '1.84'
libevent:
- 2.1.12
libjpeg_turbo:
Expand Down
8 changes: 5 additions & 3 deletions .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ alsa_lib:
c_compiler:
- gcc
c_compiler_version:
- '12'
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
Expand All @@ -21,7 +21,7 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
dbus:
- '1'
docker_image:
Expand All @@ -39,9 +39,11 @@ gstreamer:
harfbuzz:
- '9'
icu:
- '73'
- '75'
krb5:
- '1.21'
libboost_headers:
- '1.84'
libevent:
- 2.1.12
libjpeg_turbo:
Expand Down
8 changes: 5 additions & 3 deletions .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ alsa_lib:
c_compiler:
- gcc
c_compiler_version:
- '12'
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
Expand All @@ -17,7 +17,7 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
dbus:
- '1'
docker_image:
Expand All @@ -35,9 +35,11 @@ gstreamer:
harfbuzz:
- '9'
icu:
- '73'
- '75'
krb5:
- '1.21'
libboost_headers:
- '1.84'
libevent:
- 2.1.12
libjpeg_turbo:
Expand Down
8 changes: 0 additions & 8 deletions .ci_support/migrations/harfbuzz9.yaml

This file was deleted.

8 changes: 8 additions & 0 deletions .ci_support/migrations/icu75.yaml
Original file line number Diff line number Diff line change
@@ -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
10 changes: 0 additions & 10 deletions .ci_support/migrations/libxcb116.yaml

This file was deleted.

4 changes: 3 additions & 1 deletion .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,11 @@ glib:
gstreamer:
- '1.24'
icu:
- '73'
- '75'
krb5:
- '1.21'
libboost_headers:
- '1.84'
libjpeg_turbo:
- '3'
libpng:
Expand Down
4 changes: 3 additions & 1 deletion .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,11 @@ glib:
gstreamer:
- '1.24'
icu:
- '73'
- '75'
krb5:
- '1.21'
libboost_headers:
- '1.84'
libjpeg_turbo:
- '3'
libpng:
Expand Down
4 changes: 3 additions & 1 deletion .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,11 @@ glib:
gstreamer:
- '1.24'
icu:
- '73'
- '75'
krb5:
- '1.21'
libboost_headers:
- '1.84'
libjpeg_turbo:
- '3'
libpng:
Expand Down
21 changes: 3 additions & 18 deletions .scripts/build_steps.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions .scripts/run_osx_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .scripts/run_win_build.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions build-locally.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 0 additions & 11 deletions conda-forge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Loading