From 5c1021d9da98fc482eb697b5fa5b6793f9c00a77 Mon Sep 17 00:00:00 2001 From: Jim Nelson Date: Wed, 25 Sep 2013 11:42:06 -0700 Subject: [PATCH] Only build with webkitgtk-3.0 1.10.x: Closes #7541 We'll look into 2.x support in the 0.5 cycle (see #7023). --- debian/control | 4 ++-- src/CMakeLists.txt | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 5f1060ac..9b93bdc0 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 8), libunique-3.0-dev (>= 3.0.0), libnotify-dev (>=0.7.5), libcanberra-dev (>= 0.28), - libwebkitgtk-3.0-dev (>= 1.10.0), + libwebkitgtk-3.0-dev (= 1.10.2), libxml2-dev (>= 2.7.8), libsecret-1-dev (>= 0.11), libgmime-2.6-dev (>= 2.6.0), @@ -33,7 +33,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libunique-3.0-0 (>= 3.0.0), libnotify4 (>= 0.7.5), libcanberra0 (>= 0.28), - libwebkitgtk-3.0-0 (>= 1.10.0), + libwebkitgtk-3.0-0 (= 1.10.2), libxml2 (>= 2.7.8), libsqlite3-0 (>= 3.7.4), libgmime-2.6-0 (>= 2.6.0), diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 383890ff..241b0093 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -449,6 +449,7 @@ pkg_check_modules(DEPS REQUIRED gmime-2.6>=2.6.0 libsecret-1>=0.11 webkitgtk-3.0>=1.10.0 + webkitgtk-3.0<=1.10.2 libxml-2.0>=2.7.8 ${EXTRA_CLIENT_PKG_CONFIG} )