From 79f88f8f4019ef010c3ea6377d818c6d8528cddb Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 21 Mar 2024 11:06:51 +0100 Subject: [PATCH 1/2] Enable overlinking and -depending checks --- conda-forge.yml | 2 ++ recipe/meta.yaml | 16 +++++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/conda-forge.yml b/conda-forge.yml index 24494b5..24f666c 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -2,6 +2,8 @@ build_platform: osx_arm64: osx_64 conda_build: pkg_format: '2' + error_overdepending: true + error_overlinking: true conda_forge_output_validation: true github: branch_name: main diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8785c79..4d1b18f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -2,21 +2,19 @@ {% set version = "2.58.0" %} {% set abi_version = "2.0" %} {% set version_majmin = version.rsplit('.', 1)[0] %} -{% set sha256 = "d7c444a926406b59790be0deae196e18ed26059da573fa1aa9ec9ca7658a559c" %} package: name: {{ name }} version: {{ version }} source: - fn: {{ name }}-{{ version }}.tar.xz url: https://download.gnome.org/sources/{{ name }}/{{ version_majmin }}/{{ name }}-{{ version }}.tar.xz - sha256: {{ sha256 }} + sha256: d7c444a926406b59790be0deae196e18ed26059da573fa1aa9ec9ca7658a559c patches: - 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 @@ -30,7 +28,7 @@ requirements: - gi-docgen - gobject-introspection - pkg-config - - {{ compiler('rust') }} + - {{ compiler('rust') }} >=1.77 - {{ compiler('c') }} - {{ stdlib('c') }} - gnuconfig # [unix] @@ -41,14 +39,13 @@ requirements: - pango # [build_platform != target_platform] host: - glib - - gettext - - libiconv # [win] - libxml2 - cairo - gdk-pixbuf - pango - run: - - pango + - harfbuzz # [linux] + - libpng # [linux] + - freetype # [linux] test: requires: @@ -97,3 +94,4 @@ extra: recipe-maintainers: - pkgw - tschoonj + - xhochy From bf708043ca364b3ace9d52cd1ef60491a2f338c1 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 17 Apr 2024 09:24:33 +0200 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.34.1, and conda-forge-pinning 2024.04.16.19.44.50 --- .ci_support/linux_64_.yaml | 6 ++++++ .ci_support/linux_aarch64_.yaml | 6 ++++++ .ci_support/linux_ppc64le_.yaml | 6 ++++++ .ci_support/win_64_.yaml | 2 -- .github/CODEOWNERS | 2 +- README.md | 1 + 6 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 196752b..43f456c 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -16,10 +16,16 @@ channel_targets: - conda-forge main docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +freetype: +- '2' gdk_pixbuf: - '2' glib: - '2' +harfbuzz: +- '8' +libpng: +- '1.6' libxml2: - '2' pango: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 6dd059b..7789cd0 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -20,10 +20,16 @@ channel_targets: - conda-forge main docker_image: - quay.io/condaforge/linux-anvil-aarch64 +freetype: +- '2' gdk_pixbuf: - '2' glib: - '2' +harfbuzz: +- '8' +libpng: +- '1.6' libxml2: - '2' pango: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 772f87e..6d030cc 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -16,10 +16,16 @@ channel_targets: - conda-forge main docker_image: - quay.io/condaforge/linux-anvil-ppc64le +freetype: +- '2' gdk_pixbuf: - '2' glib: - '2' +harfbuzz: +- '8' +libpng: +- '1.6' libxml2: - '2' pango: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index baf6eab..f0bdffe 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -12,8 +12,6 @@ gdk_pixbuf: - '2' glib: - '2' -libiconv: -- '1' libxml2: - '2' pango: diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 8f7fac8..d929700 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @pkgw @tschoonj \ No newline at end of file +* @pkgw @tschoonj @xhochy \ No newline at end of file diff --git a/README.md b/README.md index db136f2..74866b7 100644 --- a/README.md +++ b/README.md @@ -199,4 +199,5 @@ Feedstock Maintainers * [@pkgw](https://github.com/pkgw/) * [@tschoonj](https://github.com/tschoonj/) +* [@xhochy](https://github.com/xhochy/)