From 239ecc3d0a48f8faff064748bf748b2ed6b86dd4 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 13 Jul 2024 21:18:01 +0000 Subject: [PATCH 1/4] Rebuild for harfbuzz 9 --- .ci_support/migrations/harfbuzz9.yaml | 8 ++++++++ conda-forge.yml | 2 +- recipe/meta.yaml | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 .ci_support/migrations/harfbuzz9.yaml 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/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/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 From 9bb5e41f5df2841e128b8200e74c0804152e092b Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 13 Jul 2024 21:19:17 +0000 Subject: [PATCH 2/4] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and conda-forge-pinning 2024.07.13.14.05.54 --- .ci_support/linux_64_.yaml | 2 +- .ci_support/linux_aarch64_.yaml | 2 +- .ci_support/linux_ppc64le_.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index e98657b..3e8e1b9 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -23,7 +23,7 @@ gdk_pixbuf: glib: - '2' harfbuzz: -- '8' +- '9' libpng: - '1.6' libxml2: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 7789cd0..609f545 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -27,7 +27,7 @@ gdk_pixbuf: glib: - '2' harfbuzz: -- '8' +- '9' libpng: - '1.6' libxml2: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 6d030cc..b0a4aef 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -23,7 +23,7 @@ gdk_pixbuf: glib: - '2' harfbuzz: -- '8' +- '9' libpng: - '1.6' libxml2: From 2f8b8ecc6f35e369c0ae98be94a890a563e4e103 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 17 Jul 2024 12:39:44 +0000 Subject: [PATCH 3/4] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.0, and conda-forge-pinning 2024.07.17.12.11.55 --- .ci_support/linux_64_.yaml | 2 +- .ci_support/linux_aarch64_.yaml | 2 +- .ci_support/linux_ppc64le_.yaml | 2 +- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- .ci_support/win_64_.yaml | 2 +- .scripts/build_steps.sh | 1 - 7 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 3e8e1b9..6fa2d78 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -29,7 +29,7 @@ libpng: 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 609f545..bd6ff66 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -33,7 +33,7 @@ libpng: 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 b0a4aef..8f02348 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -29,7 +29,7 @@ libpng: libxml2: - '2' pango: -- '1.50' +- '1' rust_compiler: - rust target_platform: 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 From 7b811789aba5bb9fabe1db3e438fe8eb9457f917 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 17 Jul 2024 21:01:36 +0200 Subject: [PATCH 4/4] Drop c_stdlib for osx --- recipe/conda_build_config.yaml | 2 -- 1 file changed, 2 deletions(-) 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