Date: Wednesday, December 25, 2013 @ 18:35:31 Author: andyrtr Revision: 202704
upgpkg: libxft 2.3.1-2 fix build with new freetype; FS#38263 Added: libxft/trunk/freetype_header.patch Modified: libxft/trunk/PKGBUILD -----------------------+ PKGBUILD | 10 +++++++--- freetype_header.patch | 30 ++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-12-25 15:37:00 UTC (rev 202703) +++ PKGBUILD 2013-12-25 17:35:31 UTC (rev 202704) @@ -3,7 +3,7 @@ pkgname=libxft pkgver=2.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="FreeType-based font drawing library for X" arch=('i686' 'x86_64') license=('custom') @@ -10,11 +10,15 @@ url="http://xorg.freedesktop.org/" depends=('fontconfig' 'libxrender') makedepends=('pkgconfig') -source=("${url}/releases/individual/lib/libXft-${pkgver}.tar.bz2") -sha256sums=('7fce32b92dcb7b2869bed567af2abc7bbad0d5d6fcf471b8a3e137964a31bbbd') +source=("${url}/releases/individual/lib/libXft-${pkgver}.tar.bz2" + freetype_header.patch) +sha256sums=('7fce32b92dcb7b2869bed567af2abc7bbad0d5d6fcf471b8a3e137964a31bbbd' + '991c91998e61e83061c6c08218a2e6ac5643f16183750f73ee74f29fdd440be9') build() { cd "${srcdir}/libXft-${pkgver}" + # fix build for freetype header moved - http://cgit.freedesktop.org/xorg/lib/libXft/patch/?id=4acfdaf95adb0a05c2a25550bdde036c865902f4 + patch -Np1 -i ${srcdir}/freetype_header.patch ./configure --prefix=/usr --sysconfdir=/etc --disable-static make } Added: freetype_header.patch =================================================================== --- freetype_header.patch (rev 0) +++ freetype_header.patch 2013-12-25 17:35:31 UTC (rev 202704) @@ -0,0 +1,30 @@ +From 4acfdaf95adb0a05c2a25550bdde036c865902f4 Mon Sep 17 00:00:00 2001 +From: Julien Cristau <jcris...@debian.org> +Date: Mon, 02 Dec 2013 15:26:24 +0000 +Subject: Use FT_*_H macros instead of including <freetype/*.h> + +freetype moved its headers around in 2.5.1. + +Signed-off-by: Julien Cristau <jcris...@debian.org> +--- +diff --git a/src/xftglyphs.c b/src/xftglyphs.c +index 2f3dc5a..4b5fb82 100644 +--- a/src/xftglyphs.c ++++ b/src/xftglyphs.c +@@ -21,10 +21,10 @@ + */ + + #include "xftint.h" +-#include <freetype/ftoutln.h> +-#include <freetype/ftlcdfil.h> ++#include FT_OUTLINE_H ++#include FT_LCD_FILTER_H + +-#include <freetype/ftsynth.h> ++#include FT_SYNTHESIS_H + + /* + * Validate the memory info for a font +-- +cgit v0.9.0.2-2-gbebe +