Patchwork [10/11] libxft: upgrade to 2.3.2

login
register
mail settings
Submitter Ross Burton
Date July 22, 2014, 6:38 p.m.
Message ID <1406054301-9027-10-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/76407/
State Accepted
Commit 252b7ee21e264c36e841bcfe9f6ade134fcbef7a
Headers show

Comments

Ross Burton - July 22, 2014, 6:38 p.m.
Remove patch that has been merged upstream.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../xorg-lib/libxft/freetype.patch                 |   39 --------------------
 .../xorg-lib/{libxft_2.3.1.bb => libxft_2.3.2.bb}  |    6 +--
 2 files changed, 2 insertions(+), 43 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-lib/libxft/freetype.patch
 rename meta/recipes-graphics/xorg-lib/{libxft_2.3.1.bb => libxft_2.3.2.bb} (85%)

Patch

diff --git a/meta/recipes-graphics/xorg-lib/libxft/freetype.patch b/meta/recipes-graphics/xorg-lib/libxft/freetype.patch
deleted file mode 100644
index 9f1aa21..0000000
--- a/meta/recipes-graphics/xorg-lib/libxft/freetype.patch
+++ /dev/null
@@ -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
-
diff --git a/meta/recipes-graphics/xorg-lib/libxft_2.3.1.bb b/meta/recipes-graphics/xorg-lib/libxft_2.3.2.bb
similarity index 85%
rename from meta/recipes-graphics/xorg-lib/libxft_2.3.1.bb
rename to meta/recipes-graphics/xorg-lib/libxft_2.3.2.bb
index 16838f0..a967cdc 100644
--- a/meta/recipes-graphics/xorg-lib/libxft_2.3.1.bb
+++ b/meta/recipes-graphics/xorg-lib/libxft_2.3.2.bb
@@ -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"