[gnome-ostree] manifest: Add another fontconfig patch
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-ostree] manifest: Add another fontconfig patch
- Date: Thu, 10 Jan 2013 13:51:50 +0000 (UTC)
commit ed0b4f375d8d60ff478b295322b5a3d11514f03d
Author: Colin Walters <walters verbum org>
Date: Thu Jan 10 08:51:27 2013 -0500
manifest: Add another fontconfig patch
manifest.json | 3 ++-
patches/fontconfig-test-build.patch | 24 ++++++++++++++++++++++++
2 files changed, 26 insertions(+), 1 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index fc1e6d7..840cd7f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -119,7 +119,8 @@
"patches": ["freetype-autogen.patch"]},
{"src": "fd:fontconfig",
- "patches": ["fontconfig-autogen.patch"]},
+ "patches": ["fontconfig-autogen.patch",
+ "fontconfig-test-build.patch"]},
{"src": "fd:xorg/util/macros",
"component": "devel",
diff --git a/patches/fontconfig-test-build.patch b/patches/fontconfig-test-build.patch
new file mode 100644
index 0000000..dbe021c
--- /dev/null
+++ b/patches/fontconfig-test-build.patch
@@ -0,0 +1,24 @@
+From e265118cfc6fdfefe6a940e8e3b621dd4cf6d07d Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Thu, 10 Jan 2013 08:46:33 -0500
+Subject: [PATCH] test: Ensure we find the uninstalled fontconfig header
+
+---
+ test/Makefile.am | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/test/Makefile.am b/test/Makefile.am
+index 3ba8e93..5e2fdd4 100644
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -7,6 +7,7 @@ TESTDATA=4x6.pcf 8x16.pcf out.expected fonts.conf.in
+ if HAVE_PTHREAD
+ check_PROGRAMS = test-pthread
+ noinst_PROGRAMS = $(check_PROGRAMS)
++test_pthread_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
+ test_pthread_LDADD = $(top_builddir)/src/libfontconfig.la
+ # We don't enable this test by default because it will require config and fonts
+ # to meaningfully test anything, and we are not installed yet.
+--
+1.7.1
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]