From 65eeff79fff8a1bfdf67ca51d147384f46f4d5c0 Mon Sep 17 00:00:00 2001
From: Nicolás Reynolds <fauno@endefensadelsl.org>
Date: Fri, 27 Dec 2013 23:55:53 +0000
Subject: Fri Dec 27 23:54:04 UTC 2013

---
 extra/libxft/PKGBUILD              | 12 ++++++++----
 extra/libxft/freetype_header.patch | 30 ++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 extra/libxft/freetype_header.patch

(limited to 'extra/libxft')

diff --git a/extra/libxft/PKGBUILD b/extra/libxft/PKGBUILD
index 9e04f5562..6bec9aa3d 100644
--- a/extra/libxft/PKGBUILD
+++ b/extra/libxft/PKGBUILD
@@ -1,20 +1,24 @@
-# $Id: PKGBUILD 198283 2013-10-30 13:55:28Z allan $
+# $Id: PKGBUILD 202705 2013-12-25 17:35:47Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxft
 pkgver=2.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="FreeType-based font drawing library for X"
 arch=('i686' 'x86_64')
 license=('custom')
 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
 }
diff --git a/extra/libxft/freetype_header.patch b/extra/libxft/freetype_header.patch
new file mode 100644
index 000000000..9aba8ee29
--- /dev/null
+++ b/extra/libxft/freetype_header.patch
@@ -0,0 +1,30 @@
+From 4acfdaf95adb0a05c2a25550bdde036c865902f4 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@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 <jcristau@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
+
-- 
cgit v1.2.3-54-g00ecf