libxft: upgrade to 2.3.2

Remove patch that has been merged upstream.

(From OE-Core rev: c2a4fa3669ca8607845347c0c196fa96478156cb)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2014-07-22 19:38:20 +01:00
committed by Richard Purdie
parent 4bdd18ed2e
commit 252b7ee21e
2 changed files with 2 additions and 43 deletions

View File

@@ -1,39 +0,0 @@
Upstream-Status: Submitted
Signed-off-by: Ross Burton <ross.burton@intel.com>
From f568fa5a8220fd06659c0f26a93adcc81a42917c Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Mon, 2 Dec 2013 13:48:40 +0000
Subject: [PATCH] xftglyphs: use recommend freetype inclusion
FreeType recommends to use their special macros to include the headers, because
it gives them the ability to move headers around. They did this in 2.5.1 (yes,
a point release) and this direct inclusion doesn't work anymore.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
src/xftglyphs.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/xftglyphs.c b/src/xftglyphs.c
index 2f3dc5a..53302f0 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 <freetype/ftsynth.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#include FT_LCD_FILTER_H
+#include FT_SYNTHESIS_H
/*
* Validate the memory info for a font
--
1.8.5

View File

@@ -20,10 +20,8 @@ PROVIDES = "xft"
PE = "1"
SRC_URI += "file://freetype.patch"
SRC_URI[md5sum] = "78d64dece560c9e8699199f3faa521c0"
SRC_URI[sha256sum] = "7fce32b92dcb7b2869bed567af2abc7bbad0d5d6fcf471b8a3e137964a31bbbd"
SRC_URI[md5sum] = "331b3a2a3a1a78b5b44cfbd43f86fcfe"
SRC_URI[sha256sum] = "f5a3c824761df351ca91827ac221090943ef28b248573486050de89f4bfcdc4c"
XORG_PN = "libXft"