[geary] Bump minimum WebKitGTK version to 2.4, remove bindings for older versions.

[Michael Gratton <mjog src gnome org>]

commit 13657a22376cf33a17940ad3d04a265074a3e694
Author: Michael James Gratton <mike vee net>
Date:   Fri May 13 14:46:49 2016 +1000

    Bump minimum WebKitGTK version to 2.4, remove bindings for older versions.
    
    This is both the latest getting security updates, and the version in
    Debian Jessie.

 CMakeLists.txt                                     |    7 ---
 .../metadata/webkitgtk-1.10/WebKit-3.0.metadata    |   16 ------
 .../metadata/webkitgtk-2.0/WebKit-3.0.metadata     |   19 -------
 .../metadata/webkitgtk-2.2/WebKit-3.0.metadata     |   26 ---------
 debian/control                                     |    4 +-
 src/CMakeLists.txt                                 |   55 ++------------------
 6 files changed, 6 insertions(+), 121 deletions(-)
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b08a603..5aa1b19 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,13 +58,6 @@ find_package(PkgConfig)
 pkg_check_modules(LIBUNITY QUIET unity>=5.12.0)
 pkg_check_modules(LIBMESSAGINGMENU QUIET messaging-menu>=12.10.2)
 
-# CMake's range-checking syntax doesn't allow for a bare less-than, so using
-# improbably high version numbers to indicate maximum
-pkg_check_modules(WEBKITGTK24X QUIET webkitgtk-3.0>=2.3.0)
-pkg_check_modules(WEBKITGTK22X QUIET webkitgtk-3.0>=2.2.0 webkitgtk-3.0<=2.2.100)
-pkg_check_modules(WEBKITGTK20X QUIET webkitgtk-3.0>=2.0.0 webkitgtk-3.0<=2.0.100)
-pkg_check_modules(WEBKITGTK110X QUIET webkitgtk-3.0>=1.10.0 webkitgtk-3.0<=1.10.2)
-
 pkg_check_modules(SQLITE311 QUIET sqlite3>=3.11.0)
 pkg_check_modules(SQLITE312 QUIET sqlite3>=3.12.0)
 if (SQLITE311_FOUND AND NOT SQLITE312_FOUND)
diff --git a/debian/control b/debian/control
index 6cc0f92..a678ea1 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 8),
  libgtk-3-dev (>= 3.14.0),
  libnotify-dev (>=0.7.5),
  libcanberra-dev (>= 0.28),
- libwebkitgtk-3.0-dev (>= 1.10.0),
+ libwebkitgtk-3.0-dev (>= 2.4),
  libxml2-dev (>= 2.7.8),
  libsecret-1-dev (>= 0.11),
  libgmime-2.6-dev (>= 2.6.14),
@@ -33,7 +33,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  libgtk-3-0 (>= 3.14.0),
  libnotify4 (>= 0.7.5),
  libcanberra0 (>= 0.28),
- libwebkitgtk-3.0-0 (>= 1.10.0),
+ libwebkitgtk-3.0-0 (>= 2.4),
  libxml2 (>= 2.7.8),
  libsqlite3-0 (>= 3.7.4),
  libgmime-2.6-0 (>= 2.6.14),
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7e82f4b..d0e494c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -467,57 +467,6 @@ else ()
     message(STATUS "Unity launcher support: OFF")
 endif ()
 
-if (WEBKITGTK24X_FOUND)
-    message(STATUS "Targeting WebKitGTK 2.4")
-    SET(EXTRA_CLIENT_PKG_CONFIG
-        ${EXTRA_CLIENT_PKG_CONFIG}
-        webkitgtk-3.0>=2.3.0
-    )
-    
-    SET(WEBKITGTK_METADATA_DIR
-        webkitgtk-2.4
-    )
-       
-       SET(WEBKITGTK_CUSTOM_VALA
-               webkitgtk-2.4/WebKit-3.0-custom.vala
-       )
-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.2.100
-    )
-    
-    SET(WEBKITGTK_METADATA_DIR
-        webkitgtk-2.2
-    )
-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 (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
-    )
-else ()
-    message(FATAL_ERROR "WebKitGTK not installed / unknown version detected")
-endif ()
-
 if (NO_FATAL_WARNINGS)
     message(STATUS "Vala fatal warnings: OFF")
 else ()
@@ -545,6 +494,7 @@ pkg_check_modules(DEPS REQUIRED
     libxml-2.0>=2.7.8
     gcr-3>=3.10.1
     gobject-introspection-1.0
+    webkitgtk-3.0>=2.4.0
     ${EXTRA_CLIENT_PKG_CONFIG}
 )
 
@@ -604,6 +554,9 @@ else ()
     message(STATUS "POODLE SSLv3 fix: ON")
 endif ()
 
+set(WEBKITGTK_METADATA_DIR webkitgtk-2.4)
+set(WEBKITGTK_CUSTOM_VALA webkitgtk-2.4/WebKit-3.0-custom.vala)
+
 set(LIB_PATHS ${DEPS_LIBRARY_DIRS})
 link_directories(${LIB_PATHS})
 add_definitions(${CFLAGS})