qtwebkit: clang-fixes

from @revelator https://github.com/msys2/MINGW-packages/discussions/7589#discussioncomment-1202826

mingw-w64-qtwebkit/0502-clang-compat.patch

@@ -0,0 +1,58 @@
+diff -Naur qtwebkit-5.212.0-alpha4.a/Source/cmake/OptionsQt.cmake qtwebkit-5.212.0-alpha4.b/Source/cmake/OptionsQt.cmake
+--- qtwebkit-5.212.0-alpha4.a/Source/cmake/OptionsQt.cmake	2021-08-18 16:23:36.216770900 +0200
++++ qtwebkit-5.212.0-alpha4.b/Source/cmake/OptionsQt.cmake	2021-08-18 21:20:32.642677100 +0200
+@@ -717,7 +717,7 @@
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-expansion-to-defined")
+ endif ()
+ 
+-if (WIN32 AND COMPILER_IS_GCC_OR_CLANG)
++if (WIN32 AND NOT COMPILER_IS_CLANG)
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-keep-inline-dllexport")
+ endif ()
+ 
+diff -Naur qtwebkit-5.212.0-alpha4.a/Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h qtwebkit-5.212.0-alpha4.b/Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h
+--- qtwebkit-5.212.0-alpha4.a/Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h	2020-03-04 18:16:37.000000000 +0100
++++ qtwebkit-5.212.0-alpha4.b/Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h	2021-08-18 21:26:38.374692400 +0200
+@@ -932,6 +932,10 @@
+   return NULL;
+ }
+ 
++// gtest-port.h guarantees to #include <pthread.h> when GTEST_HAS_PTHREAD is
++// true.
++#include <pthread.h>
++
+ // Helper class for testing Google Test's multi-threading constructs.
+ // To use it, write:
+ //
+@@ -988,10 +992,6 @@
+   GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadWithParam);
+ };
+ 
+-// gtest-port.h guarantees to #include <pthread.h> when GTEST_HAS_PTHREAD is
+-// true.
+-#include <pthread.h>
+-
+ // MutexBase and Mutex implement mutex on pthreads-based platforms. They
+ // are used in conjunction with class MutexLock:
+ //
+diff -Naur qtwebkit-5.212.0-alpha4.a/Source/WebKit/win/Plugins/PluginViewWin.cpp qtwebkit-5.212.0-alpha4.b/Source/WebKit/win/Plugins/PluginViewWin.cpp
+--- qtwebkit-5.212.0-alpha4.a/Source/WebKit/win/Plugins/PluginViewWin.cpp	2020-03-04 18:16:37.000000000 +0100
++++ qtwebkit-5.212.0-alpha4.b/Source/WebKit/win/Plugins/PluginViewWin.cpp	2021-08-18 21:20:32.687353200 +0200
+@@ -153,7 +153,7 @@
+         return pluginView->m_wmPrintHDC;
+     }
+ 
+-#if COMPILER(GCC)
++#if COMPILER(GCC_OR_CLANG)
+     HDC result;
+     asm ("push    %2\n"
+          "push    %3\n"
+@@ -183,7 +183,7 @@
+         return TRUE;
+     }
+ 
+-#if COMPILER(GCC)
++#if COMPILER(GCC_OR_CLANG)
+     BOOL result;
+     asm ("push   %2\n"
+          "push   %3\n"

mingw-w64-qtwebkit/PKGBUILD

@@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 _pkgver=5.212.0-alpha4
 pkgver=${_pkgver//-/}
-pkgrel=9
+pkgrel=10
 pkgdesc="Webkit module for Qt5 (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
@@ -16,7 +16,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ruby"
              "${MINGW_PACKAGE_PREFIX}-gcc"
              "${MINGW_PACKAGE_PREFIX}-pkg-config"
-             "${MINGW_PACKAGE_PREFIX}-python2"
+             "${MINGW_PACKAGE_PREFIX}-python"
              "${MINGW_PACKAGE_PREFIX}-qt5-tools"
              "dos2unix"
              "gperf")
@@ -45,6 +45,7 @@ source=(https://github.com/annulen/webkit/releases/download/qtwebkit-${_pkgver}/
         0203-add-qtmultimedia-dependencies.patch
         0300-fix-generating-module-files.patch
         0501-build-gcc9.patch
+        0502-clang-compat.patch
         d92b11fea65364fefa700249bd3340e0cd4c5b31.patch)
 sha256sums=('9ca126da9273664dd23a3ccd0c9bebceb7bb534bddd743db31caf6a5a6d4a9e6'
             'ed80d9a31cb1f9565841e3e206d76810881b7fce30210022270bd19694a9c906'
@@ -59,6 +60,7 @@ sha256sums=('9ca126da9273664dd23a3ccd0c9bebceb7bb534bddd743db31caf6a5a6d4a9e6'
             'de80d99c50c8c23fbc83c4685e4916451535b59d72151c7752e73354aca87390'
             '5ab5de5ee65fcd2a00412c8a2a1b2bbc4281d4ad99bac743757e6e8199a75ebe'
             'f6e85179e3581456cdfa9a00af537b4fb3caf0d66b14becc6592a15deba11175'
+            '17bfe3bf5dde380b16198d9f63c7f74032c1fa7e8530047625f0f413d365a722'
             'cc5a2b762426e9cda5a3ae056bba266b5f775ee75c0590913839c255d5f10db0')
 
 # Helper macros to help make tasks easier #
@@ -90,7 +92,8 @@ prepare() {
 
   apply_patch_with_msg \
     0300-fix-generating-module-files.patch \
-    0501-build-gcc9.patch
+    0501-build-gcc9.patch \
+    0502-clang-compat.patch
 
   # Fix build with bison 3.7+
   apply_patch_with_msg \