1 files changed, 103 insertions, 0 deletions
diff --git a/patches/freetype-2.6.3/0001-generate-freetype-config-and-freetype2.pc-correctly.patch b/patches/freetype-2.6.3/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
new file mode 100644
index 000000000..a6a2272c1
--- /dev/null
+++ b/patches/freetype-2.6.3/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
@@ -0,0 +1,103 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Wed, 20 Nov 2013 14:06:25 +0100
+Subject: [PATCH] generate freetype-config and freetype2.pc correctly
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ builds/unix/configure.ac       |  4 +++-
+ builds/unix/freetype-config.in | 12 ++++++------
+ builds/unix/freetype2.in       | 14 +++++++-------
+ builds/unix/unix-def.in        |  3 ---
+ 4 files changed, 16 insertions(+), 17 deletions(-)
+
+diff --git a/builds/unix/configure.ac b/builds/unix/configure.ac
+index b568e51e04e2..cdb0df29d72f 100644
+--- a/builds/unix/configure.ac
++++ b/builds/unix/configure.ac
+@@ -1006,7 +1006,9 @@ AC_CONFIG_HEADERS([ftconfig.h:ftconfig.in],
+ # and `builds/unix/unix-cc.mk' that will be used by the build system
+ #
+ AC_CONFIG_FILES([unix-cc.mk:unix-cc.in
+-                 unix-def.mk:unix-def.in])
++                 unix-def.mk:unix-def.in
++                 freetype-config:freetype-config.in
++                 freetype2.pc:freetype2.in])
+ 
+ # re-generate the Jamfile to use libtool now
+ #
+diff --git a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in
+index f74707d5aea1..e18f5cd76e77 100644
+--- a/builds/unix/freetype-config.in
++++ b/builds/unix/freetype-config.in
+@@ -12,11 +12,11 @@
+ LC_ALL=C
+ export LC_ALL
+ 
+-prefix="%prefix%"
+-exec_prefix="%exec_prefix%"
++prefix="@prefix@"
++exec_prefix="@exec_prefix@"
+ exec_prefix_set="no"
+-includedir="%includedir%"
+-libdir="%libdir%"
++includedir="@includedir@"
++libdir="@libdir@"
+ 
+ usage()
+ {
+@@ -74,7 +74,7 @@ while test $# -gt 0 ; do
+     echo_exec_prefix=yes
+     ;;
+   --version)
+-    echo %ft_version%
++    echo @ft_version@
+     exit 0
+     ;;
+   --ftversion)
+@@ -141,7 +141,7 @@ fi
+ 
+ if test "$echo_libs" = "yes" ; then
+   libs="-lfreetype"
+-  staticlibs="%LIBSSTATIC_CONFIG%"
++  staticlibs="@LIBSSTATIC_CONFIG@"
+   if test "$show_static" = "yes" ; then
+     libs="$staticlibs"
+   fi
+diff --git a/builds/unix/freetype2.in b/builds/unix/freetype2.in
+index c4dfda4abcca..8c4d7e184293 100644
+--- a/builds/unix/freetype2.in
++++ b/builds/unix/freetype2.in
+@@ -1,14 +1,14 @@
+-prefix=%prefix%
+-exec_prefix=%exec_prefix%
+-libdir=%libdir%
+-includedir=%includedir%
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
+ 
+ Name: FreeType 2
+ URL: http://freetype.org
+ Description: A free, high-quality, and portable font engine.
+-Version: %ft_version%
++Version: @ft_version@
+ Requires:
+-Requires.private: %REQUIRES_PRIVATE%
++Requires.private: @REQUIRES_PRIVATE@
+ Libs: -L${libdir} -lfreetype
+-Libs.private: %LIBS_PRIVATE%
++Libs.private: @LIBS_PRIVATE@
+ Cflags: -I${includedir}/freetype2
+diff --git a/builds/unix/unix-def.in b/builds/unix/unix-def.in
+index f7b557fb4094..71bb39cb3959 100644
+--- a/builds/unix/unix-def.in
++++ b/builds/unix/unix-def.in
+@@ -142,7 +142,4 @@ $(OBJ_BUILD)/freetype2.pc: $(TOP_DIR)/builds/unix/freetype2.in
+ 	chmod a-w $@.tmp
+ 	mv $@.tmp $@
+ 
+-all install: $(OBJ_BUILD)/freetype-config \
+-     $(OBJ_BUILD)/freetype2.pc
+-
+ # EOF