Merge pull request #269 from regro-cf-autotick-bot/rebuild-libxcb116-…

…0-1_h6257c3 Rebuild for libxcb 1.16
conda-forge · Jun 22, 2024 · 1ea11f5 · 1ea11f5
2 parents 345bd4f + 5c5e76c
commit 1ea11f5
Show file tree

Hide file tree

Showing 21 changed files with 80 additions and 52 deletions.
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml
@@ -47,7 +47,7 @@ libpng:
 libsqlite:
 - '3'
 libxcb:
-- '1.15'
+- '1.16'
 libxml2:
 - '2'
 nspr:
@@ -59,7 +59,7 @@ openssl:
 postgresql:
 - '16'
 pulseaudio_client:
-- '17'
+- '17.0'
 target_platform:
 - linux-64
 zip_keys:
@@ -68,6 +68,6 @@ zip_keys:
 - - c_stdlib_version
   - cdt_name
 zlib:
-- '1.2'
+- '1'
 zstd:
 - '1.5'
diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml
@@ -51,7 +51,7 @@ libpng:
 libsqlite:
 - '3'
 libxcb:
-- '1.15'
+- '1.16'
 libxml2:
 - '2'
 nspr:
@@ -63,7 +63,7 @@ openssl:
 postgresql:
 - '16'
 pulseaudio_client:
-- '17'
+- '17.0'
 target_platform:
 - linux-aarch64
 zip_keys:
@@ -72,6 +72,6 @@ zip_keys:
 - - c_stdlib_version
   - cdt_name
 zlib:
-- '1.2'
+- '1'
 zstd:
 - '1.5'
diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml
@@ -47,7 +47,7 @@ libpng:
 libsqlite:
 - '3'
 libxcb:
-- '1.15'
+- '1.16'
 libxml2:
 - '2'
 nspr:
@@ -59,7 +59,7 @@ openssl:
 postgresql:
 - '16'
 pulseaudio_client:
-- '17'
+- '17.0'
 target_platform:
 - linux-ppc64le
 zip_keys:
@@ -68,6 +68,6 @@ zip_keys:
 - - c_stdlib_version
   - cdt_name
 zlib:
-- '1.2'
+- '1'
 zstd:
 - '1.5'
diff --git a/.ci_support/migrations/krb5121.yaml b/.ci_support/migrations/krb5121.yaml
diff --git a/.ci_support/migrations/libxcb115.yaml b/.ci_support/migrations/libxcb115.yaml
diff --git a/.ci_support/migrations/libxcb116.yaml b/.ci_support/migrations/libxcb116.yaml
@@ -0,0 +1,10 @@
+__migrator:
+  build_number: 1
+  commit_message: Rebuild for libxcb 1.16
+  kind: version
+  migration_number: 1
+
+# TODO: Add to global pinnins once migration completed
+libxcb:
+- '1.16'
+migrator_ts: 1718798196
diff --git a/.ci_support/migrations/pulseaudio17.yaml b/.ci_support/migrations/pulseaudio17.yaml
diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
@@ -46,6 +46,6 @@ zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
 zlib:
-- '1.2'
+- '1'
 zstd:
 - '1.5'
diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml
@@ -1,5 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '11.0'
+MACOSX_SDK_VERSION:
+- '11.0'
 c_compiler:
 - clang
 c_compiler_version:
@@ -44,6 +46,6 @@ zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
 zlib:
-- '1.2'
+- '1'
 zstd:
 - '1.5'
diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml
@@ -29,6 +29,6 @@ openssl:
 target_platform:
 - win-64
 zlib:
-- '1.2'
+- '1'
 zstd:
 - '1.5'
diff --git a/.gitattributes b/.gitattributes
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
@@ -3,7 +3,7 @@ c_compiler_version:        # [osx]
   - 15                     # [osx]
 cxx_compiler_version:      # [osx]
   - 15                     # [osx]
-MACOSX_DEPLOYMENT_TARGET:  # [osx and x86_64]
+c_stdlib_version:          # [osx and x86_64]
   - '10.13'                # [osx and x86_64]
 MACOSX_SDK_VERSION:        # [osx and x86_64]
   - '10.14'                # [osx and x86_64]
@@ -23,3 +23,6 @@ replacements:
         - '*.cmake'
       regex_re: '([^;\s"]+/sysroot)'
       replacement_re: '$ENV{CONDA_BUILD_SYSROOT}'
+
+c_stdlib_version:   # [linux]
+  - "2.17"          # [linux]
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -53,7 +53,7 @@ source:
     folder: opengl32sw                                                                                            # [win64]
 
 build:
-  number: 21
+  number: 22
   detect_binary_files_with_prefix: true
   run_exports:
     - {{ pin_subpackage('qt-main', max_pin='x.x') }}
@@ -67,8 +67,8 @@ build:
 requirements:
   build:
     - {{ compiler('c') }}
+    - {{ stdlib("c") }}
     - {{ compiler('cxx') }}
-    - sysroot_linux-64 2.17              # [linux]
     - {{ cdt('mesa-libgl-devel') }}      # [linux]
     - {{ cdt('mesa-libegl-devel') }}     # [linux]
     - {{ cdt('mesa-dri-drivers') }}      # [linux]
@@ -184,7 +184,6 @@ requirements:
     - xorg-libice                        # [linux]
     - xorg-xf86vidmodeproto              # [linux]
   run_constrained:
-    - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.14") }}  # [osx and x86_64]
     - qt {{ version }}
 
 test: