Add back patch for crashes in rasterization code

The setjmp-based code still breaks on i686.

README.md

@@ -20,19 +20,19 @@ Contains PKGBUILD files for creating Arch Linux packages:
 So if you like to improve one of my AUR packages, just create a PR here.
 
 ## Binary repository
-I also provide a [binary repository](https://martchus.dyn.f3l.de/repo/arch/ownstuff/os)
+I also provide a [binary repository](https://martchus.no-ip.biz/repo/arch/ownstuff/os)
 containing the packages found in this repository and a lot of packages found in
 the AUR:
 
 ```
 [ownstuff-testing]
 SigLevel = Optional TrustAll
-Server = https://martchus.dyn.f3l.de/repo/arch/$repo/os/$arch
+Server = https://martchus.no-ip.biz/repo/arch/$repo/os/$arch
 Server = https://ftp.f3l.de/~martchus/$repo/os/$arch
 
 [ownstuff]
 SigLevel = Optional TrustAll
-Server = https://martchus.dyn.f3l.de/repo/arch/$repo/os/$arch
+Server = https://martchus.no-ip.biz/repo/arch/$repo/os/$arch
 Server = https://ftp.f3l.de/~martchus/$repo/os/$arch
 ```
 

baikal/default/baikal.install

@@ -1,7 +1,7 @@
 # Maintainer: Florian Bruhin (The Compiler) <archlinux.org@the-compiler.org>
 
 post_install() {
-  echo "Please add /var/lib/baikal to open_basedir in your /etc/php/php.ini."
+  echo "Please add /var/lib/baikal to open_basedir in your /etc/php.ini."
   echo
   echo "You also need to set up your webserver for baikal, there are example"
   echo "configs for Apache/nginx at http://sabre.io/baikal/install/."

binutils/mingw-w64-symlinks/PKGBUILD

@@ -1,71 +1,59 @@
-# Maintainer of official package: Felix Yan <felixonmars@archlinux.org>
+# $Id: PKGBUILD 182460 2016-07-07 13:03:56Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: rubenvb vanboxem <dottie> ruben <attie> gmail <dottie> com
 
 # Same as official package but uses symlinks instead of hard links allowing
 # installation when /usr/i686-w64-mingw32 and /usr/x86_64-w64-mingw32 are
 # bound from another partition.
 
+_targets="i686-w64-mingw32 x86_64-w64-mingw32"
+
 pkgname=mingw-w64-binutils-symlinks
-pkgver=2.42
+pkgver=2.32
 pkgrel=1
-pkgdesc="Cross binutils for the MinGW-w64 cross-compiler"
+pkgdesc="Cross binutils for the MinGW-w64 cross-compiler (uses symlinks instead of hard links)"
-arch=('x86_64')
+arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/binutils"
-license=(GPL-2.0-or-later GPL-3.0-or-later LGPL-2.0-or-later LGPL-3.0-or-later GFDL-1.3 FSFAP)
+license=('GPL')
 groups=('mingw-w64-toolchain' 'mingw-w64')
 depends=('zlib')
 provides=('mingw-w64-binutils')
-conflicts=('mingw-w64-binutils');
+conflicts=('mingw-w64-binutils')
 options=('!libtool' '!emptydirs')
-validpgpkeys=('3A24BC1E8FB409FA9F14371813FCEF89DD9E3C4F')  # Nick Clifton (Chief Binutils Maintainer) <nickc@redhat.com>
+validpgpkeys=('3A24BC1E8FB409FA9F14371813FCEF89DD9E3C4F')
 source=("https://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.gz"{,.sig})
-sha512sums=('1e4ee462513eadd3c540e4782f9661df62ecbcd4d6297d61dcc0845ae7d30243c57571787706af3bb4d561e4350609d7057307290e81d76290a301f159a6abc5'
+sha256sums=('9b0d97b3d30df184d302bced12f976aa1e5fbf4b0be696cdebc6cca30411a46e'
             'SKIP')
 
-_targets="i686-w64-mingw32 x86_64-w64-mingw32"
-
 prepare() {
-  cd "$srcdir"/binutils-${pkgver}
+  cd ${srcdir}/binutils-${pkgver}
   #do not install libiberty
   sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
+  # hack! - libiberty configure tests for header files using "$CPP $CPPFLAGS"
+  sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure
 }
 
 build() {
-  # Fix the check for limits.h and certain other checks by dropping the fortify flag from CPPFLAGS
-  # note: Otherwise libiberty/config.h lacks HAVE_LIMITS_H and the compilation runs into errors like:
-  #  /build/gcc-static-compat/src/gcc/libiberty/fibheap.c:38:25: error: ‘LONG_MIN’ undeclared (first use in this function)
-  #  38 | #define FIBHEAPKEY_MIN  LONG_MIN
-  #     |                         ^~~~~~~~
-  #  /build/gcc-static-compat/src/gcc/libiberty/fibheap.c:220:30: note: in expansion of macro ‘FIBHEAPKEY_MIN’
-  #  220 |   if (okey == key && okey != FIBHEAPKEY_MIN)
-  #      |                              ^~~~~~~~~~~~~~
-  #  /build/gcc-static-compat/src/gcc/libiberty/fibheap.c:36:1: note: ‘LONG_MIN’ is defined in header ‘<limits.h>’; did you forget to ‘#include <limits.h>’?
-  #   35 | #include "fibheap.h"
-  #  +++ |+#include <limits.h>
-  CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2}
-
   for _target in $_targets; do
-    echo "Building ${_target} cross binutils"
+    msg "Building ${_target} cross binutils"
-    mkdir -p "$srcdir"/binutils-${_target} && cd "${srcdir}/binutils-${_target}"
+    mkdir -p ${srcdir}/binutils-${_target} && cd "${srcdir}/binutils-${_target}"
-    "$srcdir"/binutils-${pkgver}/configure --prefix=/usr \
+    $srcdir/binutils-${pkgver}/configure --prefix=/usr \
         --target=${_target} \
         --infodir=/usr/share/info/${_target} \
         --enable-lto --enable-plugins \
         --enable-deterministic-archives \
         --disable-multilib --disable-nls \
         --disable-werror
-     make -O
+    make
   done
 }
 
 package() {
   for _target in ${_targets}; do
-    echo "Installing ${_target} cross binutils"
+    msg "Installing ${_target} cross binutils"
-    cd "$srcdir"/binutils-${_target}
+    cd ${srcdir}/binutils-${_target}
-    make DESTDIR="$pkgdir" install
+    make DESTDIR=${pkgdir} install
-
-    rm "$pkgdir"/usr/lib/bfd-plugins/libdep.so
   done
-
   cd "${pkgdir}/usr/bin"
   for file in *; do
     if [[ ! -L $file ]] && [[ ! -d $file ]]; then

binutils/mingw-w64/PKGBUILD

@@ -1,62 +0,0 @@
-# Maintainer of official package: Felix Yan <felixonmars@archlinux.org>
-
-pkgname=mingw-w64-binutils
-pkgver=2.42
-pkgrel=1
-pkgdesc="Cross binutils for the MinGW-w64 cross-compiler"
-arch=('x86_64')
-url="http://www.gnu.org/software/binutils"
-license=(GPL-2.0-or-later GPL-3.0-or-later LGPL-2.0-or-later LGPL-3.0-or-later GFDL-1.3 FSFAP)
-groups=('mingw-w64-toolchain' 'mingw-w64')
-depends=('zlib')
-options=('!libtool' '!emptydirs')
-validpgpkeys=('3A24BC1E8FB409FA9F14371813FCEF89DD9E3C4F')  # Nick Clifton (Chief Binutils Maintainer) <nickc@redhat.com>
-source=("https://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.gz"{,.sig})
-sha512sums=('1e4ee462513eadd3c540e4782f9661df62ecbcd4d6297d61dcc0845ae7d30243c57571787706af3bb4d561e4350609d7057307290e81d76290a301f159a6abc5'
-            'SKIP')
-
-_targets="i686-w64-mingw32 x86_64-w64-mingw32"
-
-prepare() {
-  cd "$srcdir"/binutils-${pkgver}
-  #do not install libiberty
-  sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
-}
-
-build() {
-  # Fix the check for limits.h and certain other checks by dropping the fortify flag from CPPFLAGS
-  # note: Otherwise libiberty/config.h lacks HAVE_LIMITS_H and the compilation runs into errors like:
-  #  /build/gcc-static-compat/src/gcc/libiberty/fibheap.c:38:25: error: ‘LONG_MIN’ undeclared (first use in this function)
-  #  38 | #define FIBHEAPKEY_MIN  LONG_MIN
-  #     |                         ^~~~~~~~
-  #  /build/gcc-static-compat/src/gcc/libiberty/fibheap.c:220:30: note: in expansion of macro ‘FIBHEAPKEY_MIN’
-  #  220 |   if (okey == key && okey != FIBHEAPKEY_MIN)
-  #      |                              ^~~~~~~~~~~~~~
-  #  /build/gcc-static-compat/src/gcc/libiberty/fibheap.c:36:1: note: ‘LONG_MIN’ is defined in header ‘<limits.h>’; did you forget to ‘#include <limits.h>’?
-  #   35 | #include "fibheap.h"
-  #  +++ |+#include <limits.h>
-  CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2}
-
-  for _target in $_targets; do
-    echo "Building ${_target} cross binutils"
-    mkdir -p "$srcdir"/binutils-${_target} && cd "${srcdir}/binutils-${_target}"
-    "$srcdir"/binutils-${pkgver}/configure --prefix=/usr \
-        --target=${_target} \
-        --infodir=/usr/share/info/${_target} \
-        --enable-lto --enable-plugins \
-        --enable-deterministic-archives \
-        --disable-multilib --disable-nls \
-        --disable-werror
-     make -O
-  done
-}
-
-package() {
-  for _target in ${_targets}; do
-    echo "Installing ${_target} cross binutils"
-    cd "$srcdir"/binutils-${_target}
-    make DESTDIR="$pkgdir" install
-
-    rm "$pkgdir"/usr/lib/bfd-plugins/libdep.so
-  done
-}

c++utilities/default/PKGBUILD

@@ -5,7 +5,7 @@
 
 _reponame=cpp-utilities
 pkgname=c++utilities
-pkgver=5.24.8
+pkgver=5.24.7
 pkgrel=1
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
 pkgdesc='Common C++ classes and routines such as argument parser, IO and conversion utilities'
@@ -17,7 +17,7 @@ checkdepends=('cppunit')
 provides=(libc++utilities.so)
 url="https://github.com/Martchus/${_reponame}"
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('2175b45a53f5c71bb022aea1409535a82b115ce76dbcc5123b3be39f8557858a')
+sha256sums=('c3aa125933aaf9724eacca045f5d8278d524a4cef95ce54b89e88e1ac15684c2')
 
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"

c++utilities/doc/PKGBUILD

@@ -6,7 +6,7 @@
 _name=c++utilities
 _reponame=cpp-utilities
 pkgname=$_name-doc
-pkgver=5.24.8
+pkgver=5.24.7
 pkgrel=1
 arch=('any')
 pkgdesc='Common C++ classes and routines such as argument parser, IO and conversion utilities (API documentation)'
@@ -14,7 +14,7 @@ license=('GPL')
 makedepends=('cmake' 'ninja' 'doxygen' 'graphviz')
 url="https://github.com/Martchus/${_reponame}"
 source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('2175b45a53f5c71bb022aea1409535a82b115ce76dbcc5123b3be39f8557858a')
+sha256sums=('c3aa125933aaf9724eacca045f5d8278d524a4cef95ce54b89e88e1ac15684c2')
 
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"

c++utilities/mingw-w64/PKGBUILD

@@ -6,7 +6,7 @@
 _reponame=cpp-utilities
 pkgname=mingw-w64-c++utilities
 _name=${pkgname#mingw-w64-}
-pkgver=5.24.8
+pkgver=5.24.7
 pkgrel=1
 arch=('any')
 pkgdesc='Common C++ classes and routines such as argument parser, IO and conversion utilities (mingw-w64)'
@@ -17,7 +17,7 @@ checkdepends=('mingw-w64-cppunit' 'mingw-w64-wine')
 makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'ninja')
 url="https://github.com/Martchus/${_reponame}"
 source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('2175b45a53f5c71bb022aea1409535a82b115ce76dbcc5123b3be39f8557858a')
+sha256sums=('c3aa125933aaf9724eacca045f5d8278d524a4cef95ce54b89e88e1ac15684c2')
 options=(!buildflags staticlibs !strip !emptydirs)
 
 _architectures=('i686-w64-mingw32' 'x86_64-w64-mingw32')

c++utilities/static-compat/PKGBUILD

@@ -6,7 +6,7 @@
 _reponame=cpp-utilities
 pkgname=static-compat-c++utilities
 _name=${pkgname#static-compat-}
-pkgver=5.24.8
+pkgver=5.24.7
 pkgrel=1
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
 pkgdesc='Common C++ classes and routines such as argument parser, IO and conversion utilities'
@@ -17,7 +17,7 @@ makedepends=('ninja' 'static-compat-cmake')
 checkdepends=('static-compat-cppunit')
 url="https://github.com/Martchus/${_reponame}"
 source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('2175b45a53f5c71bb022aea1409535a82b115ce76dbcc5123b3be39f8557858a')
+sha256sums=('c3aa125933aaf9724eacca045f5d8278d524a4cef95ce54b89e88e1ac15684c2')
 
 prepare() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"

cmake-format/default/PKGBUILD

@@ -9,7 +9,7 @@ pkgrel=3
 pkgdesc='Source code formatter for CMake listfiles'
 arch=('any')
 url='https://github.com/cheshirekow/cmake_format'
-license=('GPL-3.0-or-later')
+license=('GPL3')
 depends=('python-six>=1.13.0')
 makedepends=('python-setuptools')
 optdepends=('python-yaml>=5.3: YAML config files' 'python-jinja>=2.10.3: complete HTML annotation' 'python-argcomplete: automatic shell completion')

devel/generator/generate.pl

@@ -76,43 +76,43 @@ $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'],
-    activeqt => [0, '91bfd21f86c450b129ac2dde9d33b32e140d8a0c'],
+    activeqt => [0, '014285857ef1cfb2d9965cf7bad871bbc336ce60'],
-    winextras => [0, '907009a4f7e5d2b99805547caf4b901bdbb0d4d6'],
+    winextras => [0, 'e6a85ae3306867400b8700600152949656eb21f7'],
-    '3d' => [0, '9bf4d03e2515f7c454647d54542330b6e90f8191'],
+    '3d' => [0, '67bee4599a28e1cadc14ed9ea4adc7061e250b90'],
-    base => [140, '1c13ef067ea3c97342f98039931ea18b3992014f'],
+    base => [138, 'b9906b5233a80cab372c95ac4dd68b25bdca0646'],
-    charts => [0, '7315c48bcec88014e78165bbda54abfcd557e0af'],
+    charts => [0, '3f3f14d69a509c3e8027bfb5d7ffca9b4f3ef003'],
-    connectivity => [3, '99f30db37c63447c59d5fac15bc8feb832a7fd04'],
+    connectivity => [4, '8024ef3d7269665ba104f528e5e284df9d9d8ae9'],
-    datavis3d => [0, '79cd0fb6cafcd42e4037ae1363fda3bc2cec934a'],
+    datavis3d => [0, '6ac6d23a8f558f36f1162b419858cc44dccd4d2b'],
-    declarative => [28, '50c8def854806485d66aabcf6918e8b987032e55'],
+    declarative => [30, 'b99568135aa60de96ca2e121dc2e8d83fb1ca886'],
-    gamepad => [0, 'b1c2f272f69e222a532485e6f820776c220b3535'],
+    gamepad => [0, '44255e2ae53a14e9a3fb671da0782ec5d396220a'],
-    graphicaleffects => [0, '2c39e673d6c15a84dcc7882d3772fa04cc79f9ed'],
+    graphicaleffects => [0, '895f9753940156dda05aa83d3c7655571514407e'],
-    imageformats => [7, '4e4f5fc6bdac96f5281a3ebeb0fee78df7b1a498'],
+    imageformats => [7, '63ec444cc7b30c45d4c8beb2c1071a1157d689eb'],
-    location => [7, '3beb9c810611337fde61d89aa981e9f177a9ede9'],
+    location => [6, 'c576985da4e6a4a0b85d5229263777e7197494e0'],
-    lottie => [0, 'b8c1fa109dce6f8bff9f55738d2f1e21ff677796'],
+    lottie => [0, '62f17bbc0ae8649178ac484afc434dbad16d6351'],
-    multimedia => [2, '53069c9c6eb52b744333812f42aed36c3db6e752'],
+    multimedia => [2, '7514352532f41d9f0f8b8d722e360b1854442731'],
-    networkauth => [1, '28180f28c98e329676463e24cef0097cba45bc00'],
+    networkauth => [0, 'ed2291d454fac207f6b1555d30b9227e51be611b'],
-    purchasing => [0, 'd4903bf08c576a6c085278c1960a2676cd83dca7'],
+    purchasing => [0, '7f4ead6f3e6431acee63987a0a1753ff140ac2d2'],
-    quick3d => [1, 'ad229f0c135f74801fba2bcd22c78abc0e3cf1d2'],
+    quick3d => [1, 'a0c37ca7615e95d69bcf6de8f19607bd46e8c37a'],
-    quickcontrols => [0, '9325659ec390eda5b160736a926ba58ccb445cce'],
+    quickcontrols => [0, '77fbfa8d313bbdb8fb762f15dd6173a067be55e3'],
-    quickcontrols2 => [5, '69fea340f8f4c483a9b2889e4e24a4b1b52ebc87'],
+    quickcontrols2 => [5, '1fc98160580fc7b791e20d34ba986c9992cae9c5'],
-    quicktimeline => [0, 'bf6c73064c82b07fcb1f7e72c263b249e137e224'],
+    quicktimeline => [0, '29394e35db43acb20e7b4d5e978a733f5b4232a6'],
-    remoteobjects => [0, '3873bdc809ca8d58d91968cb0de34da26646bc79'],
+    remoteobjects => [0, '18ef1cdce7bc4c93415f38f1c220ab697aa75908'],
-    scxml => [0, '6834b183966d08d9f061642ee7ea2d482cbbf073'],
+    scxml => [0, '6074956c2089dd0507d2930c638fa8c930f4e21c'],
-    sensors => [0, 'bf0b718cd0b6c7823e9d2037d3bdece44185f444'],
+    sensors => [0, '7f8b55744f87155a4979dd8ba405bd7feec03042'],
-    serialbus => [0, '616bc5b962cdcacb1c1ba985d7236392e9cadb8c'],
+    serialbus => [0, '5efce7d821bad2f5db95ff3ada5eeddccbb58920'],
-    serialport => [0, '34c19c6441cd440dc65b59ae7670eadf099d51f8'],
+    serialport => [0, 'fc0b6affe244e40366bd624d6e01c62712568eb8'],
-    speech => [1, '8ad0f08ad7e2a8d27dc5e69806812c6a3f298946'],
+    speech => [1, '9b3738febbc751820ede496e8d619c5be56548dc'],
-    svg => [5, '690128b2b8fb6d6fbdc43b2b2633f0f1de3f0638'],
+    svg => [6, '080fed6443e9e7b2ad30e61f31163e9481dfad0f'],
-    tools => [4, 'f82ed367d1b80b69d738cfcde534b75854a45476'],
+    tools => [4, 'ba4c633c4a4731ead0c376b908bf5449796f7de1'],
-    translations => [0, 'c601106c8b5d5495f951c8ea0ad6a9e171416ae0'],
+    translations => [0, '40aabebd04a30ccef374bf20a7bfaa1d8d665b7f'],
-    virtualkeyboard => [0, '7389450a5de5fdd210f1459abcf73621ec0496bd'],
+    virtualkeyboard => [0, '80565aa7fc37ecdb1c08e585d4ae3060618e3338'],
-    wayland => [57, '75f434f14499eb47ede2cb66f0946527bf555791'],
+    wayland => [60, '9c82b5461736f59a06923ab68c6f7584ecab4f77'],
-    webchannel => [3, 'fca83088ef430f96257d2014e77d08bd350259af'],
+    webchannel => [3, 'c78ad286a90e3d7986292b4a6036a9927bbc155f'],
-    webglplugin => [0, '3681356904277e055759693551357e7e488d1be9'],
+    webglplugin => [0, '80257933d3bf3a026455d71106e6b3e70dead765'],
-    websockets => [2, 'dbbdc64b804f7c4d0ed92198aaab49b07fa15e7f'],
+    websockets => [2, '2c2b7691ae231f43129d7f2b43984c30883ca4b1'],
-    webview => [0, 'bbb1891595aba23ff3c6d137aa74442f9e54479b'],
+    webview => [0, '3d9289d73c5c03ed5b2fe246589d0d81cfdaa22e'],
-    x11extras => [0, '6c3605fcb3b34e55951f597e06c135d97dfa6cd7'],
+    x11extras => [0, '415ac0d58521be2bb00ef4cecdb16f0b9001e88c'],
-    xmlpatterns => [0, '087f6f35bd027f940818b1696d0aad822e034377'],
+    xmlpatterns => [0, 'eb59017f04b44667e0c6778aa3995f8e86c98e48'],
 );
 # $rev := git rev-list --count v5.15.2..$commit_on_kde_fork
 

devel/generator/templates/layouts/android-qt6-base.sh.ep

@@ -14,7 +14,7 @@
 
 _android_arch=<%= $variant_prefix_part =~ s/android-// && $variant_prefix_part %>
 pkgname=<%= $package_name %>
-_qtver=6.7.1
+_qtver=6.7.0
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)

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.14<%== $kde_fork_revision ? "+kde+r$kde_fork_revision->[0]" : '' %>
+pkgver=5.15.13<%== $kde_fork_revision ? "+kde+r$kde_fork_revision->[0]" : '' %>
 pkgrel=1
 % if ($kde_fork_revision) {
 _basever=${pkgver%%+*}

devel/generator/templates/layouts/mingw-w64-qt5-module.sh.ep

@@ -45,7 +45,7 @@ _pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz"\
 % }
 <%== include 'fragments/source_file_list', relevant_files => $patch_files %>)
-% if ($qt_module_sha256 =~ qr/missing/) {
+% if ($kde_fork_revision || stash('is_lts')) {
 sha256sums=('SKIP'\
 % } else {
 sha256sums=('<%== $qt_module_sha256 %>'\

devel/generator/templates/layouts/mingw-w64-qt6-base.sh.ep

@@ -14,9 +14,9 @@
 % }
 
 pkgname=<%= $package_name %>
-_qtver=6.7.1
+_qtver=6.7.0
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=(any)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
@@ -38,13 +38,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
 sha256sums=('<%== $qt_module_sha256 %>'\
 <%== include 'fragments/sha256_list', relevant_files => $patch_files %>)
 
-# disable i686 build because 32-bit Windows is generally not supported by upstream and
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
-# it does not build anymore as of GCC 14 (probably due to commit 9a19fa8b616f83474c35cc5b34a3865073ced829)
-# remarks:
-# - This is in-line with MSYS2's packaging of mingw-w64 Qt 6 packages.
-# - You may override MINGW_W64_QT6_ARCHS by adding the variable to `/etc/makepkg.conf` in case you
-#   nevertheless want to attempt the i686 build.
-_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
 
 % if ($patch_files->size || content_for('prepare')->size) {
 prepare () {

devel/generator/templates/layouts/mingw-w64-qt6-module.sh.ep

@@ -15,7 +15,7 @@ _pkgfqn="qt<%== $qt_module %>-everywhere-src-${_qtver}"
 sha256sums=('<%== stash('git_commit') ? 'SKIP' : $qt_module_sha256 %>'\
 <%== include 'fragments/sha256_list', relevant_files => $patch_files %>)
 
-_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
 % if ($patch_files->size || content_for('prepare')->size) {
 prepare () {

devel/generator/templates/layouts/static-compat-qt6-base.sh.ep

@@ -13,7 +13,7 @@
 % }
 
 pkgname=<%= $package_name %>
-_qtver=6.7.1
+_qtver=6.7.0
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(x86_64)

devel/versions.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 declare -A versions=(
-    [syncthingtray]=1.5.3
+    [syncthingtray]=1.5.1
-    [c++utilities]=5.24.8
+    [c++utilities]=5.24.7
     [qtutilities]=6.14.0
     [qtforkawesome]=0.2.0
     [tagparser]=12.1.0
@@ -13,8 +13,8 @@ declare -A versions=(
     [blackwidowcontrol]=1.1.0
     [dbus-soundrecorder]=1.2.3
     [geocoordinatecalculator]=1.1.3
-    [qt5]=5.15.14
+    [qt5]=5.15.13
-    [qt6]=6.7.1
+    [qt6]=6.7.0
 )
 declare -A github_names=(
     [c++utilities]=cpp-utilities

devtools/custom/PKGBUILD

@@ -14,7 +14,7 @@ pkgrel=1
 pkgdesc='Tools for Arch Linux package maintainers (patches from ALARM and custom ones)'
 arch=('any')
 license=('GPL')
-url='https://martchus.dyn.f3l.de/gitea/Martchus/devtools/src/branch/custom'
+url='https://martchus.no-ip.biz/gitea/Martchus/devtools/src/branch/custom'
 conflicts=('devtools' 'devtools-alarm')
 provides=('devtools' 'devtools-alarm')
 depends=(
@@ -44,7 +44,7 @@ makedepends=(
   shellcheck
 )
 optdepends=('btrfs-progs: btrfs support')
-source=("git+https://martchus.dyn.f3l.de/gitea/Martchus/$_pkgname.git#branch=custom-v$pkgver")
+source=("git+https://martchus.no-ip.biz/gitea/Martchus/$_pkgname.git#branch=custom-v$pkgver")
 sha256sums=('SKIP')
 
 build() {

environment/static-compat/PKGBUILD

@@ -1,20 +1,15 @@
-pkgname=(static-compat-{environment,pkgconf})
+pkgname=static-compat-environment
 pkgver=1
-pkgrel=2
+pkgrel=1
 arch=('any')
 pkgdesc="Script providing common environment variables to use gcc-static-compat"
 license=('GPL')
 depends=('gcc-static-compat')
 url="https://github.com/Martchus/PKGBUILDs"
-source=(static-compat-environment.sh pkg-config.sh)
+source=("static-compat-environment.sh")
 sha256sums=('SKIP')
 
-package_static-compat-environment() {
+package() {
   install -d "${pkgdir}"/usr/bin
   install -m 755 static-compat-environment.sh "${pkgdir}"/usr/bin/static-compat-environment
 }
-
-package_static-compat-pkgconf() {
-  install -d "${pkgdir}"/usr/static-compat/bin/
-  install -m 755 pkg-config.sh "${pkgdir}"/usr/static-compat/bin/pkg-config
-}

environment/static-compat/pkg-config.sh

@@ -1,2 +0,0 @@
-#!/usr/bin/bash
-exec /usr/bin/pkg-config --static "$@"

ffmpeg/custom/PKGBUILD

@@ -9,7 +9,7 @@
 
 _name=ffmpeg
 pkgname=ffmpeg-custom
-pkgver=7.0
+pkgver=6.1.1
 pkgrel=1
 epoch=1
 pkgdesc='Complete solution to record, convert and stream audio and video (with more features enabled than regular ffmpeg)'
@@ -36,8 +36,6 @@ depends=(
   libbs2b.so
   libdav1d.so
   libdrm
-  libdvdnav
-  libdvdread
   libfreetype.so
   libgl
   libharfbuzz.so
@@ -70,7 +68,6 @@ depends=(
   libxext
   libxml2
   libxv
-  mbedtls
   libxvidcore.so
   libzimg.so
   ocl-icd
@@ -132,18 +129,32 @@ conflicts=("$_name")
 options=(
   debug
 )
-_tag=fa053f314a0150bebe073438867e454182909c53
+_tag=6f4048827982a8f48f71f551a6e1ed2362816eec
 source=(
   git+https://git.ffmpeg.org/ffmpeg.git#tag=${_tag}
   add-av_stream_get_first_dts-for-chromium.patch
 )
-b2sums=('4b2057fb68a0137bf149779beee3b7066835216a830896d4de4d31d0c00c2ab13419d4a3f0ccba1ab6d0cb063bdc91f2fc35d5916ddd65288c327880cbdefc41'
+b2sums=('SKIP'
         '555274228e09a233d92beb365d413ff5c718a782008075552cafb2130a3783cf976b51dfe4513c15777fb6e8397a34122d475080f2c4483e8feea5c0d878e6de')
 validpgpkeys=(DD1EC9E8DE085C629B3E1846B18E8928B3948D64) # Michael Niedermayer <michael@niedermayer.cc>
 
 prepare() {
   cd ffmpeg
+  # FS#79281: fix assembling with binutil as >= 2.41
+  git cherry-pick -n effadce6c756247ea8bae32dc13bb3e6f464f0eb
+  # FS#77813: fix playing ogg files with mplayer
+  git cherry-pick -n cbcc817353a019da4332ad43deb7bbc4e695d02a
   patch -Np1 -i ../add-av_stream_get_first_dts-for-chromium.patch # https://crbug.com/1251779
+  # use non-deprecated nvenc GUID for conftest
+  git cherry-pick -n 03823ac0c6a38bd6ba972539e3203a592579792f
+  git cherry-pick -n d2b46c1ef768bc31ba9180f6d469d5b8be677500
+  # Fix VDPAU vo
+  git cherry-pick -n e9c93009fc34ca9dfcf0c6f2ed90ef1df298abf7
+  # Fix bug in av_fft_end
+  git cherry-pick -n a562cfee2e214252f8b3f516527272ae32ef9532
+  git cherry-pick -n 250471ea1745fc703eb346a2a662304536a311b1
+  # Fix build with latest vulkan headers
+  git cherry-pick -n fef22c87ada4517441701e6e61e062c9f4399c8e
 }
 
 pkgver() {
@@ -166,6 +177,7 @@ build() {
     --enable-fontconfig \
     --enable-frei0r \
     --enable-gmp \
+    --enable-gnutls \
     --enable-gpl \
     --enable-ladspa \
     --enable-libaom \
@@ -173,9 +185,6 @@ build() {
     --enable-libbluray \
     --enable-libbs2b \
     --enable-libdav1d \
-    --enable-libdrm \
-    --enable-libdvdnav \
-    --enable-libdvdread \
     --enable-libfreetype \
     --enable-libfribidi \
     --enable-libiec61883 \
@@ -215,7 +224,6 @@ build() {
     --enable-libxml2 \
     --enable-libxvid \
     --enable-libzimg \
-    --enable-mbedtls \
     --enable-nvdec \
     --enable-nvenc \
     --enable-opencl \

gcc/mingw-w64/0001-missing-__thiscall-attribute-on-builtin-declaration-of-__cxa_thread_atexit.patch

@@ -1,319 +0,0 @@
-2024-05-08  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/114968
-gcc/
-	* target.def (use_atexit_for_cxa_atexit): Remove spurious space
-	from comment.
-	(adjust_cdtor_callabi_fntype): New cxx target hook.
-	* targhooks.h (default_cxx_adjust_cdtor_callabi_fntype): Declare.
-	* targhooks.cc (default_cxx_adjust_cdtor_callabi_fntype): New
-	function.
-	* doc/tm.texi.in (TARGET_CXX_ADJUST_CDTOR_CALLABI_FNTYPE): Add.
-	* doc/tm.texi: Regenerate.
-	* config/i386/i386.cc (ix86_cxx_adjust_cdtor_callabi_fntype): New
-	function.
-	(TARGET_CXX_ADJUST_CDTOR_CALLABI_FNTYPE): Redefine.
-gcc/cp/
-	* cp-tree.h (atexit_fn_ptr_type_node, cleanup_type): Adjust macro
-	comments.
-	(get_cxa_atexit_fn_ptr_type): Declare.
-	* decl.cc (get_atexit_fn_ptr_type): Adjust function comment, only
-	build type for atexit argument.
-	(get_cxa_atexit_fn_ptr_type): New function.
-	(get_atexit_node): Call get_cxa_atexit_fn_ptr_type rather than
-	get_atexit_fn_ptr_type when using __cxa_atexit.
-	(get_thread_atexit_node): Call get_cxa_atexit_fn_ptr_type
-	rather than get_atexit_fn_ptr_type.
-	(start_cleanup_fn): Add fntype argument, don't call
-	get_atexit_fn_ptr_type for it.
-	(register_dtor_fn): Adjust start_cleanup_fn caller, use
-	get_cxa_atexit_fn_ptr_type rather than get_atexit_fn_ptr_type
-	when ob_parm is true.
-	* except.cc (build_throw): Use get_cxa_atexit_fn_ptr_type ().
-
---- a/gcc/target.def
-+++ b/gcc/target.def
-@@ -6498,7 +6498,7 @@ is in effect.  The default is to return
-  hook_bool_void_false)
- 
- /* Returns true if target may use atexit in the same manner as
--   __cxa_atexit  to register static destructors.  */
-+   __cxa_atexit to register static destructors.  */
- DEFHOOK
- (use_atexit_for_cxa_atexit,
-  "This hook returns true if the target @code{atexit} function can be used\n\
-@@ -6509,6 +6509,17 @@ unloaded. The default is to return false
-  bool, (void),
-  hook_bool_void_false)
- 
-+/* Returns modified FUNCTION_TYPE for cdtor callabi.  */
-+DEFHOOK
-+(adjust_cdtor_callabi_fntype,
-+ "This hook returns a possibly modified @code{FUNCTION_TYPE} for arguments\n\
-+to @code{__cxa_atexit}, @code{__cxa_thread_atexit} or @code{__cxa_throw}\n\
-+function pointers.  ABIs like mingw32 require special attributes to be added\n\
-+to function types pointed to by arguments of these functions.\n\
-+The default is to return the passed argument unmodified.",
-+ tree, (tree fntype),
-+ default_cxx_adjust_cdtor_callabi_fntype)
-+
- DEFHOOK
- (adjust_class_at_definition,
- "@var{type} is a C++ class (i.e., RECORD_TYPE or UNION_TYPE) that has just\n\
---- a/gcc/targhooks.h
-+++ b/gcc/targhooks.h
-@@ -65,6 +65,7 @@ extern machine_mode default_mode_for_suf
- 
- extern tree default_cxx_guard_type (void);
- extern tree default_cxx_get_cookie_size (tree);
-+extern tree default_cxx_adjust_cdtor_callabi_fntype (tree);
- 
- extern bool hook_pass_by_reference_must_pass_in_stack
-   (cumulative_args_t, const function_arg_info &);
---- a/gcc/targhooks.cc
-+++ b/gcc/targhooks.cc
-@@ -329,6 +329,14 @@ default_cxx_get_cookie_size (tree type)
-   return cookie_size;
- }
- 
-+/* Returns modified FUNCTION_TYPE for cdtor callabi.  */
-+
-+tree
-+default_cxx_adjust_cdtor_callabi_fntype (tree fntype)
-+{
-+  return fntype;
-+}
-+
- /* Return true if a parameter must be passed by reference.  This version
-    of the TARGET_PASS_BY_REFERENCE hook uses just MUST_PASS_IN_STACK.  */
- 
---- a/gcc/doc/tm.texi.in
-+++ b/gcc/doc/tm.texi.in
-@@ -7223,6 +7223,8 @@ floating-point support; they are not inc
- 
- @hook TARGET_CXX_USE_ATEXIT_FOR_CXA_ATEXIT
- 
-+@hook TARGET_CXX_ADJUST_CDTOR_CALLABI_FNTYPE
-+
- @hook TARGET_CXX_ADJUST_CLASS_AT_DEFINITION
- 
- @hook TARGET_CXX_DECL_MANGLING_CONTEXT
---- a/gcc/doc/tm.texi
-+++ b/gcc/doc/tm.texi
-@@ -11117,6 +11117,14 @@ shared libraries are run in the correct
- unloaded. The default is to return false.
- @end deftypefn
- 
-+@deftypefn {Target Hook} tree TARGET_CXX_ADJUST_CDTOR_CALLABI_FNTYPE (tree @var{fntype})
-+This hook returns a possibly modified @code{FUNCTION_TYPE} for arguments
-+to @code{__cxa_atexit}, @code{__cxa_thread_atexit} or @code{__cxa_throw}
-+function pointers.  ABIs like mingw32 require special attributes to be added
-+to function types pointed to by arguments of these functions.
-+The default is to return the passed argument unmodified.
-+@end deftypefn
-+
- @deftypefn {Target Hook} void TARGET_CXX_ADJUST_CLASS_AT_DEFINITION (tree @var{type})
- @var{type} is a C++ class (i.e., RECORD_TYPE or UNION_TYPE) that has just
- been defined.  Use this hook to make adjustments to the class (eg, tweak
---- a/gcc/config/i386/i386.cc
-+++ b/gcc/config/i386/i386.cc
-@@ -25799,6 +25799,20 @@ ix86_bitint_type_info (int n, struct bit
-   return true;
- }
- 
-+/* Returns modified FUNCTION_TYPE for cdtor callabi.  */
-+tree
-+ix86_cxx_adjust_cdtor_callabi_fntype (tree fntype)
-+{
-+  if (TARGET_64BIT
-+      || TARGET_RTD
-+      || ix86_function_type_abi (fntype) != MS_ABI)
-+    return fntype;
-+  /* For 32-bit MS ABI add thiscall attribute.  */
-+  tree attribs = tree_cons (get_identifier ("thiscall"), NULL_TREE,
-+			    TYPE_ATTRIBUTES (fntype));
-+  return build_type_attribute_variant (fntype, attribs);
-+}
-+
- /* Implement PUSH_ROUNDING.  On 386, we have pushw instruction that
-    decrements by exactly 2 no matter what the position was, there is no pushb.
- 
-@@ -26410,6 +26424,8 @@ static const scoped_attribute_specs *con
- #define TARGET_C_EXCESS_PRECISION ix86_get_excess_precision
- #undef TARGET_C_BITINT_TYPE_INFO
- #define TARGET_C_BITINT_TYPE_INFO ix86_bitint_type_info
-+#undef TARGET_CXX_ADJUST_CDTOR_CALLABI_FNTYPE
-+#define TARGET_CXX_ADJUST_CDTOR_CALLABI_FNTYPE ix86_cxx_adjust_cdtor_callabi_fntype
- #undef TARGET_PROMOTE_PROTOTYPES
- #define TARGET_PROMOTE_PROTOTYPES hook_bool_const_tree_true
- #undef TARGET_PUSH_ARGUMENT
---- a/gcc/cp/cp-tree.h
-+++ b/gcc/cp/cp-tree.h
-@@ -368,8 +368,7 @@ extern GTY(()) tree cp_global_trees[CPTI
- #define throw_fn			cp_global_trees[CPTI_THROW_FN]
- #define rethrow_fn			cp_global_trees[CPTI_RETHROW_FN]
- 
--/* The type of the function-pointer argument to "__cxa_atexit" (or
--   "std::atexit", if "__cxa_atexit" is not being used).  */
-+/* The type of the function-pointer argument to "std::atexit".  */
- #define atexit_fn_ptr_type_node         cp_global_trees[CPTI_ATEXIT_FN_PTR_TYPE]
- 
- /* A pointer to `std::atexit'.  */
-@@ -384,7 +383,8 @@ extern GTY(()) tree cp_global_trees[CPTI
- /* The declaration of the dynamic_cast runtime.  */
- #define dynamic_cast_node		cp_global_trees[CPTI_DCAST]
- 
--/* The type of a destructor.  */
-+/* The type of a destructor, passed to __cxa_atexit, __cxa_thread_atexit
-+   or __cxa_throw.  */
- #define cleanup_type			cp_global_trees[CPTI_CLEANUP_TYPE]
- 
- /* The type of the vtt parameter passed to subobject constructors and
-@@ -7067,6 +7067,7 @@ extern tree check_default_argument		(tre
- extern int wrapup_namespace_globals		();
- extern tree create_implicit_typedef		(tree, tree);
- extern int local_variable_p			(const_tree);
-+extern tree get_cxa_atexit_fn_ptr_type		();
- extern tree register_dtor_fn			(tree);
- extern tmpl_spec_kind current_tmpl_spec_kind	(int);
- extern tree cxx_builtin_function		(tree decl);
---- a/gcc/cp/decl.cc
-+++ b/gcc/cp/decl.cc
-@@ -93,7 +93,7 @@ static void record_key_method_defined (t
- static tree create_array_type_for_decl (tree, tree, tree, location_t);
- static tree get_atexit_node (void);
- static tree get_dso_handle_node (void);
--static tree start_cleanup_fn (void);
-+static tree start_cleanup_fn (tree);
- static void end_cleanup_fn (void);
- static tree cp_make_fname_decl (location_t, tree, int);
- static void initialize_predefined_identifiers (void);
-@@ -9678,34 +9678,39 @@ declare_global_var (tree name, tree type
-   return decl;
- }
- 
--/* Returns the type for the argument to "__cxa_atexit" (or "atexit",
--   if "__cxa_atexit" is not being used) corresponding to the function
-+/* Returns the type for the argument to "atexit" corresponding to the function
-    to be called when the program exits.  */
- 
- static tree
--get_atexit_fn_ptr_type (void)
-+get_atexit_fn_ptr_type ()
- {
--  tree fn_type;
--
-   if (!atexit_fn_ptr_type_node)
-     {
--      tree arg_type;
--      if (flag_use_cxa_atexit 
--	  && !targetm.cxx.use_atexit_for_cxa_atexit ())
--	/* The parameter to "__cxa_atexit" is "void (*)(void *)".  */
--	arg_type = ptr_type_node;
--      else
--	/* The parameter to "atexit" is "void (*)(void)".  */
--	arg_type = NULL_TREE;
--      
--      fn_type = build_function_type_list (void_type_node,
--					  arg_type, NULL_TREE);
-+      tree fn_type = build_function_type_list (void_type_node, NULL_TREE);
-       atexit_fn_ptr_type_node = build_pointer_type (fn_type);
-     }
- 
-   return atexit_fn_ptr_type_node;
- }
- 
-+/* Returns the type for the argument to "__cxa_atexit", "__cxa_thread_atexit"
-+   or "__cxa_throw" corresponding to the destructor to be called when the
-+   program exits.  */
-+
-+tree
-+get_cxa_atexit_fn_ptr_type ()
-+{
-+  if (!cleanup_type)
-+    {
-+      tree fntype = build_function_type_list (void_type_node,
-+					      ptr_type_node, NULL_TREE);
-+      fntype = targetm.cxx.adjust_cdtor_callabi_fntype (fntype);
-+      cleanup_type = build_pointer_type (fntype);
-+    }
-+
-+  return cleanup_type;
-+}
-+
- /* Returns a pointer to the `atexit' function.  Note that if
-    FLAG_USE_CXA_ATEXIT is nonzero, then this will actually be the new
-    `__cxa_atexit' function specified in the IA64 C++ ABI.  */
-@@ -9736,7 +9741,7 @@ get_atexit_node (void)
-       use_aeabi_atexit = targetm.cxx.use_aeabi_atexit ();
-       /* First, build the pointer-to-function type for the first
- 	 argument.  */
--      fn_ptr_type = get_atexit_fn_ptr_type ();
-+      fn_ptr_type = get_cxa_atexit_fn_ptr_type ();
-       /* Then, build the rest of the argument types.  */
-       argtype2 = ptr_type_node;
-       if (use_aeabi_atexit)
-@@ -9819,7 +9824,7 @@ get_thread_atexit_node (void)
- 
-      int __cxa_thread_atexit (void (*)(void *), void *, void *) */
-   tree fn_type = build_function_type_list (integer_type_node,
--					   get_atexit_fn_ptr_type (),
-+					   get_cxa_atexit_fn_ptr_type (),
- 					   ptr_type_node, ptr_type_node,
- 					   NULL_TREE);
- 
-@@ -9866,7 +9871,7 @@ get_dso_handle_node (void)
- static GTY(()) int start_cleanup_cnt;
- 
- static tree
--start_cleanup_fn (void)
-+start_cleanup_fn (tree fntype)
- {
-   char name[32];
- 
-@@ -9878,7 +9883,6 @@ start_cleanup_fn (void)
-   /* Build the name of the function.  */
-   sprintf (name, "__tcf_%d", start_cleanup_cnt++);
-   /* Build the function declaration.  */
--  tree fntype = TREE_TYPE (get_atexit_fn_ptr_type ());
-   tree fndecl = build_lang_decl (FUNCTION_DECL, get_identifier (name), fntype);
-   DECL_CONTEXT (fndecl) = FROB_CONTEXT (current_namespace);
-   /* It's a function with internal linkage, generated by the
-@@ -9968,8 +9972,10 @@ register_dtor_fn (tree decl)
-       build_cleanup (decl);
-   
-       /* Now start the function.  */
--      cleanup = start_cleanup_fn ();
--      
-+      cleanup = start_cleanup_fn (TREE_TYPE (ob_parm
-+					     ? get_cxa_atexit_fn_ptr_type ()
-+					     : get_atexit_fn_ptr_type ()));
-+
-       /* Now, recompute the cleanup.  It may contain SAVE_EXPRs that refer
- 	 to the original function, rather than the anonymous one.  That
- 	 will make the back end think that nested functions are in use,
-@@ -9998,7 +10004,8 @@ register_dtor_fn (tree decl)
-     {
-       /* We must convert CLEANUP to the type that "__cxa_atexit"
- 	 expects.  */
--      cleanup = build_nop (get_atexit_fn_ptr_type (), cleanup);
-+      cleanup = build_nop (ob_parm ? get_cxa_atexit_fn_ptr_type ()
-+				   : get_atexit_fn_ptr_type (), cleanup);
-       /* "__cxa_atexit" will pass the address of DECL to the
- 	 cleanup function.  */
-       mark_used (decl);
---- a/gcc/cp/except.cc
-+++ b/gcc/cp/except.cc
-@@ -645,11 +645,7 @@ build_throw (location_t loc, tree exp, t
- 
-       /* The CLEANUP_TYPE is the internal type of a destructor.  */
-       if (!cleanup_type)
--	{
--	  tree tmp = build_function_type_list (void_type_node,
--					       ptr_type_node, NULL_TREE);
--	  cleanup_type = build_pointer_type (tmp);
--	}
-+	cleanup_type = get_cxa_atexit_fn_ptr_type ();
- 
-       if (!throw_fn)
- 	{

gcc/mingw-w64/PKGBUILD

@@ -1,8 +1,8 @@
 # Maintainer of official package: Felix Yan <felixonmars@archlinux.org>
 
 pkgname=mingw-w64-gcc
-pkgver=14.1.1+r1+g43b730b9134
+pkgver=13.2.1
-pkgrel=2
+pkgrel=1
 pkgdesc="Cross GCC for the MinGW-w64 cross-compiler"
 arch=('x86_64' 'aarch64')
 url="https://gcc.gnu.org"
@@ -12,15 +12,14 @@ depends=('zlib' 'libisl' 'libmpc' 'mingw-w64-crt' 'mingw-w64-binutils' 'mingw-w6
 # gcc-d doesn't build as of 13.1.0
 makedepends=("gcc-ada" "git")
 options=('!strip' 'staticlibs' '!emptydirs' '!buildflags')
-_commit=43b730b9134af60a8f1c5b107d625f7127ff23c5
+_commit=d8a0dcd146dd95e2b6b85cf82c445214d364cf3b
-source=(git+https://sourceware.org/git/gcc.git#commit=${_commit}
+source=(git+https://sourceware.org/git/gcc.git#commit=${_commit})
-        0001-missing-__thiscall-attribute-on-builtin-declaration-of-__cxa_thread_atexit.patch)
 #source=(https://ftp.gnu.org/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.xz{,.sig})
 validpgpkeys=(F3691687D867B81B51CE07D9BBE43771487328A9  # bpiotrowski@archlinux.org
               86CFFCA918CF3AF47147588051E8B148A9999C34  # evangelos@foutrelis.com
               13975A70E63C361C73AE69EF6EEB81F8981C74C7  # richard.guenther@gmail.com
               D3A93CAD751C2AF4F8C7AD516C35B99309B5FA62) # Jakub Jelinek <jakub@redhat.com>
-sha512sums=('SKIP' 'SKIP')
+sha512sums=('SKIP')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
@@ -28,17 +27,11 @@ prepare() {
   ln -sf gcc-${pkgver/+/-} gcc
   cd gcc
 
-  patch -p1 -i "$srcdir/0001-missing-__thiscall-attribute-on-builtin-declaration-of-__cxa_thread_atexit.patch"
-
   # mmapio.c:69:14: error: implicit declaration of function ‘getpagesize’
   sed -i 's|\-Werror||g' libbacktrace/configure
 }
 
 build() {
-  # Avoid errors due to implicit function declarations and similar issues (which are treated as errors as of GCC 14,
-  # see https://gcc.gnu.org/gcc-14/porting_to.html)
-  export CFLAGS_FOR_TARGET=-fpermissive
-
   for _arch in ${_architectures}; do
     mkdir -p "$srcdir"/build-${_arch} && cd "$srcdir"/build-${_arch}
     "$srcdir"/gcc/configure --prefix=/usr --libexecdir=/usr/lib \
@@ -62,7 +55,7 @@ package() {
     make DESTDIR="$pkgdir" install
     ${_arch}-strip "$pkgdir"/usr/${_arch}/lib/*.dll
     strip "$pkgdir"/usr/bin/${_arch}-*
-    strip "$pkgdir"/usr/lib/gcc/${_arch}/*/{cc1*,collect2,gnat1,f951,lto*}
+    strip "$pkgdir"/usr/lib/gcc/${_arch}/${pkgver}/{cc1*,collect2,gnat1,f951,lto*}
     ln -s ${_arch}-gcc "$pkgdir"/usr/bin/${_arch}-cc
     # mv dlls
     mkdir -p "$pkgdir"/usr/${_arch}/bin/

gcc/static-compat/PKGBUILD

@@ -1,8 +1,8 @@
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->glibc->binutils->gcc
 # NOTE: libtool requires rebuilt with each new gcc version
 
-pkgname=({gcc,gcc-libs,lib32-gcc-libs,gcc-fortran}-static-compat)
+pkgname=({gcc,gcc-libs,lib32-gcc-libs,gcc-ada,gcc-fortran}-static-compat)
-pkgver=14.1.1+r1+g43b730b9134
+pkgver=13.2.1
 _majorver=${pkgver%%.*}
 pkgrel=1
 pkgdesc='The GNU Compiler Collection'
@@ -32,10 +32,11 @@ checkdepends=(
 options=(!emptydirs !lto debug)
 _prefix=/usr/static-compat
 _libdir=usr/static-compat/lib/gcc/$CHOST/${pkgver%%+*}
-_commit=43b730b9134af60a8f1c5b107d625f7127ff23c5
+_commit=d8a0dcd146dd95e2b6b85cf82c445214d364cf3b
-source=(git+https://sourceware.org/git/gcc.git#commit=$_commit
+source=(git://gcc.gnu.org/git/gcc.git#commit=$_commit
 #source=(https://sourceware.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.xz{,.sig}
         c89 c99
+        gcc-ada-repro.patch
 )
 validpgpkeys=(F3691687D867B81B51CE07D9BBE43771487328A9  # bpiotrowski@archlinux.org
               86CFFCA918CF3AF47147588051E8B148A9999C34  # evangelos@foutrelis.com
@@ -45,7 +46,8 @@ validpgpkeys=(F3691687D867B81B51CE07D9BBE43771487328A9  # bpiotrowski@archlinux.
 #            'SKIP'
 sha256sums=('SKIP'
             'de48736f6e4153f03d0a5d38ceb6c6fdb7f054e8f47ddd6af0a3dbf14f27b931'
-            '2513c6d9984dd0a2058557bf00f06d8d5181734e41dcfe07be7ed86f2959622a')
+            '2513c6d9984dd0a2058557bf00f06d8d5181734e41dcfe07be7ed86f2959622a'
+            '1773f5137f08ac1f48f0f7297e324d5d868d55201c03068670ee4602babdef2f')
 
 prepare() {
   [[ ! -d gcc ]] && ln -s gcc-${pkgver/+/-} gcc
@@ -59,6 +61,9 @@ prepare() {
   sed -i 's|MULTILIB_DIRNAMES .*|MULTILIB_DIRNAMES = 64 32|' gcc/config/i386/t-linux64
   sed -i 's|m32=.*|m32=../lib32\$\(call if_multiarch,:i386-linux-gnu\)|' gcc/config/i386/t-linux64
 
+  # Reproducible gcc-ada
+  patch -Np0 < "$srcdir/gcc-ada-repro.patch"
+
   mkdir -p "$srcdir/gcc-build"
 }
 
@@ -118,9 +123,16 @@ build() {
   CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2}
 
   "$srcdir/gcc/configure" \
-    --enable-languages=c,c++,fortran,lto \
+    --enable-languages=ada,c,c++,fortran,lto \
     $_confflags
 
+  # link Ada host tools with host g++ - otherwise we run into linker errors because it would use the too old target glibc
+  # note: Since we don't need Ada anyways it maybe makes sense to just disable it in the future.
+  sed -i -r \
+    -e 's|\+\$\(GCC_LINK\)( .* \$\(TOOLS_LIBS\))|g++\1|g' \
+    -e 's|--LINK=\"\$\(GCC_LINK\)\"|--LINK=g++|g' \
+    gcc/ada/gcc-interface/Makefile
+
   make
 }
 
@@ -155,6 +167,7 @@ package_gcc-libs-static-compat() {
     make -C $CHOST/$lib DESTDIR="$pkgdir" install-toolexeclibLTLIBRARIES
   done
 
+  #make -C $CHOST/libobjc DESTDIR="$pkgdir" install-libs
   make -C $CHOST/libstdc++-v3/po DESTDIR="$pkgdir" install
 
   rm -rf "$pkgdir"/$_libdir/include/d/
@@ -230,7 +243,7 @@ package_gcc-static-compat() {
 
   make -C gcc DESTDIR="$pkgdir" install-man install-info
   rm "$pkgdir"$_prefix/share/man/man1/gfortran.1
-  rm "$pkgdir"$_prefix/share/info/gfortran.info
+  rm "$pkgdir"$_prefix/share/info/{gfortran,gnat-style,gnat_rm,gnat_ugn}.info
   rm -r "$pkgdir"$_prefix/share/info/dir
 
   make -C libcpp DESTDIR="$pkgdir" install
@@ -281,6 +294,44 @@ package_gcc-fortran-static-compat() {
     "$pkgdir$_prefix/share/licenses/$pkgname/"
 }
 
+package_gcc-ada-static-compat() {
+  pkgdesc='Ada front-end for GCC (GNAT)'
+  depends=("gcc-static-compat=$pkgver-$pkgrel" libisl.so)
+  options=(!emptydirs staticlibs debug)
+
+  cd gcc-build/gcc
+  make DESTDIR="$pkgdir" ada.install-{common,info}
+  install -m755 gnat1 "$pkgdir/${_libdir}"
+
+  cd "$srcdir"/gcc-build/$CHOST/libada
+  make DESTDIR="${pkgdir}" INSTALL="install" \
+    INSTALL_DATA="install -m644" install-libada
+
+  cd "$srcdir"/gcc-build/$CHOST/32/libada
+  make DESTDIR="${pkgdir}" INSTALL="install" \
+    INSTALL_DATA="install -m644" install-libada
+
+  ln -s gcc "$pkgdir$_prefix/bin/gnatgcc"
+
+  # insist on dynamic linking, but keep static libraries because gnatmake complains
+  mv "$pkgdir"/${_libdir}/adalib/libgna{rl,t}-${_majorver}.so "$pkgdir$_prefix/lib"
+  ln -s libgnarl-${_majorver}.so "$pkgdir$_prefix/lib/libgnarl.so"
+  ln -s libgnat-${_majorver}.so "$pkgdir$_prefix/lib/libgnat.so"
+  rm -f "$pkgdir"/${_libdir}/adalib/libgna{rl,t}.so
+  rm -r "$pkgdir"$_prefix/share/info/dir
+
+  install -d "$pkgdir$_prefix/lib32/"
+  mv "$pkgdir"/${_libdir}/32/adalib/libgna{rl,t}-${_majorver}.so "$pkgdir$_prefix/lib32"
+  ln -s libgnarl-${_majorver}.so "$pkgdir$_prefix/lib32/libgnarl.so"
+  ln -s libgnat-${_majorver}.so "$pkgdir$_prefix/lib32/libgnat.so"
+  rm -f "$pkgdir"/${_libdir}/32/adalib/libgna{rl,t}.so
+
+  # Install Runtime Library Exception
+  install -d "$pkgdir$_prefix/share/licenses/$pkgname/"
+  ln -s $_prefix/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION \
+    "$pkgdir$_prefix/share/licenses/$pkgname/"
+}
+
 package_lib32-gcc-libs-static-compat() {
   pkgdesc='32-bit runtime libraries shipped by GCC'
   depends=('lib32-glibc>=2.26')

harfbuzz/mingw-w64/PKGBUILD

@@ -1,70 +1,77 @@
 # Maintainer: pingplug < aur at pingplug dot me >
 # Contributor: Schala Zeal < schalaalexiazeal at gmail dot com >
 
+_commit=9aa6f8a93f035dd0a1e3978da495d830049480c8  # tags/2.9.0
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 pkgbase=mingw-w64-harfbuzz
 pkgname=('mingw-w64-harfbuzz' 'mingw-w64-harfbuzz-icu')
-pkgver=8.4.0
+pkgver=2.9.0
-pkgrel=2
+pkgrel=1
 pkgdesc="OpenType text shaping engine (mingw-w64)"
 arch=('any')
-url="https://harfbuzz.github.io/"
+url="https://www.freedesktop.org/wiki/Software/HarfBuzz"
 license=('MIT')
 depends=('mingw-w64-crt'
          'mingw-w64-glib2'
          'mingw-w64-graphite'
          'mingw-w64-freetype2')
-makedepends=('mingw-w64-meson'
+makedepends=('mingw-w64-configure'
              'mingw-w64-cairo'
              'mingw-w64-icu'
              'python'
+             'gtk-doc'
              'ragel'
              'git')
 options=('!strip' 'staticlibs' '!buildflags')
-source=("git+https://github.com/harfbuzz/harfbuzz?signed#tag=$pkgver")
+source=("git+https://github.com/harfbuzz/harfbuzz.git#commit=${_commit}")
-b2sums=('19f25dbf2ba6d90fdbb4ecb1039c8d0d72c55cff3dc3b30d6b75b626c15bf28a2118495837d80b7f622f0929dd7d4a07b5526963e1204bb9c90bc9f976c26977')
+sha256sums=('SKIP')
-validpgpkeys=(
-  053D20F17CCCA9651B2C6FCB9AB24930C0B997A2 # Khaled Hosny <khaled@aliftype.com> (@khaledhosny)
-  9F377DDB6D3153A48EB3EB1E63CC496475267693 # Caleb Maclennan <caleb@alerque.com> (@alerque)
-  2277650A4E8BDFE4B7F6BE419FEE04E5D3531115 # Ebrahim Byagowi <ebrahim@gnu.org> (@ebraminio)
-  EACF64F53455E2771BA661A4803B21859F015E4E # Behdad Esfahbod <behdad@behdad.org> (@behdad)
-)
 
 pkgver() {
   cd harfbuzz
   git describe --tags | sed 's/-/+/g'
 }
 
+prepare() {
+  cd harfbuzz
+  # disable tests (thanks to chenxiaolong)
+  sed -i '/SUBDIRS/s/test//' Makefile.am
+  NOCONFIGURE=1 ./autogen.sh
+}
+
 build() {
   cd harfbuzz
   for _arch in ${_architectures}; do
-    mkdir -p build-${_arch}-shared && pushd build-${_arch}-shared
+    # Build static and shared libs separately due to necessity of defining DGRAPHITE2_STATIC
-    ${_arch}-meson \
+    # manually when building static version
-      -D b_lto=false \
+
-      -D graphite=enabled \
+    # static build
-      -D tests=disabled \
-      -D docs=disabled \
-      -D cpp_std=c++17 \
-      ..
-    # fix linker selection error
-    sed -i 's|: c_LINKER|: cpp_LINKER|g' build.ninja
-    ninja
-    popd
     mkdir -p build-${_arch}-static && pushd build-${_arch}-static
-    ${_arch}-meson \
+    CFLAGS="${CFLAGS} -DGRAPHITE2_STATIC" \
-      --default-library static \
+    CXXFLAGS="${CXXFLAGS} -DGRAPHITE2_STATIC" \
-      -D c_args=-DGRAPHITE2_STATIC \
+    ${_arch}-configure \
-      -D cpp_args=-DGRAPHITE2_STATIC \
+      --with-glib \
-      -D b_lto=false \
+      --with-freetype \
-      -D graphite=enabled \
+      --with-cairo \
-      -D tests=disabled \
+      --with-icu \
-      -D docs=disabled \
+      --with-gobject \
-      -D cpp_std=c++17 \
+      --with-graphite2 \
-      ..
+      --enable-static=yes \
-    # fix linker selection error
+      --enable-shared=no
-    sed -i 's|: c_LINKER|: cpp_LINKER|g' build.ninja
+    make
-    ninja
+    popd
+    # shared build
+    mkdir -p build-${_arch}-shared && pushd build-${_arch}-shared
+    LDFLAGS=-lssp ${_arch}-configure \
+      --with-glib \
+      --with-freetype \
+      --with-cairo \
+      --with-icu \
+      --with-gobject \
+      --with-graphite2 \
+      --enable-static=no \
+      --enable-shared=yes
+    make
     popd
   done
 }
@@ -72,13 +79,12 @@ build() {
 package_mingw-w64-harfbuzz() {
   for _arch in ${_architectures}; do
     cd "${srcdir}/harfbuzz/build-${_arch}-static"
-    DESTDIR="${pkgdir}" ninja install
+    make DESTDIR="${pkgdir}" install
     cd "${srcdir}/harfbuzz/build-${_arch}-shared"
-    DESTDIR="${pkgdir}" ninja install
+    make DESTDIR="${pkgdir}" install
-    cp "${srcdir}/harfbuzz/src/hb-ft.h" "${pkgdir}/usr/${_arch}/include/harfbuzz/"
     find "${pkgdir}/usr/${_arch}" -name '*.exe' -exec rm {} \;
     find "${pkgdir}/usr/${_arch}" -name '*.dll' -exec ${_arch}-strip --strip-unneeded {} \;
-    find "${pkgdir}/usr/${_arch}" -name '*.a' | xargs ${_arch}-strip -g
+    find "${pkgdir}/usr/${_arch}" -name '*.a' -o -name '*.dll' | xargs ${_arch}-strip -g
 
     mkdir -p hb-icu/usr/${_arch}/{bin,include/harfbuzz,lib/pkgconfig}; cd hb-icu
     mv "${pkgdir}"/usr/${_arch}/bin/libharfbuzz-icu* ./usr/${_arch}/bin

harfbuzz/static-compat/PKGBUILD

@@ -3,24 +3,19 @@
 
 _pkgname=harfbuzz
 pkgname=static-compat-$_pkgname
-pkgver=8.4.0
+pkgver=8.1.1
 pkgrel=1
 pkgdesc="OpenType text shaping engine"
-url="https://harfbuzz.github.io/"
+url="https://www.freedesktop.org/wiki/Software/HarfBuzz"
 arch=(x86_64)
 license=(MIT)
 depends=(static-compat-glib2 static-compat-freetype2 static-compat-graphite)
 makedepends=(gobject-introspection ragel git python static-compat-meson)
 checkdepends=(python-fonttools python-setuptools)
 options=(!emptydirs !docs staticlibs)
-source=("git+https://github.com/harfbuzz/harfbuzz?signed#tag=$pkgver")
+_commit=1d665c2b521512cdd56964138fc601debd1f1177  # tags/8.1.1^0
-b2sums=('19f25dbf2ba6d90fdbb4ecb1039c8d0d72c55cff3dc3b30d6b75b626c15bf28a2118495837d80b7f622f0929dd7d4a07b5526963e1204bb9c90bc9f976c26977')
+source=("git+https://github.com/harfbuzz/harfbuzz#commit=$_commit")
-validpgpkeys=(
+sha256sums=('SKIP')
-  053D20F17CCCA9651B2C6FCB9AB24930C0B997A2 # Khaled Hosny <khaled@aliftype.com> (@khaledhosny)
-  9F377DDB6D3153A48EB3EB1E63CC496475267693 # Caleb Maclennan <caleb@alerque.com> (@alerque)
-  2277650A4E8BDFE4B7F6BE419FEE04E5D3531115 # Ebrahim Byagowi <ebrahim@gnu.org> (@ebraminio)
-  EACF64F53455E2771BA661A4803B21859F015E4E # Behdad Esfahbod <behdad@behdad.org> (@behdad)
-)
 
 pkgver() {
   cd harfbuzz

libsodium/mingw-w64/PKGBUILD

@@ -1,50 +0,0 @@
-# Maintainer: Wolfgang Pupp <wolfgang.pupp@gmail.com>
-# Maintainer: Martchus <martchus@gmx.net>
-# Contributor: Felix Yan <felixonmars@archlinux.org>
-# Contributor: namelessjon <jonathan.stott@gmail.com>
-# Contributor: Alessio Sergi <asergi at archlinux dot us>
-# Contributor: Alexey Pavlov <alexpux@gmail.com>
-
-_realname=libsodium
-pkgname="mingw-w64-${_realname}"
-pkgver=1.0.19
-pkgrel=1
-pkgdesc="A modern, portable, easy to use crypto library (mingw-w64)"
-arch=(any)
-url="https://github.com/jedisct1/libsodium"
-license=('custom:ISC')
-depends=('mingw-w64-crt')
-options=(!strip !buildflags staticlibs)
-makedepends=('mingw-w64-configure')
-source=(https://download.libsodium.org/libsodium/releases/${_realname}-${pkgver}.tar.gz{,.sig})
-b2sums=('de43520150b55760142d186404cc3e49471c6e911a7a590c7ae08bc61e928c063c459555f49cd88155238fb0008ef3924b6d7c14ba9cff2f90f1e96201e1259c'
-        'SKIP')
-
-validpgpkeys=("54A2B8892CC3D6A597B92B6C210627AABA709FE1") # Frank Denis
-_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
-
-build() {
-  for _arch in ${_architectures}; do
-    mkdir -p "${srcdir}"/build-${_arch} && cd "${srcdir}"/build-${_arch}
-
-    ${_arch}-configure ../${_realname}-stable
-
-    make
-  done
-}
-
-package() {
-  for _arch in ${_architectures}; do
-    cd "${srcdir}"/build-${_arch}
-    make DESTDIR="$pkgdir" install
-
-    ${_arch}-strip --strip-unneeded "${pkgdir}"/usr/${_arch}/bin/*.dll
-    ${_arch}-strip -g "${pkgdir}"/usr/${_arch}/lib/*.a
-
-    rm "${pkgdir}/usr/${_arch}/bin/"*.def
-    rm -rf "${pkgdir}/usr/${_arch}/share"
-  done
-
-  install -Dm644 ${srcdir}/${_realname}-stable/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-

libsodium/mingw-w64/keys/pgp/54A2B8892CC3D6A597B92B6C210627AABA709FE1.asc

@@ -1,140 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-I1dBOYLJoonhOH/lNmxjQvc=
-=59kd
------END PGP PUBLIC KEY BLOCK-----

nginx-mod-accesskey/default/PKGBUILD

@@ -3,9 +3,9 @@
 
 pkgname=nginx-mod-accesskey
 pkgver=2.0.5
-pkgrel=13
+pkgrel=12
 _dirname="nginx-accesskey-$pkgver"
-_nginxver=1.26.0
+_nginxver=1.24.0
 
 pkgdesc='Accesskey module for NGINX'
 arch=('x86_64')

nginx-mod-cache-purge/default/PKGBUILD

@@ -3,9 +3,9 @@
 
 pkgname=nginx-mod-cache-purge
 pkgver=2.3
-pkgrel=13
+pkgrel=12
 _dirname="ngx_cache_purge-${pkgver}"
-_nginxver=1.26.0
+_nginxver=1.24.0
 
 pkgdesc='NGINX module that adds ability to purge content from FastCGI, proxy, SCGI and uWSGI caches'
 arch=('x86_64')

nginx-mod-dav-ext/default/PKGBUILD

@@ -3,9 +3,9 @@
 
 pkgname=nginx-mod-dav-ext
 pkgver=3.0.0
-pkgrel=11
+pkgrel=10
 _dirname="nginx-dav-ext-module-$pkgver"
-_nginxver=1.26.0
+_nginxver=1.24.0
 
 pkgdesc='NGINX WebDAV missing commands support'
 arch=('x86_64')

nginx-mod-fancyindex/default/PKGBUILD

@@ -3,9 +3,9 @@
 
 pkgname=nginx-mod-fancyindex
 pkgver=0.5.2
-pkgrel=6
+pkgrel=5
 _dirname="ngx-fancyindex-${pkgver}"
-_nginxver=1.26.0
+_nginxver=1.24.0
 
 pkgdesc='Fancy indexes module for the Nginx web server'
 arch=('x86_64')

nginx-mod-rtmp/default/PKGBUILD

@@ -5,9 +5,9 @@
 
 pkgname=nginx-mod-rtmp
 pkgver=1.2.2
-pkgrel=6
+pkgrel=5
 _dirname="nginx-rtmp-module-$pkgver"
-_nginxver=1.26.0
+_nginxver=1.24.0
 
 pkgdesc='Module for nginx that adds RTMP support'
 arch=('x86_64')

nginx-mod-slowfs-cache/default/PKGBUILD

@@ -3,9 +3,9 @@
 
 pkgname=nginx-mod-slowfs-cache
 pkgver=1.10
-pkgrel=13
+pkgrel=12
 _dirname="ngx_slowfs_cache-${pkgver}"
-_nginxver=1.26.0
+_nginxver=1.24.0
 
 pkgdesc='NGINX module that adds ability to cache static files'
 arch=('x86_64')

nginx-mod-substitutions-filter/default/PKGBUILD

@@ -5,7 +5,7 @@ pkgname=nginx-mod-substitutions-filter
 pkgver=0.6.4.115.e12e965
 pkgrel=2
 _dirname="$pkgname"
-_nginxver=1.26.0 # FIXME: fix build against NGINX 1.20.0
+_nginxver=1.24.0 # FIXME: fix build against NGINX 1.20.0
 
 pkgdesc='NGINX filter module which can do both regular expression and fixed string substitutions'
 arch=('x86_64')

nginx-mod-upload-progress/default/PKGBUILD

@@ -5,7 +5,7 @@ pkgname=nginx-mod-upload-progress
 pkgver=0.9.2
 pkgrel=12
 _dirname="nginx-upload-progress-module-$pkgver"
-_nginxver=1.26.0 # FIXME: fix build against NGINX 1.24.0
+_nginxver=1.24.0 # FIXME: fix build against NGINX 1.24.0
 
 pkgdesc='NGINX module implementing an upload progress system, that monitors RFC1867 POST uploads'
 arch=('x86_64')

nginx-mod-upstream-fair/default/PKGBUILD

@@ -5,7 +5,7 @@ pkgname=nginx-mod-upstream-fair
 pkgver=0.1.3
 pkgrel=11
 _dirname="nginx-upstream-fair-$pkgver"
-_nginxver=1.26.0 # FIXME: fix build against NGINX 1.20.0
+_nginxver=1.24.0 # FIXME: fix build against NGINX 1.20.0
 
 pkgdesc='Fair load balancer module for nginx'
 arch=('x86_64')

openssl/android-aarch64/PKGBUILD

@@ -5,7 +5,7 @@ _pkg_arch=aarch64
 _android_arch=arm64-v8a
 _android_platform_arch=arch-arm64
 _pkgname=openssl
-_pkgver=3.3.0
+_pkgver=3.2.1
 
 pkgname=android-$_pkg_arch-$_pkgname
 # use a pacman compatible version scheme
@@ -21,7 +21,7 @@ makedepends=('android-environment' 'android-sdk-build-tools')
 conflicts=("android-$_pkgname-$_android_arch")
 replaces=("android-$_pkgname-$_android_arch")
 source=("https://www.openssl.org/source/openssl-${_pkgver}.tar.gz"{,.asc})
-sha256sums=('53e66b043322a606abf0087e7699a0e033a37fa13feb9742df35c3a33b18fb02'
+sha256sums=('83c7329fe52c850677d75e5d0b0ca245309b97e8ecbcfdc1dfdc4ab9fac35b39'
             'SKIP')
 validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491'
               '7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C'

openssl/android-armv7a-eabi/PKGBUILD

@@ -5,7 +5,7 @@ _pkg_arch=armv7a-eabi
 _android_arch=armeabi-v7a
 _android_platform_arch=arch-arm
 _pkgname=openssl
-_pkgver=3.3.0
+_pkgver=3.2.1
 
 pkgname=android-$_pkg_arch-$_pkgname
 # use a pacman compatible version scheme
@@ -21,7 +21,7 @@ makedepends=('android-environment' 'android-sdk-build-tools')
 conflicts=("android-$_pkgname-$_android_arch")
 replaces=("android-$_pkgname-$_android_arch")
 source=("https://www.openssl.org/source/openssl-${_pkgver}.tar.gz"{,.asc})
-sha256sums=('53e66b043322a606abf0087e7699a0e033a37fa13feb9742df35c3a33b18fb02'
+sha256sums=('83c7329fe52c850677d75e5d0b0ca245309b97e8ecbcfdc1dfdc4ab9fac35b39'
             'SKIP')
 validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491'
               '7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C'

openssl/android-x86-64/PKGBUILD

@@ -5,7 +5,7 @@ _pkg_arch=x86-64
 _android_arch=x86_64
 _android_platform_arch=arch-x86_64
 _pkgname=openssl
-_pkgver=3.3.0
+_pkgver=3.2.1
 
 pkgname=android-$_pkg_arch-$_pkgname
 # use a pacman compatible version scheme
@@ -21,7 +21,7 @@ makedepends=('android-environment' 'android-sdk-build-tools')
 conflicts=("android-$_pkgname-$_android_arch")
 replaces=("android-$_pkgname-$_android_arch")
 source=("https://www.openssl.org/source/openssl-${_pkgver}.tar.gz"{,.asc})
-sha256sums=('53e66b043322a606abf0087e7699a0e033a37fa13feb9742df35c3a33b18fb02'
+sha256sums=('83c7329fe52c850677d75e5d0b0ca245309b97e8ecbcfdc1dfdc4ab9fac35b39'
             'SKIP')
 validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491'
               '7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C'

openssl/android-x86/PKGBUILD

@@ -5,7 +5,7 @@ _pkg_arch=x86
 _android_arch=x86
 _android_platform_arch=arch-x86
 _pkgname=openssl
-_pkgver=3.3.0
+_pkgver=3.2.1
 
 pkgname=android-$_pkg_arch-$_pkgname
 # use a pacman compatible version scheme
@@ -21,7 +21,7 @@ makedepends=('android-environment' 'android-sdk-build-tools')
 conflicts=("android-$_pkgname-$_android_arch")
 replaces=("android-$_pkgname-$_android_arch")
 source=("https://www.openssl.org/source/openssl-${_pkgver}.tar.gz"{,.asc})
-sha256sums=('53e66b043322a606abf0087e7699a0e033a37fa13feb9742df35c3a33b18fb02'
+sha256sums=('83c7329fe52c850677d75e5d0b0ca245309b97e8ecbcfdc1dfdc4ab9fac35b39'
             'SKIP')
 validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491'
               '7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C'

openssl/mingw-w64/PKGBUILD

@@ -4,7 +4,7 @@
 # Contributor: Filip Brcic < brcha at gna dot org >
 # Contributor: Martchus < martchus at gmx dot net >
 
-_pkgver=3.3.0
+_pkgver=3.2.1
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 pkgname=mingw-w64-openssl
@@ -20,7 +20,7 @@ makedepends=('mingw-w64-gcc'
              'perl')
 options=('!strip' 'staticlibs' '!buildflags' '!lto')
 source=("https://www.openssl.org/source/openssl-${_pkgver}.tar.gz"{,.asc})
-sha256sums=('53e66b043322a606abf0087e7699a0e033a37fa13feb9742df35c3a33b18fb02'
+sha256sums=('83c7329fe52c850677d75e5d0b0ca245309b97e8ecbcfdc1dfdc4ab9fac35b39'
             'SKIP')
 validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491'
               '7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C'

openssl/static-compat/PKGBUILD

@@ -2,7 +2,7 @@
 
 _pkgname=openssl
 pkgname=static-compat-$_pkgname
-_ver=3.3.0
+_ver=3.2.1
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 pkgrel=1
@@ -16,7 +16,7 @@ optdepends=('ca-certificates')
 options=(!emptydirs staticlibs)
 source=("https://www.openssl.org/source/${_pkgname}-${_ver}.tar.gz"{,.asc}
 	'ca-dir.patch')
-sha256sums=('53e66b043322a606abf0087e7699a0e033a37fa13feb9742df35c3a33b18fb02'
+sha256sums=('83c7329fe52c850677d75e5d0b0ca245309b97e8ecbcfdc1dfdc4ab9fac35b39'
             'SKIP'
             '0a32d9ca68e8d985ce0bfef6a4c20b46675e06178cc2d0bf6d91bd6865d648b7')
 validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491'

passwordmanager/mingw-w64-qt6/PKGBUILD

@@ -8,7 +8,7 @@ pkgname=mingw-w64-passwordmanager-qt6
 _name=${pkgname#mingw-w64-}
 _name=${_name%-qt6}
 pkgver=4.2.0
-pkgrel=2
+pkgrel=1
 arch=('any')
 pkgdesc='A simple password store using AES-256-CBC encryption via OpenSSL (mingw-w64)'
 license=('GPL')
@@ -19,7 +19,7 @@ source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/arc
 sha256sums=('018dc831794182a66f4820ede7e399cee7633107542451206062bb01500541e0')
 options=(!buildflags staticlibs !strip !emptydirs)
 
-_architectures=(${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32})
+_architectures=('i686-w64-mingw32' 'x86_64-w64-mingw32')
 _configurations=()
 [[ $NO_SHARED_LIBS ]] || _configurations+=('shared')
 [[ $NO_STATIC_LIBS ]] || _configurations+=('static') makedepends+=('mingw-w64-cmake-static' 'mingw-w64-qt6-base-static' 'mingw-w64-qt6-translations' 'mingw-w64-qt6-svg-static' 'breeze-icons' 'numix-icon-theme-git')

passwordmanager/qt6/PKGBUILD

@@ -37,7 +37,7 @@ build() {
     -DCMAKE_BUILD_TYPE:STRING='Release' \
     -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
     -DCONFIGURATION_NAME:STRING="$_cfg" \
-    -DCONFIGURATION_DISPLAY_NAME="" \
+    -DCONFIGURATION_DISPLAY_NAME="Qt 6" \
     -DCONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES:STRING="-$_cfg" \
     -DPASSWORD_MANAGER_CONFIGURATION_TARGET_SUFFIX:STRING="$_cfg" \
     -DQT_PACKAGE_PREFIX:STRING='Qt6' \

pianobooster/mingw-w64/PKGBUILD

@@ -1,8 +1,8 @@
 _pkgname='pianobooster'
 pkgname='mingw-w64-pianobooster-custom'
 pkgdesc='A MIDI file player that teaches you how to play the piano (mingw-w64, with custom and experimental patches, statically linked)'
-pkgver=1392.86ce9b0
+pkgver=1.0.1
-pkgrel=3
+pkgrel=1
 depends=()
 makedepends=('mingw-w64-qt6-base-static' 'mingw-w64-ftgl' 'mingw-w64-fluidsynth' 'mingw-w64-qtutilities-qt6' 'mingw-w64-c++utilities'
              'git' 'clang' 'qt6-declarative' 'qt6-tools' 'mingw-w64-cmake-static' 'mingw-w64-qt6-tools-static' 'mingw-w64-qt6-svg-static'
@@ -15,7 +15,7 @@ source=("${_pkgname}::${MARTCHUS_GIT_URL_PREFIX:-git+https://github.com/Martchus
 sha256sums=(SKIP)
 options=(!buildflags staticlibs !strip !emptydirs)
 
-_architectures=(${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32})
+_architectures=('i686-w64-mingw32' 'x86_64-w64-mingw32')
 
 pkgver() {
   cd "${srcdir}/${_pkgname}"

postgresql/mingw-w64/PKGBUILD

@@ -2,7 +2,7 @@
 # Contributor: ant32 <antreimer@gmail.com>
 
 pkgname=mingw-w64-postgresql
-pkgver=16.2
+pkgver=16.1
 pkgrel=1
 pkgdesc='Sophisticated object-relational DBMS (mingw-w64)'
 arch=('any')
@@ -17,7 +17,7 @@ replaces=('mingw-w64-postgresql-libs')
 source=("http://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2"
         '0001-Use-.dll.a-as-extension-for-import-libraries.patch'
         '0002-Use-pthread-library-from-MinGW.patch')
-sha256sums=('446e88294dbc2c9085ab4b7061a646fa604b4bec03521d5ea671c2e5ad9b2952'
+sha256sums=('ce3c4d85d19b0121fe0d3f8ef1fa601f71989e86f8a66f7dc3ad546dd5564fec'
             '44b1cceb0f5ef792acc00e9415dc2f7f777747199078ce4c8704d3420de52cf5'
             '72e627524dd4994d85db43ea02d71b2c9983037306a85822f744e76b40f40f2f')
 

qca-qt5/mingw-w64/PKGBUILD

@@ -6,7 +6,7 @@
 
 pkgbase=mingw-w64-qca-qt5
 pkgname=(mingw-w64-qca-qt5 mingw-w64-qca-qt6)
-pkgver=2.3.8
+pkgver=2.3.5
 pkgrel=1
 pkgdesc='Qt Cryptographic Architecture (mingw-w64)'
 arch=('any')
@@ -15,12 +15,11 @@ license=(LGPL)
 makedepends=('mingw-w64-cmake' 'mingw-w64-qt5-base' 'mingw-w64-qt6-5compat' 'qt6-base' 'ninja')
 options=('!strip' '!buildflags' 'staticlibs')
 source=(https://download.kde.org/stable/qca/$pkgver/qca-$pkgver.tar.xz{,.sig})
-sha256sums=('48759ca86a0202461d908ba66134380cc3bb7d20fed3c031b9fc0289796a8264'
+sha256sums=('91f7d916ab3692bf5991f0a553bf8153161bfdda14bd005d480a2b4e384362e8'
             'SKIP')
 validpgpkeys=(CB9387521E1EE0127DA804843FDBB55084CC5D84) # Harald Sitter <sitter@kde.org>
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
-_architectures_qt6=(${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32})
 
 build() {
   for _arch in ${_architectures}; do
@@ -28,9 +27,7 @@ build() {
       -DQCA_INSTALL_IN_QT_PREFIX=ON \
       -DBUILD_TESTS=OFF
     VERBOSE=1 cmake --build build-qt5-$_arch
-  done
 
-  for _arch in ${_architectures_qt6}; do
     ${_arch}-cmake -G Ninja -B build-qt6-${_arch} -S qca-$pkgver \
       -DQT6=ON \
       -DQCA_INSTALL_IN_QT_PREFIX=ON \
@@ -76,7 +73,7 @@ package_mingw-w64-qca-qt5() {
 package_mingw-w64-qca-qt6() {
   depends=(mingw-w64-qt6-5compat)
 
-  for _arch in ${_architectures_qt6}; do
+  for _arch in ${_architectures}; do
     DESTDIR="$pkgdir" cmake --install build-qt6-$_arch
     _cleanup $_arch
   done

qt5-3d/mingw-w64-static/PKGBUILD

@@ -10,14 +10,14 @@
 
 _qt_module=qt3d
 pkgname=mingw-w64-qt5-3d-static
-pkgver=5.15.14
+pkgver=5.15.13
 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=9bf4d03e2515f7c454647d54542330b6e90f8191
+_commit=67bee4599a28e1cadc14ed9ea4adc7061e250b90
 _basever=${pkgver%%+*}
 makedepends+=('git')
 options=('!strip' '!buildflags' 'staticlibs')
@@ -25,7 +25,7 @@ groups=('mingw-w64-qt5')
 url='https://www.qt.io/'
 _pkgfqn=${_qt_module}
 source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
-sha256sums=('0c50ac7d9bb8ac61d42f79a550886bc908f0df90e00268beb2e180563d5d6d50')
+sha256sums=('SKIP')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 

qt5-3d/mingw-w64-static/qt3d-sha256.txt

@@ -1 +1 @@
-0c50ac7d9bb8ac61d42f79a550886bc908f0df90e00268beb2e180563d5d6d50
+cf08bc14ebdf811643a0d07e1d7168fdc2d46d40d95041d27707ddf51fcc6783

qt5-3d/mingw-w64/PKGBUILD

@@ -10,14 +10,14 @@
 
 _qt_module=qt3d
 pkgname=mingw-w64-qt5-3d
-pkgver=5.15.14
+pkgver=5.15.13
 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=9bf4d03e2515f7c454647d54542330b6e90f8191
+_commit=67bee4599a28e1cadc14ed9ea4adc7061e250b90
 _basever=${pkgver%%+*}
 makedepends+=('git')
 options=('!strip' '!buildflags' 'staticlibs')
@@ -25,7 +25,7 @@ groups=('mingw-w64-qt5')
 url='https://www.qt.io/'
 _pkgfqn=${_qt_module}
 source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
-sha256sums=('0c50ac7d9bb8ac61d42f79a550886bc908f0df90e00268beb2e180563d5d6d50')
+sha256sums=('SKIP')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 

qt5-3d/mingw-w64/PKGBUILD.sh.ep

@@ -4,7 +4,7 @@
 # Contributor: ant32 <antreimer@gmail.com>
 % end
 \
-pkgver=5.15.14
+pkgver=5.15.13
 pkgrel=1
 arch=(<%== include 'fragments/mingw-w64-qt5-non_any_archs' %>)
 pkgdesc="C++ and QML APIs for easy inclusion of 3D graphics (mingw-w64)"

qt5-3d/mingw-w64/qt3d-sha256.txt

@@ -1 +1 @@
-0c50ac7d9bb8ac61d42f79a550886bc908f0df90e00268beb2e180563d5d6d50
+cf08bc14ebdf811643a0d07e1d7168fdc2d46d40d95041d27707ddf51fcc6783

qt5-activeqt/mingw-w64/PKGBUILD

@@ -15,14 +15,14 @@
 
 _qt_module=qtactiveqt
 pkgname=mingw-w64-qt5-activeqt
-pkgver=5.15.14
+pkgver=5.15.13
 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=91bfd21f86c450b129ac2dde9d33b32e140d8a0c
+_commit=014285857ef1cfb2d9965cf7bad871bbc336ce60
 _basever=${pkgver%%+*}
 makedepends+=('git')
 options=('!strip' '!buildflags' 'staticlibs')
@@ -32,7 +32,7 @@ _pkgfqn=${_qt_module}
 source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit
         '0001-Don-t-require-windows.h-when-using-native-Linux-gcc.patch'
         '0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch')
-sha256sums=('c2b8d05a0a807c336573c0d47b36c7cc9817e288f74b7db28c232f787858ce3b'
+sha256sums=('SKIP'
             '05443c9a67b30160a7d4264da9c57b1a2fdbc3c74bab8e9f69c51ac8feeac2cb'
             '06aa9413f31edd4f8c51d65cf6a8e1add8d5a6af2588f18bdc2e67164ebdaea7')
 

qt5-activeqt/mingw-w64/PKGBUILD.sh.ep

@@ -10,7 +10,7 @@
 
 % end
 \
-pkgver=5.15.14
+pkgver=5.15.13
 pkgrel=1
 arch=('any')
 pkgdesc="ActiveX integration framework (mingw-w64)"

qt5-activeqt/mingw-w64/qtactiveqt-sha256.txt

@@ -1 +1 @@
-c2b8d05a0a807c336573c0d47b36c7cc9817e288f74b7db28c232f787858ce3b
+c5a635be320e3ba9cbc20e04901f660d46541e4943a98cf2e5d42d0f09562c17

qt5-base/mingw-w64-static/PKGBUILD

@@ -17,10 +17,10 @@
 
 _qt_module=qtbase
 pkgname=mingw-w64-qt5-base-static
-pkgver=5.15.14+kde+r140
+pkgver=5.15.13+kde+r138
 pkgrel=1
 _basever=${pkgver%%+*}
-_commit=1c13ef067ea3c97342f98039931ea18b3992014f
+_commit=b9906b5233a80cab372c95ac4dd68b25bdca0646
 pkgdesc='A cross-platform application and UI framework, native OpenGL backend (mingw-w64)'
 arch=('any')
 url='https://www.qt.io/'
@@ -71,38 +71,38 @@ source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit
         '0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch'
         '0032-Fix-crashes-in-rasterization-code-using-setjmp.patch')
 sha256sums=('SKIP'
-            '5b9f3f36e05a029181ca72b83683c119adbfba625ad98ba3fb02113d75d35d44'
+            '11c2b54df2b5ea031c2103366d0b27d0786c3420b29cca391cc0015fd35264d7'
-            'ccab6d5fdce7809281c05c1b0b8ec65aab6db1112283fc69ba10bb05e664d545'
+            '2b00e98c8c8acb1a453191be77a2f7a9188e030480864e58ac39b517bb63ffb5'
-            '9d4c8bfde02f7e77ea194f1e1ea724baaf947dcd72adca815559e43070df2938'
+            '5131dff4db6f63e36ea364ce59b2fdb047fbb6d55e6543316054f6ebcd76711b'
-            'b6921b9b00542a4afad0f9f97f36b9d45c619bafa06a93576bed6545aea8dd3b'
+            '3147a21ccad3026a06d8b622db96949d51f32b6a1d25c8aae5fe5a95c3e95625'
-            'd76628f9395f8b7813e058ebbb8b87d380d490d2e2e67d5d59218082330b3a65'
+            '4bd74cc1d78da412faac71b5357fd86fea3f1781d0b554f8f7fd3684c833e8ce'
-            'e909ab659266bc65fd14e16231855b3cf209a3a03965f934f5d81771d4a0191d'
+            'e566e5cdd5bc077c35054be1465148acd5ee209e609690c670b78df88cc9295b'
-            '06fc346c7299fb31f0cbebb55c3749d533b48e99fd59e8a3ed3c068fcda03a2f'
+            '7fe1dc6c1251c16c4236924cb5a03ac55d1dca051bd9d99fbf7b35f91454fda3'
-            'edd73dc56259afdc8865417974b8956697954aad22844522554fe83c665a3ac8'
+            'c054851c46036710ff6f025a48d4b5b2d6e5d5d54c74b73c2cb81b00bdfa029a'
-            '41ffca5bd37d020a3edc56c0b9949e466026fb8c8d935defd9e66a71b779934c'
+            'a2702d6ca3f696ca3c77b00df7bb512f5f3430fce109048c62c97d294758efd8'
-            'd869ae862fd3251c478e14fdb614185c81e5defb5b00f31161ff5497c66823e2'
+            '395339c3dde4115283db948899980e536a355422190bc90850efdc3438c527d8'
-            '7ac6575b691ed70dde02182aec6f81aaad4aca8a041ab594868d113a913c9e41'
+            'c386790a879e68b9d00bfe9f14afa67d8a374de57bdea164a5252499ec34cbcb'
-            '0dba86fae79ae7368b504ae7d297359f4448f160a42b20b3857d81d2cde91ab5'
+            '576177950e99f62d05bee487dd5ae1b731fe4acf438553c74e7c48631dd8789b'
-            'ddce558f74a1cdcb673e9a1e9df75442ea71fc6e2503fc85d779c5d8b948784a'
+            '02bc0ce27d7835829d4e84580fb0a0b864b36b14331a166dba88f1942a6414a3'
-            '48ee9c592f17400f37e958a59f3605c97d335dec18537b0d730601bb9787a07b'
+            '736de6cd28c8efb1729f926c1fa42c963c7f1d3a9e4b56b098906b570473320f'
-            '7e242c398740eabed1c437498e04744fda8a413ce6e668a2a654741d5900dd42'
+            '294f3ab13a546a1bfeae472cf7342e2bce6c058a6867d19038ba1c194fb33b8d'
-            '7cf8f198fe0348aa5c97c85bfcf868be62fec0fa0148570565c48ef1d91aa0e9'
+            '8f202adf905ebce78dd2942d17c0d935f0de7014ffa75840310edc0bd790ff03'
-            '6ed70651c02399a407ffa4d8e76da46d5765983034d1e0644686f599b865b68f'
+            '129b4667c5e3cfe68040cbae2fce487e2d016bcbe2380a5ba410b225279f71b9'
-            '9edc35b11aa19b10ddd7ced57b3b0d035755a4c443ba3b6c6755810a0ecd338f'
+            'fbd8cd4680e10074f90bf79d9d08ad787b483cf7c21250d1db1c8a5c829a1d83'
-            'e4cc92c85debb106bf8ebc899729f8dc17a94a062ffa1c9e6f7fd4cc1c17f91e'
+            '05a29084b9bc3324beefb9ae6d00ea68c3b3c51a0b4595c024300949c906d7fd'
-            '2e9ac0244ca938fc547db038b5d72a31b82e155c84050bf0e3407300bf7eaecb'
+            '7843f5be44b9b367cb81c143c6d670e6a5be40510848c09a1448d921c3437639'
-            'a46f82235cfc8a6644b425061a7e923fa4468623974ddf75a46ec45802654cd0'
+            '7002db8f819bf34cafda04dc4d288fef58aec9e409230dc68fcb542cb48f09bb'
-            'cdad591ba62797d930b5121eef39fa5e2928c76f28b0c32ab35b10ec04e550e4'
+            '57607c662e6d68f2ca856617c8d7cfaa05ba8332ea70b67ab628a8f0cf2ca032'
-            '67dec80f21aa819cea23a1b8a267c2724d2fa86e23c69834bc711b381fc03447'
+            '5910c4567348101d0a87197b2e52e59673467247ca4ffc89cba5701d98373435'
-            '17320ad851fdf1f7282bb2215429aff12617096b0b82dfc689f3832766f5436e'
+            '0181986547b7c70bf2bc8de31198240f99a92e4cfdb1db81c7b99b849c416c1f'
-            '3cb80c51dda4e79b5480e0417678c751d0f5b762014939593d9f9c1b645080be'
+            '9e692f956dffa5c936a2911d8418746b19197962111b4f0f45b33972ed3890f2'
-            'ecc72af327991945a6076790aadd5309aa8ac06891a14ed080fa49632e50b0b0'
+            '1d5e09034c9c903653d10c3983e4dcb710ebe8f08694e5e55199a3e4acb8f629'
-            'efb16ee563478711ca027074494b0cbb1c4f3054028dedd5bcf2b3da91c0797c'
+            '5379cea6fd54a16e7f67b617bf3582c08f8934ae8d699e85ad21f20dcf192424'
-            '6247074166f5d9a97fb60597b15a80a65cfb2ea5dffc31dcb739cbaa9a95ac62'
+            '82d1db9d4536350fe2549c400487018a8477a15da83a568240a013a6d82dfe92'
-            '29062bf991b8eab0c65a5ecf09f9a69673757653aacb48269033e5ad8d4f652f'
+            '01413344603a8e99f7b0280e7f297de4ea415e0c5011b1dac116eaf25082220b'
-            'd0d8703d6ec5b960da6a537a3903804ef4366693125b0a31e5cd59954e348888'
+            '4f88801a586c35515fd982f8e465fb4546ef38765c6a2abe1e8ca69e3700d799'
-            '422b67821c2cb1025e3a230965ef664eabb05a9c6d623bc67fc0daaa0fd57262'
+            'b4dad74bbe2731aaa8711408fe509344e7e6049def897389f7e2a86423f3377e'
-            '5be2fe99912d1f905aac9a5c1de48e130a3e364bb97fa47fd81f66f26c7c9296')
+            '17f251d456713c920c6581659c54b9c372e1a329081b2ed9d9826e9e0ddd317a')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 

qt5-base/mingw-w64-static/qtbase-sha256.txt

@@ -1 +1 @@
-cce3b289529f02b1c27a2c6659abb8f6d7ba62545507f17b44d31f15ecdcc109
+06e49a14145574834d4d04f73e6baf662ee5e72e78973e1d7d0fe614472a80a4

qt5-base/mingw-w64/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch

@@ -1,4 +1,4 @@
-From 59185445811e7e53c6301fb041012991e313688f Mon Sep 17 00:00:00 2001
+From c134da249ee5459358292e1665b69aede5035c5b Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 18:30:51 +0100
 Subject: [PATCH 01/32] Adjust win32-g++ profile for cross compilation with
@@ -162,5 +162,5 @@ index 5de482f23b5..3c3d22c6993 100644
  
  QMAKE_LINK              = $${CROSS_COMPILE}g++
 -- 
-2.45.1
+2.44.0
 

qt5-base/mingw-w64/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch

@@ -1,4 +1,4 @@
-From c35f9705a2382167db2ed0cf2f5d8af5118d3534 Mon Sep 17 00:00:00 2001
+From acadba49c80804a908477f9a367c645fdf4300cc Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:36:53 +0200
 Subject: [PATCH 02/32] Ensure GLdouble is defined when using dynamic OpenGL
@@ -23,5 +23,5 @@ index 4554291bbd9..23d55bddebd 100644
  #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
  #include <stdio.h>
 -- 
-2.45.1
+2.44.0
 

qt5-base/mingw-w64/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch

@@ -1,4 +1,4 @@
-From 9d6f369f80da45624cac856c60b9abb3c9ea30b2 Mon Sep 17 00:00:00 2001
+From d3cb4d3b96c01f151e15dc1017f2687f7d8102c3 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:48:51 +0200
 Subject: [PATCH 03/32] Fix too many sections assemler error in OpenGL factory
@@ -25,5 +25,5 @@ index 24758afdeb3..aa04b4a672e 100644
      HEADERS += opengl/qopengl.h \
                 opengl/qopengl_p.h \
 -- 
-2.45.1
+2.44.0
 

qt5-base/mingw-w64/0004-Make-sure-.pc-files-are-installed-correctly.patch

@@ -1,4 +1,4 @@
-From 9b0772d1085b410d1e11816de607f88df648518d Mon Sep 17 00:00:00 2001
+From ed34f597de640c8ef123db60931353894564aa8d Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:54:12 +0200
 Subject: [PATCH 04/32] Make sure *.pc files are installed correctly
@@ -62,5 +62,5 @@ index 5e446bd7e2b..183cef29089 100644
                      uninst.append("\n\t");
                  uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
 -- 
-2.45.1
+2.44.0
 

qt5-base/mingw-w64/0005-Don-t-add-resource-files-to-LIBS-parameter.patch

@@ -1,4 +1,4 @@
-From 181646ede776937ac769f4cbacb2d16e71d08c6a Mon Sep 17 00:00:00 2001
+From a99587c177203e31c8cfbc825be56866c5a4f747 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:58:28 +0200
 Subject: [PATCH 05/32] Don't add resource files to LIBS parameter
@@ -24,5 +24,5 @@ index ee9a41838bc..8d1dcae85bb 100644
      if (project->isActiveConfig("dll")) {
          QString destDir = "";
 -- 
-2.45.1
+2.44.0
 

qt5-base/mingw-w64/0006-Prevent-debug-library-names-in-pkg-config-files.patch

@@ -1,4 +1,4 @@
-From 32b01780c19554e1b2950fa841525dcb17f4f5ff Mon Sep 17 00:00:00 2001
+From 6456e33a0b4797be08898dce2ce4ccce1c07bef8 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:01:14 +0200
 Subject: [PATCH 06/32] Prevent debug library names in pkg-config files
@@ -29,5 +29,5 @@ index fc996663d8d..23ac736fc06 100644
      QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
      if(!subdir.isEmpty()) {
 -- 
-2.45.1
+2.44.0
 

qt5-base/mingw-w64/0007-Fix-linking-against-shared-static-libpng.patch

@@ -1,4 +1,4 @@
-From b7593425c07e0584a64b86a6c96ef48c25e1edf4 Mon Sep 17 00:00:00 2001
+From 6979ca5c02d202597cf516cab889babbb9f74acc Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 26 Jan 2017 17:51:31 +0100
 Subject: [PATCH 07/32] Fix linking against shared/static libpng
@@ -26,5 +26,5 @@ index 95e8955b510..bc3eae90872 100644
              ],
              "use": [
 -- 
-2.45.1
+2.44.0
 

qt5-base/mingw-w64/0008-Fix-linking-against-static-D-Bus.patch

@@ -1,4 +1,4 @@
-From 4d7ece6b41e514620379181ca2e19e2cb21fb3c7 Mon Sep 17 00:00:00 2001
+From a1cd8b87b57eee2b9724d64a2c3b2c949981c544 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 19:36:25 +0100
 Subject: [PATCH 08/32] Fix linking against static D-Bus
@@ -54,5 +54,5 @@ index accaa4f5ed5..4b11c74caa7 100644
  #  include <dbus/dbus.h>
  #else
 -- 
-2.45.1
+2.44.0
 

qt5-base/mingw-w64/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch

@@ -1,4 +1,4 @@
-From dce1b9b945c9f5a528cf21f3fba9bb7bab69c134 Mon Sep 17 00:00:00 2001
+From 33ff3ba65c06a02136208b80567a0ba0c8db844a Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 18:28:10 +0200
 Subject: [PATCH 09/32] Don't try to use debug version of D-Bus library
@@ -25,5 +25,5 @@ index e97969ab25c..b75f8a8033c 100644
                      },
                      "condition": "config.win32 && features.shared"
 -- 
-2.45.1
+2.44.0
 

qt5-base/mingw-w64/0010-Fix-linking-against-static-freetype2.patch

@@ -1,4 +1,4 @@
-From a191eac4e7eb82ebe3f7627163d3942b13ec60f4 Mon Sep 17 00:00:00 2001
+From c1019300eed7fabb7c2c73d5510e5a83e06a89b2 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 20:51:19 +0100
 Subject: [PATCH 10/32] Fix linking against static freetype2
@@ -25,5 +25,5 @@ index bc3eae90872..d9b540ce428 100644
                  { "libs": "-lfreetype" }
              ],
 -- 
-2.45.1
+2.44.0
 

qt5-base/mingw-w64/0011-Fix-linking-against-static-harfbuzz.patch

@@ -1,4 +1,4 @@
-From ed77c71d51c933ecce2af067b9d3ce898a9811b3 Mon Sep 17 00:00:00 2001
+From d5ca57cecd935d1475d5b5677391e703a9733989 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:22:56 +0200
 Subject: [PATCH 11/32] Fix linking against static harfbuzz
@@ -25,5 +25,5 @@ index d9b540ce428..69cb564e868 100644
          },
          "imf": {
 -- 
-2.45.1
+2.44.0
 

qt5-base/mingw-w64/0012-Fix-linking-against-static-pcre.patch

@@ -1,4 +1,4 @@
-From 41ea62c42fc5386e3956d55cf2e7726aa257f335 Mon Sep 17 00:00:00 2001
+From 2189baae3ddff3bdba3f8d8480fa313e50432093 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:24:01 +0200
 Subject: [PATCH 12/32] Fix linking against static pcre
@@ -24,5 +24,5 @@ index 1f10150435d..6a97b47773e 100644
  #include <pcre2.h>
  
 -- 
-2.45.1
+2.44.0
 

qt5-base/mingw-w64/0013-Fix-linking-against-shared-static-MariaDB.patch

@@ -1,4 +1,4 @@
-From 3561a46f89b20bb55fd73f71efee00cac7c347b8 Mon Sep 17 00:00:00 2001
+From 5cdbce5a33f7881eee348250b1b9867c64ea686d Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:56:55 +0200
 Subject: [PATCH 13/32] Fix linking against shared/static MariaDB
@@ -22,5 +22,5 @@ index 28ccbeadcde..a5e3001bf60 100644
                  { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },
                  { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },
 -- 
-2.45.1
+2.44.0
 

qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-PostgreSQL.patch

@@ -1,4 +1,4 @@
-From 0a4e4c57620b8224531f1d6e8ef0db3ce066857b Mon Sep 17 00:00:00 2001
+From d95435227c24ef2b1be37561a55751e8ff3cfd0e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:58:25 +0200
 Subject: [PATCH 14/32] Fix linking against shared/static PostgreSQL
@@ -24,5 +24,5 @@ index a5e3001bf60..5768d3b9a97 100644
              ]
          },
 -- 
-2.45.1
+2.44.0
 

qt5-base/mingw-w64/0015-Rename-qtmain-to-qt5main.patch

@@ -1,4 +1,4 @@
-From 243c90ced35cc231bd16a344da759db3f12131dd Mon Sep 17 00:00:00 2001
+From 41e6e4c93cc8cbe45305458bc87573ad5a630601 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:25:40 +0200
 Subject: [PATCH 15/32] Rename qtmain to qt5main
@@ -76,5 +76,5 @@ index 1f54c846eca..162e7a4b1b4 100644
  
  CONFIG += static
 -- 
-2.45.1
+2.44.0
 

qt5-base/mingw-w64/0016-Enable-rpath-for-build-tools.patch

@@ -1,4 +1,4 @@
-From 731606af0cded31a76af9c5835c4746aa4738260 Mon Sep 17 00:00:00 2001
+From 0dc529641264921bd859fabdf4a6d082b253fcdc Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 17:59:27 +0200
 Subject: [PATCH 16/32] Enable rpath for build tools
@@ -33,5 +33,5 @@ index 8354f30eea2..30e8cf18c51 100644
  INSTALLS += target
  
 -- 
-2.45.1
+2.44.0
 

qt5-base/mingw-w64/0017-Use-system-zlib-for-build-tools.patch

@@ -1,4 +1,4 @@
-From 88e72a2c464f041a4ab238a90016edce35ceebbe Mon Sep 17 00:00:00 2001
+From c8b4c96da58bf20d982f5142ac0f218a2abeeb90 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:04:42 +0200
 Subject: [PATCH 17/32] Use system zlib for build tools
@@ -23,5 +23,5 @@ index 24862a07dbc..698e6cfb95d 100644
  } else {
      CONFIG += no_core_dep
 -- 
-2.45.1
+2.44.0
 

qt5-base/mingw-w64/0018-Merge-shared-and-static-library-trees.patch

@@ -1,4 +1,4 @@
-From fb7f2ab8ec627a62ded0f6c5965fef132ccc3db0 Mon Sep 17 00:00:00 2001
+From 2029f79155af8b3fdff3b9a66ee25b7ff274c327 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:45:08 +0200
 Subject: [PATCH 18/32] Merge shared and static library trees
@@ -204,5 +204,5 @@ index c0ce0972ef4..5a2deaf31d2 100644
  mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst
  INSTALLS += mkspecs
 -- 
-2.45.1
+2.44.0
 

qt5-base/mingw-w64/0019-Use-.dll.a-as-import-lib-extension.patch

@@ -1,4 +1,4 @@
-From 45f282343d32577fb7551144189fde9a01d044de Mon Sep 17 00:00:00 2001
+From d5bbf09f6dd16ada912feae0a1a63cf22ecd5f71 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:26:18 +0200
 Subject: [PATCH 19/32] Use *.dll.a as import lib extension
@@ -116,5 +116,5 @@ index 183cef29089..03732df4a84 100644
                  + project->first("QMAKE_EXTENSION_SHLIB"));
          project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
 -- 
-2.45.1
+2.44.0
 

qt5-base/mingw-w64/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch

@@ -1,4 +1,4 @@
-From e8cf5872bad72b833adbe4da4001090fa41b0454 Mon Sep 17 00:00:00 2001
+From 8d7db460bee900348d29fb86784de1a79312bc19 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:32:00 +0200
 Subject: [PATCH 20/32] Pull dependencies of static libraries in CMake modules
@@ -499,5 +499,5 @@ index b465a7fa898..eaf9011c3d9 100644
  set_property(TARGET Qt5::$${CMAKE_PLUGIN_NAME} PROPERTY QT_PLUGIN_CLASS_NAME \"$$CMAKE_PLUGIN_NAME\")
 +endif()
 -- 
-2.45.1
+2.44.0
 

qt5-base/mingw-w64/0021-Allow-usage-of-static-version-with-CMake.patch

@@ -1,4 +1,4 @@
-From 2b2526c3f49b6a1d9e174d68c373a9ae9730d583 Mon Sep 17 00:00:00 2001
+From a32c64f42900b052b017795255511cf5d1ea019d Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 5 Aug 2017 21:14:26 +0200
 Subject: [PATCH 21/32] Allow usage of static version with CMake
@@ -961,7 +961,7 @@ index 00000000000..0091940fd26
 +set(OVERRIDE_QT_VARIANT_PREFIX "${ORIGINAL_OVERRIDE_QT_VARIANT_PREFIX}")
 +
 diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
-index 4ceafb6445e..774d8b6c2f7 100644
+index 0d02edb41c3..9da1361c95a 100644
 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in
 +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
 @@ -2,6 +2,8 @@ if(NOT DEFINED QT_DEFAULT_MAJOR_VERSION)
@@ -973,7 +973,7 @@ index 4ceafb6445e..774d8b6c2f7 100644
  if (NOT TARGET Qt5::qmake)
      add_executable(Qt5::qmake IMPORTED)
  
-@@ -56,12 +58,12 @@ set(Qt5Core_QMAKE_EXECUTABLE Qt5::qmake)
+@@ -55,12 +57,12 @@ set(Qt5Core_QMAKE_EXECUTABLE Qt5::qmake)
  set(Qt5Core_MOC_EXECUTABLE Qt5::moc)
  set(Qt5Core_RCC_EXECUTABLE Qt5::rcc)
  
@@ -990,7 +990,7 @@ index 4ceafb6445e..774d8b6c2f7 100644
    COMPATIBLE_INTERFACE_STRING QT_MAJOR_VERSION QT_COORD_TYPE
  )
  
-@@ -72,7 +74,7 @@ foreach(_dir ${_qt5_corelib_extra_includes})
+@@ -71,7 +73,7 @@ foreach(_dir ${_qt5_corelib_extra_includes})
  endforeach()
  
  list(APPEND Qt5Core_INCLUDE_DIRS ${_qt5_corelib_extra_includes})
@@ -999,7 +999,7 @@ index 4ceafb6445e..774d8b6c2f7 100644
  set(_qt5_corelib_extra_includes)
  
  # Targets using Qt need to use the POSITION_INDEPENDENT_CODE property. The
-@@ -87,7 +89,7 @@ set(Qt5_POSITION_INDEPENDENT_CODE True)
+@@ -86,7 +88,7 @@ set(Qt5_POSITION_INDEPENDENT_CODE True)
  # Applications now need to be compiled with the -fPIC option if the Qt option
  # \"reduce relocations\" is active. For backward compatibility only, Qt accepts
  # the use of -fPIE for GCC 4.x versions.
@@ -1008,7 +1008,7 @@ index 4ceafb6445e..774d8b6c2f7 100644
  
  # TODO Qt6: Remove
  set(Qt5Core_EXECUTABLE_COMPILE_FLAGS \"\")
-@@ -95,7 +97,7 @@ set(Qt5Core_EXECUTABLE_COMPILE_FLAGS \"\")
+@@ -94,7 +96,7 @@ set(Qt5Core_EXECUTABLE_COMPILE_FLAGS \"\")
  !!IF !isEmpty(QT_NAMESPACE)
  list(APPEND Qt5Core_DEFINITIONS -DQT_NAMESPACE=$$QT_NAMESPACE)
  list(APPEND Qt5Core_COMPILE_DEFINITIONS QT_NAMESPACE=$$QT_NAMESPACE)
@@ -1017,7 +1017,7 @@ index 4ceafb6445e..774d8b6c2f7 100644
  !!ENDIF
  
  !!IF !isEmpty(CMAKE_DISABLED_FEATURES)
-@@ -104,9 +106,9 @@ set(Qt5_DISABLED_FEATURES
+@@ -103,9 +105,9 @@ set(Qt5_DISABLED_FEATURES
  )
  !!ENDIF
  
@@ -1029,7 +1029,7 @@ index 4ceafb6445e..774d8b6c2f7 100644
  
  !!IF qtConfig(reduce_exports)
  set(QT_VISIBILITY_AVAILABLE \"True\")
-@@ -154,14 +156,14 @@ if (NOT TARGET Qt5::WinMain)
+@@ -153,14 +155,14 @@ if (NOT TARGET Qt5::WinMain)
          set(_isWin32 $<BOOL:$<TARGET_PROPERTY:WIN32_EXECUTABLE>>)
          set(_isNotExcluded $<NOT:$<BOOL:$<TARGET_PROPERTY:Qt5_NO_LINK_QTMAIN>>>)
          set(_isPolicyNEW $<TARGET_POLICY:CMP0020>)
@@ -1091,5 +1091,5 @@ index 2a575958ae4..ca0e3be3b56 100644
      INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\"
  )
 -- 
-2.45.1
+2.44.0
 

qt5-base/mingw-w64/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch

@@ -1,4 +1,4 @@
-From a36333cb15ec3cc9adc8e7065034715a741ca7aa Mon Sep 17 00:00:00 2001
+From 1e0190cb9b33cd6aaef745da13d8e4de85a50775 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 16:42:07 +0200
 Subject: [PATCH 22/32] Adjust linker flags for static build with
@@ -13,10 +13,10 @@ Change-Id: Iad665f18da5b4540f0899829a0165e1d3aa4ea60
  1 file changed, 6 insertions(+)
 
 diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
-index 774d8b6c2f7..d16a0fb18c0 100644
+index 9da1361c95a..5e802dea4c5 100644
 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in
 +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
-@@ -207,3 +207,9 @@ if(NOT \"${QT_NO_CREATE_VERSIONLESS_TARGETS}\" AND NOT TARGET Qt::WinMain)
+@@ -206,3 +206,9 @@ if(NOT \"${QT_NO_CREATE_VERSIONLESS_TARGETS}\" AND NOT TARGET Qt::WinMain)
      )
  endif()
  !!ENDIF
@@ -27,5 +27,5 @@ index 774d8b6c2f7..d16a0fb18c0 100644
 +set_target_properties(${IMPORTED_TARGET_NAME} PROPERTIES \"INTERFACE_LINK_LIBRARIES\" \"$<${_isExe}:-static;ws2_32>\")
 +unset(_isExe)
 -- 
-2.45.1
+2.44.0
 

qt5-base/mingw-w64/0023-Use-correct-pkg-config-static-flag.patch

@@ -1,4 +1,4 @@
-From 4af65a7ec4c2ddb51b87b03d7351c8b7a9f13d2a Mon Sep 17 00:00:00 2001
+From 4d24aaff9e4e144e320a964c2c21060b41c3039f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:50:21 +0200
 Subject: [PATCH 23/32] Use correct pkg-config --static flag
@@ -22,5 +22,5 @@ index 85acb3757aa..0a4db10dfca 100644
      $$qtConfEvaluate("features.cross_compile") {
          # cross compiling, check that pkg-config is set up sanely
 -- 
-2.45.1
+2.44.0
 

qt5-base/mingw-w64/0024-Fix-macro-invoking-moc-rcc-and-uic.patch

@@ -1,4 +1,4 @@
-From 19c277e150d5d12b5eb1bd80ce8a1f6863fafbb2 Mon Sep 17 00:00:00 2001
+From bfe19d4efc3d2102f6132231a3d41b4940ba2ecf Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 4 Dec 2016 20:35:47 +0100
 Subject: [PATCH 24/32] Fix macro invoking moc, rcc and uic
@@ -70,5 +70,5 @@ index 35d2a2dc546..99f061f1b82 100644
            MAIN_DEPENDENCY ${infile} VERBATIM)
          set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON)
 -- 
-2.45.1
+2.44.0
 

qt5-base/mingw-w64/0025-Ignore-errors-about-missing-feature-static.patch

@@ -1,4 +1,4 @@
-From f4d043d78ddb2a497e8623a282510271dec3a39b Mon Sep 17 00:00:00 2001
+From b4037f482107b0bde253b487487501b8bc82db55 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 20:59:54 +0100
 Subject: [PATCH 25/32] Ignore errors about missing feature static
@@ -32,5 +32,5 @@ index 7777e615bda..5f30366660b 100644
 +    !equals($$1, "static"): error("Could not find feature $${1}.")
  }
 -- 
-2.45.1
+2.44.0
 

qt5-base/mingw-w64/0026-Enable-and-fix-use-of-iconv.patch

@@ -1,4 +1,4 @@
-From 0c129a2729d3332ce66e7f987076d789aec7d763 Mon Sep 17 00:00:00 2001
+From 5f1d71631402760aa75df7b0ea8c9be7608f51a2 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:20 +0100
 Subject: [PATCH 26/32] Enable and fix use of iconv
@@ -74,5 +74,5 @@ index a9025a2dd29..ffb6f50fbe1 100644
          },
          "icu": {
 -- 
-2.45.1
+2.44.0
 

qt5-base/mingw-w64/0027-Ignore-failing-pkg-config-test.patch

@@ -1,4 +1,4 @@
-From 36508b49514d17ba00eafd15dd21202dfbec5092 Mon Sep 17 00:00:00 2001
+From 341d9fb7080be076b2dbeb5d1b714eff08060327 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:48 +0100
 Subject: [PATCH 27/32] Ignore failing pkg-config test
@@ -21,5 +21,5 @@ index b75f8a8033c..72a963a6793 100644
                  "publicFeature",
                  { "type": "publicQtConfig", "negative": true },
 -- 
-2.45.1
+2.44.0
 

qt5-base/mingw-w64/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch

@@ -1,4 +1,4 @@
-From aab538b9ed39da73b7d12f46a64fde01cc646883 Mon Sep 17 00:00:00 2001
+From 2095dda5640e16c678173355a2d39910701d8fc3 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Tue, 7 Feb 2017 18:25:28 +0100
 Subject: [PATCH 28/32] Prevent qmake from messing static lib dependencies
@@ -41,5 +41,5 @@ index 03732df4a84..602f7609f58 100644
      int libidx = 0;
      for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
 -- 
-2.45.1
+2.44.0
 

qt5-base/mingw-w64/0029-Hardcode-linker-flags-for-platform-plugins.patch

@@ -1,4 +1,4 @@
-From cac5077627da94fdd50cf5fba443608639a98d57 Mon Sep 17 00:00:00 2001
+From c08a720e1cd51c0015ec02143cd65b17e5e69b64 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 23:42:30 +0100
 Subject: [PATCH 29/32] Hardcode linker flags for platform plugins
@@ -174,5 +174,5 @@ index 50a3bb41a92..02f74650a9b 100644
  include(windows.pri)
  
 -- 
-2.45.1
+2.44.0
 

qt5-base/mingw-w64/0030-Fix-linking-against-static-plugins-with-qmake.patch

@@ -1,4 +1,4 @@
-From 50f9630adc9205f5fdc5e45b04f5c116ad64776f Mon Sep 17 00:00:00 2001
+From bd80f6a8310a4e9d3d91d4fc242cccc3718977b1 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 25 Aug 2017 17:07:17 +0200
 Subject: [PATCH 30/32] Fix linking against static plugins with qmake
@@ -33,5 +33,5 @@ index b79b324b887..6a03b7a74bf 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.45.1
+2.44.0
 

qt5-base/mingw-w64/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch

@@ -1,4 +1,4 @@
-From 87e11456be77dba3965fc9bac3a3b6d3ea16012a Mon Sep 17 00:00:00 2001
+From 5a1f5a3b43cfc29cd8ec1ce8791ef4029f5e2f96 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Mon, 24 Jun 2019 13:51:02 +0200
 Subject: [PATCH 31/32] Prevent 'Cannot find feature windows_vulkan_sdk'
@@ -33,5 +33,5 @@ index 8475e4111a7..c0eb8faa17d 100644
      LD_USES = $$resolve_depends(LD_USES, QMAKE_DEPENDS_, _LD)
      for (nu, LD_USES) {
 -- 
-2.45.1
+2.44.0
 

qt5-base/mingw-w64/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch

@@ -1,4 +1,4 @@
-From 8179dcecafdbaa987228042b6b958af3da091f0d Mon Sep 17 00:00:00 2001
+From 1690bb85bf77a77a80abf2d369b6ec17b87ab4f8 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 26 Jun 2021 22:24:12 +0200
 Subject: [PATCH 32/32] Fix crashes in rasterization code using setjmp
@@ -244,5 +244,5 @@ index 1a2b907606a..746a41efa8e 100644
          "Description": "FreeType is a freely available software library to render fonts.",
          "Homepage": "http://www.freetype.org",
 -- 
-2.45.1
+2.44.0
 

qt5-base/mingw-w64/PKGBUILD

@@ -17,10 +17,10 @@
 
 _qt_module=qtbase
 pkgname=mingw-w64-qt5-base
-pkgver=5.15.14+kde+r140
+pkgver=5.15.13+kde+r138
 pkgrel=1
 _basever=${pkgver%%+*}
-_commit=1c13ef067ea3c97342f98039931ea18b3992014f
+_commit=b9906b5233a80cab372c95ac4dd68b25bdca0646
 pkgdesc='A cross-platform application and UI framework, native OpenGL backend (mingw-w64)'
 arch=('i686' 'x86_64')
 url='https://www.qt.io/'
@@ -70,38 +70,38 @@ source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit
         '0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch'
         '0032-Fix-crashes-in-rasterization-code-using-setjmp.patch')
 sha256sums=('SKIP'
-            '5b9f3f36e05a029181ca72b83683c119adbfba625ad98ba3fb02113d75d35d44'
+            '11c2b54df2b5ea031c2103366d0b27d0786c3420b29cca391cc0015fd35264d7'
-            'ccab6d5fdce7809281c05c1b0b8ec65aab6db1112283fc69ba10bb05e664d545'
+            '2b00e98c8c8acb1a453191be77a2f7a9188e030480864e58ac39b517bb63ffb5'
-            '9d4c8bfde02f7e77ea194f1e1ea724baaf947dcd72adca815559e43070df2938'
+            '5131dff4db6f63e36ea364ce59b2fdb047fbb6d55e6543316054f6ebcd76711b'
-            'b6921b9b00542a4afad0f9f97f36b9d45c619bafa06a93576bed6545aea8dd3b'
+            '3147a21ccad3026a06d8b622db96949d51f32b6a1d25c8aae5fe5a95c3e95625'
-            'd76628f9395f8b7813e058ebbb8b87d380d490d2e2e67d5d59218082330b3a65'
+            '4bd74cc1d78da412faac71b5357fd86fea3f1781d0b554f8f7fd3684c833e8ce'
-            'e909ab659266bc65fd14e16231855b3cf209a3a03965f934f5d81771d4a0191d'
+            'e566e5cdd5bc077c35054be1465148acd5ee209e609690c670b78df88cc9295b'
-            '06fc346c7299fb31f0cbebb55c3749d533b48e99fd59e8a3ed3c068fcda03a2f'
+            '7fe1dc6c1251c16c4236924cb5a03ac55d1dca051bd9d99fbf7b35f91454fda3'
-            'edd73dc56259afdc8865417974b8956697954aad22844522554fe83c665a3ac8'
+            'c054851c46036710ff6f025a48d4b5b2d6e5d5d54c74b73c2cb81b00bdfa029a'
-            '41ffca5bd37d020a3edc56c0b9949e466026fb8c8d935defd9e66a71b779934c'
+            'a2702d6ca3f696ca3c77b00df7bb512f5f3430fce109048c62c97d294758efd8'
-            'd869ae862fd3251c478e14fdb614185c81e5defb5b00f31161ff5497c66823e2'
+            '395339c3dde4115283db948899980e536a355422190bc90850efdc3438c527d8'
-            '7ac6575b691ed70dde02182aec6f81aaad4aca8a041ab594868d113a913c9e41'
+            'c386790a879e68b9d00bfe9f14afa67d8a374de57bdea164a5252499ec34cbcb'
-            '0dba86fae79ae7368b504ae7d297359f4448f160a42b20b3857d81d2cde91ab5'
+            '576177950e99f62d05bee487dd5ae1b731fe4acf438553c74e7c48631dd8789b'
-            'ddce558f74a1cdcb673e9a1e9df75442ea71fc6e2503fc85d779c5d8b948784a'
+            '02bc0ce27d7835829d4e84580fb0a0b864b36b14331a166dba88f1942a6414a3'
-            '48ee9c592f17400f37e958a59f3605c97d335dec18537b0d730601bb9787a07b'
+            '736de6cd28c8efb1729f926c1fa42c963c7f1d3a9e4b56b098906b570473320f'
-            '7e242c398740eabed1c437498e04744fda8a413ce6e668a2a654741d5900dd42'
+            '294f3ab13a546a1bfeae472cf7342e2bce6c058a6867d19038ba1c194fb33b8d'
-            '7cf8f198fe0348aa5c97c85bfcf868be62fec0fa0148570565c48ef1d91aa0e9'
+            '8f202adf905ebce78dd2942d17c0d935f0de7014ffa75840310edc0bd790ff03'
-            '6ed70651c02399a407ffa4d8e76da46d5765983034d1e0644686f599b865b68f'
+            '129b4667c5e3cfe68040cbae2fce487e2d016bcbe2380a5ba410b225279f71b9'
-            '9edc35b11aa19b10ddd7ced57b3b0d035755a4c443ba3b6c6755810a0ecd338f'
+            'fbd8cd4680e10074f90bf79d9d08ad787b483cf7c21250d1db1c8a5c829a1d83'
-            'e4cc92c85debb106bf8ebc899729f8dc17a94a062ffa1c9e6f7fd4cc1c17f91e'
+            '05a29084b9bc3324beefb9ae6d00ea68c3b3c51a0b4595c024300949c906d7fd'
-            '2e9ac0244ca938fc547db038b5d72a31b82e155c84050bf0e3407300bf7eaecb'
+            '7843f5be44b9b367cb81c143c6d670e6a5be40510848c09a1448d921c3437639'
-            'a46f82235cfc8a6644b425061a7e923fa4468623974ddf75a46ec45802654cd0'
+            '7002db8f819bf34cafda04dc4d288fef58aec9e409230dc68fcb542cb48f09bb'
-            'cdad591ba62797d930b5121eef39fa5e2928c76f28b0c32ab35b10ec04e550e4'
+            '57607c662e6d68f2ca856617c8d7cfaa05ba8332ea70b67ab628a8f0cf2ca032'
-            '67dec80f21aa819cea23a1b8a267c2724d2fa86e23c69834bc711b381fc03447'
+            '5910c4567348101d0a87197b2e52e59673467247ca4ffc89cba5701d98373435'
-            '17320ad851fdf1f7282bb2215429aff12617096b0b82dfc689f3832766f5436e'
+            '0181986547b7c70bf2bc8de31198240f99a92e4cfdb1db81c7b99b849c416c1f'
-            '3cb80c51dda4e79b5480e0417678c751d0f5b762014939593d9f9c1b645080be'
+            '9e692f956dffa5c936a2911d8418746b19197962111b4f0f45b33972ed3890f2'
-            'ecc72af327991945a6076790aadd5309aa8ac06891a14ed080fa49632e50b0b0'
+            '1d5e09034c9c903653d10c3983e4dcb710ebe8f08694e5e55199a3e4acb8f629'
-            'efb16ee563478711ca027074494b0cbb1c4f3054028dedd5bcf2b3da91c0797c'
+            '5379cea6fd54a16e7f67b617bf3582c08f8934ae8d699e85ad21f20dcf192424'
-            '6247074166f5d9a97fb60597b15a80a65cfb2ea5dffc31dcb739cbaa9a95ac62'
+            '82d1db9d4536350fe2549c400487018a8477a15da83a568240a013a6d82dfe92'
-            '29062bf991b8eab0c65a5ecf09f9a69673757653aacb48269033e5ad8d4f652f'
+            '01413344603a8e99f7b0280e7f297de4ea415e0c5011b1dac116eaf25082220b'
-            'd0d8703d6ec5b960da6a537a3903804ef4366693125b0a31e5cd59954e348888'
+            '4f88801a586c35515fd982f8e465fb4546ef38765c6a2abe1e8ca69e3700d799'
-            '422b67821c2cb1025e3a230965ef664eabb05a9c6d623bc67fc0daaa0fd57262'
+            'b4dad74bbe2731aaa8711408fe509344e7e6049def897389f7e2a86423f3377e'
-            '5be2fe99912d1f905aac9a5c1de48e130a3e364bb97fa47fd81f66f26c7c9296')
+            '17f251d456713c920c6581659c54b9c372e1a329081b2ed9d9826e9e0ddd317a')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 

qt5-base/mingw-w64/qtbase-sha256.txt

@@ -1 +1 @@
-cce3b289529f02b1c27a2c6659abb8f6d7ba62545507f17b44d31f15ecdcc109
+06e49a14145574834d4d04f73e6baf662ee5e72e78973e1d7d0fe614472a80a4

qt5-charts/mingw-w64-static/PKGBUILD

@@ -9,7 +9,7 @@
 
 _qt_module=qtcharts
 pkgname=mingw-w64-qt5-charts-static
-pkgver=5.15.14
+pkgver=5.15.13
 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=7315c48bcec88014e78165bbda54abfcd557e0af
+_commit=3f3f14d69a509c3e8027bfb5d7ffca9b4f3ef003
 _basever=${pkgver%%+*}
 makedepends+=('git')
 options=('!strip' '!buildflags' 'staticlibs')
@@ -25,7 +25,7 @@ groups=('mingw-w64-qt5')
 url='https://www.qt.io/'
 _pkgfqn=${_qt_module}
 source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
-sha256sums=('222e7f3fa95314e9e25e202ed02d92b67fae320762c0d6fc5734ff8c1c98bbdf')
+sha256sums=('SKIP')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 

qt5-charts/mingw-w64-static/qtcharts-sha256.txt

@@ -1 +1 @@
-222e7f3fa95314e9e25e202ed02d92b67fae320762c0d6fc5734ff8c1c98bbdf
+98b5b2a348ef6bd68b2b64eee48815ddfd785476f1cdc797179a68c32322f209

qt5-charts/mingw-w64/PKGBUILD

@@ -9,7 +9,7 @@
 
 _qt_module=qtcharts
 pkgname=mingw-w64-qt5-charts
-pkgver=5.15.14
+pkgver=5.15.13
 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=7315c48bcec88014e78165bbda54abfcd557e0af
+_commit=3f3f14d69a509c3e8027bfb5d7ffca9b4f3ef003
 _basever=${pkgver%%+*}
 makedepends+=('git')
 options=('!strip' '!buildflags' 'staticlibs')
@@ -25,7 +25,7 @@ groups=('mingw-w64-qt5')
 url='https://www.qt.io/'
 _pkgfqn=${_qt_module}
 source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
-sha256sums=('222e7f3fa95314e9e25e202ed02d92b67fae320762c0d6fc5734ff8c1c98bbdf')
+sha256sums=('SKIP')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 

qt5-charts/mingw-w64/PKGBUILD.sh.ep

@@ -1,6 +1,6 @@
 % layout 'mingw-w64-qt5-module';
 \
-pkgver=5.15.14
+pkgver=5.15.13
 pkgrel=1
 arch=('any')
 pkgdesc="Provides a set of easy to use chart components (mingw-w64)"

qt5-charts/mingw-w64/qtcharts-sha256.txt

@@ -1 +1 @@
-222e7f3fa95314e9e25e202ed02d92b67fae320762c0d6fc5734ff8c1c98bbdf
+98b5b2a348ef6bd68b2b64eee48815ddfd785476f1cdc797179a68c32322f209

qt5-connectivity/mingw-w64-static/PKGBUILD

@@ -9,23 +9,23 @@
 
 _qt_module=qtconnectivity
 pkgname=mingw-w64-qt5-connectivity-static
-pkgver=5.15.14
+pkgver=5.15.13
 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=99f30db37c63447c59d5fac15bc8feb832a7fd04
+_commit=8024ef3d7269665ba104f528e5e284df9d9d8ae9
 _basever=${pkgver%%+*}
-pkgver+=+kde+r3
+pkgver+=+kde+r4
 makedepends+=('git')
 options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
 url='https://www.qt.io/'
 _pkgfqn=${_qt_module}
 source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
-sha256sums=('3775e6f5600d43713a0d7337e297aa608d2bb0e7b8c2cbb76ccdf0bfdb656132')
+sha256sums=('SKIP')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 

qt5-connectivity/mingw-w64-static/qtconnectivity-sha256.txt

@@ -1 +1 @@
-3775e6f5600d43713a0d7337e297aa608d2bb0e7b8c2cbb76ccdf0bfdb656132
+97c1e18cf0b58212900899793d4776cf35ddc64ec8863c104ef7b418cfc0b6d7

qt5-connectivity/mingw-w64/PKGBUILD

@@ -9,23 +9,23 @@
 
 _qt_module=qtconnectivity
 pkgname=mingw-w64-qt5-connectivity
-pkgver=5.15.14
+pkgver=5.15.13
 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=99f30db37c63447c59d5fac15bc8feb832a7fd04
+_commit=8024ef3d7269665ba104f528e5e284df9d9d8ae9
 _basever=${pkgver%%+*}
-pkgver+=+kde+r3
+pkgver+=+kde+r4
 makedepends+=('git')
 options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
 url='https://www.qt.io/'
 _pkgfqn=${_qt_module}
 source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
-sha256sums=('3775e6f5600d43713a0d7337e297aa608d2bb0e7b8c2cbb76ccdf0bfdb656132')
+sha256sums=('SKIP')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'