[vlc-commits] Contribs: update fontconfig to 2.10.2

[Jean-Baptiste Kempf]

vlc/vlc-2.0 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Mar 10 12:41:53 2013 +0100| [317ec1f4495d804299ff2636486bdca00a233fb9] | committer: Jean-Baptiste Kempf

Contribs: update fontconfig to 2.10.2
(cherry picked from commit f9ac72c893dce40875b65bbaa15a6b5765636ae4)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=317ec1f4495d804299ff2636486bdca00a233fb9
---

 contrib/src/fontconfig/SHA512SUMS              |    2 +-
 contrib/src/fontconfig/fontconfig-noxml2.patch |    8 ++++----
 contrib/src/fontconfig/rules.mak               |    3 +--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/contrib/src/fontconfig/SHA512SUMS b/contrib/src/fontconfig/SHA512SUMS
index e635f7b..97023fc 100644
--- a/contrib/src/fontconfig/SHA512SUMS
+++ b/contrib/src/fontconfig/SHA512SUMS
@@ -1 +1 @@
-a110e72cc631f1e374324a02f6ba9526b89a547cafe2ae27b9913938b19018843b2940084d62f0dfaf38a6919dea6974fb98422d3908026f6873d5fba17c55a0  fontconfig-2.8.0.tar.gz
+d8886b3bb40790591120ae7701efa7430dcb8c171eaa9bac3c42fe62cb0c9646c66aded49a8683a4299e2dbeda90dbf4ca09bb53075f9c089f95097135142cb6  fontconfig-2.10.2.tar.gz
diff --git a/contrib/src/fontconfig/fontconfig-noxml2.patch b/contrib/src/fontconfig/fontconfig-noxml2.patch
index 6f7f6f5..a560f96 100644
--- a/contrib/src/fontconfig/fontconfig-noxml2.patch
+++ b/contrib/src/fontconfig/fontconfig-noxml2.patch
@@ -69,15 +69,15 @@
 diff -ruN fontconfig/src/fcxml.c fontconfig.new/src/fcxml.c
 --- fontconfig/src/fcxml.c	2009-08-13 16:08:49.000000000 +0200
 +++ fontconfig.new/src/fcxml.c	2009-08-19 00:03:35.000000000 +0200
-@@ -2466,13 +2466,18 @@
+@@ -2850,6 +2850,7 @@
  bail0:
      return ret || !complain;
  }
 +#endif
-+
  
- FcBool
- FcConfigParseAndLoad (FcConfig	    *config,
+ #ifdef _WIN32
+ pfnGetSystemWindowsDirectory pGetSystemWindowsDirectory = NULL;
+@@ -2861,7 +2862,10 @@
  		      const FcChar8 *name,
  		      FcBool	    complain)
  {
diff --git a/contrib/src/fontconfig/rules.mak b/contrib/src/fontconfig/rules.mak
index 59b5717..576322c 100644
--- a/contrib/src/fontconfig/rules.mak
+++ b/contrib/src/fontconfig/rules.mak
@@ -1,6 +1,6 @@
 # fontconfig
 
-FONTCONFIG_VERSION := 2.8.0
+FONTCONFIG_VERSION := 2.10.2
 FONTCONFIG_URL := http://fontconfig.org/release/fontconfig-$(FONTCONFIG_VERSION).tar.gz
 
 PKGS += fontconfig
@@ -15,7 +15,6 @@ $(TARBALLS)/fontconfig-$(FONTCONFIG_VERSION).tar.gz:
 
 fontconfig: fontconfig-$(FONTCONFIG_VERSION).tar.gz .sum-fontconfig
 	$(UNPACK)
-	$(APPLY) $(SRC)/fontconfig/fontconfig-march.patch
 ifdef HAVE_WIN32
 	$(APPLY) $(SRC)/fontconfig/fontconfig-win32.patch
 	$(APPLY) $(SRC)/fontconfig/fontconfig-noxml2.patch