Title: [165808] trunk/Tools
- Revision
- 165808
- Author
- [email protected]
- Date
- 2014-03-18 05:51:19 -0700 (Tue, 18 Mar 2014)
Log Message
[EFL] fontconfig-2.8.0 is not compliant with C++11 leading to a build break
https://bugs.webkit.org/show_bug.cgi?id=130336
Patch by Robert Plociennik <[email protected]> on 2014-03-18
Reviewed by Gyuyoung Kim.
Compilation with gcc 4.8.x results in 'invalid suffix on literal; C++11
requires a space between literal and string macro [-Wliteral-suffix]'
warning treated as error.
This patch applies a solution from r162448 to the EFL port.
* efl/patches/fontconfig-C-11-requires-a-space-between-literal-and-identifier.patch: Added.
* efl/jhbuild.modules: Added appropriate patch section.
Modified Paths
Added Paths
Diff
Modified: trunk/Tools/ChangeLog (165807 => 165808)
--- trunk/Tools/ChangeLog 2014-03-18 11:56:53 UTC (rev 165807)
+++ trunk/Tools/ChangeLog 2014-03-18 12:51:19 UTC (rev 165808)
@@ -1,3 +1,19 @@
+2014-03-18 Robert Plociennik <[email protected]>
+
+ [EFL] fontconfig-2.8.0 is not compliant with C++11 leading to a build break
+ https://bugs.webkit.org/show_bug.cgi?id=130336
+
+ Reviewed by Gyuyoung Kim.
+
+ Compilation with gcc 4.8.x results in 'invalid suffix on literal; C++11
+ requires a space between literal and string macro [-Wliteral-suffix]'
+ warning treated as error.
+
+ This patch applies a solution from r162448 to the EFL port.
+
+ * efl/patches/fontconfig-C-11-requires-a-space-between-literal-and-identifier.patch: Added.
+ * efl/jhbuild.modules: Added appropriate patch section.
+
2014-03-17 Ryosuke Niwa <[email protected]>
webkitpy test rebaseline.
Modified: trunk/Tools/efl/jhbuild.modules (165807 => 165808)
--- trunk/Tools/efl/jhbuild.modules 2014-03-18 11:56:53 UTC (rev 165807)
+++ trunk/Tools/efl/jhbuild.modules 2014-03-18 12:51:19 UTC (rev 165808)
@@ -134,6 +134,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>
Added: trunk/Tools/efl/patches/fontconfig-C-11-requires-a-space-between-literal-and-identifier.patch (0 => 165808)
--- trunk/Tools/efl/patches/fontconfig-C-11-requires-a-space-between-literal-and-identifier.patch (rev 0)
+++ trunk/Tools/efl/patches/fontconfig-C-11-requires-a-space-between-literal-and-identifier.patch 2014-03-18 12:51:19 UTC (rev 165808)
@@ -0,0 +1,30 @@
+From 7069d717e982adcf8e1d300cbd10eec6322a65c9 Mon Sep 17 00:00:00 2001
+From: Akira TAGOH <[email protected]>
+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
+
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
