Title: [201284] releases/WebKitGTK/webkit-2.12
- Revision
- 201284
- Author
- carlo...@webkit.org
- Date
- 2016-05-23 06:41:43 -0700 (Mon, 23 May 2016)
Log Message
Merge r197886 - [cmake] Fixed All-in-One build.
https://bugs.webkit.org/show_bug.cgi?id=155241
Patch by Konstantin Tokarev <annu...@yandex.ru> on 2016-03-09
Reviewed by Csaba Osztrogonác.
.:
* Source/cmake/WebKitMacros.cmake: Last item of WebCore_SOURCES was
not removed in PROCESS_ALLINONE_FILE.
Source/WebCore:
No new tests needed.
* bindings/js/JSBindingsAllInOne.cpp: Should not include generated
file.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/ChangeLog (201283 => 201284)
--- releases/WebKitGTK/webkit-2.12/ChangeLog 2016-05-23 13:37:27 UTC (rev 201283)
+++ releases/WebKitGTK/webkit-2.12/ChangeLog 2016-05-23 13:41:43 UTC (rev 201284)
@@ -1,3 +1,13 @@
+2016-03-09 Konstantin Tokarev <annu...@yandex.ru>
+
+ [cmake] Fixed All-in-One build.
+ https://bugs.webkit.org/show_bug.cgi?id=155241
+
+ Reviewed by Csaba Osztrogonác.
+
+ * Source/cmake/WebKitMacros.cmake: Last item of WebCore_SOURCES was
+ not removed in PROCESS_ALLINONE_FILE.
+
2016-04-28 Carlos Garcia Campos <cgar...@igalia.com>
Unreviewed. Update OptionsGTK.cmake and NEWS for 2.12.2 release.
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (201283 => 201284)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-05-23 13:37:27 UTC (rev 201283)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-05-23 13:41:43 UTC (rev 201284)
@@ -1,3 +1,15 @@
+2016-03-09 Konstantin Tokarev <annu...@yandex.ru>
+
+ [cmake] Fixed All-in-One build.
+ https://bugs.webkit.org/show_bug.cgi?id=155241
+
+ Reviewed by Csaba Osztrogonác.
+
+ No new tests needed.
+
+ * bindings/js/JSBindingsAllInOne.cpp: Should not include generated
+ file.
+
2016-05-19 Philippe Normand <pnorm...@igalia.com>
[GStreamer] unrelated codecs required to play videos
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp (201283 => 201284)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp 2016-05-23 13:37:27 UTC (rev 201283)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp 2016-05-23 13:41:43 UTC (rev 201284)
@@ -138,7 +138,6 @@
#include "JSWorkerCustom.cpp"
#include "JSWorkerGlobalScopeBase.cpp"
#include "JSWorkerGlobalScopeCustom.cpp"
-#include "JSXMLDocument.cpp"
#include "JSXMLHttpRequestCustom.cpp"
#include "JSXPathResultCustom.cpp"
#include "JSXSLTProcessorCustom.cpp"
Modified: releases/WebKitGTK/webkit-2.12/Source/cmake/WebKitMacros.cmake (201283 => 201284)
--- releases/WebKitGTK/webkit-2.12/Source/cmake/WebKitMacros.cmake 2016-05-23 13:37:27 UTC (rev 201283)
+++ releases/WebKitGTK/webkit-2.12/Source/cmake/WebKitMacros.cmake 2016-05-23 13:41:43 UTC (rev 201284)
@@ -344,7 +344,7 @@
endforeach ()
foreach (_allin ${_allins})
- string(REGEX REPLACE ";[^;]*/${_allin};" ";" _new_result "${${_result_file_list}}")
+ string(REGEX REPLACE ";[^;]*/${_allin};" ";" _new_result "${${_result_file_list}};")
set(${_result_file_list} ${_new_result})
endforeach ()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
