qtwebkit: Update to 5.212.0-alpha

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

@@ -20,7 +20,7 @@
 +        DynGetTickCount64 = *(ULONGLONG (*)(void))(GetProcAddress(hKernel32,
 +                                        "GetTickCount64"));
 +    }
-+    if (DynGetTickCount64 != (void*)-1)
++    if (DynGetTickCount64 != (void*) NULL)
 +    {
 +        return DynGetTickCount64();
 +    }

mingw-w64-qtwebkit/0002-qtwebkit-workaround-build-breakage-after-svn-commit-136242.patch

@@ -1,21 +0,0 @@
---- qtwebkit/Source/WebKit/qt/Api/qwebkitglobal.h	2013-01-06 19:14:49.225087412 +0100
-+++ qtwebkit/Source/WebKit/qt/Api/qwebkitglobal.h	2013-01-06 19:15:02.498182976 +0100
-@@ -24,7 +24,6 @@
- #include <QtCore/qglobal.h>
- #include <QtCore/qstring.h>
- 
--#ifndef QT_STATIC
- #  if !defined(BUILDING_WebKitWidgets) && defined(BUILDING_WebKit)
- #      define QWEBKIT_EXPORT Q_DECL_EXPORT
- #  else
-@@ -37,10 +36,6 @@
- #  else
- #      define QWEBKITWIDGETS_EXPORT Q_DECL_IMPORT
- #  endif
--#else
--#  define QWEBKITWIDGETS_EXPORT
--#  define QWEBKIT_EXPORT
--#endif
- 
- QWEBKIT_EXPORT QString qWebKitVersion();
- QWEBKIT_EXPORT int qWebKitMajorVersion();

mingw-w64-qtwebkit/0007-fix-set-pythonpath-under-bash.patch

@@ -1,15 +0,0 @@
-diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake
-index 53f294abba7..d1edb210cc1 100644
---- a/Source/cmake/WebKitMacros.cmake
-+++ b/Source/cmake/WebKitMacros.cmake
-@@ -374,7 +374,9 @@ macro(GENERATE_WEBKIT2_MESSAGE_SOURCES _output_source _input_files)
- endmacro()
- 
- macro(MAKE_JS_FILE_ARRAYS _output_cpp _output_h _scripts _scripts_dependencies)
--    if (WIN32)
-+    if (NOT CMAKE_VERSION VERSION_LESS 3.1)
-+        set(_python_path ${CMAKE_COMMAND} -E env "PYTHONPATH=${JavaScriptCore_SCRIPTS_DIR}")
-+    elseif (WIN32)
-         set(_python_path set "PYTHONPATH=${JavaScriptCore_SCRIPTS_DIR}" &&)
-     else ()
-         set(_python_path "PYTHONPATH=${JavaScriptCore_SCRIPTS_DIR}")

mingw-w64-qtwebkit/0010-generate-proper-library-names.patch

@@ -1,29 +0,0 @@
-diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake
-index fdc2a4f8e1e..fcf6c411eaf 100644
---- a/Source/cmake/OptionsQt.cmake
-+++ b/Source/cmake/OptionsQt.cmake
-@@ -58,6 +58,15 @@ set(CMAKE_MACOSX_RPATH ON)
- 
- add_definitions(-DBUILDING_QT__=1)
- 
-+if (WIN32)
-+    if (${CMAKE_BUILD_TYPE} MATCHES "Debug")
-+        set(CMAKE_DEBUG_POSTFIX d)
-+    endif ()
-+
-+    set(CMAKE_SHARED_LIBRARY_PREFIX "")
-+    set(CMAKE_SHARED_MODULE_PREFIX "")
-+endif ()
-+
- WEBKIT_OPTION_BEGIN()
- 
- if (APPLE)
-@@ -629,8 +638,6 @@ if (MSVC)
-             set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DEBUG:FASTLINK")
-             set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DEBUG:FASTLINK")
-         endif ()
--
--        set(CMAKE_DEBUG_POSTFIX d)
-     elseif (${CMAKE_BUILD_TYPE} MATCHES "Release")
-         add_compile_options(/Oy-)
-     endif ()

mingw-w64-qtwebkit/0013-minimal-debug.patch

@@ -1,34 +0,0 @@
-diff --git a/Source/PlatformQt.cmake b/Source/PlatformQt.cmake
-index e651e52c078..397ab8dbc3c 100644
---- a/Source/PlatformQt.cmake
-+++ b/Source/PlatformQt.cmake
-@@ -1,6 +1,28 @@
-+# Minimal debug
-+
-+# Builds with debug flags result in a huge amount of symbols with the GNU toolchain,
-+# resulting in the need of several gigabytes of memory at link-time. Reduce the pressure
-+# by compiling any static library like WTF or JSC with optimization flags instead and keep
-+# debug symbols for the static libraries that implement API.
-+cmake_dependent_option(USE_MINIMAL_DEBUG_INFO "Add debug info only for the libraries that implement API" OFF
-+    "NOT MINGW" ON)
-+
-+if (USE_MINIMAL_DEBUG_INFO)
-+    target_compile_options(WTF                PRIVATE -g0 -O1)
-+    target_compile_options(JavaScriptCore     PRIVATE -g0 -O1)
-+    target_compile_options(WebCore            PRIVATE -g0 -O1)
-+    target_compile_options(WebCoreTestSupport PRIVATE -g0 -O1)
-+    if (TARGET ANGLESupport)
-+        target_compile_options(ANGLESupport   PRIVATE -g0 -O1)
-+    endif ()
-+    if (TARGET gtest)
-+        target_compile_options(gtest          PRIVATE -g0 -O1)
-+    endif ()
-+endif ()
-+
- # GTest
- 
--if (ENABLE_API_TESTS)
-+if (TARGET gtest)
-     set(GTEST_DEFINITIONS QT_NO_KEYWORDS)
-     if (COMPILER_IS_GCC_OR_CLANG)
-         list(APPEND GTEST_DEFINITIONS "GTEST_API_=__attribute__((visibility(\"default\")))")

mingw-w64-qtwebkit/PKGBUILD

@@ -3,8 +3,9 @@
 _realname=qtwebkit
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=tp5
-pkgrel=4
+_pkgver=5.212.0-alpha
+pkgver=5.212.0alpha
+pkgrel=1
 pkgdesc="Webkit module for Qt5 (mingw-w64)"
 arch=('any')
 url="https://github.com/annulen/webkit/wiki"
@@ -25,52 +26,40 @@ depends=("${MINGW_PACKAGE_PREFIX}-icu"
          "${MINGW_PACKAGE_PREFIX}-sqlite3"
          "${MINGW_PACKAGE_PREFIX}-qt5")
 #install=${_realname}-qt5-git-${CARCH}.install
-source=(https://github.com/annulen/webkit/releases/download/qtwebkit-tp5/${_realname}-${pkgver}.tar.xz
+source=(https://github.com/annulen/webkit/releases/download/qtwebkit-${_pkgver}/${_realname}-${_pkgver}.tar.xz
         0001-gettickcount64-compatibility-xp.patch
-        0002-qtwebkit-workaround-build-breakage-after-svn-commit-136242.patch
         0003-qtwebkit-mfence-mingw.patch
         0004-msvc-bug-not-mingw.patch
         0005-fix-icu-find.patch
         0006-python-output-unix-line-endings.patch
-        0007-fix-set-pythonpath-under-bash.patch
         0008-fix-using-msys-perl.patch
         0009-missing-includes.patch
-        0010-generate-proper-library-names.patch
         0011-mingw-posix-layout-files.patch
         0012-install-additional-pri-files.patch
-        0013-minimal-debug.patch
         0014-disable-asm-win64.patch)
-sha256sums=('553dfb47a10d256314b74105d0eafadab0efc0ebd32d77a09cffbe2fed09def8'
-            'da74b0cefbbe9e7afc58de231db1e5101c49cf96f42c9e6245ea3a7e03ec8a32'
-            '5edcff1f6a59d89d9a2de32e34f7a2523f07dffbec502e845cc40d6ac526d7db'
+sha256sums=('f70fea4623a0f1df6ec535358f9c431d6ead9c04742a85258aaabcd0805d2719'
+            '0c3e99ab770752b41782fed1b551353ebdee2b8f8c1c408b09b6d5550eb43dc1'
             'ed80d9a31cb1f9565841e3e206d76810881b7fce30210022270bd19694a9c906'
             'd6340dbcf58b3c031735c23d63e1c58d14baf6fbf2b085cbb7110ea81ade6b1f'
             'b9e39597d140f3fc40d07ae0f0eea0cbabd7b16d8e430d26445ae3063b8ad055'
             '16410ad976524b40e7b9d906e67e4f46b86b58db6d7bb61e929f500387d7937f'
-            'ecb8ce93fc111611f82d7edc2eb91f78f1f1cf35ce00b0501cb345b5a828ee92'
             '9ef33dc05e5652362e10d34d75fd2cf9e7952c1c99306eb2402367401f86770b'
             'e365ccf6748b0ad1a4cba3dcc35fdb286cddc553b54e1242908a5b4019fd6d41'
-            '1f1b3eabbb200e0aa694eddaba5b5d38a52f467d2cee5a2aa1e64b1fc0c097a0'
             'a1ef305a81b4e1b70290d4c3f70bee545f06c17736fe77abde474dba0df8c5c7'
             '054ab5d003e5436e6b5e59d9d61895fed88d8c4eb9cdff39b1d5ef8b89528c68'
-            'c5c39dd972529041715b94e0cdf54ddda9008c64afbedd8c148497aacc6efad1'
             'c39b65235a61217bf4197285d21765a47a91d2e8c267f4b777c982d56d32b408')
 
 prepare() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/${_realname}-${_pkgver}"
   patch -p1 -i ${srcdir}/0001-gettickcount64-compatibility-xp.patch
-  patch -p1 -i ${srcdir}/0002-qtwebkit-workaround-build-breakage-after-svn-commit-136242.patch
   patch -p1 -i ${srcdir}/0003-qtwebkit-mfence-mingw.patch
   patch -p1 -i ${srcdir}/0004-msvc-bug-not-mingw.patch
   patch -p1 -i ${srcdir}/0005-fix-icu-find.patch
   patch -p1 -i ${srcdir}/0006-python-output-unix-line-endings.patch
-  patch -p1 -i ${srcdir}/0007-fix-set-pythonpath-under-bash.patch
   patch -p1 -i ${srcdir}/0008-fix-using-msys-perl.patch
   patch -p1 -i ${srcdir}/0009-missing-includes.patch
-  patch -p1 -i ${srcdir}/0010-generate-proper-library-names.patch
   patch -p1 -i ${srcdir}/0011-mingw-posix-layout-files.patch
   patch -p1 -i ${srcdir}/0012-install-additional-pri-files.patch
-  patch -p1 -i ${srcdir}/0013-minimal-debug.patch
   patch -p1 -i ${srcdir}/0014-disable-asm-win64.patch
 
   # MSYS2 gperf cannot handle \r\n.
@@ -96,7 +85,7 @@ build() {
     -DCMAKE_BUILD_TYPE=Debug \
     -DPORT=Qt \
     ${jit_opt} \
-    ../${_realname}-${pkgver}
+    ../${_realname}-${_pkgver}
 
   make
 
@@ -112,7 +101,7 @@ build() {
     -DCMAKE_BUILD_TYPE=Release \
     -DPORT=Qt \
     ${jit_opt} \
-    ../${_realname}-${pkgver}
+    ../${_realname}-${_pkgver}
 
   make