nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Build against WebKitGTK 2.0.4: Closes #720290

Browse source
This commit is contained in:
Jim Nelson 2013-12-12 14:48:53 -08:00
parent 62af03e511
commit 258c84d335
4 changed files with 35 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -52,6 +52,7 @@ endif ()
find_package(PkgConfig)
pkg_check_modules(LIBUNITY QUIET unity>=5.12.0)
pkg_check_modules(LIBMESSAGINGMENU QUIET messaging-menu>=12.10.2)
pkg_check_modules(WEBKITGTK110X QUIET webkitgtk-3.0<=1.10.2)
pkg_check_modules(WEBKITGTK22X QUIET webkitgtk-3.0>=2.2.0)
# intl

16
bindings/metadata/webkitgtk-1.10/WebKit-3.0.metadata Normal file
View file

@ -0,0 +1,16 @@
DOM* parent="WebKit.DOM" name="DOM(.+)"
DOMEventTarget.add_event_listener skip=false
DOMEventTarget.remove_event_listener skip=false
WebView.entering_fullscreen#signal name="entering_fullscreen_signal"
WebView.leaving_fullscreen#signal name="leaving_fullscreen_signal"
WebView.move_cursor#virtual_method name="leaving_fullscreen_method"
WebSettings.enable_default_context_menu#property deprecated=false
DOMNode.dispatch_event type="void"
DOMWebKitNamedFlow.dispatch_event type="void"
DOMDOMApplicationCache.dispatch_event type="void"
DOMDOMWindow.dispatch_event type="void"

3
bindings/metadata/webkitgtk-2.0/WebKit-3.0.metadata
View file

@ -13,4 +13,7 @@ DOMNode.dispatch_event type="void"
DOMWebKitNamedFlow.dispatch_event type="void"
DOMDOMApplicationCache.dispatch_event type="void"
DOMDOMWindow.dispatch_event type="void"
DOMTextTrackCue.dispatch_event type="void"
DOMTextTrack.dispatch_event type="void"
DOMTextTrackList.dispatch_event type="void"

19
src/CMakeLists.txt
View file

@ -438,8 +438,19 @@ else ()
message(STATUS "Unity launcher support: OFF")
endif ()
if (WEBKITGTK22X_FOUND)
message(STATUS "Targeting WebKitGTK 2.2.x")
if (WEBKITGTK110X_FOUND)
message(STATUS "Targeting WebKitGTK 1.10")
SET(EXTRA_CLIENT_PKG_CONFIG
${EXTRA_CLIENT_PKG_CONFIG}
webkitgtk-3.0>=1.10.0
webkitgtk-3.0<=1.10.2
)
SET(WEBKITGTK_METADATA_DIR
webkitgtk-1.10
)
elseif (WEBKITGTK22X_FOUND)
message(STATUS "Targeting WebKitGTK 2.2")
SET(EXTRA_CLIENT_PKG_CONFIG
${EXTRA_CLIENT_PKG_CONFIG}
webkitgtk-3.0>=2.2.0
@ -449,10 +460,10 @@ if (WEBKITGTK22X_FOUND)
webkitgtk-2.2
)
else ()
message(STATUS "Targeting WebKitGTK 1.10.0 to 2.0.4")
message(STATUS "Targeting WebKitGTK 2.0")
SET(EXTRA_CLIENT_PKG_CONFIG
${EXTRA_CLIENT_PKG_CONFIG}
webkitgtk-3.0>=1.10.0
webkitgtk-3.0>=2.0.0
webkitgtk-3.0<=2.0.4
)