<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[161351] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/161351">161351</a></dd>
<dt>Author</dt> <dd>mrobinson@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-06 10:33:15 -0800 (Mon, 06 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CMake] [GTK] Fix the build for the WebKitGTK+ developer configuration
https://bugs.webkit.org/show_bug.cgi?id=126505
Reviewed by Gustavo Noronha Silva.
.:
* Source/cmake/FindGLIB.cmake: Add support for finding the gio-unix include directory location.
* Source/cmake/FindGUdev.cmake: Added.
* Source/cmake/FindGeoClue.cmake: Added.
* Source/cmake/OptionsGTK.cmake: When gamepad is enabled look for gio-unix and GUdev. When
geolocation is enabled look for GeoClue.
Source/WebCore:
* CMakeLists.txt: Add missing IDLS and source files to the lists.
* PlatformGTK.cmake: Add missing include directories and source files to the lists.
Use the GeoClue, GUdev, and gio-unix include paths and libraries and sort the list
of WebCore include directories.
* UseJSC.cmake: Align the sourced list with the contents of the bindings/js directory.
Source/WebKit:
* PlatformGTK.cmake: Add the geoclue platform directory to the include directory list.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformGTKcmake">trunk/Source/WebCore/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebCoreUseJSCcmake">trunk/Source/WebCore/UseJSC.cmake</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitPlatformGTKcmake">trunk/Source/WebKit/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourcecmakeFindGLIBcmake">trunk/Source/cmake/FindGLIB.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsGTKcmake">trunk/Source/cmake/OptionsGTK.cmake</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourcecmakeFindGUdevcmake">trunk/Source/cmake/FindGUdev.cmake</a></li>
<li><a href="#trunkSourcecmakeFindGeoCluecmake">trunk/Source/cmake/FindGeoClue.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (161350 => 161351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-01-06 18:25:17 UTC (rev 161350)
+++ trunk/ChangeLog 2014-01-06 18:33:15 UTC (rev 161351)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-01-06 Martin Robinson <mrobinson@igalia.com>
+
+ [CMake] [GTK] Fix the build for the WebKitGTK+ developer configuration
+ https://bugs.webkit.org/show_bug.cgi?id=126505
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * Source/cmake/FindGLIB.cmake: Add support for finding the gio-unix include directory location.
+ * Source/cmake/FindGUdev.cmake: Added.
+ * Source/cmake/FindGeoClue.cmake: Added.
+ * Source/cmake/OptionsGTK.cmake: When gamepad is enabled look for gio-unix and GUdev. When
+ geolocation is enabled look for GeoClue.
+
</ins><span class="cx"> 2014-01-06 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Use libc++ for C++11 on darwin
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (161350 => 161351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2014-01-06 18:25:17 UTC (rev 161350)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-01-06 18:33:15 UTC (rev 161351)
</span><span class="lines">@@ -549,9 +549,11 @@
</span><span class="cx"> page/History.idl
</span><span class="cx"> page/Location.idl
</span><span class="cx"> page/Navigator.idl
</span><del>- page/Performance.idl
</del><span class="cx"> page/PerformanceEntry.idl
</span><span class="cx"> page/PerformanceEntryList.idl
</span><ins>+ page/Performance.idl
+ page/PerformanceMark.idl
+ page/PerformanceMeasure.idl
</ins><span class="cx"> page/PerformanceNavigation.idl
</span><span class="cx"> page/PerformanceResourceTiming.idl
</span><span class="cx"> page/PerformanceTiming.idl
</span><span class="lines">@@ -830,8 +832,10 @@
</span><span class="cx"> Modules/indexeddb/leveldb/IDBLevelDBCoding.cpp
</span><span class="cx"> Modules/indexeddb/leveldb/IDBServerConnectionLevelDB.cpp
</span><span class="cx">
</span><ins>+ Modules/mediasource/DOMURLMediaSource.cpp
</ins><span class="cx"> Modules/mediasource/MediaSource.cpp
</span><span class="cx"> Modules/mediasource/MediaSourceRegistry.cpp
</span><ins>+ Modules/mediasource/SampleMap.cpp
</ins><span class="cx"> Modules/mediasource/SourceBuffer.cpp
</span><span class="cx"> Modules/mediasource/SourceBufferList.cpp
</span><span class="cx"> Modules/mediasource/VideoPlaybackQuality.cpp
</span><span class="lines">@@ -1411,6 +1415,7 @@
</span><span class="cx"> html/HTMLMapElement.cpp
</span><span class="cx"> html/HTMLMarqueeElement.cpp
</span><span class="cx"> html/HTMLMediaElement.cpp
</span><ins>+ html/HTMLMediaSource.cpp
</ins><span class="cx"> html/HTMLMenuElement.cpp
</span><span class="cx"> html/HTMLMetaElement.cpp
</span><span class="cx"> html/HTMLMeterElement.cpp
</span><span class="lines">@@ -1765,6 +1770,7 @@
</span><span class="cx"> page/PerformanceNavigation.cpp
</span><span class="cx"> page/PerformanceResourceTiming.cpp
</span><span class="cx"> page/PerformanceTiming.cpp
</span><ins>+ page/PerformanceUserTiming.cpp
</ins><span class="cx"> page/PrintContext.cpp
</span><span class="cx"> page/Screen.cpp
</span><span class="cx"> page/SecurityOrigin.cpp
</span><span class="lines">@@ -2998,6 +3004,12 @@
</span><span class="cx"> set(WebCoreTestSupport_SOURCES
</span><span class="cx"> platform/mock/PlatformSpeechSynthesizerMock.cpp
</span><span class="cx">
</span><ins>+ platform/mock/mediasource/MockBox.cpp
+ platform/mock/mediasource/MockMediaPlayerMediaSource.cpp
+ platform/mock/mediasource/MockMediaSourcePrivate.cpp
+ platform/mock/mediasource/MockSourceBufferPrivate.cpp
+ platform/mock/mediasource/MockTracks.cpp
+
</ins><span class="cx"> testing/InternalSettings.cpp
</span><span class="cx"> testing/Internals.cpp
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161350 => 161351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-06 18:25:17 UTC (rev 161350)
+++ trunk/Source/WebCore/ChangeLog 2014-01-06 18:33:15 UTC (rev 161351)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-01-06 Martin Robinson <mrobinson@igalia.com>
+
+ [CMake] [GTK] Fix the build for the WebKitGTK+ developer configuration
+ https://bugs.webkit.org/show_bug.cgi?id=126505
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * CMakeLists.txt: Add missing IDLS and source files to the lists.
+ * PlatformGTK.cmake: Add missing include directories and source files to the lists.
+ Use the GeoClue, GUdev, and gio-unix include paths and libraries and sort the list
+ of WebCore include directories.
+ * UseJSC.cmake: Align the sourced list with the contents of the bindings/js directory.
+
</ins><span class="cx"> 2014-01-06 Gavin Barraclough <barraclough@apple.com>
</span><span class="cx">
</span><span class="cx"> Refactor NSActivity handling code from ChildProcess to UserActivity
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (161350 => 161351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformGTK.cmake 2014-01-06 18:25:17 UTC (rev 161350)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2014-01-06 18:33:15 UTC (rev 161351)
</span><span class="lines">@@ -3,6 +3,7 @@
</span><span class="cx"> "${WEBCORE_DIR}/editing/atk"
</span><span class="cx"> "${WEBCORE_DIR}/page/gtk"
</span><span class="cx"> "${WEBCORE_DIR}/platform/cairo"
</span><ins>+ "${WEBCORE_DIR}/platform/geoclue"
</ins><span class="cx"> "${WEBCORE_DIR}/platform/gtk"
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/cairo"
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/egl"
</span><span class="lines">@@ -15,6 +16,7 @@
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/opentype"
</span><span class="cx"> "${WEBCORE_DIR}/platform/linux"
</span><span class="cx"> "${WEBCORE_DIR}/platform/mediastream/gstreamer"
</span><ins>+ "${WEBCORE_DIR}/platform/mock/mediasource"
</ins><span class="cx"> "${WEBCORE_DIR}/platform/network/gtk"
</span><span class="cx"> "${WEBCORE_DIR}/platform/network/soup"
</span><span class="cx"> "${WEBCORE_DIR}/platform/text/gtk"
</span><span class="lines">@@ -37,6 +39,8 @@
</span><span class="cx"> platform/audio/gstreamer/FFTFrameGStreamer.cpp
</span><span class="cx"> platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp
</span><span class="cx">
</span><ins>+ platform/geoclue/GeolocationProviderGeoclue.cpp
+
</ins><span class="cx"> platform/graphics/GraphicsContext3DPrivate.cpp
</span><span class="cx"> platform/graphics/OpenGLShims.cpp
</span><span class="cx"> platform/graphics/WOFFFileFormat.cpp
</span><span class="lines">@@ -96,6 +100,8 @@
</span><span class="cx">
</span><span class="cx"> platform/graphics/opentype/OpenTypeVerticalData.cpp
</span><span class="cx">
</span><ins>+ platform/gtk/GamepadsGtk.cpp
+
</ins><span class="cx"> platform/image-decoders/cairo/ImageDecoderCairo.cpp
</span><span class="cx">
</span><span class="cx"> platform/linux/GamepadDeviceLinux.cpp
</span><span class="lines">@@ -187,7 +193,6 @@
</span><span class="cx"> platform/gtk/FileSystemGtk.cpp
</span><span class="cx"> platform/gtk/GOwnPtrGtk.cpp
</span><span class="cx"> platform/gtk/GRefPtrGtk.cpp
</span><del>- platform/gtk/GamepadsGtk.cpp
</del><span class="cx"> platform/gtk/GtkClickCounter.cpp
</span><span class="cx"> platform/gtk/GtkDragAndDropHelper.cpp
</span><span class="cx"> platform/gtk/GtkInputMethodFilter.cpp
</span><span class="lines">@@ -290,10 +295,12 @@
</span><span class="cx"> ${ENCHANT_LIBRARIES}
</span><span class="cx"> ${FONTCONFIG_LIBRARIES}
</span><span class="cx"> ${FREETYPE_LIBRARIES}
</span><ins>+ ${GEOCLUE_LIBRARIES}
</ins><span class="cx"> ${GLIB_GIO_LIBRARIES}
</span><span class="cx"> ${GLIB_GMODULE_LIBRARIES}
</span><span class="cx"> ${GLIB_GOBJECT_LIBRARIES}
</span><span class="cx"> ${GLIB_LIBRARIES}
</span><ins>+ ${GUDEV_LIBRARIES}
</ins><span class="cx"> ${HARFBUZZ_LIBRARIES}
</span><span class="cx"> ${ICU_LIBRARIES}
</span><span class="cx"> ${JPEG_LIBRARIES}
</span><span class="lines">@@ -313,19 +320,22 @@
</span><span class="cx">
</span><span class="cx"> list(APPEND WebCore_INCLUDE_DIRECTORIES
</span><span class="cx"> ${ATK_INCLUDE_DIRS}
</span><ins>+ ${CAIRO_INCLUDE_DIRS}
</ins><span class="cx"> ${ENCHANT_INCLUDE_DIRS}
</span><del>- ${CAIRO_INCLUDE_DIRS}
</del><span class="cx"> ${FREETYPE_INCLUDE_DIRS}
</span><ins>+ ${GEOCLUE_INCLUDE_DIRS}
+ ${GIO_UNIX_INCLUDE_DIRS}
+ ${GLIB_INCLUDE_DIRS}
+ ${GUDEV_INCLUDE_DIRS}
+ ${HARFBUZZ_INCLUDE_DIRS}
</ins><span class="cx"> ${ICU_INCLUDE_DIRS}
</span><ins>+ ${LIBSOUP_INCLUDE_DIRS}
</ins><span class="cx"> ${LIBXML2_INCLUDE_DIR}
</span><span class="cx"> ${LIBXSLT_INCLUDE_DIR}
</span><span class="cx"> ${SQLITE_INCLUDE_DIR}
</span><del>- ${GLIB_INCLUDE_DIRS}
- ${LIBSOUP_INCLUDE_DIRS}
- ${ZLIB_INCLUDE_DIRS}
- ${HARFBUZZ_INCLUDE_DIRS}
</del><span class="cx"> ${WEBP_INCLUDE_DIRS}
</span><span class="cx"> ${XT_INCLUDE_DIRS}
</span><ins>+ ${ZLIB_INCLUDE_DIRS}
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
</span></span></pre></div>
<a id="trunkSourceWebCoreUseJSCcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/UseJSC.cmake (161350 => 161351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/UseJSC.cmake 2014-01-06 18:25:17 UTC (rev 161350)
+++ trunk/Source/WebCore/UseJSC.cmake 2014-01-06 18:33:15 UTC (rev 161351)
</span><span class="lines">@@ -28,7 +28,13 @@
</span><span class="cx"> bindings/js/DOMWrapperWorld.cpp
</span><span class="cx"> bindings/js/Dictionary.cpp
</span><span class="cx"> bindings/js/GCController.cpp
</span><ins>+ bindings/js/IDBBindingUtilities.cpp
</ins><span class="cx"> bindings/js/JSAttrCustom.cpp
</span><ins>+ bindings/js/JSAudioBufferSourceNodeCustom.cpp
+ bindings/js/JSAudioContextCustom.cpp
+ bindings/js/JSAudioTrackCustom.cpp
+ bindings/js/JSAudioTrackListCustom.cpp
+ bindings/js/JSBiquadFilterNodeCustom.cpp
</ins><span class="cx"> bindings/js/JSBlobCustom.cpp
</span><span class="cx"> bindings/js/JSCDATASectionCustom.cpp
</span><span class="cx"> bindings/js/JSCSSRuleCustom.cpp
</span><span class="lines">@@ -40,9 +46,15 @@
</span><span class="cx"> bindings/js/JSCanvasRenderingContextCustom.cpp
</span><span class="cx"> bindings/js/JSClipboardCustom.cpp
</span><span class="cx"> bindings/js/JSCommandLineAPIHostCustom.cpp
</span><ins>+ bindings/js/JSCryptoAlgorithmBuilder.cpp
+ bindings/js/JSCryptoAlgorithmDictionary.cpp
</ins><span class="cx"> bindings/js/JSCryptoCustom.cpp
</span><ins>+ bindings/js/JSCryptoKeyCustom.cpp
+ bindings/js/JSCryptoKeyPairCustom.cpp
+ bindings/js/JSCryptoKeySerializationJWK.cpp
+ bindings/js/JSCryptoOperationData.cpp
+ bindings/js/JSCustomSQLStatementErrorCallback.cpp
</ins><span class="cx"> bindings/js/JSCustomXPathNSResolver.cpp
</span><del>- bindings/js/JSDictionary.cpp
</del><span class="cx"> bindings/js/JSDOMBinding.cpp
</span><span class="cx"> bindings/js/JSDOMFormDataCustom.cpp
</span><span class="cx"> bindings/js/JSDOMGlobalObject.cpp
</span><span class="lines">@@ -50,14 +62,17 @@
</span><span class="cx"> bindings/js/JSDOMMimeTypeArrayCustom.cpp
</span><span class="cx"> bindings/js/JSDOMPluginArrayCustom.cpp
</span><span class="cx"> bindings/js/JSDOMPluginCustom.cpp
</span><ins>+ bindings/js/JSDOMPromise.cpp
</ins><span class="cx"> bindings/js/JSDOMStringListCustom.cpp
</span><span class="cx"> bindings/js/JSDOMStringMapCustom.cpp
</span><span class="cx"> bindings/js/JSDOMWindowBase.cpp
</span><span class="cx"> bindings/js/JSDOMWindowCustom.cpp
</span><span class="cx"> bindings/js/JSDOMWindowShell.cpp
</span><span class="cx"> bindings/js/JSDOMWrapper.cpp
</span><ins>+ bindings/js/JSDedicatedWorkerGlobalScopeCustom.cpp
</ins><span class="cx"> bindings/js/JSDeviceMotionEventCustom.cpp
</span><span class="cx"> bindings/js/JSDeviceOrientationEventCustom.cpp
</span><ins>+ bindings/js/JSDictionary.cpp
</ins><span class="cx"> bindings/js/JSDocumentCustom.cpp
</span><span class="cx"> bindings/js/JSElementCustom.cpp
</span><span class="cx"> bindings/js/JSErrorHandler.cpp
</span><span class="lines">@@ -65,6 +80,7 @@
</span><span class="cx"> bindings/js/JSEventListener.cpp
</span><span class="cx"> bindings/js/JSEventTargetCustom.cpp
</span><span class="cx"> bindings/js/JSExceptionBase.cpp
</span><ins>+ bindings/js/JSFileReaderCustom.cpp
</ins><span class="cx"> bindings/js/JSGeolocationCustom.cpp
</span><span class="cx"> bindings/js/JSHTMLAllCollectionCustom.cpp
</span><span class="cx"> bindings/js/JSHTMLAppletElementCustom.cpp
</span><span class="lines">@@ -85,6 +101,9 @@
</span><span class="cx"> bindings/js/JSHTMLSelectElementCustom.cpp
</span><span class="cx"> bindings/js/JSHTMLTemplateElementCustom.cpp
</span><span class="cx"> bindings/js/JSHistoryCustom.cpp
</span><ins>+ bindings/js/JSIDBAnyCustom.cpp
+ bindings/js/JSIDBDatabaseCustom.cpp
+ bindings/js/JSIDBObjectStoreCustom.cpp
</ins><span class="cx"> bindings/js/JSImageConstructor.cpp
</span><span class="cx"> bindings/js/JSImageDataCustom.cpp
</span><span class="cx"> bindings/js/JSInjectedScriptHostCustom.cpp
</span><span class="lines">@@ -94,6 +113,8 @@
</span><span class="cx"> bindings/js/JSLazyEventListener.cpp
</span><span class="cx"> bindings/js/JSLocationCustom.cpp
</span><span class="cx"> bindings/js/JSMainThreadExecState.cpp
</span><ins>+ bindings/js/JSMediaSourceStatesCustom.cpp
+ bindings/js/JSMediaStreamCapabilitiesCustom.cpp
</ins><span class="cx"> bindings/js/JSMessageChannelCustom.cpp
</span><span class="cx"> bindings/js/JSMessageEventCustom.cpp
</span><span class="cx"> bindings/js/JSMessagePortCustom.cpp
</span><span class="lines">@@ -105,16 +126,43 @@
</span><span class="cx"> bindings/js/JSNodeFilterCustom.cpp
</span><span class="cx"> bindings/js/JSNodeIteratorCustom.cpp
</span><span class="cx"> bindings/js/JSNodeListCustom.cpp
</span><ins>+ bindings/js/JSOscillatorNodeCustom.cpp
+ bindings/js/JSPannerNodeCustom.cpp
+ bindings/js/JSPerformanceEntryCustom.cpp
</ins><span class="cx"> bindings/js/JSPluginElementFunctions.cpp
</span><span class="cx"> bindings/js/JSPopStateEventCustom.cpp
</span><ins>+ bindings/js/JSRTCIceCandidateCustom.cpp
+ bindings/js/JSRTCPeerConnectionCustom.cpp
+ bindings/js/JSRTCSessionDescriptionCustom.cpp
+ bindings/js/JSRTCStatsResponseCustom.cpp
+ bindings/js/JSRequestAnimationFrameCallbackCustom.cpp
+ bindings/js/JSSQLResultSetRowListCustom.cpp
+ bindings/js/JSSQLTransactionCustom.cpp
+ bindings/js/JSSQLTransactionSyncCustom.cpp
+ bindings/js/JSSVGElementInstanceCustom.cpp
+ bindings/js/JSSVGLengthCustom.cpp
+ bindings/js/JSSVGPathSegCustom.cpp
+ bindings/js/JSSharedWorkerCustom.cpp
</ins><span class="cx"> bindings/js/JSStorageCustom.cpp
</span><span class="cx"> bindings/js/JSStyleSheetCustom.cpp
</span><span class="cx"> bindings/js/JSStyleSheetListCustom.cpp
</span><ins>+ bindings/js/JSSubtleCryptoCustom.cpp
</ins><span class="cx"> bindings/js/JSTextCustom.cpp
</span><ins>+ bindings/js/JSTextTrackCueCustom.cpp
+ bindings/js/JSTextTrackCustom.cpp
+ bindings/js/JSTextTrackListCustom.cpp
</ins><span class="cx"> bindings/js/JSTouchCustom.cpp
</span><span class="cx"> bindings/js/JSTouchListCustom.cpp
</span><ins>+ bindings/js/JSTrackCustom.cpp
+ bindings/js/JSTrackEventCustom.cpp
</ins><span class="cx"> bindings/js/JSTreeWalkerCustom.cpp
</span><ins>+ bindings/js/JSVideoTrackCustom.cpp
+ bindings/js/JSVideoTrackListCustom.cpp
+ bindings/js/JSWebGLRenderingContextCustom.cpp
</ins><span class="cx"> bindings/js/JSWebKitPointCustom.cpp
</span><ins>+ bindings/js/JSWorkerCustom.cpp
+ bindings/js/JSWorkerGlobalScopeBase.cpp
+ bindings/js/JSWorkerGlobalScopeCustom.cpp
</ins><span class="cx"> bindings/js/JSXMLHttpRequestCustom.cpp
</span><span class="cx"> bindings/js/JSXPathResultCustom.cpp
</span><span class="cx"> bindings/js/JSXSLTProcessorCustom.cpp
</span><span class="lines">@@ -131,6 +179,8 @@
</span><span class="cx"> bindings/js/ScriptState.cpp
</span><span class="cx"> bindings/js/SerializedScriptValue.cpp
</span><span class="cx"> bindings/js/WebCoreTypedArrayController.cpp
</span><ins>+ bindings/js/WorkerScriptController.cpp
+ bindings/js/WorkerScriptDebugServer.cpp
</ins><span class="cx">
</span><span class="cx"> bridge/IdentifierRep.cpp
</span><span class="cx"> bridge/NP_jsobject.cpp
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (161350 => 161351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2014-01-06 18:25:17 UTC (rev 161350)
+++ trunk/Source/WebKit/ChangeLog 2014-01-06 18:33:15 UTC (rev 161351)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-01-06 Martin Robinson <mrobinson@igalia.com>
+
+ [CMake] [GTK] Fix the build for the WebKitGTK+ developer configuration
+ https://bugs.webkit.org/show_bug.cgi?id=126505
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * PlatformGTK.cmake: Add the geoclue platform directory to the include directory list.
+
</ins><span class="cx"> 2014-01-06 Mark Rowe <mrowe@apple.com>
</span><span class="cx">
</span><span class="cx"> <https://webkit.org/b/126499> Move WebKit off the legacy WebKit availability macros
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/PlatformGTK.cmake (161350 => 161351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/PlatformGTK.cmake 2014-01-06 18:25:17 UTC (rev 161350)
+++ trunk/Source/WebKit/PlatformGTK.cmake 2014-01-06 18:33:15 UTC (rev 161351)
</span><span class="lines">@@ -18,6 +18,7 @@
</span><span class="cx"> ${WEBCORE_DIR}/ForwardingHeaders
</span><span class="cx"> ${WEBCORE_DIR}/accessibility/atk
</span><span class="cx"> ${WEBCORE_DIR}/platform/cairo
</span><ins>+ ${WEBCORE_DIR}/platform/geoclue
</ins><span class="cx"> ${WEBCORE_DIR}/platform/graphics/cairo
</span><span class="cx"> ${WEBCORE_DIR}/platform/graphics/gtk
</span><span class="cx"> ${WEBCORE_DIR}/platform/graphics/opentype
</span></span></pre></div>
<a id="trunkSourcecmakeFindGLIBcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/FindGLIB.cmake (161350 => 161351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/FindGLIB.cmake 2014-01-06 18:25:17 UTC (rev 161350)
+++ trunk/Source/cmake/FindGLIB.cmake 2014-01-06 18:33:15 UTC (rev 161351)
</span><span class="lines">@@ -94,6 +94,11 @@
</span><span class="cx"> elseif (${_component} STREQUAL "gthread")
</span><span class="cx"> find_library(GLIB_GTHREAD_LIBRARIES NAMES gthread-2.0 HINTS ${_GLIB_LIBRARY_DIR})
</span><span class="cx"> set(ADDITIONAL_REQUIRED_VARS ${ADDITIONAL_REQUIRED_VARS} GLIB_GTHREAD_LIBRARIES)
</span><ins>+ elseif (${_component} STREQUAL "gio-unix")
+ # gio-unix is compiled as part of the gio library, but the include paths
+ # are separate from the shared glib ones. Since this is currently only used
+ # by WebKitGTK+ we don't go to extraordinary measures beyond pkg-config.
+ pkg_check_modules(GIO_UNIX QUIET gio-unix-2.0)
</ins><span class="cx"> endif ()
</span><span class="cx"> endforeach ()
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcecmakeFindGUdevcmake"></a>
<div class="addfile"><h4>Added: trunk/Source/cmake/FindGUdev.cmake (0 => 161351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/FindGUdev.cmake (rev 0)
+++ trunk/Source/cmake/FindGUdev.cmake 2014-01-06 18:33:15 UTC (rev 161351)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+# - Try to find GUdev
+# Once done, this will define
+#
+# GUDEV_FOUND - system has GUdev
+# GUDEV_INCLUDE_DIRS - the GUdev include directories
+# GUDEV_LIBRARIES - link these to use GUdev
+#
+# Copyright (C) 2012 Raphael Kubo da Costa <rakuco@webkit.org>
+# Copyright (C) 2013, 2014 Igalia S.L.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``AS
+# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+find_package(PkgConfig)
+pkg_check_modules(GUDEV gudev-1.0)
+
+set(VERSION_OK TRUE)
+if (GUDEV_VERSION)
+ if (GUDEV_FIND_VERSION_EXACT)
+ if (NOT("${GUDEV_FIND_VERSION}" VERSION_EQUAL "${GUDEV_VERSION}"))
+ set(VERSION_OK FALSE)
+ endif ()
+ else ()
+ if ("${GUDEV_VERSION}" VERSION_LESS "${GUDEV_FIND_VERSION}")
+ set(VERSION_OK FALSE)
+ endif ()
+ endif ()
+endif ()
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GUDEV DEFAULT_MSG GUDEV_INCLUDE_DIRS GUDEV_LIBRARIES VERSION_OK)
</ins></span></pre></div>
<a id="trunkSourcecmakeFindGeoCluecmake"></a>
<div class="addfile"><h4>Added: trunk/Source/cmake/FindGeoClue.cmake (0 => 161351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/FindGeoClue.cmake (rev 0)
+++ trunk/Source/cmake/FindGeoClue.cmake 2014-01-06 18:33:15 UTC (rev 161351)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+# - Try to find GeoClue
+# Once done, this will define
+#
+# GEOCLUE_FOUND - system has GeoClue
+# GEOCLUE_INCLUDE_DIRS - the GeoClue include directories
+# GEOCLUE_LIBRARIES - link these to use GeoClue
+#
+# Copyright (C) 2012 Raphael Kubo da Costa <rakuco@webkit.org>
+# Copyright (C) 2013, 2014 Igalia S.L.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``AS
+# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+find_package(PkgConfig)
+pkg_check_modules(GEOCLUE geoclue)
+
+set(VERSION_OK TRUE)
+if (GEOCLUE_VERSION)
+ if (GEOCLUE_FIND_VERSION_EXACT)
+ if (NOT("${GEOCLUE_FIND_VERSION}" VERSION_EQUAL "${GEOCLUE_VERSION}"))
+ set(VERSION_OK FALSE)
+ endif ()
+ else ()
+ if ("${GEOCLUE_VERSION}" VERSION_LESS "${GEOCLUE_FIND_VERSION}")
+ set(VERSION_OK FALSE)
+ endif ()
+ endif ()
+endif ()
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GEOCLUE DEFAULT_MSG GEOCLUE_INCLUDE_DIRS GEOCLUE_LIBRARIES VERSION_OK)
</ins></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (161350 => 161351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsGTK.cmake 2014-01-06 18:25:17 UTC (rev 161350)
+++ trunk/Source/cmake/OptionsGTK.cmake 2014-01-06 18:33:15 UTC (rev 161351)
</span><span class="lines">@@ -152,7 +152,6 @@
</span><span class="cx"> find_package(Cairo 1.10.2 REQUIRED)
</span><span class="cx"> find_package(Fontconfig 2.8.0 REQUIRED)
</span><span class="cx"> find_package(Freetype 2.4.2 REQUIRED)
</span><del>-find_package(GLIB 2.33.2 REQUIRED COMPONENTS gio gobject gthread gmodule)
</del><span class="cx"> find_package(GTK3 3.6.0 REQUIRED)
</span><span class="cx"> find_package(GDK3 3.6.0 REQUIRED)
</span><span class="cx"> find_package(GTK2 2.24.10 REQUIRED)
</span><span class="lines">@@ -174,6 +173,16 @@
</span><span class="cx"> find_package(ATSPI 2.5.3)
</span><span class="cx"> find_package(GObjectIntrospection)
</span><span class="cx">
</span><ins>+set(glib_components gio gobject gthread gmodule)
+if (ENABLE_GAMEPAD)
+ list(APPEND glib_components gio-unix)
+endif ()
+find_package(GLIB 2.33.2 REQUIRED COMPONENTS ${glib_components})
+
+if (ENABLE_GEOLOCATION)
+ find_package(GeoClue)
+endif ()
+
</ins><span class="cx"> # We don't use find_package for GLX because it is part of -lGL, unlike EGL.
</span><span class="cx"> find_package(OpenGL)
</span><span class="cx"> check_include_files("GL/glx.h" GLX_FOUND)
</span><span class="lines">@@ -217,6 +226,10 @@
</span><span class="cx"> add_definitions(-DWTF_USE_LEVELDB=1)
</span><span class="cx"> endif ()
</span><span class="cx">
</span><ins>+if (ENABLE_GAMEPAD)
+ find_package(GUdev)
+endif ()
+
</ins><span class="cx"> set(CPACK_SOURCE_GENERATOR TBZ2)
</span><span class="cx">
</span><span class="cx"> set(DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR ${DERIVED_SOURCES_DIR}/webkitdom)
</span></span></pre>
</div>
</div>
</body>
</html>