about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/libraries/cairo/0001-test-don-t-always-build-FreeType-dependent-test.patch
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2019-04-22 15:36:13 +0000
committerAlyssa Ross <hi@alyssa.is>2019-04-23 10:12:29 +0000
commit1ab2a0d1102c29ae7dd5c52816c26ce93002d3b6 (patch)
treeadbb74821dc71054a7d2341bcec6b6877b882987 /nixpkgs/pkgs/development/libraries/cairo/0001-test-don-t-always-build-FreeType-dependent-test.patch
parent684bf817e76b76e543d8772e3ea21214f1ac9504 (diff)
downloadnixlib-1ab2a0d1102c29ae7dd5c52816c26ce93002d3b6.tar
nixlib-1ab2a0d1102c29ae7dd5c52816c26ce93002d3b6.tar.gz
nixlib-1ab2a0d1102c29ae7dd5c52816c26ce93002d3b6.tar.bz2
nixlib-1ab2a0d1102c29ae7dd5c52816c26ce93002d3b6.tar.lz
nixlib-1ab2a0d1102c29ae7dd5c52816c26ce93002d3b6.tar.xz
nixlib-1ab2a0d1102c29ae7dd5c52816c26ce93002d3b6.tar.zst
nixlib-1ab2a0d1102c29ae7dd5c52816c26ce93002d3b6.zip
cairo: make freetype support optional
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/cairo/0001-test-don-t-always-build-FreeType-dependent-test.patch')
-rw-r--r--nixpkgs/pkgs/development/libraries/cairo/0001-test-don-t-always-build-FreeType-dependent-test.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/cairo/0001-test-don-t-always-build-FreeType-dependent-test.patch b/nixpkgs/pkgs/development/libraries/cairo/0001-test-don-t-always-build-FreeType-dependent-test.patch
new file mode 100644
index 000000000000..9688aca55ab9
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/cairo/0001-test-don-t-always-build-FreeType-dependent-test.patch
@@ -0,0 +1,34 @@
+From 3910b1155f2d5a98142ade67e09f097cb94a2d2e Mon Sep 17 00:00:00 2001
+From: Alyssa Ross <hi@alyssa.is>
+Date: Mon, 22 Apr 2019 09:53:54 +0000
+Subject: [PATCH 1/5] test: don't always build FreeType-dependent test
+
+This caused a build failure when attempting to build cairo without
+FreeType available on the system.
+---
+ test/Makefile.sources | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/Makefile.sources b/test/Makefile.sources
+index c47131faf..cc3d81f7e 100644
+--- a/test/Makefile.sources
++++ b/test/Makefile.sources
+@@ -144,7 +144,6 @@ test_sources = \
+ 	font-face-get-type.c				\
+ 	font-matrix-translation.c			\
+ 	font-options.c					\
+-	font-variations.c				\
+ 	glyph-cache-pressure.c				\
+ 	get-and-set.c					\
+ 	get-clip.c					\
+@@ -399,6 +398,7 @@ pthread_test_sources =					\
+ 
+ ft_font_test_sources = \
+ 	bitmap-font.c \
++	font-variations.c \
+ 	ft-font-create-for-ft-face.c \
+ 	ft-show-glyphs-positioning.c \
+ 	ft-show-glyphs-table.c \
+-- 
+2.19.2
+