Changeset 161351 in webkit
- Timestamp:
- Jan 6, 2014 10:33:15 AM (10 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r161333 r161351 1 2014-01-06 Martin Robinson <mrobinson@igalia.com> 2 3 [CMake] [GTK] Fix the build for the WebKitGTK+ developer configuration 4 https://bugs.webkit.org/show_bug.cgi?id=126505 5 6 Reviewed by Gustavo Noronha Silva. 7 8 * Source/cmake/FindGLIB.cmake: Add support for finding the gio-unix include directory location. 9 * Source/cmake/FindGUdev.cmake: Added. 10 * Source/cmake/FindGeoClue.cmake: Added. 11 * Source/cmake/OptionsGTK.cmake: When gamepad is enabled look for gio-unix and GUdev. When 12 geolocation is enabled look for GeoClue. 13 1 14 2014-01-06 Zan Dobersek <zdobersek@igalia.com> 2 15 -
trunk/Source/WebCore/CMakeLists.txt
r161271 r161351 550 550 page/Location.idl 551 551 page/Navigator.idl 552 page/Performance.idl553 552 page/PerformanceEntry.idl 554 553 page/PerformanceEntryList.idl 554 page/Performance.idl 555 page/PerformanceMark.idl 556 page/PerformanceMeasure.idl 555 557 page/PerformanceNavigation.idl 556 558 page/PerformanceResourceTiming.idl … … 831 833 Modules/indexeddb/leveldb/IDBServerConnectionLevelDB.cpp 832 834 835 Modules/mediasource/DOMURLMediaSource.cpp 833 836 Modules/mediasource/MediaSource.cpp 834 837 Modules/mediasource/MediaSourceRegistry.cpp 838 Modules/mediasource/SampleMap.cpp 835 839 Modules/mediasource/SourceBuffer.cpp 836 840 Modules/mediasource/SourceBufferList.cpp … … 1412 1416 html/HTMLMarqueeElement.cpp 1413 1417 html/HTMLMediaElement.cpp 1418 html/HTMLMediaSource.cpp 1414 1419 html/HTMLMenuElement.cpp 1415 1420 html/HTMLMetaElement.cpp … … 1766 1771 page/PerformanceResourceTiming.cpp 1767 1772 page/PerformanceTiming.cpp 1773 page/PerformanceUserTiming.cpp 1768 1774 page/PrintContext.cpp 1769 1775 page/Screen.cpp … … 2999 3005 platform/mock/PlatformSpeechSynthesizerMock.cpp 3000 3006 3007 platform/mock/mediasource/MockBox.cpp 3008 platform/mock/mediasource/MockMediaPlayerMediaSource.cpp 3009 platform/mock/mediasource/MockMediaSourcePrivate.cpp 3010 platform/mock/mediasource/MockSourceBufferPrivate.cpp 3011 platform/mock/mediasource/MockTracks.cpp 3012 3001 3013 testing/InternalSettings.cpp 3002 3014 testing/Internals.cpp -
trunk/Source/WebCore/ChangeLog
r161350 r161351 1 2014-01-06 Martin Robinson <mrobinson@igalia.com> 2 3 [CMake] [GTK] Fix the build for the WebKitGTK+ developer configuration 4 https://bugs.webkit.org/show_bug.cgi?id=126505 5 6 Reviewed by Gustavo Noronha Silva. 7 8 * CMakeLists.txt: Add missing IDLS and source files to the lists. 9 * PlatformGTK.cmake: Add missing include directories and source files to the lists. 10 Use the GeoClue, GUdev, and gio-unix include paths and libraries and sort the list 11 of WebCore include directories. 12 * UseJSC.cmake: Align the sourced list with the contents of the bindings/js directory. 13 1 14 2014-01-06 Gavin Barraclough <barraclough@apple.com> 2 15 -
trunk/Source/WebCore/PlatformGTK.cmake
r161325 r161351 4 4 "${WEBCORE_DIR}/page/gtk" 5 5 "${WEBCORE_DIR}/platform/cairo" 6 "${WEBCORE_DIR}/platform/geoclue" 6 7 "${WEBCORE_DIR}/platform/gtk" 7 8 "${WEBCORE_DIR}/platform/graphics/cairo" … … 16 17 "${WEBCORE_DIR}/platform/linux" 17 18 "${WEBCORE_DIR}/platform/mediastream/gstreamer" 19 "${WEBCORE_DIR}/platform/mock/mediasource" 18 20 "${WEBCORE_DIR}/platform/network/gtk" 19 21 "${WEBCORE_DIR}/platform/network/soup" … … 37 39 platform/audio/gstreamer/FFTFrameGStreamer.cpp 38 40 platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp 41 42 platform/geoclue/GeolocationProviderGeoclue.cpp 39 43 40 44 platform/graphics/GraphicsContext3DPrivate.cpp … … 97 101 platform/graphics/opentype/OpenTypeVerticalData.cpp 98 102 103 platform/gtk/GamepadsGtk.cpp 104 99 105 platform/image-decoders/cairo/ImageDecoderCairo.cpp 100 106 … … 188 194 platform/gtk/GOwnPtrGtk.cpp 189 195 platform/gtk/GRefPtrGtk.cpp 190 platform/gtk/GamepadsGtk.cpp191 196 platform/gtk/GtkClickCounter.cpp 192 197 platform/gtk/GtkDragAndDropHelper.cpp … … 291 296 ${FONTCONFIG_LIBRARIES} 292 297 ${FREETYPE_LIBRARIES} 298 ${GEOCLUE_LIBRARIES} 293 299 ${GLIB_GIO_LIBRARIES} 294 300 ${GLIB_GMODULE_LIBRARIES} 295 301 ${GLIB_GOBJECT_LIBRARIES} 296 302 ${GLIB_LIBRARIES} 303 ${GUDEV_LIBRARIES} 297 304 ${HARFBUZZ_LIBRARIES} 298 305 ${ICU_LIBRARIES} … … 314 321 list(APPEND WebCore_INCLUDE_DIRECTORIES 315 322 ${ATK_INCLUDE_DIRS} 323 ${CAIRO_INCLUDE_DIRS} 316 324 ${ENCHANT_INCLUDE_DIRS} 317 ${CAIRO_INCLUDE_DIRS}318 325 ${FREETYPE_INCLUDE_DIRS} 326 ${GEOCLUE_INCLUDE_DIRS} 327 ${GIO_UNIX_INCLUDE_DIRS} 328 ${GLIB_INCLUDE_DIRS} 329 ${GUDEV_INCLUDE_DIRS} 330 ${HARFBUZZ_INCLUDE_DIRS} 319 331 ${ICU_INCLUDE_DIRS} 332 ${LIBSOUP_INCLUDE_DIRS} 320 333 ${LIBXML2_INCLUDE_DIR} 321 334 ${LIBXSLT_INCLUDE_DIR} 322 335 ${SQLITE_INCLUDE_DIR} 323 ${GLIB_INCLUDE_DIRS}324 ${LIBSOUP_INCLUDE_DIRS}325 ${ZLIB_INCLUDE_DIRS}326 ${HARFBUZZ_INCLUDE_DIRS}327 336 ${WEBP_INCLUDE_DIRS} 328 337 ${XT_INCLUDE_DIRS} 338 ${ZLIB_INCLUDE_DIRS} 329 339 ) 330 340 -
trunk/Source/WebCore/UseJSC.cmake
r160946 r161351 29 29 bindings/js/Dictionary.cpp 30 30 bindings/js/GCController.cpp 31 bindings/js/IDBBindingUtilities.cpp 31 32 bindings/js/JSAttrCustom.cpp 33 bindings/js/JSAudioBufferSourceNodeCustom.cpp 34 bindings/js/JSAudioContextCustom.cpp 35 bindings/js/JSAudioTrackCustom.cpp 36 bindings/js/JSAudioTrackListCustom.cpp 37 bindings/js/JSBiquadFilterNodeCustom.cpp 32 38 bindings/js/JSBlobCustom.cpp 33 39 bindings/js/JSCDATASectionCustom.cpp … … 41 47 bindings/js/JSClipboardCustom.cpp 42 48 bindings/js/JSCommandLineAPIHostCustom.cpp 49 bindings/js/JSCryptoAlgorithmBuilder.cpp 50 bindings/js/JSCryptoAlgorithmDictionary.cpp 43 51 bindings/js/JSCryptoCustom.cpp 52 bindings/js/JSCryptoKeyCustom.cpp 53 bindings/js/JSCryptoKeyPairCustom.cpp 54 bindings/js/JSCryptoKeySerializationJWK.cpp 55 bindings/js/JSCryptoOperationData.cpp 56 bindings/js/JSCustomSQLStatementErrorCallback.cpp 44 57 bindings/js/JSCustomXPathNSResolver.cpp 45 bindings/js/JSDictionary.cpp46 58 bindings/js/JSDOMBinding.cpp 47 59 bindings/js/JSDOMFormDataCustom.cpp … … 51 63 bindings/js/JSDOMPluginArrayCustom.cpp 52 64 bindings/js/JSDOMPluginCustom.cpp 65 bindings/js/JSDOMPromise.cpp 53 66 bindings/js/JSDOMStringListCustom.cpp 54 67 bindings/js/JSDOMStringMapCustom.cpp … … 57 70 bindings/js/JSDOMWindowShell.cpp 58 71 bindings/js/JSDOMWrapper.cpp 72 bindings/js/JSDedicatedWorkerGlobalScopeCustom.cpp 59 73 bindings/js/JSDeviceMotionEventCustom.cpp 60 74 bindings/js/JSDeviceOrientationEventCustom.cpp 75 bindings/js/JSDictionary.cpp 61 76 bindings/js/JSDocumentCustom.cpp 62 77 bindings/js/JSElementCustom.cpp … … 66 81 bindings/js/JSEventTargetCustom.cpp 67 82 bindings/js/JSExceptionBase.cpp 83 bindings/js/JSFileReaderCustom.cpp 68 84 bindings/js/JSGeolocationCustom.cpp 69 85 bindings/js/JSHTMLAllCollectionCustom.cpp … … 86 102 bindings/js/JSHTMLTemplateElementCustom.cpp 87 103 bindings/js/JSHistoryCustom.cpp 104 bindings/js/JSIDBAnyCustom.cpp 105 bindings/js/JSIDBDatabaseCustom.cpp 106 bindings/js/JSIDBObjectStoreCustom.cpp 88 107 bindings/js/JSImageConstructor.cpp 89 108 bindings/js/JSImageDataCustom.cpp … … 95 114 bindings/js/JSLocationCustom.cpp 96 115 bindings/js/JSMainThreadExecState.cpp 116 bindings/js/JSMediaSourceStatesCustom.cpp 117 bindings/js/JSMediaStreamCapabilitiesCustom.cpp 97 118 bindings/js/JSMessageChannelCustom.cpp 98 119 bindings/js/JSMessageEventCustom.cpp … … 106 127 bindings/js/JSNodeIteratorCustom.cpp 107 128 bindings/js/JSNodeListCustom.cpp 129 bindings/js/JSOscillatorNodeCustom.cpp 130 bindings/js/JSPannerNodeCustom.cpp 131 bindings/js/JSPerformanceEntryCustom.cpp 108 132 bindings/js/JSPluginElementFunctions.cpp 109 133 bindings/js/JSPopStateEventCustom.cpp 134 bindings/js/JSRTCIceCandidateCustom.cpp 135 bindings/js/JSRTCPeerConnectionCustom.cpp 136 bindings/js/JSRTCSessionDescriptionCustom.cpp 137 bindings/js/JSRTCStatsResponseCustom.cpp 138 bindings/js/JSRequestAnimationFrameCallbackCustom.cpp 139 bindings/js/JSSQLResultSetRowListCustom.cpp 140 bindings/js/JSSQLTransactionCustom.cpp 141 bindings/js/JSSQLTransactionSyncCustom.cpp 142 bindings/js/JSSVGElementInstanceCustom.cpp 143 bindings/js/JSSVGLengthCustom.cpp 144 bindings/js/JSSVGPathSegCustom.cpp 145 bindings/js/JSSharedWorkerCustom.cpp 110 146 bindings/js/JSStorageCustom.cpp 111 147 bindings/js/JSStyleSheetCustom.cpp 112 148 bindings/js/JSStyleSheetListCustom.cpp 149 bindings/js/JSSubtleCryptoCustom.cpp 113 150 bindings/js/JSTextCustom.cpp 151 bindings/js/JSTextTrackCueCustom.cpp 152 bindings/js/JSTextTrackCustom.cpp 153 bindings/js/JSTextTrackListCustom.cpp 114 154 bindings/js/JSTouchCustom.cpp 115 155 bindings/js/JSTouchListCustom.cpp 156 bindings/js/JSTrackCustom.cpp 157 bindings/js/JSTrackEventCustom.cpp 116 158 bindings/js/JSTreeWalkerCustom.cpp 159 bindings/js/JSVideoTrackCustom.cpp 160 bindings/js/JSVideoTrackListCustom.cpp 161 bindings/js/JSWebGLRenderingContextCustom.cpp 117 162 bindings/js/JSWebKitPointCustom.cpp 163 bindings/js/JSWorkerCustom.cpp 164 bindings/js/JSWorkerGlobalScopeBase.cpp 165 bindings/js/JSWorkerGlobalScopeCustom.cpp 118 166 bindings/js/JSXMLHttpRequestCustom.cpp 119 167 bindings/js/JSXPathResultCustom.cpp … … 132 180 bindings/js/SerializedScriptValue.cpp 133 181 bindings/js/WebCoreTypedArrayController.cpp 182 bindings/js/WorkerScriptController.cpp 183 bindings/js/WorkerScriptDebugServer.cpp 134 184 135 185 bridge/IdentifierRep.cpp -
trunk/Source/WebKit/ChangeLog
r161332 r161351 1 2014-01-06 Martin Robinson <mrobinson@igalia.com> 2 3 [CMake] [GTK] Fix the build for the WebKitGTK+ developer configuration 4 https://bugs.webkit.org/show_bug.cgi?id=126505 5 6 Reviewed by Gustavo Noronha Silva. 7 8 * PlatformGTK.cmake: Add the geoclue platform directory to the include directory list. 9 1 10 2014-01-06 Mark Rowe <mrowe@apple.com> 2 11 -
trunk/Source/WebKit/PlatformGTK.cmake
r161325 r161351 19 19 ${WEBCORE_DIR}/accessibility/atk 20 20 ${WEBCORE_DIR}/platform/cairo 21 ${WEBCORE_DIR}/platform/geoclue 21 22 ${WEBCORE_DIR}/platform/graphics/cairo 22 23 ${WEBCORE_DIR}/platform/graphics/gtk -
trunk/Source/cmake/FindGLIB.cmake
r136790 r161351 95 95 find_library(GLIB_GTHREAD_LIBRARIES NAMES gthread-2.0 HINTS ${_GLIB_LIBRARY_DIR}) 96 96 set(ADDITIONAL_REQUIRED_VARS ${ADDITIONAL_REQUIRED_VARS} GLIB_GTHREAD_LIBRARIES) 97 elseif (${_component} STREQUAL "gio-unix") 98 # gio-unix is compiled as part of the gio library, but the include paths 99 # are separate from the shared glib ones. Since this is currently only used 100 # by WebKitGTK+ we don't go to extraordinary measures beyond pkg-config. 101 pkg_check_modules(GIO_UNIX QUIET gio-unix-2.0) 97 102 endif () 98 103 endforeach () -
trunk/Source/cmake/OptionsGTK.cmake
r161325 r161351 153 153 find_package(Fontconfig 2.8.0 REQUIRED) 154 154 find_package(Freetype 2.4.2 REQUIRED) 155 find_package(GLIB 2.33.2 REQUIRED COMPONENTS gio gobject gthread gmodule)156 155 find_package(GTK3 3.6.0 REQUIRED) 157 156 find_package(GDK3 3.6.0 REQUIRED) … … 175 174 find_package(GObjectIntrospection) 176 175 176 set(glib_components gio gobject gthread gmodule) 177 if (ENABLE_GAMEPAD) 178 list(APPEND glib_components gio-unix) 179 endif () 180 find_package(GLIB 2.33.2 REQUIRED COMPONENTS ${glib_components}) 181 182 if (ENABLE_GEOLOCATION) 183 find_package(GeoClue) 184 endif () 185 177 186 # We don't use find_package for GLX because it is part of -lGL, unlike EGL. 178 187 find_package(OpenGL) … … 216 225 set(WTF_USE_LEVELDB 1) 217 226 add_definitions(-DWTF_USE_LEVELDB=1) 227 endif () 228 229 if (ENABLE_GAMEPAD) 230 find_package(GUdev) 218 231 endif () 219 232
Note: See TracChangeset
for help on using the changeset viewer.