[WPE] Update fontconfig to 2.12.4.
authorMs2ger@igalia.com <Ms2ger@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 20 Sep 2017 14:38:52 +0000 (14:38 +0000)
committerMs2ger@igalia.com <Ms2ger@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 20 Sep 2017 14:38:52 +0000 (14:38 +0000)
https://bugs.webkit.org/show_bug.cgi?id=177228

Reviewed by Carlos Garcia Campos.

* wpe/jhbuild.modules:
* wpe/patches/fontconfig-avoid-conflicts-with-integer-width-macros-from-TS-18.patch: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@222260 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/wpe/jhbuild.modules
Tools/wpe/patches/fontconfig-avoid-conflicts-with-integer-width-macros-from-TS-18.patch [deleted file]

index 4d91431..dac65db 100644 (file)
@@ -1,3 +1,13 @@
+2017-09-20  Ms2ger  <Ms2ger@igalia.com>
+
+        [WPE] Update fontconfig to 2.12.4.
+        https://bugs.webkit.org/show_bug.cgi?id=177228
+
+        Reviewed by Carlos Garcia Campos.
+
+        * wpe/jhbuild.modules:
+        * wpe/patches/fontconfig-avoid-conflicts-with-integer-width-macros-from-TS-18.patch: Removed.
+
 2017-09-19  Myles C. Maxfield  <mmaxfield@apple.com>
 
         WSL should be able to trap when something fatal happens
index 855c035..01ee431 100644 (file)
     <dependencies>
       <dep package="freetype6"/>
     </dependencies>
-    <branch module="software/fontconfig/release/fontconfig-2.11.1.tar.gz" version="2.11.1"
+    <branch module="software/fontconfig/release/fontconfig-2.12.4.tar.bz2" version="2.12.4"
             repo="freedesktop.org"
-            hash="sha256:b6b066c7dce3f436fdc0dfbae9d36122b38094f4f53bd8dffd45e195b0540d8d"
-            md5sum="e75e303b4f7756c2b16203a57ac87eba">
-        <patch file="fontconfig-avoid-conflicts-with-integer-width-macros-from-TS-18.patch" strip="1"/>
-    </branch>
+            hash="sha256:668293fcc4b3c59765cdee5cee05941091c0879edcc24dfec5455ef83912e45c"/>
   </autotools>
 
   <autotools id="harfbuzz" autogen-sh="configure"
diff --git a/Tools/wpe/patches/fontconfig-avoid-conflicts-with-integer-width-macros-from-TS-18.patch b/Tools/wpe/patches/fontconfig-avoid-conflicts-with-integer-width-macros-from-TS-18.patch
deleted file mode 100644 (file)
index e13f895..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-From 20cddc824c6501c2082cac41b162c34cd5fcc530 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 11 Dec 2016 14:32:00 -0800
-Subject: [PATCH] Avoid conflicts with integer width macros from TS
- 18661-1:2014
-
-glibc 2.25+ has now defined these macros in <limits.h>
-https://sourceware.org/git/?p=glibc.git;a=commit;h=5b17fd0da62bf923cb61d1bb7b08cf2e1f1f9c1a
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Submitted
-
- fontconfig/fontconfig.h | 2 +-
- src/fcobjs.h            | 2 +-
- src/fcobjshash.gperf    | 2 +-
- src/fcobjshash.h        | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-Index: fontconfig-2.11.1/fontconfig/fontconfig.h
-===================================================================
---- fontconfig-2.11.1.orig/fontconfig/fontconfig.h
-+++ fontconfig-2.11.1/fontconfig/fontconfig.h
-@@ -123,7 +123,8 @@ typedef int                FcBool;
- #define FC_USER_CACHE_FILE        ".fonts.cache-" FC_CACHE_VERSION
- /* Adjust outline rasterizer */
--#define FC_CHAR_WIDTH     "charwidth" /* Int */
-+#define FC_CHARWIDTH      "charwidth" /* Int */
-+#define FC_CHAR_WIDTH     FC_CHARWIDTH
- #define FC_CHAR_HEIGHT            "charheight"/* Int */
- #define FC_MATRIX         "matrix"    /* FcMatrix */
-Index: fontconfig-2.11.1/src/fcobjs.h
-===================================================================
---- fontconfig-2.11.1.orig/src/fcobjs.h
-+++ fontconfig-2.11.1/src/fcobjs.h
-@@ -51,7 +51,7 @@ FC_OBJECT (DPI,                      FcTypeDouble,   NULL)
- FC_OBJECT (RGBA,              FcTypeInteger,  NULL)
- FC_OBJECT (SCALE,             FcTypeDouble,   NULL)
- FC_OBJECT (MINSPACE,          FcTypeBool,     NULL)
--FC_OBJECT (CHAR_WIDTH,                FcTypeInteger,  NULL)
-+FC_OBJECT (CHARWIDTH,         FcTypeInteger,  NULL)
- FC_OBJECT (CHAR_HEIGHT,               FcTypeInteger,  NULL)
- FC_OBJECT (MATRIX,            FcTypeMatrix,   NULL)
- FC_OBJECT (CHARSET,           FcTypeCharSet,  FcCompareCharSet)
-Index: fontconfig-2.11.1/src/fcobjshash.gperf
-===================================================================
---- fontconfig-2.11.1.orig/src/fcobjshash.gperf
-+++ fontconfig-2.11.1/src/fcobjshash.gperf
-@@ -44,7 +44,7 @@ int id;
- "rgba",FC_RGBA_OBJECT
- "scale",FC_SCALE_OBJECT
- "minspace",FC_MINSPACE_OBJECT
--"charwidth",FC_CHAR_WIDTH_OBJECT
-+"charwidth",FC_CHARWIDTH_OBJECT
- "charheight",FC_CHAR_HEIGHT_OBJECT
- "matrix",FC_MATRIX_OBJECT
- "charset",FC_CHARSET_OBJECT
-Index: fontconfig-2.11.1/src/fcobjshash.h
-===================================================================
---- fontconfig-2.11.1.orig/src/fcobjshash.h
-+++ fontconfig-2.11.1/src/fcobjshash.h
-@@ -275,7 +275,7 @@ FcObjectTypeLookup (register const char
- #line 26 "fcobjshash.gperf"
-       {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str40,FC_WIDTH_OBJECT},
- #line 47 "fcobjshash.gperf"
--      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str41,FC_CHAR_WIDTH_OBJECT},
-+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str41,FC_CHARWIDTH_OBJECT},
- #line 48 "fcobjshash.gperf"
-       {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str42,FC_CHAR_HEIGHT_OBJECT},
- #line 44 "fcobjshash.gperf"