[geary/wip/728002-webkit2: 32/43] Bump minimum WebKitGTK+ version to 2.10.



commit 0c5f2275e8dafee92a45cd6a5c1593d9600c4763
Author: Michael James Gratton <mike vee net>
Date:   Sun Oct 16 22:55:55 2016 +1100

    Bump minimum WebKitGTK+ version to 2.10.
    
    We already need to 2.10 for the EditorState::typing-attributes property,
    and we're probably going to want 2.8 anyway for
    WebKit.UserContentManager::register_script_message_handler.
    
    This means geary 0.12 won't compile under Debian stable unless backports
    (bpo) are enabled, but that is how most users will get it 0.12
    anyway. Further, the fact that stable is still shipping WK 2.6 is pretty
    heinous from a security POV.
    
    * src/CMakeLists.txt: Yoiks and away.

 src/CMakeLists.txt |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7ce93a5..a8efdd7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -487,6 +487,7 @@ else ()
 endif ()
 
 set(TARGET_GLIB 2.42)
+set(TARGET_WEBKIT 2.10)
 
 pkg_check_modules(DEPS REQUIRED
     gthread-2.0
@@ -503,8 +504,8 @@ pkg_check_modules(DEPS REQUIRED
     libxml-2.0>=2.7.8
     gcr-3>=3.10.1
     gobject-introspection-1.0
-    webkit2gtk-4.0>=2.6
-    webkit2gtk-web-extension-4.0>=2.6
+    webkit2gtk-4.0>=${TARGET_WEBKIT}
+    webkit2gtk-web-extension-4.0>=${TARGET_WEBKIT}
     enchant>=1.6
     ${EXTRA_CLIENT_PKG_CONFIG}
 )


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]