Title: [228629] releases/WebKitGTK/webkit-2.20/Source/WTF
Revision
228629
Author
carlo...@webkit.org
Date
2018-02-19 01:39:04 -0800 (Mon, 19 Feb 2018)

Log Message

Merge r228136 - [cmake] Fix build with ICU configured without collation support
https://bugs.webkit.org/show_bug.cgi?id=182498

Reviewed by Alex Christensen.

WebKit has CollatorDefault.cpp providing necessary stubs when
UCONFIG_NO_COLLATION is defined, however it is not included in cmake
file list.

* wtf/CMakeLists.txt:

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.20/Source/WTF/ChangeLog (228628 => 228629)


--- releases/WebKitGTK/webkit-2.20/Source/WTF/ChangeLog	2018-02-19 09:36:00 UTC (rev 228628)
+++ releases/WebKitGTK/webkit-2.20/Source/WTF/ChangeLog	2018-02-19 09:39:04 UTC (rev 228629)
@@ -1,3 +1,16 @@
+2018-02-05  Konstantin Tokarev  <annu...@yandex.ru>
+
+        [cmake] Fix build with ICU configured without collation support
+        https://bugs.webkit.org/show_bug.cgi?id=182498
+
+        Reviewed by Alex Christensen.
+
+        WebKit has CollatorDefault.cpp providing necessary stubs when
+        UCONFIG_NO_COLLATION is defined, however it is not included in cmake
+        file list.
+
+        * wtf/CMakeLists.txt:
+
 2018-02-05  Alicia Boya GarcĂ­a  <ab...@igalia.com>
 
         Fix bug in MediaTime comparison for negative values with different scale.

Modified: releases/WebKitGTK/webkit-2.20/Source/WTF/wtf/CMakeLists.txt (228628 => 228629)


--- releases/WebKitGTK/webkit-2.20/Source/WTF/wtf/CMakeLists.txt	2018-02-19 09:36:00 UTC (rev 228628)
+++ releases/WebKitGTK/webkit-2.20/Source/WTF/wtf/CMakeLists.txt	2018-02-19 09:39:04 UTC (rev 228629)
@@ -459,6 +459,8 @@
 endif ()
 
 list(APPEND WTF_SOURCES
+    unicode/CollatorDefault.cpp
+
     unicode/icu/CollatorICU.cpp
 )
 set(WTF_SYSTEM_INCLUDE_DIRECTORIES
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to