Contribs: update fontconfig to 2.10.2

diff --git a/contrib/src/fontconfig/SHA512SUMS b/contrib/src/fontconfig/SHA512SUMS
index e635f7bfd7bd66f90f12e91064f8e50fa471e659..97023fc85e075f4854894df3a9fb446d21e01b62 100644 (file)
--- 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 6f7f6f5d790ae4760fae9fe0810899f1d813e521..a560f964b440b070e34dacd4c1ede09c74bb093b 100644 (file)
--- 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 59b57177d612d8b514fd7529622c3d53551fb6b0..576322c7a944d9cfc54291c457d1a242aa437b8f 100644 (file)
--- 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