summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2009-03-26 21:28:38 +0000
committerMarc Kleine-Budde <mkl@pengutronix.de>2009-03-26 21:28:38 +0000
commit6e9a5bf12f19ca168bde09b6417b6d9ca4000f09 (patch)
tree4a29247a1200b589054b49f93f223b4daceaf2e0 /patches
parentb803853f7186bd066467039e4ffcf6623057c8cc (diff)
downloadptxdist-6e9a5bf12f19ca168bde09b6417b6d9ca4000f09.tar.gz
ptxdist-6e9a5bf12f19ca168bde09b6417b6d9ca4000f09.tar.xz
[freetype] version bump to 3.2.9
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10173 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'patches')
-rw-r--r--patches/freetype-2.3.9/generic/builds_unix_freetype-config_in_sysroot.diff (renamed from patches/freetype-2.3.8/generic/builds_unix_freetype-config_in_sysroot.diff)47
-rw-r--r--patches/freetype-2.3.9/generic/series (renamed from patches/freetype-2.3.8/generic/series)0
2 files changed, 23 insertions, 24 deletions
diff --git a/patches/freetype-2.3.8/generic/builds_unix_freetype-config_in_sysroot.diff b/patches/freetype-2.3.9/generic/builds_unix_freetype-config_in_sysroot.diff
index 4caeaa8af..e7a1b522c 100644
--- a/patches/freetype-2.3.8/generic/builds_unix_freetype-config_in_sysroot.diff
+++ b/patches/freetype-2.3.9/generic/builds_unix_freetype-config_in_sysroot.diff
@@ -18,28 +18,11 @@
# builds/unix/freetype-config.in | 22 +++++++++++-----------
# 1 file changed, 11 insertions(+), 11 deletions(-)
#
-Index: freetype-2.3.4/builds/unix/freetype-config.in
+Index: freetype-2.3.9/builds/unix/freetype-config.in
===================================================================
---- freetype-2.3.4.orig/builds/unix/freetype-config.in
-+++ freetype-2.3.4/builds/unix/freetype-config.in
-@@ -76,13 +76,13 @@ while test $# -gt 0 ; do
- exit 0
- ;;
- --ftversion)
-- major=`grep define @prefix@/include/freetype2/freetype/freetype.h \
-+ major=`grep define ${SYSROOT}@prefix@/include/freetype2/freetype/freetype.h \
- | grep FREETYPE_MAJOR \
- | sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'`
-- minor=`grep define @prefix@/include/freetype2/freetype/freetype.h \
-+ minor=`grep define ${SYSROOT}@prefix@/include/freetype2/freetype/freetype.h \
- | grep FREETYPE_MINOR \
- | sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'`
-- patch=`grep define @prefix@/include/freetype2/freetype/freetype.h \
-+ patch=`grep define ${SYSROOT}@prefix@/include/freetype2/freetype/freetype.h \
- | grep FREETYPE_PATCH \
- | sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'`
- echo $major.$minor.$patch
-@@ -111,11 +111,11 @@ if test "$local_prefix" = "yes" ; then
+--- freetype-2.3.9.orig/builds/unix/freetype-config.in
++++ freetype-2.3.9/builds/unix/freetype-config.in
+@@ -101,11 +101,11 @@ if test "$local_prefix" = "yes" ; then
fi
if test "$echo_prefix" = "yes" ; then
@@ -53,7 +36,23 @@ Index: freetype-2.3.4/builds/unix/freetype-config.in
fi
if test "$exec_prefix_set" = "yes" ; then
-@@ -128,9 +128,9 @@ else
+@@ -118,22 +118,22 @@ else
+ fi
+
+ if test "$echo_ft_version" = "yes" ; then
+- major=`grep define $includedir/freetype2/freetype/freetype.h \
++ major=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
+ | grep FREETYPE_MAJOR \
+ | sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'`
+- minor=`grep define $includedir/freetype2/freetype/freetype.h \
++ minor=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
+ | grep FREETYPE_MINOR \
+ | sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'`
+- patch=`grep define $includedir/freetype2/freetype/freetype.h \
++ patch=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
+ | grep FREETYPE_PATCH \
+ | sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'`
+ echo $major.$minor.$patch
fi
if test "$echo_cflags" = "yes" ; then
@@ -66,7 +65,7 @@ Index: freetype-2.3.4/builds/unix/freetype-config.in
else
echo $cflags
fi
-@@ -142,8 +142,8 @@ if test "$echo_libs" = "yes" ; then
+@@ -145,8 +145,8 @@ if test "$echo_libs" = "yes" ; then
eval "rpath=\"$hardcode_libdir_flag_spec\""
fi
libs="-lfreetype @LIBZ@ @FT2_EXTRA_LIBS@"
@@ -77,7 +76,7 @@ Index: freetype-2.3.4/builds/unix/freetype-config.in
else
echo $libs
fi
-@@ -151,7 +151,7 @@ fi
+@@ -154,7 +154,7 @@ fi
if test "$echo_libtool" = "yes" ; then
convlib="libfreetype.la"
diff --git a/patches/freetype-2.3.8/generic/series b/patches/freetype-2.3.9/generic/series
index 5d703e3a2..5d703e3a2 100644
--- a/patches/freetype-2.3.8/generic/series
+++ b/patches/freetype-2.3.9/generic/series