qtwebkit: Update to 5.212.0-alpha4

mingw-w64-qtwebkit/0001-gettickcount64-compatibility-xp.patch

@@ -1,38 +0,0 @@
---- qtwebkit-tp5/Source/WTF/wtf/CurrentTime.cpp.orig	2017-02-07 20:18:29.395887200 +0300
-+++ qtwebkit-tp5/Source/WTF/wtf/CurrentTime.cpp	2017-02-07 20:20:03.241254800 +0300
-@@ -91,6 +91,35 @@
- 
- #if USE(QUERY_PERFORMANCE_COUNTER)
- 
-+#if defined(_WIN32) && (defined(__x86_64__) || defined(_AMD64_)) && _WIN32_WINNT < 0x0600
-+/* GetTickCount64() is not available on XP. */
-+ULONGLONG GetTickCount64 ()
-+{
-+    static ULONGLONG (CALLBACK *DynGetTickCount64)() = (ULONGLONG (*)(void))-1;
-+    static DWORD last_ticks = 0;
-+    static DWORD n_overflow = 0;
-+    DWORD ticks = 0;
-+    HINSTANCE hKernel32;
-+
-+    if (DynGetTickCount64 == (void*)-1)
-+    {
-+        hKernel32 = GetModuleHandleW(L"KERNEL32");
-+        DynGetTickCount64 = *(ULONGLONG (*)(void))(GetProcAddress(hKernel32,
-+                                        "GetTickCount64"));
-+    }
-+    if (DynGetTickCount64 != (void*) NULL)
-+    {
-+        return DynGetTickCount64();
-+    }
-+
-+    ticks = GetTickCount();
-+    if (ticks < last_ticks)
-+        n_overflow++;
-+    last_ticks = ticks;
-+    return ((ULONGLONG)n_overflow << 32LL) + (ULONGLONG)GetTickCount();
-+}
-+#endif
-+
- static LARGE_INTEGER qpcFrequency;
- static bool syncedTime;
- 

mingw-w64-qtwebkit/0004-msvc-bug-not-mingw.patch

@@ -1,11 +0,0 @@
---- qtwebkit-tp5/Source/JavaScriptCore/jsc.cpp.orig	2017-02-07 21:14:51.788349000 +0300
-+++ qtwebkit-tp5/Source/JavaScriptCore/jsc.cpp	2017-02-07 21:15:15.280692700 +0300
-@@ -1710,7 +1710,7 @@
-     fesetenv( &env );
- #endif
- 
--#if OS(WINDOWS) && (defined(_M_X64) || defined(__x86_64__))
-+#if OS(WINDOWS) && (defined(_M_X64) || defined(__x86_64__)) && !COMPILER(GCC)
-     // The VS2013 runtime has a bug where it mis-detects AVX-capable processors
-     // if the feature has been disabled in firmware. This causes us to crash
-     // in some of the math functions. For now, we disable those optimizations

mingw-w64-qtwebkit/0015-use-proper-import-suffix-mingw.patch

@@ -0,0 +1,14 @@
+diff -Naur qtwebkit-5.212.0-alpha4-orig/Source/cmake/OptionsQt.cmake qtwebkit-5.212.0-alpha4/Source/cmake/OptionsQt.cmake
+--- qtwebkit-5.212.0-alpha4-orig/Source/cmake/OptionsQt.cmake	2019-06-26 19:25:02.000000000 +0300
++++ qtwebkit-5.212.0-alpha4/Source/cmake/OptionsQt.cmake	2020-03-04 20:16:37.000000000 +0300
+@@ -184,8 +184,10 @@
+ 
+     set(CMAKE_SHARED_LIBRARY_PREFIX "")
+     set(CMAKE_SHARED_MODULE_PREFIX "")
++    if(NOT MINGW)
+     # QMake doesn't treat import libraries as a separate product kind
+     set(CMAKE_IMPORT_LIBRARY_SUFFIX "${CMAKE_STATIC_LIBRARY_SUFFIX}")
++    endif()
+ endif ()
+ 
+ WEBKIT_OPTION_BEGIN()

mingw-w64-qtwebkit/0502-fix-typos.patch

@@ -1,26 +0,0 @@
---- qtwebkit-5.212.0-alpha3/Source/WebCore/dom/Document.cpp.orig	2019-11-08 11:33:20.999642500 +0300
-+++ qtwebkit-5.212.0-alpha3/Source/WebCore/dom/Document.cpp	2019-11-08 11:34:00.987712500 +0300
-@@ -4407,12 +4407,12 @@
-     unsigned i = 0;
- 
-     UChar32 c;
--    U16_NEXT(characters, i, length, c)
-+    U16_NEXT(characters, i, length, c);
-     if (!isValidNameStart(c))
-         return false;
- 
-     while (i < length) {
--        U16_NEXT(characters, i, length, c)
-+        U16_NEXT(characters, i, length, c);
-         if (!isValidNamePart(c))
-             return false;
-     }
-@@ -4474,7 +4474,7 @@
- 
-     for (unsigned i = 0; i < length;) {
-         UChar32 c;
--        U16_NEXT(qualifiedName, i, length, c)
-+        U16_NEXT(qualifiedName, i, length, c);
-         if (c == ':') {
-             if (sawColon) {
-                 ec = NAMESPACE_ERR;

mingw-w64-qtwebkit/PKGBUILD

@@ -3,7 +3,7 @@
 _realname=qtwebkit
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-_pkgver=5.212.0-alpha3
+_pkgver=5.212.0-alpha4
 pkgver=${_pkgver//-/}
 pkgrel=1
 pkgdesc="Webkit module for Qt5 (mingw-w64)"
@@ -28,33 +28,29 @@ depends=("${MINGW_PACKAGE_PREFIX}-icu"
          "${MINGW_PACKAGE_PREFIX}-woff2")
 #install=${_realname}-qt5-git-${CARCH}.install
 source=(https://github.com/annulen/webkit/releases/download/qtwebkit-${_pkgver}/${_realname}-${_pkgver}.tar.xz
-        0001-gettickcount64-compatibility-xp.patch
         0003-qtwebkit-mfence-mingw.patch
-        0004-msvc-bug-not-mingw.patch
         0005-fix-icu-find.patch
         0006-python-output-unix-line-endings.patch
         0008-fix-using-msys-perl.patch
         0011-mingw-posix-layout-files.patch
         0014-disable-asm-win64.patch
+        0015-use-proper-import-suffix-mingw.patch
         0202-install-private-headers-and-modules.patch
         0203-add-qtmultimedia-dependencies.patch
         0300-fix-generating-module-files.patch
-        0501-build-gcc9.patch
-        0502-fix-typos.patch)
-sha256sums=('357eee582445574472e410ebece632d06fa0ec94358fc4345f2a713922df5e17'
-            '0c3e99ab770752b41782fed1b551353ebdee2b8f8c1c408b09b6d5550eb43dc1'
+        0501-build-gcc9.patch)
+sha256sums=('9ca126da9273664dd23a3ccd0c9bebceb7bb534bddd743db31caf6a5a6d4a9e6'
             'ed80d9a31cb1f9565841e3e206d76810881b7fce30210022270bd19694a9c906'
-            'd6340dbcf58b3c031735c23d63e1c58d14baf6fbf2b085cbb7110ea81ade6b1f'
             'b9e39597d140f3fc40d07ae0f0eea0cbabd7b16d8e430d26445ae3063b8ad055'
             '16410ad976524b40e7b9d906e67e4f46b86b58db6d7bb61e929f500387d7937f'
             '9ef33dc05e5652362e10d34d75fd2cf9e7952c1c99306eb2402367401f86770b'
             'a1ef305a81b4e1b70290d4c3f70bee545f06c17736fe77abde474dba0df8c5c7'
             'c39b65235a61217bf4197285d21765a47a91d2e8c267f4b777c982d56d32b408'
+            '7406d9d008e0c657b6d8e6cea20adeb18ad485fc3c749c0fc4ec98dfe1f28e36'
             'bc65b6e2bca1d8b304b063a4783dbcb845f0554202c7e2035f2cdca9b165d8ea'
             'de80d99c50c8c23fbc83c4685e4916451535b59d72151c7752e73354aca87390'
             '5ab5de5ee65fcd2a00412c8a2a1b2bbc4281d4ad99bac743757e6e8199a75ebe'
-            'f6e85179e3581456cdfa9a00af537b4fb3caf0d66b14becc6592a15deba11175'
-            '07694631b209a8c871f902b48f6005aa9bf36a41526e930da973ec7e98668de1')
+            'f6e85179e3581456cdfa9a00af537b4fb3caf0d66b14becc6592a15deba11175')
 
 # Helper macros to help make tasks easier #
 apply_patch_with_msg() {
@@ -69,14 +65,13 @@ prepare() {
   cd "${srcdir}/${_realname}-${_pkgver}"
   
   apply_patch_with_msg \
-    0001-gettickcount64-compatibility-xp.patch \
     0003-qtwebkit-mfence-mingw.patch \
-    0004-msvc-bug-not-mingw.patch \
     0005-fix-icu-find.patch \
     0006-python-output-unix-line-endings.patch \
     0008-fix-using-msys-perl.patch \
     0011-mingw-posix-layout-files.patch \
-    0014-disable-asm-win64.patch
+    0014-disable-asm-win64.patch \
+    0015-use-proper-import-suffix-mingw.patch
   
   # Upstream patches
   apply_patch_with_msg \
@@ -85,8 +80,7 @@ prepare() {
   
   apply_patch_with_msg \
     0300-fix-generating-module-files.patch \
-    0501-build-gcc9.patch \
-    0502-fix-typos.patch
+    0501-build-gcc9.patch
 
   # MSYS2 gperf cannot handle \r\n.
   find . -name "*.gperf" -exec dos2unix "{}" \;
@@ -123,6 +117,7 @@ build() {
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
     -DCMAKE_BUILD_TYPE=Release \
     -DPORT=Qt \
+    -DFORCE_DEBUG_INFO=OFF \
     ${jit_opt} \
     ../${_realname}-${_pkgver}