Merge pull request #115 from regro-cf-autotick-bot/rebuild-harfbuzz9-…

…0-1_ha4c090 Rebuild for harfbuzz 9
conda-forge · Jul 18, 2024 · 6a5b696 · 6a5b696
2 parents ca01eb9 + 7b81178
commit 6a5b696
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,7 @@ glib: @@
     libxml2:
     - '2'
     pango:
-    - '1.50'
+    - '1'
     rust_compiler:
     - rust
     target_platform:
@@ Expand Down @@