diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index e98657b..6fa2d78 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -23,13 +23,13 @@ gdk_pixbuf: glib: - '2' harfbuzz: -- '8' +- '9' libpng: - '1.6' libxml2: - '2' pango: -- '1.50' +- '1' rust_compiler: - rust target_platform: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 7789cd0..bd6ff66 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -27,13 +27,13 @@ gdk_pixbuf: glib: - '2' harfbuzz: -- '8' +- '9' libpng: - '1.6' libxml2: - '2' pango: -- '1.50' +- '1' rust_compiler: - rust target_platform: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 6d030cc..8f02348 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -23,13 +23,13 @@ gdk_pixbuf: glib: - '2' harfbuzz: -- '8' +- '9' libpng: - '1.6' libxml2: - '2' pango: -- '1.50' +- '1' rust_compiler: - rust target_platform: diff --git a/.ci_support/migrations/harfbuzz9.yaml b/.ci_support/migrations/harfbuzz9.yaml new file mode 100644 index 0000000..0216ea6 --- /dev/null +++ b/.ci_support/migrations/harfbuzz9.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for harfbuzz 9 + kind: version + migration_number: 1 +harfbuzz: +- '9' +migrator_ts: 1719592972.538086 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index b3dde11..5691ef4 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -25,7 +25,7 @@ libxml2: macos_machine: - x86_64-apple-darwin13.4.0 pango: -- '1.50' +- '1' rust_compiler: - rust target_platform: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 1e4cf4d..0c262b0 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -25,7 +25,7 @@ libxml2: macos_machine: - arm64-apple-darwin20.0.0 pango: -- '1.50' +- '1' rust_compiler: - rust target_platform: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index f0bdffe..6cffae6 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -15,7 +15,7 @@ glib: libxml2: - '2' pango: -- '1.50' +- '1' rust_compiler: - rust target_platform: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index a5836e8..ba4b251 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -72,7 +72,6 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" - ( startgroup "Inspecting artifacts" ) 2> /dev/null # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 diff --git a/conda-forge.yml b/conda-forge.yml index 24f666c..82eec8c 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,9 +1,9 @@ build_platform: osx_arm64: osx_64 conda_build: - pkg_format: '2' error_overdepending: true error_overlinking: true + pkg_format: '2' conda_forge_output_validation: true github: branch_name: main diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 18f453f..cd9a60b 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,6 +1,4 @@ c_compiler: # [win] - vs2022 # [win] -c_stdlib_version: # [osx and x86] - - '10.12' # [osx and x86] gdk_pixbuf: - 2 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ff00ff6..0960b86 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -14,7 +14,7 @@ source: - add_rust_lto.patch build: - number: 0 + number: 1 run_exports: # Looks good but no new info after 2.43 so keeping it x.x for safety. # https://abi-laboratory.pro/?view=timeline&l=librsvg