$ git diff --patch-with-stat --summary bf6b58584ee1bd35e1714f80fe6803445b711036..f72b3f656e9a7560a939b68f65edde20de3309fe

 .abf.yml                                    |  4 +++-
 webkit.spec                                 |  8 ++++++--
 webkitgtk-2.16.5-clang-5.0-workaround.patch | 22 ++++++++++++++++++++++
 3 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 webkitgtk-2.16.5-clang-5.0-workaround.patch

diff --git a/.abf.yml b/.abf.yml
index 34386af..7845b7a 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,4 @@
+removed_sources:
+  webkitgtk-2.18.5.tar.xz: 5f36db464f6b7bbe6a57e55bc9bb172f87a4c398
 sources:
-  webkitgtk-2.18.1.tar.xz: 5054dd6b8afdc6e98b947e361011d6dca6da74e2
+  webkitgtk-2.18.6.tar.xz: fb0daa85142cfe8822de518dfaa7bd5c3cdd6c23
diff --git a/webkit.spec b/webkit.spec
index 4136ca3..9adf012 100644
--- a/webkit.spec
+++ b/webkit.spec
@@ -17,14 +17,15 @@
 
 Summary:	Web browser engine
 Name:		webkit2
-Version:	2.18.1
-Release:	2
+Version:	2.18.6
+Release:	1.1
 License:	BSD and LGPLv2+
 Group:		System/Libraries
 Source0:	http://webkitgtk.org/releases/%{oname}-%{version}.tar.xz
 Patch0:		webkitgtk-typelib-sharelib-link.patch
 # (cb) force disable lto when building the typelibs
 Patch1:		webkitgtk-2.10.4-nolto.patch
+Patch2:		webkitgtk-2.16.5-clang-5.0-workaround.patch
 URL:		http://www.webkitgtk.org
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -39,6 +40,8 @@ BuildRequires:	jpeg-devel
 BuildRequires:	png-devel
 BuildRequires:	pkgconfig(libwebp)
 BuildRequires:	pkgconfig(libsecret-1)
+BuildRequires:	pkgconfig(geoclue-2.0)
+BuildRequires:	pkgconfig(ruby)
 BuildRequires:	librsvg-devel >= 2.2.0
 BuildRequires:	libstdc++-devel
 BuildRequires:	libsoup-devel >= 2.42.0
@@ -65,6 +68,7 @@ BuildRequires:	pkgconfig(gnutls)
 BuildRequires:	gail-devel
 BuildRequires:	ruby
 BuildRequires:	cmake >= 2.8.8
+BuildRequires:	perl-JSON-PP
 Requires:	%{libwebkit2} = %{version}
 
 %description
diff --git a/webkitgtk-2.16.5-clang-5.0-workaround.patch b/webkitgtk-2.16.5-clang-5.0-workaround.patch
new file mode 100644
index 0000000..078697a
--- /dev/null
+++ b/webkitgtk-2.16.5-clang-5.0-workaround.patch
@@ -0,0 +1,22 @@
+--- webkitgtk-2.16.5/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp.omv~	2017-07-05 17:10:02.768291293 +0200
++++ webkitgtk-2.16.5/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp	2017-07-05 17:10:11.708082859 +0200
+@@ -293,7 +293,7 @@ typedef short int yytype_int16;
+ # define YYUSE(E) /* empty */
+ #endif
+ 
+-#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
++#if !defined(__clang__) && defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+ /* Suppress an incorrect diagnostic about yylval being uninitialized.  */
+ # define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
+     _Pragma ("GCC diagnostic push") \
+--- webkitgtk-2.16.5/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp.omv~	2017-07-05 17:09:24.107192904 +0200
++++ webkitgtk-2.16.5/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp	2017-07-05 17:09:32.828989472 +0200
+@@ -495,7 +495,7 @@ typedef short int yytype_int16;
+ # define YYUSE(E) /* empty */
+ #endif
+ 
+-#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
++#if !defined(__clang__) && defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+ /* Suppress an incorrect diagnostic about yylval being uninitialized.  */
+ # define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
+     _Pragma ("GCC diagnostic push") \