[EFL] fontconfig-2.8.0 is not compliant with C++11 leading to a build break
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 18 Mar 2014 12:51:19 +0000 (12:51 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 18 Mar 2014 12:51:19 +0000 (12:51 +0000)
https://bugs.webkit.org/show_bug.cgi?id=130336

Patch by Robert Plociennik <r.plociennik@samsung.com> 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.

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

Tools/ChangeLog
Tools/efl/jhbuild.modules
Tools/efl/patches/fontconfig-C-11-requires-a-space-between-literal-and-identifier.patch [new file with mode: 0644]

index 6547f7c870d30d6085ef0c04bd77dbbeff081876..180dcc1bca790d21c8d09cd8ada2010fb33964e7 100644 (file)
@@ -1,3 +1,19 @@
+2014-03-18  Robert Plociennik  <r.plociennik@samsung.com>
+
+        [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  <rniwa@webkit.org>
 
         webkitpy test rebaseline.
index 7af912a3a7e00fe6597951139b1d7065f907d0cc..c94258d92b961baf8d5c8b8425e6e1f3f35eeb75 100644 (file)
             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>
 
diff --git a/Tools/efl/patches/fontconfig-C-11-requires-a-space-between-literal-and-identifier.patch b/Tools/efl/patches/fontconfig-C-11-requires-a-space-between-literal-and-identifier.patch
new file mode 100644 (file)
index 0000000..b4e0a54
--- /dev/null
@@ -0,0 +1,30 @@
+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
+