From 441551c4d41a565a540013c45eae8b97136046c4 Mon Sep 17 00:00:00 2001
From: Isabel Paredes <isabel.paredes@quantstack.net>
Date: Tue, 26 Nov 2024 11:38:35 +0100
Subject: [PATCH] Update cairo (#1432)

* Enable png

* Update recipe

* Remove patches

* Add libffi
---
 recipes/recipes_emscripten/cairo/build.sh        |  6 +-----
 .../cairo/patches/cairo-wasm.patch               | 13 -------------
 recipes/recipes_emscripten/cairo/recipe.yaml     | 16 +++++++++-------
 3 files changed, 10 insertions(+), 25 deletions(-)
 delete mode 100644 recipes/recipes_emscripten/cairo/patches/cairo-wasm.patch

diff --git a/recipes/recipes_emscripten/cairo/build.sh b/recipes/recipes_emscripten/cairo/build.sh
index 6afd872e7..a8f08b569 100644
--- a/recipes/recipes_emscripten/cairo/build.sh
+++ b/recipes/recipes_emscripten/cairo/build.sh
@@ -2,17 +2,13 @@
 
 set -ex
 
-export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$BUILD_PREFIX/lib/pkgconfig
-export PKG_CONFIG=$BUILD_PREFIX/bin/pkg-config
-
 export CFLAGS="${CFLAGS} -DCAIRO_NO_MUTEX=1"
-export LDFLAGS="${LDFLAGS} -lz"
 
 meson_config_args=(
     -Dfontconfig=enabled
     -Dfreetype=enabled
     -Dglib=enabled
-    -Dpng=disabled
+    -Dpng=enabled
     -Dxlib=disabled
     -Dxlib-xcb=disabled
     -Dxcb=disabled
diff --git a/recipes/recipes_emscripten/cairo/patches/cairo-wasm.patch b/recipes/recipes_emscripten/cairo/patches/cairo-wasm.patch
deleted file mode 100644
index 0eb3e46dd..000000000
--- a/recipes/recipes_emscripten/cairo/patches/cairo-wasm.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/cairo-ft-private.h b/src/cairo-ft-private.h
-index 836f7e523..6b0e30223 100644
---- a/src/cairo-ft-private.h
-+++ b/src/cairo-ft-private.h
-@@ -43,6 +43,8 @@
- 
- #if CAIRO_HAS_FT_FONT
- 
-+#include FT_COLOR_H
-+
- CAIRO_BEGIN_DECLS
- 
- typedef struct _cairo_ft_unscaled_font cairo_ft_unscaled_font_t;
diff --git a/recipes/recipes_emscripten/cairo/recipe.yaml b/recipes/recipes_emscripten/cairo/recipe.yaml
index 8a0327f8d..a27db4f12 100644
--- a/recipes/recipes_emscripten/cairo/recipe.yaml
+++ b/recipes/recipes_emscripten/cairo/recipe.yaml
@@ -9,11 +9,9 @@ package:
 source:
   url: http://cairographics.org/releases/${{ name }}-${{ version }}.tar.xz
   sha256: 243a0736b978a33dee29f9cca7521733b78a65b5418206fef7bd1c3d4cf10b64
-  patches:
-  - patches/cairo-wasm.patch
 
 build:
-  number: 1
+  number: 2
 
 requirements:
   build:
@@ -32,12 +30,16 @@ requirements:
     - lzo
     - expat
     - zlib
+    - libffi
 
 tests:
-- script:
-    - test -f $PREFIX/lib/libcairo.a
-    - test -f $PREFIX/lib/libcairo-gobject.a
-    - test -f $PREFIX/include/cairo/cairo.h
+- package_contents:
+    lib:
+    - libcairo.a
+    - libcairo-script-interpreter.a
+    include:
+    - cairo/cairo.h
+    - cairo/cairo-svg.h
 
 about:
   homepage: http://cairographics.org/