diff options
| -rw-r--r-- | patches/libXft-2.1.14/0001-xft-config-add-SYSROOT-support.patch | 35 | ||||
| -rw-r--r-- | patches/libXft-2.1.14/series | 1 | ||||
| -rw-r--r-- | rules/xorg-lib-Xft.make | 2 |
3 files changed, 1 insertions, 37 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 diff --git a/rules/xorg-lib-Xft.make b/rules/xorg-lib-Xft.make index fc6040acc..1f77db2fc 100644 --- a/rules/xorg-lib-Xft.make +++ b/rules/xorg-lib-Xft.make @@ -16,7 +16,7 @@ PACKAGES-$(PTXCONF_XORG_LIB_XFT) += xorg-lib-xft # # Paths and names # -XORG_LIB_XFT_VERSION := 2.1.14 +XORG_LIB_XFT_VERSION := 2.2.0 XORG_LIB_XFT := libXft-$(XORG_LIB_XFT_VERSION) XORG_LIB_XFT_SUFFIX := tar.bz2 XORG_LIB_XFT_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_XFT).$(XORG_LIB_XFT_SUFFIX) |