summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorJuergen Beisert <jbe@pengutronix.de>2011-01-04 17:41:37 +0100
committerJuergen Beisert <jbe@pengutronix.de>2011-01-05 15:19:20 +0100
commitabc1d43d1509614b53284c6edc4ec89fc9caab78 (patch)
tree87ceeedcd41f9fadd70238c9d952d88e68aceb8c /patches
parentc546e1a71fd6ec526dd526a739c4774a18b424de (diff)
downloadptxdist-abc1d43d1509614b53284c6edc4ec89fc9caab78.tar.gz
ptxdist-abc1d43d1509614b53284c6edc4ec89fc9caab78.tar.xz
XORG libXft: Minor update
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r--patches/libXft-2.1.14/0001-xft-config-add-SYSROOT-support.patch35
-rw-r--r--patches/libXft-2.1.14/series1
2 files changed, 0 insertions, 36 deletions
diff --git a/patches/libXft-2.1.14/0001-xft-config-add-SYSROOT-support.patch b/patches/libXft-2.1.14/0001-xft-config-add-SYSROOT-support.patch
deleted file mode 100644
index d5191ecce..000000000
--- a/patches/libXft-2.1.14/0001-xft-config-add-SYSROOT-support.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From edec345978a5f2bb283ad35bab594ff75ea5b4c1 Mon Sep 17 00:00:00 2001
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Date: Sun, 10 Jan 2010 01:04:21 +0100
-Subject: [PATCH] xft-config: add SYSROOT support
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
----
- xft-config.in | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/xft-config.in b/xft-config.in
-index 549b73a..6f25ecc 100644
---- a/xft-config.in
-+++ b/xft-config.in
-@@ -84,14 +84,14 @@ if test "$echo_exec_prefix" = "yes" ; then
- fi
-
- if test "$echo_cflags" = "yes" ; then
-- cflags="-I${includedir} ${freetypecflags} ${fontconfigcflags} ${xrendercflags}"
-+ cflags="-I${SYSROOT}${includedir} ${freetypecflags} ${fontconfigcflags} ${xrendercflags}"
- echo $cflags
- fi
-
- if test "$echo_libs" = "yes" ; then
- libs="-lXft -lX11 ${freetypelibs} ${fontconfiglibs} ${xrenderlibs}"
-- if test "${libdir}" != "/usr/lib" ; then
-- echo -L${libdir} $libs
-+ if test "${SYSROOT}${libdir}" != "/usr/lib" ; then
-+ echo -L${SYSROOT}${libdir} $libs
- else
- echo $libs
- fi
---
-1.6.6
-
diff --git a/patches/libXft-2.1.14/series b/patches/libXft-2.1.14/series
deleted file mode 100644
index cadd210cf..000000000
--- a/patches/libXft-2.1.14/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-xft-config-add-SYSROOT-support.patch