Commit 9aa82356 authored by changseok.oh@collabora.com's avatar changseok.oh@collabora.com
Browse files

[GTK] Fix a c++11 compliance issue for fontconfig

https://bugs.webkit.org/show_bug.cgi?id=127283

Reviewed by Martin Robinson.

fontconfig-2.8.0 is not compliant with C++11. So I propose to apply a
hotfix until bumping fontconfig up.

* gtk/jhbuild.modules:
* gtk/patches/fontconfig-C-11-requires-a-space-between-literal-and-identifier.patch: Added.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@162448 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent a059000f
2014-01-21 ChangSeok Oh <changseok.oh@collabora.com>
[GTK] Fix a c++11 compliance issue for fontconfig
https://bugs.webkit.org/show_bug.cgi?id=127283
Reviewed by Martin Robinson.
fontconfig-2.8.0 is not compliant with C++11. So I propose to apply a
hotfix until bumping fontconfig up.
* gtk/jhbuild.modules:
* gtk/patches/fontconfig-C-11-requires-a-space-between-literal-and-identifier.patch: Added.
2014-01-21 Peter Molnar <pmolnar.u-szeged@partner.samsung.com>
 
run-jsc-stress-tests should accept --child-processes option and WEBKIT_TEST_CHILD_PROCESSES env.var
......
......@@ -193,6 +193,7 @@
repo="freedesktop.org"
hash="sha256:fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335"
md5sum="77e15a92006ddc2adbb06f840d591c0e">
<patch file="fontconfig-C-11-requires-a-space-between-literal-and-identifier.patch" strip="1"/>
</branch>
</autotools>
......
From 7069d717e982adcf8e1d300cbd10eec6322a65c9 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Sun, 22 Apr 2012 21:40:44 +0900
Subject: [PATCH] C++11 requires a space between literal and identifier
Reported by Buganini
---
fontconfig/fontconfig.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index 0e2ca50..b27ccb5 100644
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -112,9 +112,9 @@ typedef int FcBool;
#define FC_DECORATIVE "decorative" /* Bool - true if style is a decorative variant */
#define FC_LCD_FILTER "lcdfilter" /* Int */
-#define FC_CACHE_SUFFIX ".cache-"FC_CACHE_VERSION
-#define FC_DIR_CACHE_FILE "fonts.cache-"FC_CACHE_VERSION
-#define FC_USER_CACHE_FILE ".fonts.cache-"FC_CACHE_VERSION
+#define FC_CACHE_SUFFIX ".cache-" FC_CACHE_VERSION
+#define FC_DIR_CACHE_FILE "fonts.cache-" FC_CACHE_VERSION
+#define FC_USER_CACHE_FILE ".fonts.cache-" FC_CACHE_VERSION
/* Adjust outline rasterizer */
#define FC_CHAR_WIDTH "charwidth" /* Int */
--
1.8.3.2
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment