[geary/wip/720315-webkitgtk-2.4] Initial patch

[Jim Nelson <jnelson src gnome org>]

commit 4e27bd49c152fd91503324bc896f8c7bded2a019
Author: Jim Nelson <jim yorba org>
Date:   Mon Dec 16 15:08:07 2013 -0800

    Initial patch

 CMakeLists.txt                                     |    4 +++-
 .../metadata/webkitgtk-2.4/WebKit-3.0.metadata     |   14 ++++++++++++++
 src/CMakeLists.txt                                 |   19 +++++++++++++++----
 3 files changed, 32 insertions(+), 5 deletions(-)
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a991c61..77de038 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,7 +53,9 @@ 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)
+pkg_check_modules(WEBKITGTK200X QUIET webkitgtk-3.0>=2.0.0 webkitgtk-3.0<2.1.0)
+pkg_check_modules(WEBKITGTK22X QUIET webkitgtk-3.0>=2.2.0 webkitgtk-3.0<2.3.0)
+pkg_check_modules(WEBKITGTK24X QUIET webkitgtk-3.0>=2.3.0)
 
 # intl
 include(Gettext)
diff --git a/bindings/metadata/webkitgtk-2.4/WebKit-3.0.metadata 
b/bindings/metadata/webkitgtk-2.4/WebKit-3.0.metadata
new file mode 100644
index 0000000..49723e4
--- /dev/null
+++ b/bindings/metadata/webkitgtk-2.4/WebKit-3.0.metadata
@@ -0,0 +1,14 @@
+DOM* parent="WebKit.DOM" name="DOM(.+)"
+
+DOMEventTarget.add_event_listener skip=false
+DOMEventTarget.add_event_listener.handler closure=-1
+DOMEventTarget.add_event_listener.user_data closure=-1
+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
+
+WebFrame.get_global_context skip
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fab8709..16165c2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -449,26 +449,37 @@ if (WEBKITGTK110X_FOUND)
     SET(WEBKITGTK_METADATA_DIR
         webkitgtk-1.10
     )
+elseif (WEBKITGTK20X_FOUND)
+    message(STATUS "Targeting WebKitGTK 2.0")
+    SET(EXTRA_CLIENT_PKG_CONFIG
+        ${EXTRA_CLIENT_PKG_CONFIG}
+        webkitgtk-3.0>=2.0.0
+        webkitgtk-3.0<=2.0.4
+    )
+    
+    SET(WEBKITGTK_METADATA_DIR
+        webkitgtk-2.0
+    )
 elseif (WEBKITGTK22X_FOUND)
     message(STATUS "Targeting WebKitGTK 2.2")
     SET(EXTRA_CLIENT_PKG_CONFIG
         ${EXTRA_CLIENT_PKG_CONFIG}
         webkitgtk-3.0>=2.2.0
+        webkitgtk-3.0<2.3.0
     )
     
     SET(WEBKITGTK_METADATA_DIR
         webkitgtk-2.2
     )
 else ()
-    message(STATUS "Targeting WebKitGTK 2.0")
+    message(STATUS "Targeting WebKitGTK 2.4")
     SET(EXTRA_CLIENT_PKG_CONFIG
         ${EXTRA_CLIENT_PKG_CONFIG}
-        webkitgtk-3.0>=2.0.0
-        webkitgtk-3.0<=2.0.4
+        webkitgtk-3.0>=2.3.0
     )
     
     SET(WEBKITGTK_METADATA_DIR
-        webkitgtk-2.0
+        webkitgtk-2.4
     )
 endif ()