Rebase Qt 5 packages against 5.15.4

2022-05-16 20:00:12 +02:00 · 2022-05-16 20:00:12 +02:00 · a10fd8c94b
parent 969a806092
commit a10fd8c94b
184 changed files with 419 additions and 401 deletions
--- a/devel/generator/gen-kde-fork-revisions.sh
+++ b/devel/generator/gen-kde-fork-revisions.sh
@ -0,0 +1,17 @@
+#!/bin/bash
+set -e # abort on first error
+shopt -s nullglob
+bindir=$(dirname "$0")
+source "$bindir/../versions.sh"
+expected_version=${versions[qt5]}.*
+
+arch_pkgbuilds=$1
+[[ $arch_pkgbuilds ]] && cd "$arch_pkgbuilds"
+
+for pkgbuild in qt5-*/trunk/PKGBUILD ; do
+    source "$pkgbuild"
+    if [[ $pkgname != qt5-doc ]] && [[ $pkgver =~ $expected_version ]] && [[ $_commit ]]; then
+        echo "${pkgname##qt5-} => [${pkgver##*+r}, '$_commit']",
+    fi
+done
+
--- a/devel/generator/generate.pl
+++ b/devel/generator/generate.pl
@ -76,43 +76,44 @@ $mojolicious->helper(expand_libs => sub {

 # define revisions of Qt modules from KDE fork
 my %kde_fork_revisions = (
-    # module         => [rev, 'commit on KDE fork',                       'version bump to be reverted'             ],
-    '3d'             => [18,  '6d926ec2739f2289c6b0bbfbc325700046e1ceee',                                           ],
-    activeqt         => [0,   '2c53a16f431bbb950bfca8ac32ddabf217a0bf04',                                           ],
-    base             => [145, 'cfa044e74c4f3be46fe2f177d022af3321766b1f',                                           ],
-    charts           => [0,   'f13988aa1ad9de5d92e7b0ba4d0d947dd019d759',                                           ],
-    connectivity     => [0,   '8a377440b37f5633156a8e40c9f0dce5f4d5a665',                                           ],
-    connnectivity    => [5,   '8a377440b37f5633156a8e40c9f0dce5f4d5a665',                                           ],
-    datavis3d        => [0,   '19af9584f7b80928ee49950c573c770af68c9519',                                           ],
-    declarative      => [20,  '02105099301450c890e1caba977ef44efdc43da7',                                           ],
-    gamepad          => [0,   '6b7a6303439f83147680723f4d8142d676cdb928',                                           ],
-    graphicaleffects => [0,   '379577925766385991f413a2b0d0d46831381ffa',                                           ],
-    imageformats     => [0,   '90038c936763645610fe1e5f05cfc025e4d98631',                                           ],
-    location         => [0,   '1bf01b84e30aab2b87a19184ce42160e6c92d8b1',                                           ],
-    lottie           => [0,   'fca3f80f0ce389271e5bd9af864ce56a313d359a',                                           ],
-    multimedia       => [0,   'fa6c3d653682f9fd331d859c7196a291a8a4d8d5',                                           ],
-    networkauth      => [0,   '958db00a2064f77b354b573102ca2c2b2e07529c',                                           ],
-    purchasing       => [0,   '255b9e16f286003bbfaff9d48e4548fb0cb3b398',                                           ],
-    quick3d          => [2,   '1ede2ac20170357b3e8d7d9810e5474e08170827',                                           ],
-    quickcontrols    => [0,   'd054de15b3c9ead0f96655ddfb1a6381ed7a0e2b',                                           ],
-    quickcontrols2   => [4,   '26bd7f5414dc592ab5277e2bb4ad0199faa889de',                                           ],
-    quicktimeline    => [0,   '98b1ff53458887061b4bcc183efcce899f432394',                                           ],
-    remoteobjects    => [0,   '581475dfeb44c8b51c0be86e0f2f57df7d117a80',                                           ],
-    scxml            => [0,   '50d2da3965ed8e85f3f5f5760393c42b12d34a9f',                                           ],
-    sensors          => [0,   '975ba788d3d0ee87aa08bb5301cd33dcbf00521b',                                           ],
-    serialbus        => [0,   '22b3cad193232ab379a0c9e16989a7db1fdc9234',                                           ],
-    serialport       => [0,   'f95e2411d7c978def87846ea7cedf3dc5fd7c8b8',                                           ],
-    speech           => [1,   '08b27c29aadc0cc0303cca97c9a3baa2a690dfe4',                                           ],
-    svg              => [12,  '2f42157cabbd1db6249ccb1d14e6eede80451e0c',                                           ],
-    tools            => [1,   'a3e5b2eb8ef5982bc1fffb390ebcd141be1deee4',                                           ],
-    translations     => [2,   'a6d5e7f84a57394db4c8b069f81c56cfeb802e19',                                           ],
-    virtualkeyboard  => [3,   'bb40dee811333929dd467a480dce24ab7af84ef9',                                           ],
-    wayland          => [40,  '118674630cdb5933e66a8b4415afe7c716ad4662',                                           ],
-    webchannel       => [3,   '611016a49f3a9ba7b58bef29bc295323e06373ae',                                           ],
-    webglplugin      => [0,   '4318ad91c2a8bea3a0aaaa64aaf49d3b997e50a1',                                           ],
-    websockets       => [3,   '7196d2cc34adf9f45b50a9488f4ff95b36092993',                                           ],
-    winextras        => [0,   '051202df9c553d7c0a384f07bd67fde98f3b02c4',                                           ],
-    xmlpatterns      => [0,   'af4958af9d628d6124e64abd9743abce42f15a6f',                                           ],
+    # module => [rev, 'commit on KDE fork', 'version bump to be reverted'],
+    '3d' => [17, '5fd3906445ac95bf1cca6e7a7e0aeb6e3bcf5016'],
+    activeqt => [0, '065ae50f6bf947f11b7bcaa3199df99a83667574'],
+    base => [135, 'e0a15c11b853954d4189b2e30aa2450184de0987'],
+    charts => [0, '16c2a8821135bf89369c4e3c5a1bdff8b05ffdb5'],
+    connectivity => [4, '25720ab6004cf37ae54ad85d22f87f5fc9e6e72e'],
+    datavis3d => [0, '5f8e2a037d5201c902149c828d102b71e90257e2'],
+    declarative => [17, '51efb2ed2f071beda188270a23ac450fe4b318f7'],
+    gamepad => [0, '8526b210146a2d030ae2f55ad44261befea4a087'],
+    graphicaleffects => [0, '4c6ec38635aa22cf0854df8e710733c529f4ec02'],
+    imageformats => [0, '8c5bcabbf6a2e27539c2ad689fd69f2406d5cf5c'],
+    location => [2, 'db3b6bc6afed6477e6ab2d8465e41efee30fb6d5'],
+    lottie => [0, 'ccba2b00bd7f10558edb8664d6b9a95e9fafe6ac'],
+    multimedia => [0, 'dc0ee181d4c56ff66c989bd3292dad7cc35e234b'],
+    networkauth => [0, '2b0c9499e4000858138802e8f5aa28aa2ebe14c0'],
+    purchasing => [0, '397c721847059b998d3b345149a3f6113579d7fe'],
+    quick3d => [2, 'd52bfdf7d967419a61c2a4492163626096838a99'],
+    quickcontrols => [0, 'd405bf6a29bc9d6da6e3dcefbd1b88f5ed70fb1b'],
+    quickcontrols2 => [4, '0d3d39e821ea7634c174a29910c18d7101bce6f7'],
+    quicktimeline => [0, '2ce816fa5822bcc1c47678447405b2e5dc1312c1'],
+    remoteobjects => [0, '809412e1cc2151c21f843796ef67705600f6aafb'],
+    scxml => [0, 'dcbd73cf3e8a07dbfa249d7db2257caafa83781b'],
+    sensors => [0, '1ab8d6c7257f9ec060739b648704be1cf1c16b05'],
+    serialbus => [0, 'e34053fbda8d687e3dc294fbd5e3a88bf94a7a66'],
+    serialport => [0, '191e67e428522a0e2e1e8d2f3440607a9760d441'],
+    speech => [1, 'c8a1dadc46ccdbeaef45aa805a9dc98d4b3220bd'],
+    svg => [10, '23b8cf7d833c335d7735855570c05e9e0893a9b7'],
+    tools => [0, '53ee43a51b5a3de2877dafffc78e71ff55926708'],
+    translations => [2, '527dcd684e8d5c645870c854b86df77edeedbc22'],
+    virtualkeyboard => [3, 'e8ae4757dd32e8dbf69a7c57f2bc5c1e238416db'],
+    wayland => [38, '36659e6130ed3fc2b3f0c91423408ef5ecb7b991'],
+    webchannel => [3, '8c842152da613f941892481d62267c73c4a4f006'],
+    webglplugin => [0, 'df60c61e640dc4fb6be0d9565a4ab08aee054f93'],
+    websockets => [3, '6a4991250793cd38efa5e8db858cd49c82439130'],
+    webview => [0, '826d2a33929c69807917536d48b7861e7682001e'],
+    winextras => [0, '96cfbd36ad9979ff1974cf137b68b9ae101022c3'],
+    x11extras => [0, '51b0a5a2e3e35f4cb17da1e7cb4babef6294bfb4'],
+    xmlpatterns => [0, 'dfcae10dec8c1c2c544ad0cd303cea113b0af51d'],
 );
 # $rev := git rev-list --count v5.15.2..$commit_on_kde_fork

--- a/devel/generator/templates/layouts/mingw-w64-qt5-base.sh.ep
+++ b/devel/generator/templates/layouts/mingw-w64-qt5-base.sh.ep
@ -31,7 +31,7 @@

 _qt_module=qt<%== $qt_module %>
 pkgname=<%= $package_name %>
-pkgver=5.15.3<%== $kde_fork_revision ? "+kde+r$kde_fork_revision->[0]" : '' %>
+pkgver=5.15.4<%== $kde_fork_revision ? "+kde+r$kde_fork_revision->[0]" : '' %>
 pkgrel=1
 % if ($kde_fork_revision) {
 _basever=${pkgver%%+*}
--- a/devel/versions.sh
+++ b/devel/versions.sh
@ -13,7 +13,7 @@ declare -A versions=(
    [blackwidowcontrol]=1.0.2
    [dbus-soundrecorder]=1.2.3
    [geocoordinatecalculator]=1.1.3
-    [qt5]=5.15.3
+    [qt5]=5.15.4
    [qt6]=6.3.0
 )
 declare -A github_names=(
--- a/qt5-3d/mingw-w64-static/PKGBUILD
+++ b/qt5-3d/mingw-w64-static/PKGBUILD
@ -10,16 +10,16 @@

 _qt_module=qt3d
 pkgname=mingw-w64-qt5-3d-static
-pkgver=5.15.3
+pkgver=5.15.4
 pkgrel=1
 arch=('any')
 pkgdesc="C++ and QML APIs for easy inclusion of 3D graphics (mingw-w64)"
 depends=('mingw-w64-qt5-declarative-static' 'mingw-w64-assimp')
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'mingw-w64-vulkan-headers' 'assimp')
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
-_commit=6d926ec2739f2289c6b0bbfbc325700046e1ceee
+_commit=5fd3906445ac95bf1cca6e7a7e0aeb6e3bcf5016
 _basever=$pkgver
-pkgver+=+kde+r18
+pkgver+=+kde+r17
 makedepends+=('git')
 options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
--- a/qt5-3d/mingw-w64-static/qt3d-sha256.txt
+++ b/qt5-3d/mingw-w64-static/qt3d-sha256.txt
@ -1 +1 @@
-03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d
+SKIP
--- a/qt5-3d/mingw-w64/PKGBUILD
+++ b/qt5-3d/mingw-w64/PKGBUILD
@ -10,16 +10,16 @@

 _qt_module=qt3d
 pkgname=mingw-w64-qt5-3d
-pkgver=5.15.3
+pkgver=5.15.4
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="C++ and QML APIs for easy inclusion of 3D graphics (mingw-w64)"
 depends=('mingw-w64-qt5-declarative' 'mingw-w64-assimp')
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'mingw-w64-vulkan-headers' 'assimp')
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
-_commit=6d926ec2739f2289c6b0bbfbc325700046e1ceee
+_commit=5fd3906445ac95bf1cca6e7a7e0aeb6e3bcf5016
 _basever=$pkgver
-pkgver+=+kde+r18
+pkgver+=+kde+r17
 makedepends+=('git')
 options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
--- a/qt5-3d/mingw-w64/PKGBUILD.sh.ep
+++ b/qt5-3d/mingw-w64/PKGBUILD.sh.ep
@ -4,7 +4,7 @@
 # Contributor: ant32 <antreimer@gmail.com>
 % end
 \
-pkgver=5.15.3
+pkgver=5.15.4
 pkgrel=1
 arch=(<%== include 'fragments/mingw-w64-qt5-non_any_archs' %>)
 pkgdesc="C++ and QML APIs for easy inclusion of 3D graphics (mingw-w64)"
--- a/qt5-3d/mingw-w64/qt3d-sha256.txt
+++ b/qt5-3d/mingw-w64/qt3d-sha256.txt
@ -1 +1 @@
-03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d
+SKIP
--- a/qt5-activeqt/mingw-w64/PKGBUILD
+++ b/qt5-activeqt/mingw-w64/PKGBUILD
@ -15,14 +15,14 @@

 _qt_module=qtactiveqt
 pkgname=mingw-w64-qt5-activeqt
-pkgver=5.15.3
+pkgver=5.15.4
 pkgrel=1
 arch=('any')
 pkgdesc="ActiveX integration framework (mingw-w64)"
 depends=('mingw-w64-qt5-base')
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'python')
 license=('GPL3' 'LGPL3' 'LGPL2.1' 'FDL' 'custom')
-_commit=2c53a16f431bbb950bfca8ac32ddabf217a0bf04
+_commit=065ae50f6bf947f11b7bcaa3199df99a83667574
 _basever=$pkgver
 pkgver+=+kde+r0
 makedepends+=('git')
--- a/qt5-activeqt/mingw-w64/PKGBUILD.sh.ep
+++ b/qt5-activeqt/mingw-w64/PKGBUILD.sh.ep
@ -10,7 +10,7 @@

 % end
 \
-pkgver=5.15.3
+pkgver=5.15.4
 pkgrel=1
 arch=('any')
 pkgdesc="ActiveX integration framework (mingw-w64)"
--- a/qt5-activeqt/mingw-w64/qtactiveqt-sha256.txt
+++ b/qt5-activeqt/mingw-w64/qtactiveqt-sha256.txt
@ -1 +1 @@
-868161fee0876d17079cd5bed58d1667bf19ffd0018cbe515129f11510ad2a5c
+SKIP
--- a/qt5-base/mingw-w64-static/PKGBUILD
+++ b/qt5-base/mingw-w64-static/PKGBUILD
@ -17,10 +17,10 @@

 _qt_module=qtbase
 pkgname=mingw-w64-qt5-base-static
-pkgver=5.15.3+kde+r145
+pkgver=5.15.4+kde+r135
 pkgrel=1
 _basever=${pkgver%%+*}
-_commit=cfa044e74c4f3be46fe2f177d022af3321766b1f
+_commit=e0a15c11b853954d4189b2e30aa2450184de0987
 pkgdesc='A cross-platform application and UI framework, native OpenGL backend (mingw-w64)'
 arch=('any')
 url='https://www.qt.io/'
@ -72,39 +72,39 @@ source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit
        '0032-Fix-crashes-in-rasterization-code-using-setjmp.patch'
        '0033-Handle-even-more-include-in-enum-cases.patch')
 sha256sums=('SKIP'
-            'c46cc0408f60117c0299ac25c6ada46b54ad48ae6063450609cd650d54b461b9'
-            '1c47cf77b1dfe57487b1ad6364ad3e1ad3e67184598bf356fff25ac3847816cd'
-            'fbcc353eaf380ce3c9884c1f0db94b3b19edd1c2182edf9f64d4c8190d7a426a'
-            'c8eac4f92067f75cc28cbf3344e54a76ed9783ebf663772e9c417c51a27ece3d'
-            '334a9e7ec195e504c51a3ea697d35f62cf58c9c5e255175d9c0aaaa8cfe2b676'
-            '38fafe0b297b5451db359b616e91c15f24a91dc8d8876ae8bfb463a4ce05715e'
-            'a525983aabb87585b76d647c0d53c1d703938dcb48601dde407bff88eb9ac2c9'
-            'daf1409342054e9464de9b329b775032d0ec94b15ea4be78457c26a184dce31c'
-            'ad395e48421dda7af1982d37b39bec4891839e7883227801547fcb559a8dee35'
-            '189558608903e4c073777fec1f026d4cf09aec1bfd914a1e7ddbee24c36de5ad'
-            '9cb6133a2c2a713119ce90974e968e425d634bc5e57870e3ddabbd49fec420c2'
-            '38b6fe3c8a4aef5f8aae73edcc2ddcaf27ea6dd2509ec4f0db875a1916c92130'
-            '4d4dcb973428232b1f3423e7369b7d252af9bfba238415ac247187073f8a19e1'
-            'dcc4168cad92fc7b12a80fdd07cfb52a446a138cea95f7fe855d988f1cee6903'
-            '37bcaaf3b89670432ec23a5bf8b6cc76122080347aea07b98eb114dfda4247a3'
-            '9fb4f6a4dfddd033a72e70972831e5f5b202ab07d1365eab13e628f41f8d44e5'
-            '09487150942169445a5be1563073efaa772705c6e1c343d73419919e19e5e486'
-            'e1e80eb30a4e173eb2a73ab48dde1a8199bf5ac3bd627d888bf2eec9bdcb6785'
-            '5599de2decb0004f64ca8ee9972513cdddd58c990a5d5e555acf68400a4db67c'
-            'b3ce6af7a2315768b647eb482e40c902a4ffd889955dd3fcdd369bb37b15de20'
-            '9273a07e25232570adf63543274dc288a0cb9e43307511b9d18b9aa63588cf0d'
-            '6642e40e992b5e3449a7a434f20a278cc747894f808ec488b451a29dc8bafeee'
-            'd049f1a9cb7729cfcb57e0fd306b440abf1119f21799db43473c90ab67935bd9'
-            'a92ce41ecb6efcdb44b798f8330c4278b8265ff515b5104d673b90c48a149758'
-            '58ef2e17a968a5e6339d6ef367f7e63ce87ca179632f5ea89f87243d72d741ad'
-            '92c898660785efc23269ba5ed8120bd5b03ec0ac61bda34cc85affdd6288fa2f'
-            '6376fed98be25792d6fb1b0f3f4d1bb1d7e87e9a930b20eca243ae423260487e'
-            'aefec02f32f33a2e5972f32ce525773486b1f7d7e9f7d2f8155110e9ac885238'
-            '66093629e17c87474e0138ff7a5c07a22d342dda253f9937a62f633bb60db9fa'
-            '507af447d79665d653d08cec57ca4c5045ce07cfad06663c8aa43c7d286f4ac8'
-            '3593448edd09d55125b144a1d7cfad8fe0397d5a1c3920541e21adbd3ded01d4'
-            '49382f3f487d14743271c96c9c061b083787d74e9f4080451a28e4c9d4106d62'
-            '107badd0a0703a1df0484b0f96ae08ffa92279e2e513803b1f8170a99fb76cd1')
+            'e54366498a5374c85164e883c58f7274bf231ec285ba6dc0c7eadad9ec3ffbb1'
+            '2962c1a34f36a28401bac0d90b808a79567a4d3105f22ba3534a8f9a16e77c77'
+            '8d5cee5485be27fde395488328c4ae3751d8b6f99b2fb975178dedaa776c17de'
+            '0465f1a8f8830106164d86d18514cc1558c7cb0d057e3f8d1902f9e3bd9fb23b'
+            'ed5f2b71229201bce7563f5f91d89e059779a49b9c6c91596224332169083507'
+            '8de6b8c5405917589a6847f69b02d4940a021737c355a25b3f163cdab548b711'
+            '502cb54d8b77c71b7812dca378c079bcdeb0f0bc991095131896974eed20e04c'
+            '1ee4ec6ee02f049d8d991d0a56fcd6a687a3a7cc368d5b937a98ee0f52834584'
+            'cc2d8d8daf4ae578690cf50b81196aeff0e9f44672ed30ceb33a41abae42099d'
+            'e16188f688e03da51f909151915d201666853a909f132a137c1505daa87d87eb'
+            '31bcdb687bf1d0bd0ee789cf5c67ebbfb8e379757f9d4ebb02f16486a1bcc4f0'
+            '7f6c2cb002446f6f24450a6bf6bcd07db46a2cbfc065d751cda1334da0a1facc'
+            '903554c186f1876d01e9a2383820f257bac604a964550cbb1d01b25f374b7872'
+            '9f29ba92db17e4690ecb10977aca1e3d9212bec143562664a5c2562c9c9e7ade'
+            '911c46fa0a4b8993ae061f91ff2874567ffe40fe5f79930b926aa79c9c2e351f'
+            'bd7ad72c515c519213eb5e3512a6079830f86970a2de5c4a4d58d0c602f35422'
+            '07551376ed340d12093ca2f22e354f47b14bff050f83f04eb9b65c91ffa9a0a3'
+            '6014b68b4fc357a05cde75a4c84fce9cfcda2ce21368ca3f382756025dce9732'
+            'b522c9c8d2f04ee44d26a32ee0e7b5408e9fb54cc15dda718cf1e8ba03e52157'
+            '8ea4685376fed385f99c304161597e2f11f942b43efefdb94ee448b2a74f8aeb'
+            'ed71ed12749f8948088dfcec3a980ff7033c7db78d1543888ac1f869bd422e30'
+            '846b354c2a8a8dd9e85fcbaf2c079627fa33cf8a49349b208a2e4d1698663181'
+            '9a791909b3adb5c94ddfd4f3b25637190b3327307873d7da6003c082d84a11e8'
+            'aefa30834e2d8006768591277e6f06afb4f2e79b19fca357d8b05a9fb57153f1'
+            '93b941ffbb75ed7d6177e8b41c7a39f64b3607955a2102e069c60ae832e6beac'
+            'a7d547da8f8aae320f0f65476dc3bd95c6d9339a6b56793c8a8232432e501874'
+            'a205639ac75464ee2d3a278791262894079b2f1d6b7e4802ccb6b56ac6952be8'
+            'faebb2d05cdc748d69f397c237433a7a27aab50922b7b57511a4f03524ec04cd'
+            '3095c5da24a9e2d572627acf24c4eb36a4f575d564ee17c59b3e6879bfd8dd40'
+            'b1276acc58de81e72c9bfa456af1328c3bb21615fe42a577e25d21bd77c7c17c'
+            '5761551f4c3ba63d357acdb3e313ef4e0cf64b44394484b757cc8725062e2eb6'
+            'acefce75b6659a72d611609c7edf6ad8478bc8af018e8a37085d52415faae505'
+            '0d654b878944c128a9cd47cafddd0cc1d326dfbcf6b8d607edeebe1d4c92f2c5')

 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'

--- a/qt5-base/mingw-w64/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
+++ b/qt5-base/mingw-w64/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
@ -1,4 +1,4 @@
-From 59ea6c2ee1a18c4ba751873837c28d773c16e2cb Mon Sep 17 00:00:00 2001
+From 23d804d6ac00a19523f807f32f0aca53d44b8512 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 18:30:51 +0100
 Subject: [PATCH 01/33] Adjust win32-g++ profile for cross compilation with
@ -162,5 +162,5 @@ index 5de482f23b..3c3d22c699 100644
 
 QMAKE_LINK              = $${CROSS_COMPILE}g++
 -- 
-2.36.0
+2.36.1

--- a/qt5-base/mingw-w64/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
+++ b/qt5-base/mingw-w64/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
@ -1,4 +1,4 @@
-From 94948750f287ca19ca97d14f622222969fc585c7 Mon Sep 17 00:00:00 2001
+From 0daf9692e7eb1f22991fe8c911dd44b9728ca300 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:36:53 +0200
 Subject: [PATCH 02/33] Ensure GLdouble is defined when using dynamic OpenGL
@ -23,5 +23,5 @@ index 4554291bbd..23d55bddeb 100644
 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
 #include <stdio.h>
 -- 
-2.36.0
+2.36.1

--- a/qt5-base/mingw-w64/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
+++ b/qt5-base/mingw-w64/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
@ -1,4 +1,4 @@
-From 1aa8355f0c9b6ffd82f2659d534a08e51f6e9a89 Mon Sep 17 00:00:00 2001
+From 839541ae815910abaa1d282692e2041c73b9148d Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:48:51 +0200
 Subject: [PATCH 03/33] Fix too many sections assemler error in OpenGL factory
@ -25,5 +25,5 @@ index 24758afdeb..aa04b4a672 100644
     HEADERS += opengl/qopengl.h \
                opengl/qopengl_p.h \
 -- 
-2.36.0
+2.36.1

--- a/qt5-base/mingw-w64/0004-Make-sure-.pc-files-are-installed-correctly.patch
+++ b/qt5-base/mingw-w64/0004-Make-sure-.pc-files-are-installed-correctly.patch
@ -1,4 +1,4 @@
-From 929fc955a5bf89d34f20d00167020977e4764364 Mon Sep 17 00:00:00 2001
+From a7bca5e7438adcb986ade228fb867cf40f232f65 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:54:12 +0200
 Subject: [PATCH 04/33] Make sure *.pc files are installed correctly
@ -62,5 +62,5 @@ index 5e446bd7e2..183cef2908 100644
                     uninst.append("\n\t");
                 uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
 -- 
-2.36.0
+2.36.1

--- a/qt5-base/mingw-w64/0005-Don-t-add-resource-files-to-LIBS-parameter.patch
+++ b/qt5-base/mingw-w64/0005-Don-t-add-resource-files-to-LIBS-parameter.patch
@ -1,4 +1,4 @@
-From b7cec595cded4ec614a5f1287d341320c98af56f Mon Sep 17 00:00:00 2001
+From 65f0b9268811388b9f993a983e7b973432fe6985 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:58:28 +0200
 Subject: [PATCH 05/33] Don't add resource files to LIBS parameter
@ -24,5 +24,5 @@ index ee9a41838b..8d1dcae85b 100644
     if (project->isActiveConfig("dll")) {
         QString destDir = "";
 -- 
-2.36.0
+2.36.1

--- a/qt5-base/mingw-w64/0006-Prevent-debug-library-names-in-pkg-config-files.patch
+++ b/qt5-base/mingw-w64/0006-Prevent-debug-library-names-in-pkg-config-files.patch
@ -1,4 +1,4 @@
-From f81842796ab5b0d0046c61b9b96bc669133938ba Mon Sep 17 00:00:00 2001
+From f1b16ffa422af5a295178e2e0864e07de5c10f25 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:01:14 +0200
 Subject: [PATCH 06/33] Prevent debug library names in pkg-config files
@ -29,5 +29,5 @@ index a33017e19d..62a06d3560 100644
     QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
     if(!subdir.isEmpty()) {
 -- 
-2.36.0
+2.36.1

--- a/qt5-base/mingw-w64/0007-Fix-linking-against-shared-static-libpng.patch
+++ b/qt5-base/mingw-w64/0007-Fix-linking-against-shared-static-libpng.patch
@ -1,4 +1,4 @@
-From b20bb5f49da689f26b54790036f55f18844f0ae1 Mon Sep 17 00:00:00 2001
+From acba669125da3bfdac2195820a9872566db29975 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 26 Jan 2017 17:51:31 +0100
 Subject: [PATCH 07/33] Fix linking against shared/static libpng
@ -26,5 +26,5 @@ index 12c95742d2..e0043542ec 100644
             ],
             "use": [
 -- 
-2.36.0
+2.36.1

--- a/qt5-base/mingw-w64/0008-Fix-linking-against-static-D-Bus.patch
+++ b/qt5-base/mingw-w64/0008-Fix-linking-against-static-D-Bus.patch
@ -1,4 +1,4 @@
-From 244bb705e1fc73c97735625af799ed097e8ac3ef Mon Sep 17 00:00:00 2001
+From 9dcf149ca4b41db23a4c1ccc3fec7db4621071c5 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 19:36:25 +0100
 Subject: [PATCH 08/33] Fix linking against static D-Bus
@ -54,5 +54,5 @@ index accaa4f5ed..4b11c74caa 100644
 #  include <dbus/dbus.h>
 #else
 -- 
-2.36.0
+2.36.1

--- a/qt5-base/mingw-w64/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
+++ b/qt5-base/mingw-w64/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
@ -1,4 +1,4 @@
-From 17a9b70f3cda06ce586f048105ae03c11b68984a Mon Sep 17 00:00:00 2001
+From 0986318a86937b2222babb6ec7c17c05fee23b32 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 18:28:10 +0200
 Subject: [PATCH 09/33] Don't try to use debug version of D-Bus library
@ -25,5 +25,5 @@ index fedc80fa18..e308b5b7d7 100644
                     },
                     "condition": "config.win32 && features.shared"
 -- 
-2.36.0
+2.36.1

--- a/qt5-base/mingw-w64/0010-Fix-linking-against-static-freetype2.patch
+++ b/qt5-base/mingw-w64/0010-Fix-linking-against-static-freetype2.patch
@ -1,4 +1,4 @@
-From a8adb53041a621c15dc8afc05caae8e74fe584b9 Mon Sep 17 00:00:00 2001
+From f41ad000227142d8eb0ae8ee04ff7813d57b4eef Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 20:51:19 +0100
 Subject: [PATCH 10/33] Fix linking against static freetype2
@ -26,5 +26,5 @@ index e0043542ec..2fe0a018b1 100644
                 { "libs": "-lfreetype" }
             ],
 -- 
-2.36.0
+2.36.1

--- a/qt5-base/mingw-w64/0011-Fix-linking-against-static-harfbuzz.patch
+++ b/qt5-base/mingw-w64/0011-Fix-linking-against-static-harfbuzz.patch
@ -1,4 +1,4 @@
-From d696e88f2594d6160e7771c386a35f9b1e5315d3 Mon Sep 17 00:00:00 2001
+From 7caf291b795d3b56e66dd3f7f754ec048fb18710 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:22:56 +0200
 Subject: [PATCH 11/33] Fix linking against static harfbuzz
@ -25,5 +25,5 @@ index 2fe0a018b1..ceeee23164 100644
         },
         "imf": {
 -- 
-2.36.0
+2.36.1

--- a/qt5-base/mingw-w64/0012-Fix-linking-against-static-pcre.patch
+++ b/qt5-base/mingw-w64/0012-Fix-linking-against-static-pcre.patch
@ -1,4 +1,4 @@
-From 4e4a508bd51e30309a495a25a5396db92af87d7d Mon Sep 17 00:00:00 2001
+From 35ee6babaa589049fab6c4b5af44f9b129c7a069 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:24:01 +0200
 Subject: [PATCH 12/33] Fix linking against static pcre
@ -24,5 +24,5 @@ index d7e3cc5ee2..e17c19fbae 100644
 #include <pcre2.h>
 
 -- 
-2.36.0
+2.36.1

--- a/qt5-base/mingw-w64/0013-Fix-linking-against-shared-static-MariaDB.patch
+++ b/qt5-base/mingw-w64/0013-Fix-linking-against-shared-static-MariaDB.patch
@ -1,4 +1,4 @@
-From 6a03907710bce50318cd80e233f0e2f54f1f394d Mon Sep 17 00:00:00 2001
+From 6e7f2b340c0a8c699a63a020c71f865c6b3804f5 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:56:55 +0200
 Subject: [PATCH 13/33] Fix linking against shared/static MariaDB
@ -22,5 +22,5 @@ index 28ccbeadcd..7262914c64 100644
                 { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },
                 { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },
 -- 
-2.36.0
+2.36.1

--- a/qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-PostgreSQL.patch
+++ b/qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-PostgreSQL.patch
@ -1,4 +1,4 @@
-From f537a2f238904e6f61953f1d2e89b03dab9db61e Mon Sep 17 00:00:00 2001
+From 8691567261c4d3d4acb1eaae70d4282901ec29e8 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:58:25 +0200
 Subject: [PATCH 14/33] Fix linking against shared/static PostgreSQL
@ -24,5 +24,5 @@ index 7262914c64..852ba558be 100644
             ]
         },
 -- 
-2.36.0
+2.36.1

--- a/qt5-base/mingw-w64/0015-Rename-qtmain-to-qt5main.patch
+++ b/qt5-base/mingw-w64/0015-Rename-qtmain-to-qt5main.patch
@ -1,4 +1,4 @@
-From ddc0494d7eedd5b2d9e81f13e87f409ccb32e0b2 Mon Sep 17 00:00:00 2001
+From 755c622f8cd0f9c64ab77fef8da72845f4060cee Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:25:40 +0200
 Subject: [PATCH 15/33] Rename qtmain to qt5main
@ -76,5 +76,5 @@ index 1f54c846ec..162e7a4b1b 100644
 
 CONFIG += static
 -- 
-2.36.0
+2.36.1

--- a/qt5-base/mingw-w64/0016-Enable-rpath-for-build-tools.patch
+++ b/qt5-base/mingw-w64/0016-Enable-rpath-for-build-tools.patch
@ -1,4 +1,4 @@
-From 36f1d2408585cb82ee53f06c7c3fd745ee5e9ff8 Mon Sep 17 00:00:00 2001
+From 765559b1ba5f1829ca61feb9001d06bf79c960ca Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 17:59:27 +0200
 Subject: [PATCH 16/33] Enable rpath for build tools
@ -33,5 +33,5 @@ index 8354f30eea..30e8cf18c5 100644
 INSTALLS += target
 
 -- 
-2.36.0
+2.36.1

--- a/qt5-base/mingw-w64/0017-Use-system-zlib-for-build-tools.patch
+++ b/qt5-base/mingw-w64/0017-Use-system-zlib-for-build-tools.patch
@ -1,4 +1,4 @@
-From f60e40d4df1492d9349105c24abe6d5331afbd1d Mon Sep 17 00:00:00 2001
+From 7db6046edd2c8129660e13b4489feea798b90f77 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:04:42 +0200
 Subject: [PATCH 17/33] Use system zlib for build tools
@ -23,5 +23,5 @@ index 24862a07db..698e6cfb95 100644
 } else {
     CONFIG += no_core_dep
 -- 
-2.36.0
+2.36.1

--- a/qt5-base/mingw-w64/0018-Merge-shared-and-static-library-trees.patch
+++ b/qt5-base/mingw-w64/0018-Merge-shared-and-static-library-trees.patch
@ -1,4 +1,4 @@
-From ccf5a8a0183be1864d8d1b1be321d4671381b60c Mon Sep 17 00:00:00 2001
+From a8c019454d89468771253722224dd00802705289 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:45:08 +0200
 Subject: [PATCH 18/33] Merge shared and static library trees
@ -204,5 +204,5 @@ index c0ce0972ef..5a2deaf31d 100644
 mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst
 INSTALLS += mkspecs
 -- 
-2.36.0
+2.36.1

--- a/qt5-base/mingw-w64/0019-Use-.dll.a-as-import-lib-extension.patch
+++ b/qt5-base/mingw-w64/0019-Use-.dll.a-as-import-lib-extension.patch
@ -1,4 +1,4 @@
-From 80a21a21aac613d66d5f25edaeebddbd944d6a8f Mon Sep 17 00:00:00 2001
+From 7c2c449e7d286be7aa1df1494e19ec1c3130792d Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:26:18 +0200
 Subject: [PATCH 19/33] Use *.dll.a as import lib extension
@ -94,5 +94,5 @@ index 183cef2908..03732df4a8 100644
                 + project->first("QMAKE_EXTENSION_SHLIB"));
         project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
 -- 
-2.36.0
+2.36.1

--- a/qt5-base/mingw-w64/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
+++ b/qt5-base/mingw-w64/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
@ -1,4 +1,4 @@
-From 8dbcef883d3048562be9ea1f9c80d9db62a0646b Mon Sep 17 00:00:00 2001
+From 2549c562ae5de32f93a1b1ea63f32f6284d0aedf Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:32:00 +0200
 Subject: [PATCH 20/33] Pull dependencies of static libraries in CMake modules
@ -501,5 +501,5 @@ index b550a52c60..acbe1cc33b 100644
 +endif()
 \ No newline at end of file
 -- 
-2.36.0
+2.36.1

--- a/qt5-base/mingw-w64/0021-Allow-usage-of-static-version-with-CMake.patch
+++ b/qt5-base/mingw-w64/0021-Allow-usage-of-static-version-with-CMake.patch
@ -1,4 +1,4 @@
-From 556553e661d8b1daf08f372dfb63b2d49fd95cf2 Mon Sep 17 00:00:00 2001
+From 97dd25ccddaf09c2cd81e7e1c6bc937b18fcb314 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 5 Aug 2017 21:14:26 +0200
 Subject: [PATCH 21/33] Allow usage of static version with CMake
@ -1091,5 +1091,5 @@ index 2a575958ae..ca0e3be3b5 100644
     INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\"
 )
 -- 
-2.36.0
+2.36.1

--- a/qt5-base/mingw-w64/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
+++ b/qt5-base/mingw-w64/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
@ -1,4 +1,4 @@
-From b503245788923091390dfa4bcd86565cbfd45c5e Mon Sep 17 00:00:00 2001
+From 11da4f686d3b0b0cde2524f0dbd45341e89bf459 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 16:42:07 +0200
 Subject: [PATCH 22/33] Adjust linker flags for static build with
@ -27,5 +27,5 @@ index 9da1361c95..5e802dea4c 100644
 +set_target_properties(${IMPORTED_TARGET_NAME} PROPERTIES \"INTERFACE_LINK_LIBRARIES\" \"$<${_isExe}:-static;ws2_32>\")
 +unset(_isExe)
 -- 
-2.36.0
+2.36.1

--- a/qt5-base/mingw-w64/0023-Use-correct-pkg-config-static-flag.patch
+++ b/qt5-base/mingw-w64/0023-Use-correct-pkg-config-static-flag.patch
@ -1,4 +1,4 @@
-From 6c1c4abc454552ff9938a5846d49f7a5e1204e8b Mon Sep 17 00:00:00 2001
+From 8e60e28dda9d636716fcd8503135fa9a0579d83c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:50:21 +0200
 Subject: [PATCH 23/33] Use correct pkg-config --static flag
@ -22,5 +22,5 @@ index 53c67f885b..8934b72291 100644
     $$qtConfEvaluate("features.cross_compile") {
         # cross compiling, check that pkg-config is set up sanely
 -- 
-2.36.0
+2.36.1

--- a/qt5-base/mingw-w64/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
+++ b/qt5-base/mingw-w64/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
@ -1,4 +1,4 @@
-From a7a3500fa02896d109e774ce50fe4c3386d54a6b Mon Sep 17 00:00:00 2001
+From 44428a18a9d7a548f78b22cdc24945e79ae6fcc2 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 4 Dec 2016 20:35:47 +0100
 Subject: [PATCH 24/33] Fix macro invoking moc, rcc and uic
@ -70,5 +70,5 @@ index 35d2a2dc54..99f061f1b8 100644
           MAIN_DEPENDENCY ${infile} VERBATIM)
         set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON)
 -- 
-2.36.0
+2.36.1

--- a/qt5-base/mingw-w64/0025-Ignore-errors-about-missing-feature-static.patch
+++ b/qt5-base/mingw-w64/0025-Ignore-errors-about-missing-feature-static.patch
@ -1,4 +1,4 @@
-From 38fa787362ec25f1f3602311e444a07b6273cd52 Mon Sep 17 00:00:00 2001
+From 3ca911c0682dfc2dc76709a27de47085727d31d3 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 20:59:54 +0100
 Subject: [PATCH 25/33] Ignore errors about missing feature static
@ -32,5 +32,5 @@ index 7777e615bd..5f30366660 100644
 +    !equals($$1, "static"): error("Could not find feature $${1}.")
 }
 -- 
-2.36.0
+2.36.1

--- a/qt5-base/mingw-w64/0026-Enable-and-fix-use-of-iconv.patch
+++ b/qt5-base/mingw-w64/0026-Enable-and-fix-use-of-iconv.patch
@ -1,4 +1,4 @@
-From 2b2bcb4baae3a98427fee0134da14c7a43af7f44 Mon Sep 17 00:00:00 2001
+From 269b1e040b8358d29cfee1709fc19cb5409a808b Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:20 +0100
 Subject: [PATCH 26/33] Enable and fix use of iconv
@ -74,5 +74,5 @@ index 9b5d19d41b..f649a9f6ef 100644
         },
         "icu": {
 -- 
-2.36.0
+2.36.1

--- a/qt5-base/mingw-w64/0027-Ignore-failing-pkg-config-test.patch
+++ b/qt5-base/mingw-w64/0027-Ignore-failing-pkg-config-test.patch
@ -1,4 +1,4 @@
-From 4bbf5b08f1dcae784078d7d4bc6f96adbd7d3446 Mon Sep 17 00:00:00 2001
+From 6f8b521567786e38f5c986f05793c1a8e376eee4 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:48 +0100
 Subject: [PATCH 27/33] Ignore failing pkg-config test
@ -21,5 +21,5 @@ index e308b5b7d7..928ee2afa1 100644
                 "publicFeature",
                 { "type": "publicQtConfig", "negative": true },
 -- 
-2.36.0
+2.36.1

--- a/qt5-base/mingw-w64/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
+++ b/qt5-base/mingw-w64/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
@ -1,4 +1,4 @@
-From eef20ecace32e188f1767b4ba7d6bb6f9dd58a7a Mon Sep 17 00:00:00 2001
+From 892c3bb8d9dfad8ef0d54112dc9d2af23c58638b Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Tue, 7 Feb 2017 18:25:28 +0100
 Subject: [PATCH 28/33] Prevent qmake from messing static lib dependencies
@ -41,5 +41,5 @@ index 03732df4a8..602f7609f5 100644
     int libidx = 0;
     for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
 -- 
-2.36.0
+2.36.1

--- a/qt5-base/mingw-w64/0029-Hardcode-linker-flags-for-platform-plugins.patch
+++ b/qt5-base/mingw-w64/0029-Hardcode-linker-flags-for-platform-plugins.patch
@ -1,4 +1,4 @@
-From 71f171ff0493a0e15f58106d3db420b172e832f9 Mon Sep 17 00:00:00 2001
+From ab90e575a14292a690cc51241fd54f579f9ac3ad Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 23:42:30 +0100
 Subject: [PATCH 29/33] Hardcode linker flags for platform plugins
@ -174,5 +174,5 @@ index 50a3bb41a9..02f74650a9 100644
 include(windows.pri)
 
 -- 
-2.36.0
+2.36.1

--- a/qt5-base/mingw-w64/0030-Fix-linking-against-static-plugins-with-qmake.patch
+++ b/qt5-base/mingw-w64/0030-Fix-linking-against-static-plugins-with-qmake.patch
@ -1,4 +1,4 @@
-From eecb8c2d469dc85d58a9ccd02e05183209e74cd0 Mon Sep 17 00:00:00 2001
+From cff7c1280b6f94659a17235692dafecc71049d54 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 25 Aug 2017 17:07:17 +0200
 Subject: [PATCH 30/33] Fix linking against static plugins with qmake
@ -33,5 +33,5 @@ index b79b324b88..6a03b7a74b 100644
         # Check if the plugin is known to Qt. We can use this to determine
         # the plugin path. Unknown plugins must rely on the default link path.
 -- 
-2.36.0
+2.36.1

--- a/qt5-base/mingw-w64/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
+++ b/qt5-base/mingw-w64/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
@ -1,4 +1,4 @@
-From 4a4ad45a243a2f050d1c70e5a0d750ec97a84a7b Mon Sep 17 00:00:00 2001
+From b10914297d9675501a1daadecda9c309aec546fd Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Mon, 24 Jun 2019 13:51:02 +0200
 Subject: [PATCH 31/33] Prevent 'Cannot find feature windows_vulkan_sdk'
@ -33,5 +33,5 @@ index 8475e4111a..c0eb8faa17 100644
     LD_USES = $$resolve_depends(LD_USES, QMAKE_DEPENDS_, _LD)
     for (nu, LD_USES) {
 -- 
-2.36.0
+2.36.1

--- a/qt5-base/mingw-w64/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch
+++ b/qt5-base/mingw-w64/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch
@ -1,4 +1,4 @@
-From 37253c5b055d9a28d3cf08019fa156b86714ce18 Mon Sep 17 00:00:00 2001
+From 7841fa06722b5778b9882076dd12dc81402b66d0 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 26 Jun 2021 22:24:12 +0200
 Subject: [PATCH 32/33] Fix crashes in rasterization code using setjmp
@ -244,5 +244,5 @@ index 7b16e8c211..38f03b73d8 100644
         "Description": "FreeType is a freely available software library to render fonts.",
         "Homepage": "http://www.freetype.org",
 -- 
-2.36.0
+2.36.1

--- a/qt5-base/mingw-w64/0033-Handle-even-more-include-in-enum-cases.patch
+++ b/qt5-base/mingw-w64/0033-Handle-even-more-include-in-enum-cases.patch
@ -1,4 +1,4 @@
-From a785d0d6b84ccbe0e74d7846076ba6df7d250dd8 Mon Sep 17 00:00:00 2001
+From 1bd4629742cda699fccdbc75ab6a722ddf1b6af8 Mon Sep 17 00:00:00 2001
 From: Fabian Kosmale <fabian.kosmale@qt.io>
 Date: Tue, 3 Aug 2021 16:23:25 +0200
 Subject: [PATCH 33/33] Handle even more include in enum cases
@ -52,5 +52,5 @@ index b8abf77f12..cd53ba6a28 100644
 };
 #endif
 -- 
-2.36.0
+2.36.1

--- a/qt5-base/mingw-w64/PKGBUILD
+++ b/qt5-base/mingw-w64/PKGBUILD
@ -17,10 +17,10 @@

 _qt_module=qtbase
 pkgname=mingw-w64-qt5-base
-pkgver=5.15.3+kde+r145
+pkgver=5.15.4+kde+r135
 pkgrel=1
 _basever=${pkgver%%+*}
-_commit=cfa044e74c4f3be46fe2f177d022af3321766b1f
+_commit=e0a15c11b853954d4189b2e30aa2450184de0987
 pkgdesc='A cross-platform application and UI framework, native OpenGL backend (mingw-w64)'
 arch=('i686' 'x86_64')
 url='https://www.qt.io/'
@ -71,39 +71,39 @@ source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit
        '0032-Fix-crashes-in-rasterization-code-using-setjmp.patch'
        '0033-Handle-even-more-include-in-enum-cases.patch')
 sha256sums=('SKIP'
-            'c46cc0408f60117c0299ac25c6ada46b54ad48ae6063450609cd650d54b461b9'
-            '1c47cf77b1dfe57487b1ad6364ad3e1ad3e67184598bf356fff25ac3847816cd'
-            'fbcc353eaf380ce3c9884c1f0db94b3b19edd1c2182edf9f64d4c8190d7a426a'
-            'c8eac4f92067f75cc28cbf3344e54a76ed9783ebf663772e9c417c51a27ece3d'
-            '334a9e7ec195e504c51a3ea697d35f62cf58c9c5e255175d9c0aaaa8cfe2b676'
-            '38fafe0b297b5451db359b616e91c15f24a91dc8d8876ae8bfb463a4ce05715e'
-            'a525983aabb87585b76d647c0d53c1d703938dcb48601dde407bff88eb9ac2c9'
-            'daf1409342054e9464de9b329b775032d0ec94b15ea4be78457c26a184dce31c'
-            'ad395e48421dda7af1982d37b39bec4891839e7883227801547fcb559a8dee35'
-            '189558608903e4c073777fec1f026d4cf09aec1bfd914a1e7ddbee24c36de5ad'
-            '9cb6133a2c2a713119ce90974e968e425d634bc5e57870e3ddabbd49fec420c2'
-            '38b6fe3c8a4aef5f8aae73edcc2ddcaf27ea6dd2509ec4f0db875a1916c92130'
-            '4d4dcb973428232b1f3423e7369b7d252af9bfba238415ac247187073f8a19e1'
-            'dcc4168cad92fc7b12a80fdd07cfb52a446a138cea95f7fe855d988f1cee6903'
-            '37bcaaf3b89670432ec23a5bf8b6cc76122080347aea07b98eb114dfda4247a3'
-            '9fb4f6a4dfddd033a72e70972831e5f5b202ab07d1365eab13e628f41f8d44e5'
-            '09487150942169445a5be1563073efaa772705c6e1c343d73419919e19e5e486'
-            'e1e80eb30a4e173eb2a73ab48dde1a8199bf5ac3bd627d888bf2eec9bdcb6785'
-            '5599de2decb0004f64ca8ee9972513cdddd58c990a5d5e555acf68400a4db67c'
-            'b3ce6af7a2315768b647eb482e40c902a4ffd889955dd3fcdd369bb37b15de20'
-            '9273a07e25232570adf63543274dc288a0cb9e43307511b9d18b9aa63588cf0d'
-            '6642e40e992b5e3449a7a434f20a278cc747894f808ec488b451a29dc8bafeee'
-            'd049f1a9cb7729cfcb57e0fd306b440abf1119f21799db43473c90ab67935bd9'
-            'a92ce41ecb6efcdb44b798f8330c4278b8265ff515b5104d673b90c48a149758'
-            '58ef2e17a968a5e6339d6ef367f7e63ce87ca179632f5ea89f87243d72d741ad'
-            '92c898660785efc23269ba5ed8120bd5b03ec0ac61bda34cc85affdd6288fa2f'
-            '6376fed98be25792d6fb1b0f3f4d1bb1d7e87e9a930b20eca243ae423260487e'
-            'aefec02f32f33a2e5972f32ce525773486b1f7d7e9f7d2f8155110e9ac885238'
-            '66093629e17c87474e0138ff7a5c07a22d342dda253f9937a62f633bb60db9fa'
-            '507af447d79665d653d08cec57ca4c5045ce07cfad06663c8aa43c7d286f4ac8'
-            '3593448edd09d55125b144a1d7cfad8fe0397d5a1c3920541e21adbd3ded01d4'
-            '49382f3f487d14743271c96c9c061b083787d74e9f4080451a28e4c9d4106d62'
-            '107badd0a0703a1df0484b0f96ae08ffa92279e2e513803b1f8170a99fb76cd1')
+            'e54366498a5374c85164e883c58f7274bf231ec285ba6dc0c7eadad9ec3ffbb1'
+            '2962c1a34f36a28401bac0d90b808a79567a4d3105f22ba3534a8f9a16e77c77'
+            '8d5cee5485be27fde395488328c4ae3751d8b6f99b2fb975178dedaa776c17de'
+            '0465f1a8f8830106164d86d18514cc1558c7cb0d057e3f8d1902f9e3bd9fb23b'
+            'ed5f2b71229201bce7563f5f91d89e059779a49b9c6c91596224332169083507'
+            '8de6b8c5405917589a6847f69b02d4940a021737c355a25b3f163cdab548b711'
+            '502cb54d8b77c71b7812dca378c079bcdeb0f0bc991095131896974eed20e04c'
+            '1ee4ec6ee02f049d8d991d0a56fcd6a687a3a7cc368d5b937a98ee0f52834584'
+            'cc2d8d8daf4ae578690cf50b81196aeff0e9f44672ed30ceb33a41abae42099d'
+            'e16188f688e03da51f909151915d201666853a909f132a137c1505daa87d87eb'
+            '31bcdb687bf1d0bd0ee789cf5c67ebbfb8e379757f9d4ebb02f16486a1bcc4f0'
+            '7f6c2cb002446f6f24450a6bf6bcd07db46a2cbfc065d751cda1334da0a1facc'
+            '903554c186f1876d01e9a2383820f257bac604a964550cbb1d01b25f374b7872'
+            '9f29ba92db17e4690ecb10977aca1e3d9212bec143562664a5c2562c9c9e7ade'
+            '911c46fa0a4b8993ae061f91ff2874567ffe40fe5f79930b926aa79c9c2e351f'
+            'bd7ad72c515c519213eb5e3512a6079830f86970a2de5c4a4d58d0c602f35422'
+            '07551376ed340d12093ca2f22e354f47b14bff050f83f04eb9b65c91ffa9a0a3'
+            '6014b68b4fc357a05cde75a4c84fce9cfcda2ce21368ca3f382756025dce9732'
+            'b522c9c8d2f04ee44d26a32ee0e7b5408e9fb54cc15dda718cf1e8ba03e52157'
+            '8ea4685376fed385f99c304161597e2f11f942b43efefdb94ee448b2a74f8aeb'
+            'ed71ed12749f8948088dfcec3a980ff7033c7db78d1543888ac1f869bd422e30'
+            '846b354c2a8a8dd9e85fcbaf2c079627fa33cf8a49349b208a2e4d1698663181'
+            '9a791909b3adb5c94ddfd4f3b25637190b3327307873d7da6003c082d84a11e8'
+            'aefa30834e2d8006768591277e6f06afb4f2e79b19fca357d8b05a9fb57153f1'
+            '93b941ffbb75ed7d6177e8b41c7a39f64b3607955a2102e069c60ae832e6beac'
+            'a7d547da8f8aae320f0f65476dc3bd95c6d9339a6b56793c8a8232432e501874'
+            'a205639ac75464ee2d3a278791262894079b2f1d6b7e4802ccb6b56ac6952be8'
+            'faebb2d05cdc748d69f397c237433a7a27aab50922b7b57511a4f03524ec04cd'
+            '3095c5da24a9e2d572627acf24c4eb36a4f575d564ee17c59b3e6879bfd8dd40'
+            'b1276acc58de81e72c9bfa456af1328c3bb21615fe42a577e25d21bd77c7c17c'
+            '5761551f4c3ba63d357acdb3e313ef4e0cf64b44394484b757cc8725062e2eb6'
+            'acefce75b6659a72d611609c7edf6ad8478bc8af018e8a37085d52415faae505'
+            '0d654b878944c128a9cd47cafddd0cc1d326dfbcf6b8d607edeebe1d4c92f2c5')

 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'

--- a/qt5-charts/mingw-w64-static/PKGBUILD
+++ b/qt5-charts/mingw-w64-static/PKGBUILD
@ -9,7 +9,7 @@

 _qt_module=qtcharts
 pkgname=mingw-w64-qt5-charts-static
-pkgver=5.15.3
+pkgver=5.15.4
 pkgrel=1
 arch=('any')
 pkgdesc="Provides a set of easy to use chart components (mingw-w64)"
@ -17,7 +17,7 @@ depends=('mingw-w64-qt5-base-static' 'mingw-w64-pkg-config')
 optdepends=('mingw-w64-qt5-declarative-static: QML bindings')
 makedepends=('mingw-w64-gcc' 'mingw-w64-qt5-declarative-static')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-_commit=f13988aa1ad9de5d92e7b0ba4d0d947dd019d759
+_commit=16c2a8821135bf89369c4e3c5a1bdff8b05ffdb5
 _basever=$pkgver
 pkgver+=+kde+r0
 makedepends+=('git')
--- a/qt5-charts/mingw-w64-static/qtcharts-sha256.txt
+++ b/qt5-charts/mingw-w64-static/qtcharts-sha256.txt
@ -1 +1 @@
-e0750e4195bd8a8b9758ab4d98d437edbe273cd3d289dd6a8f325df6d13f3d11
+SKIP
--- a/qt5-charts/mingw-w64/PKGBUILD
+++ b/qt5-charts/mingw-w64/PKGBUILD
@ -9,7 +9,7 @@

 _qt_module=qtcharts
 pkgname=mingw-w64-qt5-charts
-pkgver=5.15.3
+pkgver=5.15.4
 pkgrel=1
 arch=('any')
 pkgdesc="Provides a set of easy to use chart components (mingw-w64)"
@ -17,7 +17,7 @@ depends=('mingw-w64-qt5-base' 'mingw-w64-pkg-config')
 optdepends=('mingw-w64-qt5-declarative: QML bindings')
 makedepends=('mingw-w64-gcc' 'mingw-w64-qt5-declarative')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-_commit=f13988aa1ad9de5d92e7b0ba4d0d947dd019d759
+_commit=16c2a8821135bf89369c4e3c5a1bdff8b05ffdb5
 _basever=$pkgver
 pkgver+=+kde+r0
 makedepends+=('git')
--- a/qt5-charts/mingw-w64/PKGBUILD.sh.ep
+++ b/qt5-charts/mingw-w64/PKGBUILD.sh.ep
@ -1,6 +1,6 @@
 % layout 'mingw-w64-qt5-module';
 \
-pkgver=5.15.3
+pkgver=5.15.4
 pkgrel=1
 arch=('any')
 pkgdesc="Provides a set of easy to use chart components (mingw-w64)"
--- a/qt5-charts/mingw-w64/qtcharts-sha256.txt
+++ b/qt5-charts/mingw-w64/qtcharts-sha256.txt
@ -1 +1 @@
-e0750e4195bd8a8b9758ab4d98d437edbe273cd3d289dd6a8f325df6d13f3d11
+SKIP
--- a/qt5-connectivity/mingw-w64-static/PKGBUILD
+++ b/qt5-connectivity/mingw-w64-static/PKGBUILD
@ -9,16 +9,16 @@

 _qt_module=qtconnectivity
 pkgname=mingw-w64-qt5-connectivity-static
-pkgver=5.15.3
+pkgver=5.15.4
 pkgrel=1
 arch=('any')
 pkgdesc="Provides access to Bluetooth hardware (mingw-w64)"
 depends=('mingw-w64-qt5-base-static')
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'mingw-w64-qt5-declarative-static')
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
-_commit=8a377440b37f5633156a8e40c9f0dce5f4d5a665
+_commit=25720ab6004cf37ae54ad85d22f87f5fc9e6e72e
 _basever=$pkgver
-pkgver+=+kde+r0
+pkgver+=+kde+r4
 makedepends+=('git')
 options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
--- a/qt5-connectivity/mingw-w64-static/qtconnectivity-sha256.txt
+++ b/qt5-connectivity/mingw-w64-static/qtconnectivity-sha256.txt
@ -1 +1 @@
-0380327871f76103e5b8c2a305988d76d352b6a982b3e7b3bc3cdc184c64bfa0
+SKIP
--- a/qt5-connectivity/mingw-w64/PKGBUILD
+++ b/qt5-connectivity/mingw-w64/PKGBUILD
@ -9,16 +9,16 @@

 _qt_module=qtconnectivity
 pkgname=mingw-w64-qt5-connectivity
-pkgver=5.15.3
+pkgver=5.15.4
 pkgrel=1
 arch=('any')
 pkgdesc="Provides access to Bluetooth hardware (mingw-w64)"
 depends=('mingw-w64-qt5-base')
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'mingw-w64-qt5-declarative')
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
-_commit=8a377440b37f5633156a8e40c9f0dce5f4d5a665
+_commit=25720ab6004cf37ae54ad85d22f87f5fc9e6e72e
 _basever=$pkgver
-pkgver+=+kde+r0
+pkgver+=+kde+r4
 makedepends+=('git')
 options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
--- a/qt5-connectivity/mingw-w64/PKGBUILD.sh.ep
+++ b/qt5-connectivity/mingw-w64/PKGBUILD.sh.ep
@ -1,6 +1,6 @@
 % layout 'mingw-w64-qt5-module';
 \
-pkgver=5.15.3
+pkgver=5.15.4
 pkgrel=1
 arch=('any')
 pkgdesc="Provides access to Bluetooth hardware (mingw-w64)"
--- a/qt5-connectivity/mingw-w64/qtconnectivity-sha256.txt
+++ b/qt5-connectivity/mingw-w64/qtconnectivity-sha256.txt
@ -1 +1 @@
-0380327871f76103e5b8c2a305988d76d352b6a982b3e7b3bc3cdc184c64bfa0
+SKIP
--- a/qt5-datavis3d/mingw-w64-static/PKGBUILD
+++ b/qt5-datavis3d/mingw-w64-static/PKGBUILD
@ -9,7 +9,7 @@

 _qt_module=qtdatavis3d
 pkgname=mingw-w64-qt5-datavis3d-static
-pkgver=5.15.3
+pkgver=5.15.4
 pkgrel=1
 arch=('any')
 pkgdesc="Qt Data Visualization module (mingw-w64)"
@ -17,7 +17,7 @@ depends=('mingw-w64-qt5-base-static')
 optdepends=('mingw-w64-qt5-declarative-static: QML bindings')
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'mingw-w64-qt5-declarative-static')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-_commit=19af9584f7b80928ee49950c573c770af68c9519
+_commit=5f8e2a037d5201c902149c828d102b71e90257e2
 _basever=$pkgver
 pkgver+=+kde+r0
 makedepends+=('git')
--- a/qt5-datavis3d/mingw-w64-static/qtdatavis3d-sha256.txt
+++ b/qt5-datavis3d/mingw-w64-static/qtdatavis3d-sha256.txt
@ -1 +1 @@
-226a6575d573ad78aca459709722c496c23aee526aa0c38eb7c93b0bea1eb6fd
+SKIP
--- a/qt5-datavis3d/mingw-w64/PKGBUILD
+++ b/qt5-datavis3d/mingw-w64/PKGBUILD
@ -9,7 +9,7 @@

 _qt_module=qtdatavis3d
 pkgname=mingw-w64-qt5-datavis3d
-pkgver=5.15.3
+pkgver=5.15.4
 pkgrel=1
 arch=('any')
 pkgdesc="Qt Data Visualization module (mingw-w64)"
@ -17,7 +17,7 @@ depends=('mingw-w64-qt5-base')
 optdepends=('mingw-w64-qt5-declarative: QML bindings')
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'mingw-w64-qt5-declarative')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-_commit=19af9584f7b80928ee49950c573c770af68c9519
+_commit=5f8e2a037d5201c902149c828d102b71e90257e2
 _basever=$pkgver
 pkgver+=+kde+r0
 makedepends+=('git')
--- a/qt5-datavis3d/mingw-w64/PKGBUILD.sh.ep
+++ b/qt5-datavis3d/mingw-w64/PKGBUILD.sh.ep
@ -1,6 +1,6 @@
 % layout 'mingw-w64-qt5-module';
 \
-pkgver=5.15.3
+pkgver=5.15.4
 pkgrel=1
 arch=('any')
 pkgdesc="Qt Data Visualization module (mingw-w64)"
--- a/qt5-datavis3d/mingw-w64/qtdatavis3d-sha256.txt
+++ b/qt5-datavis3d/mingw-w64/qtdatavis3d-sha256.txt
@ -1 +1 @@
-226a6575d573ad78aca459709722c496c23aee526aa0c38eb7c93b0bea1eb6fd
+SKIP
--- a/qt5-declarative/mingw-w64-static/PKGBUILD
+++ b/qt5-declarative/mingw-w64-static/PKGBUILD
@ -14,16 +14,16 @@

 _qt_module=qtdeclarative
 pkgname=mingw-w64-qt5-declarative-static
-pkgver=5.15.3
+pkgver=5.15.4
 pkgrel=1
 arch=('any')
 pkgdesc='Classes for QML and JavaScript languages (mingw-w64)'
 depends=('mingw-w64-qt5-base-static')
 makedepends=('mingw-w64-gcc' 'mingw-w64-vulkan-headers' 'mingw-w64-pkg-config' 'python')
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
-_commit=02105099301450c890e1caba977ef44efdc43da7
+_commit=51efb2ed2f071beda188270a23ac450fe4b318f7
 _basever=$pkgver
-pkgver+=+kde+r20
+pkgver+=+kde+r17
 makedepends+=('git')
 options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
@ -34,9 +34,9 @@ source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit
        '0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch'
        '0003-Disable-d3d12-requiring-fxc.exe.patch')
 sha256sums=('SKIP'
-            'e6b40d364b9f6fd4409c62d3cea9072de8ad95ad1a7be2ec8b51c4555b11f926'
-            '75f4f331b29cbd1a09a7330cf716b55c70c27b7fd23929bdec710416ba84acef'
-            '7290ced093d45e53198c6082398310e61770e2525eaaa855fe0d1db1ef72e8e1')
+            'a27f544db7c19991ef1ba785b3faaa159f71e035c05009467155c59ffcee95d7'
+            'da409a2ce953a69545cf27294d4de042bd66fda42c9442a0922192b452321a83'
+            '142eb48c75dcd6b707550bf978b8f4125ea8ef2333fc6dd6b50e7de43f6eecd3')

 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'

--- a/qt5-declarative/mingw-w64/0001-Ensure-static-plugins-are-exported.patch
+++ b/qt5-declarative/mingw-w64/0001-Ensure-static-plugins-are-exported.patch
@ -1,4 +1,4 @@
-From 0120487a66bef4b95249517d3d1d16d58e569f82 Mon Sep 17 00:00:00 2001
+From e6e8b269ace9857c3ca487201bbd3566cd6f39a6 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 23 Oct 2016 01:18:13 +0200
 Subject: [PATCH 1/3] Ensure static plugins are exported
@ -19,5 +19,5 @@ index 4242143bca..bccb7b3146 100644
     foreach(_other_plugin ${_qt5qml_other_plugins})
         include(${_other_plugin} OPTIONAL)
 -- 
-2.35.1
+2.36.1

--- a/qt5-declarative/mingw-w64/0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch
+++ b/qt5-declarative/mingw-w64/0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch
@ -1,4 +1,4 @@
-From b47eb78bd39a2db8eaebe9c21359c114ea66bf17 Mon Sep 17 00:00:00 2001
+From 7177e5dad754a9266d2dd8a6d4485e5fc35437d9 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 4 Feb 2017 01:59:59 +0100
 Subject: [PATCH 2/3] Prevent exporting QML parser symbols on static build
@ -33,5 +33,5 @@ index bf8155c6ec..2bfa230bcc 100644
 #      define QML_PARSER_EXPORT
 #    elif defined(QT_BUILD_QML_LIB)
 -- 
-2.35.1
+2.36.1

--- a/qt5-declarative/mingw-w64/0003-Disable-d3d12-requiring-fxc.exe.patch
+++ b/qt5-declarative/mingw-w64/0003-Disable-d3d12-requiring-fxc.exe.patch
@ -1,4 +1,4 @@
-From dc60d4a4ece8c116e8d03bf876d27eee2d67cf51 Mon Sep 17 00:00:00 2001
+From dfb96194f58dd199ade22c34fcdd9b93c53d4739 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 20 Nov 2020 18:32:31 +0100
 Subject: [PATCH 3/3] Disable d3d12 requiring fxc.exe
@ -29,5 +29,5 @@ index 39c0c0815c..9cc521a191 100644
 qtConfig(openvg): SUBDIRS += openvg
 
 -- 
-2.35.1
+2.36.1

--- a/qt5-declarative/mingw-w64/PKGBUILD
+++ b/qt5-declarative/mingw-w64/PKGBUILD
@ -14,16 +14,16 @@

 _qt_module=qtdeclarative
 pkgname=mingw-w64-qt5-declarative
-pkgver=5.15.3
+pkgver=5.15.4
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='Classes for QML and JavaScript languages (mingw-w64)'
 depends=('mingw-w64-qt5-base')
 makedepends=('mingw-w64-gcc' 'mingw-w64-vulkan-headers' 'mingw-w64-pkg-config' 'python')
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
-_commit=02105099301450c890e1caba977ef44efdc43da7
+_commit=51efb2ed2f071beda188270a23ac450fe4b318f7
 _basever=$pkgver
-pkgver+=+kde+r20
+pkgver+=+kde+r17
 makedepends+=('git')
 options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
@ -34,9 +34,9 @@ source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit
        '0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch'
        '0003-Disable-d3d12-requiring-fxc.exe.patch')
 sha256sums=('SKIP'
-            'e6b40d364b9f6fd4409c62d3cea9072de8ad95ad1a7be2ec8b51c4555b11f926'
-            '75f4f331b29cbd1a09a7330cf716b55c70c27b7fd23929bdec710416ba84acef'
-            '7290ced093d45e53198c6082398310e61770e2525eaaa855fe0d1db1ef72e8e1')
+            'a27f544db7c19991ef1ba785b3faaa159f71e035c05009467155c59ffcee95d7'
+            'da409a2ce953a69545cf27294d4de042bd66fda42c9442a0922192b452321a83'
+            '142eb48c75dcd6b707550bf978b8f4125ea8ef2333fc6dd6b50e7de43f6eecd3')

 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'

--- a/qt5-declarative/mingw-w64/PKGBUILD.sh.ep
+++ b/qt5-declarative/mingw-w64/PKGBUILD.sh.ep
@ -6,7 +6,7 @@
 # Contributor: ohmyarch
 % end
 \
-pkgver=5.15.3
+pkgver=5.15.4
 pkgrel=1
 arch=(<%== include 'fragments/mingw-w64-qt5-non_any_archs' %>)
 pkgdesc='Classes for QML and JavaScript languages (mingw-w64)'
--- a/qt5-declarative/mingw-w64/qtdeclarative-sha256.txt
+++ b/qt5-declarative/mingw-w64/qtdeclarative-sha256.txt
@ -1 +1 @@
-c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651
+SKIP
--- a/qt5-gamepad/mingw-w64-static/PKGBUILD
+++ b/qt5-gamepad/mingw-w64-static/PKGBUILD
@ -9,7 +9,7 @@

 _qt_module=qtgamepad
 pkgname=mingw-w64-qt5-gamepad-static
-pkgver=5.15.3
+pkgver=5.15.4
 pkgrel=1
 arch=('any')
 pkgdesc="Adds support for getting events from gamepad devices (mingw-w64)"
@ -17,7 +17,7 @@ depends=('mingw-w64-qt5-base-static' 'mingw-w64-sdl2')
 optdepends=('mingw-w64-qt5-declarative-static: QML bindings')
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'mingw-w64-qt5-declarative-static')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-_commit=6b7a6303439f83147680723f4d8142d676cdb928
+_commit=8526b210146a2d030ae2f55ad44261befea4a087
 _basever=$pkgver
 pkgver+=+kde+r0
 makedepends+=('git')
--- a/qt5-gamepad/mingw-w64-static/qtgamepad-sha256.txt
+++ b/qt5-gamepad/mingw-w64-static/qtgamepad-sha256.txt
@ -1 +1 @@
-c77611f7898326d69176ad67a9b886f617cdedc368ec29f223d63537d25b075c
+SKIP
--- a/qt5-gamepad/mingw-w64/PKGBUILD
+++ b/qt5-gamepad/mingw-w64/PKGBUILD
@ -9,7 +9,7 @@

 _qt_module=qtgamepad
 pkgname=mingw-w64-qt5-gamepad
-pkgver=5.15.3
+pkgver=5.15.4
 pkgrel=1
 arch=('any')
 pkgdesc="Adds support for getting events from gamepad devices (mingw-w64)"
@ -17,7 +17,7 @@ depends=('mingw-w64-qt5-base' 'mingw-w64-sdl2')
 optdepends=('mingw-w64-qt5-declarative: QML bindings')
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'mingw-w64-qt5-declarative')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-_commit=6b7a6303439f83147680723f4d8142d676cdb928
+_commit=8526b210146a2d030ae2f55ad44261befea4a087
 _basever=$pkgver
 pkgver+=+kde+r0
 makedepends+=('git')
--- a/qt5-gamepad/mingw-w64/PKGBUILD.sh.ep
+++ b/qt5-gamepad/mingw-w64/PKGBUILD.sh.ep
@ -1,6 +1,6 @@
 % layout 'mingw-w64-qt5-module';
 \
-pkgver=5.15.3
+pkgver=5.15.4
 pkgrel=1
 arch=('any')
 pkgdesc="Adds support for getting events from gamepad devices (mingw-w64)"
--- a/qt5-gamepad/mingw-w64/qtgamepad-sha256.txt
+++ b/qt5-gamepad/mingw-w64/qtgamepad-sha256.txt
@ -1 +1 @@
-c77611f7898326d69176ad67a9b886f617cdedc368ec29f223d63537d25b075c
+SKIP
--- a/qt5-graphicaleffects/mingw-w64-static/PKGBUILD
+++ b/qt5-graphicaleffects/mingw-w64-static/PKGBUILD
@ -11,14 +11,14 @@

 _qt_module=qtgraphicaleffects
 pkgname=mingw-w64-qt5-graphicaleffects-static
-pkgver=5.15.3
+pkgver=5.15.4
 pkgrel=1
 arch=('any')
 pkgdesc="Graphical effects for use with Qt Quick 2 (mingw-w64)"
 depends=('mingw-w64-qt5-declarative-static')
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-_commit=379577925766385991f413a2b0d0d46831381ffa
+_commit=4c6ec38635aa22cf0854df8e710733c529f4ec02
 _basever=$pkgver
 pkgver+=+kde+r0
 makedepends+=('git')
--- a/qt5-graphicaleffects/mingw-w64-static/qtgraphicaleffects-sha256.txt
+++ b/qt5-graphicaleffects/mingw-w64-static/qtgraphicaleffects-sha256.txt
@ -1 +1 @@
-ec8d67f64967d5046410490b549c576f9b9e8b47ec68594ae84aa8870173dfe4
+SKIP
--- a/qt5-graphicaleffects/mingw-w64/PKGBUILD
+++ b/qt5-graphicaleffects/mingw-w64/PKGBUILD
@ -11,14 +11,14 @@

 _qt_module=qtgraphicaleffects
 pkgname=mingw-w64-qt5-graphicaleffects
-pkgver=5.15.3
+pkgver=5.15.4
 pkgrel=1
 arch=('any')
 pkgdesc="Graphical effects for use with Qt Quick 2 (mingw-w64)"
 depends=('mingw-w64-qt5-declarative')
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-_commit=379577925766385991f413a2b0d0d46831381ffa
+_commit=4c6ec38635aa22cf0854df8e710733c529f4ec02
 _basever=$pkgver
 pkgver+=+kde+r0
 makedepends+=('git')
--- a/qt5-graphicaleffects/mingw-w64/PKGBUILD.sh.ep
+++ b/qt5-graphicaleffects/mingw-w64/PKGBUILD.sh.ep
@ -5,7 +5,7 @@
 # Contributor: Filip Brcic <brcha@gna.org>
 % end
 \
-pkgver=5.15.3
+pkgver=5.15.4
 pkgrel=1
 arch=('any')
 pkgdesc="Graphical effects for use with Qt Quick 2 (mingw-w64)"
--- a/qt5-graphicaleffects/mingw-w64/qtgraphicaleffects-sha256.txt
+++ b/qt5-graphicaleffects/mingw-w64/qtgraphicaleffects-sha256.txt
@ -1 +1 @@
-ec8d67f64967d5046410490b549c576f9b9e8b47ec68594ae84aa8870173dfe4
+SKIP
--- a/qt5-imageformats/mingw-w64-static/PKGBUILD
+++ b/qt5-imageformats/mingw-w64-static/PKGBUILD
@ -11,7 +11,7 @@

 _qt_module=qtimageformats
 pkgname=mingw-w64-qt5-imageformats-static
-pkgver=5.15.3
+pkgver=5.15.4
 pkgrel=1
 arch=('any')
 pkgdesc="Plugins for additional image formats: TIFF, MNG, TGA, WBMP (mingw-w64)"
@ -22,7 +22,7 @@ depends=('mingw-w64-qt5-base-static')
 #depends+=('mingw-w64-libwebp') # for WebP
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-_commit=90038c936763645610fe1e5f05cfc025e4d98631
+_commit=8c5bcabbf6a2e27539c2ad689fd69f2406d5cf5c
 _basever=$pkgver
 pkgver+=+kde+r0
 makedepends+=('git')
--- a/qt5-imageformats/mingw-w64-static/qtimageformats-sha256.txt
+++ b/qt5-imageformats/mingw-w64-static/qtimageformats-sha256.txt
@ -1 +1 @@
-bf8285c7ce04284527ab823ddc7cf48a1bb79131db3a7127342167f4814253d7
+SKIP
--- a/qt5-imageformats/mingw-w64/PKGBUILD
+++ b/qt5-imageformats/mingw-w64/PKGBUILD
@ -11,7 +11,7 @@

 _qt_module=qtimageformats
 pkgname=mingw-w64-qt5-imageformats
-pkgver=5.15.3
+pkgver=5.15.4
 pkgrel=1
 arch=('any')
 pkgdesc="Plugins for additional image formats: TIFF, MNG, TGA, WBMP (mingw-w64)"
@ -22,7 +22,7 @@ depends=('mingw-w64-qt5-base')
 #depends+=('mingw-w64-libwebp') # for WebP
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-_commit=90038c936763645610fe1e5f05cfc025e4d98631
+_commit=8c5bcabbf6a2e27539c2ad689fd69f2406d5cf5c
 _basever=$pkgver
 pkgver+=+kde+r0
 makedepends+=('git')
--- a/qt5-imageformats/mingw-w64/PKGBUILD.sh.ep
+++ b/qt5-imageformats/mingw-w64/PKGBUILD.sh.ep
@ -5,7 +5,7 @@
 # Contributor: Filip Brcic <brcha@gna.org>
 % end
 \
-pkgver=5.15.3
+pkgver=5.15.4
 pkgrel=1
 arch=('any')
 pkgdesc="Plugins for additional image formats: TIFF, MNG, TGA, WBMP (mingw-w64)"
--- a/qt5-imageformats/mingw-w64/qtimageformats-sha256.txt
+++ b/qt5-imageformats/mingw-w64/qtimageformats-sha256.txt
@ -1 +1 @@
-bf8285c7ce04284527ab823ddc7cf48a1bb79131db3a7127342167f4814253d7
+SKIP
--- a/qt5-location/mingw-w64-static/PKGBUILD
+++ b/qt5-location/mingw-w64-static/PKGBUILD
@ -15,16 +15,16 @@ _additional_qmake_args+='-- -no-feature-geoservices_mapbox -no-feature-geoservic

 _qt_module=qtlocation
 pkgname=mingw-w64-qt5-location-static
-pkgver=5.15.3
+pkgver=5.15.4
 pkgrel=1
 arch=('any')
 pkgdesc='Provides access to position, satellite and area monitoring classes (mingw-w64)'
 depends=('mingw-w64-qt5-base-static' 'mingw-w64-qt5-declarative-static')
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-_commit=1bf01b84e30aab2b87a19184ce42160e6c92d8b1
+_commit=db3b6bc6afed6477e6ab2d8465e41efee30fb6d5
 _basever=$pkgver
-pkgver+=+kde+r0
+pkgver+=+kde+r2
 makedepends+=('git')
 options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
--- a/qt5-location/mingw-w64-static/qtlocation-sha256.txt
+++ b/qt5-location/mingw-w64-static/qtlocation-sha256.txt
@ -1 +1 @@
-984fcb09e108df49a8dac35d5ce6dffc49caafd2acb1c2f8a5173a6a21f392a0
+SKIP
--- a/qt5-location/mingw-w64/PKGBUILD
+++ b/qt5-location/mingw-w64/PKGBUILD
@ -15,16 +15,16 @@ _additional_qmake_args+='-- -no-feature-geoservices_mapbox -no-feature-geoservic

 _qt_module=qtlocation
 pkgname=mingw-w64-qt5-location
-pkgver=5.15.3
+pkgver=5.15.4
 pkgrel=1
 arch=('any')
 pkgdesc='Provides access to position, satellite and area monitoring classes (mingw-w64)'
 depends=('mingw-w64-qt5-base' 'mingw-w64-qt5-declarative')
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-_commit=1bf01b84e30aab2b87a19184ce42160e6c92d8b1
+_commit=db3b6bc6afed6477e6ab2d8465e41efee30fb6d5
 _basever=$pkgver
-pkgver+=+kde+r0
+pkgver+=+kde+r2
 makedepends+=('git')
 options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
--- a/qt5-location/mingw-w64/PKGBUILD.sh.ep
+++ b/qt5-location/mingw-w64/PKGBUILD.sh.ep
@ -12,7 +12,7 @@ _additional_qmake_args+='-- -no-feature-geoservices_mapbox -no-feature-geoservic

 % end
 \
-pkgver=5.15.3
+pkgver=5.15.4
 pkgrel=1
 arch=('any')
 pkgdesc='Provides access to position, satellite and area monitoring classes (mingw-w64)'
--- a/qt5-location/mingw-w64/qtlocation-sha256.txt
+++ b/qt5-location/mingw-w64/qtlocation-sha256.txt
@ -1 +1 @@
-984fcb09e108df49a8dac35d5ce6dffc49caafd2acb1c2f8a5173a6a21f392a0
+SKIP
--- a/qt5-multimedia/mingw-w64-static/PKGBUILD
+++ b/qt5-multimedia/mingw-w64-static/PKGBUILD
@ -12,14 +12,14 @@

 _qt_module=qtmultimedia
 pkgname=mingw-w64-qt5-multimedia-static
-pkgver=5.15.3
+pkgver=5.15.4
 pkgrel=1
 arch=('any')
 pkgdesc='Classes for audio, video, radio and camera functionality (mingw-w64)'
 depends=('mingw-w64-qt5-base-static' 'mingw-w64-qt5-declarative-static')
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-_commit=fa6c3d653682f9fd331d859c7196a291a8a4d8d5
+_commit=dc0ee181d4c56ff66c989bd3292dad7cc35e234b
 _basever=$pkgver
 pkgver+=+kde+r0
 makedepends+=('git')
--- a/qt5-multimedia/mingw-w64-static/qtmultimedia-sha256.txt
+++ b/qt5-multimedia/mingw-w64-static/qtmultimedia-sha256.txt
@ -1 +1 @@
-0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5
+SKIP
--- a/qt5-multimedia/mingw-w64/PKGBUILD
+++ b/qt5-multimedia/mingw-w64/PKGBUILD
@ -12,14 +12,14 @@

 _qt_module=qtmultimedia
 pkgname=mingw-w64-qt5-multimedia
-pkgver=5.15.3
+pkgver=5.15.4
 pkgrel=1
 arch=('any')
 pkgdesc='Classes for audio, video, radio and camera functionality (mingw-w64)'
 depends=('mingw-w64-qt5-base' 'mingw-w64-qt5-declarative')
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-_commit=fa6c3d653682f9fd331d859c7196a291a8a4d8d5
+_commit=dc0ee181d4c56ff66c989bd3292dad7cc35e234b
 _basever=$pkgver
 pkgver+=+kde+r0
 makedepends+=('git')
--- a/qt5-multimedia/mingw-w64/PKGBUILD.sh.ep
+++ b/qt5-multimedia/mingw-w64/PKGBUILD.sh.ep
@ -4,7 +4,7 @@
 # Contributor: ant32 <antreimer@gmail.com>
 % end
 \
-pkgver=5.15.3
+pkgver=5.15.4
 pkgrel=1
 arch=('any')
 pkgdesc='Classes for audio, video, radio and camera functionality (mingw-w64)'
--- a/qt5-multimedia/mingw-w64/qtmultimedia-sha256.txt
+++ b/qt5-multimedia/mingw-w64/qtmultimedia-sha256.txt
@ -1 +1 @@
-0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5
+SKIP
--- a/qt5-networkauth/mingw-w64-static/PKGBUILD
+++ b/qt5-networkauth/mingw-w64-static/PKGBUILD
@ -10,7 +10,7 @@

 _qt_module=qtnetworkauth
 pkgname=mingw-w64-qt5-networkauth-static
-pkgver=5.15.3
+pkgver=5.15.4
 pkgrel=1
 arch=('any')
 pkgdesc="Network authentication module (mingw-w64)"
@ -18,7 +18,7 @@ depends=('mingw-w64-qt5-base-static')
 optdepends=()
 makedepends=('mingw-w64-gcc')
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
-_commit=958db00a2064f77b354b573102ca2c2b2e07529c
+_commit=2b0c9499e4000858138802e8f5aa28aa2ebe14c0
 _basever=$pkgver
 pkgver+=+kde+r0
 makedepends+=('git')
--- a/qt5-networkauth/mingw-w64-static/qtnetworkauth-sha256.txt
+++ b/qt5-networkauth/mingw-w64-static/qtnetworkauth-sha256.txt
@ -1 +1 @@
-fcc2ec42faa68561efa8f00cd72e662fbc06563ebc6de1dc42d96bb2997acd85
+SKIP
--- a/qt5-networkauth/mingw-w64/PKGBUILD
+++ b/qt5-networkauth/mingw-w64/PKGBUILD
@ -10,7 +10,7 @@

 _qt_module=qtnetworkauth
 pkgname=mingw-w64-qt5-networkauth
-pkgver=5.15.3
+pkgver=5.15.4
 pkgrel=1
 arch=('any')
 pkgdesc="Network authentication module (mingw-w64)"
@ -18,7 +18,7 @@ depends=('mingw-w64-qt5-base')
 optdepends=()
 makedepends=('mingw-w64-gcc')
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
-_commit=958db00a2064f77b354b573102ca2c2b2e07529c
+_commit=2b0c9499e4000858138802e8f5aa28aa2ebe14c0
 _basever=$pkgver
 pkgver+=+kde+r0
 makedepends+=('git')
--- a/qt5-networkauth/mingw-w64/PKGBUILD.sh.ep
+++ b/qt5-networkauth/mingw-w64/PKGBUILD.sh.ep
@ -4,7 +4,7 @@
 # Contributor: ant32 <antreimer@gmail.com>
 % end
 \
-pkgver=5.15.3
+pkgver=5.15.4
 pkgrel=1
 arch=('any')
 pkgdesc="Network authentication module (mingw-w64)"
--- a/qt5-networkauth/mingw-w64/qtnetworkauth-sha256.txt
+++ b/qt5-networkauth/mingw-w64/qtnetworkauth-sha256.txt
@ -1 +1 @@
-fcc2ec42faa68561efa8f00cd72e662fbc06563ebc6de1dc42d96bb2997acd85
+SKIP
--- a/qt5-quickcontrols/mingw-w64-static/PKGBUILD
+++ b/qt5-quickcontrols/mingw-w64-static/PKGBUILD
@ -11,14 +11,14 @@

 _qt_module=qtquickcontrols
 pkgname=mingw-w64-qt5-quickcontrols-static
-pkgver=5.15.3
+pkgver=5.15.4
 pkgrel=1
 arch=('any')
 pkgdesc="Reusable Qt Quick based UI controls to create classic desktop-style user interfaces (mingw-w64)"
 depends=('mingw-w64-qt5-declarative-static')
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-_commit=d054de15b3c9ead0f96655ddfb1a6381ed7a0e2b
+_commit=d405bf6a29bc9d6da6e3dcefbd1b88f5ed70fb1b
 _basever=$pkgver
 pkgver+=+kde+r0
 makedepends+=('git')
--- a/Show More
+++ b/Show More