Add back patch for crashes in rasterization code

The setjmp-based code still breaks on i686.
2024-04-05 01:49:08 +02:00
137 changed files with 655 additions and 795 deletions
--- a/binutils/mingw-w64-symlinks/PKGBUILD
+++ b/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"
-arch=('x86_64')
+pkgdesc="Cross binutils for the MinGW-w64 cross-compiler (uses symlinks instead of hard links)"
+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"
-    mkdir -p "$srcdir"/binutils-${_target} && cd "${srcdir}/binutils-${_target}"
-    "$srcdir"/binutils-${pkgver}/configure --prefix=/usr \
+    msg "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
+    make
  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
+    msg "Installing ${_target} cross binutils"
+    cd ${srcdir}/binutils-${_target}
+    make DESTDIR=${pkgdir} install
  done
-
  cd "${pkgdir}/usr/bin"
  for file in *; do
    if [[ ! -L $file ]] && [[ ! -d $file ]]; then
--- a/binutils/mingw-w64/PKGBUILD
+++ b/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
-}
--- a/c++utilities/default/PKGBUILD
+++ b/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}"
--- a/c++utilities/doc/PKGBUILD
+++ b/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}"
--- a/c++utilities/mingw-w64/PKGBUILD
+++ b/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')
--- a/c++utilities/static-compat/PKGBUILD
+++ b/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}"
--- a/cmake-format/default/PKGBUILD
+++ b/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')
--- a/devel/generator/templates/layouts/mingw-w64-qt6-base.sh.ep
+++ b/devel/generator/templates/layouts/mingw-w64-qt6-base.sh.ep
@ -16,7 +16,7 @@
 pkgname=<%= $package_name %>
 _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
-# 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}
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

 % if ($patch_files->size || content_for('prepare')->size) {
 prepare () {
--- a/devel/generator/templates/layouts/mingw-w64-qt6-module.sh.ep
+++ b/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 () {
--- a/devel/versions.sh
+++ b/devel/versions.sh
@ -1,7 +1,7 @@
 #!/bin/bash
 declare -A versions=(
-    [syncthingtray]=1.5.3
-    [c++utilities]=5.24.8
+    [syncthingtray]=1.5.1
+    [c++utilities]=5.24.7
    [qtutilities]=6.14.0
    [qtforkawesome]=0.2.0
    [tagparser]=12.1.0
--- a/environment/static-compat/PKGBUILD
+++ b/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
-}
--- a/environment/static-compat/pkg-config.sh
+++ b/environment/static-compat/pkg-config.sh
@ -1,2 +0,0 @@
-#!/usr/bin/bash
-exec /usr/bin/pkg-config --static "$@"
--- a/gcc/mingw-w64/0001-missing-thiscall-attribute-on-builtin-declaration-of-cxa_thread_atexit.patch
+++ b/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)
- 	{
--- a/gcc/mingw-w64/PKGBUILD
+++ b/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
-pkgrel=2
+pkgver=13.2.1
+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
-source=(git+https://sourceware.org/git/gcc.git#commit=${_commit}
-        0001-missing-__thiscall-attribute-on-builtin-declaration-of-__cxa_thread_atexit.patch)
+_commit=d8a0dcd146dd95e2b6b85cf82c445214d364cf3b
+source=(git+https://sourceware.org/git/gcc.git#commit=${_commit})
 #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/
--- a/gcc/static-compat/PKGBUILD
+++ b/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)
-pkgver=14.1.1+r1+g43b730b9134
+pkgname=({gcc,gcc-libs,lib32-gcc-libs,gcc-ada,gcc-fortran}-static-compat)
+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
-source=(git+https://sourceware.org/git/gcc.git#commit=$_commit
+_commit=d8a0dcd146dd95e2b6b85cf82c445214d364cf3b
+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')
--- a/harfbuzz/mingw-w64/PKGBUILD
+++ b/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
-pkgrel=2
+pkgver=2.9.0
+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")
-b2sums=('19f25dbf2ba6d90fdbb4ecb1039c8d0d72c55cff3dc3b30d6b75b626c15bf28a2118495837d80b7f622f0929dd7d4a07b5526963e1204bb9c90bc9f976c26977')
-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)
-)
+source=("git+https://github.com/harfbuzz/harfbuzz.git#commit=${_commit}")
+sha256sums=('SKIP')

 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
-    ${_arch}-meson \
-      -D b_lto=false \
-      -D graphite=enabled \
-      -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
+    # Build static and shared libs separately due to necessity of defining DGRAPHITE2_STATIC
+    # manually when building static version
+
+    # static build
    mkdir -p build-${_arch}-static && pushd build-${_arch}-static
-    ${_arch}-meson \
-      --default-library static \
-      -D c_args=-DGRAPHITE2_STATIC \
-      -D cpp_args=-DGRAPHITE2_STATIC \
-      -D b_lto=false \
-      -D graphite=enabled \
-      -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
+    CFLAGS="${CFLAGS} -DGRAPHITE2_STATIC" \
+    CXXFLAGS="${CXXFLAGS} -DGRAPHITE2_STATIC" \
+    ${_arch}-configure \
+      --with-glib \
+      --with-freetype \
+      --with-cairo \
+      --with-icu \
+      --with-gobject \
+      --with-graphite2 \
+      --enable-static=yes \
+      --enable-shared=no
+    make
+    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
-    cp "${srcdir}/harfbuzz/src/hb-ft.h" "${pkgdir}/usr/${_arch}/include/harfbuzz/"
+    make DESTDIR="${pkgdir}" install
    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
--- a/harfbuzz/static-compat/PKGBUILD
+++ b/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")
-b2sums=('19f25dbf2ba6d90fdbb4ecb1039c8d0d72c55cff3dc3b30d6b75b626c15bf28a2118495837d80b7f622f0929dd7d4a07b5526963e1204bb9c90bc9f976c26977')
-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)
-)
+_commit=1d665c2b521512cdd56964138fc601debd1f1177  # tags/8.1.1^0
+source=("git+https://github.com/harfbuzz/harfbuzz#commit=$_commit")
+sha256sums=('SKIP')

 pkgver() {
  cd harfbuzz
--- a/nginx-mod-accesskey/default/PKGBUILD
+++ b/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')
--- a/nginx-mod-cache-purge/default/PKGBUILD
+++ b/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')
--- a/nginx-mod-dav-ext/default/PKGBUILD
+++ b/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')
--- a/nginx-mod-fancyindex/default/PKGBUILD
+++ b/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')
--- a/nginx-mod-rtmp/default/PKGBUILD
+++ b/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')
--- a/nginx-mod-slowfs-cache/default/PKGBUILD
+++ b/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')
--- a/nginx-mod-substitutions-filter/default/PKGBUILD
+++ b/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')
--- a/nginx-mod-upload-progress/default/PKGBUILD
+++ b/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')
--- a/nginx-mod-upstream-fair/default/PKGBUILD
+++ b/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')
--- a/openssl/android-aarch64/PKGBUILD
+++ b/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'
--- a/openssl/android-armv7a-eabi/PKGBUILD
+++ b/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'
--- a/openssl/android-x86-64/PKGBUILD
+++ b/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'
--- a/openssl/android-x86/PKGBUILD
+++ b/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'
--- a/openssl/mingw-w64/PKGBUILD
+++ b/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'
--- a/openssl/static-compat/PKGBUILD
+++ b/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'
--- a/passwordmanager/mingw-w64-qt6/PKGBUILD
+++ b/passwordmanager/mingw-w64-qt6/PKGBUILD
@ -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')
--- a/passwordmanager/qt6/PKGBUILD
+++ b/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' \
--- a/pianobooster/mingw-w64/PKGBUILD
+++ b/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
-pkgrel=2
+pkgver=1.0.1
+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}"
--- a/postgresql/mingw-w64/PKGBUILD
+++ b/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')

--- a/qt6-3d/mingw-w64-static/PKGBUILD
+++ b/qt6-3d/mingw-w64-static/PKGBUILD
@ -21,7 +21,7 @@ _pkgfqn="qt3d-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
 sha256sums=('3362d01c7542af0e902908d2d339374feda1a037552ea625b900278982375c27')

-_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

 build() {
  for _arch in ${_architectures}; do
--- a/qt6-3d/mingw-w64/PKGBUILD
+++ b/qt6-3d/mingw-w64/PKGBUILD
@ -21,7 +21,7 @@ _pkgfqn="qt3d-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
 sha256sums=('0da87a46217f4d72f6d0de9768605d5325ef3d093f73a5e0d73dd88e99c1fc2a')

-_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

 build() {
  for _arch in ${_architectures}; do
--- a/qt6-5compat/mingw-w64-static/PKGBUILD
+++ b/qt6-5compat/mingw-w64-static/PKGBUILD
@ -19,7 +19,7 @@ _pkgfqn="qt5compat-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
 sha256sums=('9d49d4fd8345d8a40b63e0b65cd49c1d8286e33a7f1409bf1316763f654e19f5')

-_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

 build() {
  for _arch in ${_architectures}; do
--- a/qt6-5compat/mingw-w64/PKGBUILD
+++ b/qt6-5compat/mingw-w64/PKGBUILD
@ -19,7 +19,7 @@ _pkgfqn="qt5compat-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
 sha256sums=('9d49d4fd8345d8a40b63e0b65cd49c1d8286e33a7f1409bf1316763f654e19f5')

-_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

 build() {
  for _arch in ${_architectures}; do
--- a/qt6-activeqt/mingw-w64-static/PKGBUILD
+++ b/qt6-activeqt/mingw-w64-static/PKGBUILD
@ -26,7 +26,7 @@ sha256sums=('450485a213fb479042c36e37bfa0f8f7fcff4cf54f053de9d4f226810834d0b3'
            'bc65d03b23c52b28b52e7476b373dbbdf32af7c510728f73dee187872e3b0105'
            '0b27ecbba1123e349fce11f38dd68ce6addce4d1309568b52cb816324aae4974')

-_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

 prepare () {
  cd $_pkgfqn
--- a/qt6-activeqt/mingw-w64/PKGBUILD
+++ b/qt6-activeqt/mingw-w64/PKGBUILD
@ -26,7 +26,7 @@ sha256sums=('450485a213fb479042c36e37bfa0f8f7fcff4cf54f053de9d4f226810834d0b3'
            'bc65d03b23c52b28b52e7476b373dbbdf32af7c510728f73dee187872e3b0105'
            '0b27ecbba1123e349fce11f38dd68ce6addce4d1309568b52cb816324aae4974')

-_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

 prepare () {
  cd $_pkgfqn
--- a/qt6-base/android-aarch64/0018-Fix-crashes-in-rasterization-code-using-setjmp.patch
+++ b/qt6-base/android-aarch64/0018-Fix-crashes-in-rasterization-code-using-setjmp.patch
@ -0,0 +1 @@
+../mingw-w64/0018-Fix-crashes-in-rasterization-code-using-setjmp.patch
--- a/qt6-base/android-aarch64/PKGBUILD
+++ b/qt6-base/android-aarch64/PKGBUILD
@ -44,25 +44,27 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
        '0014-Fix-setting-exception-flags-of-plugin-targets.patch'
        '0015-Link-corelib-correctly-against-runtimeobject-when-co.patch'
        '0016-Workaround-linker-error-about-missing-symbol-__sync_.patch'
-        '0017-Fix-wrong-cpp-conditional-in-qspan.h.patch')
+        '0017-Fix-wrong-cpp-conditional-in-qspan.h.patch'
+        '0018-Fix-crashes-in-rasterization-code-using-setjmp.patch')
 sha256sums=('11b2e29e2e52fb0e3b453ea13bbe51a10fdff36e1c192d8868c5a40233b8b254'
-            'e25f83ddf9e3f9eefcb833751cff8957f32cb2f13f5a1f033679b45d2c9e544e'
-            'ae4a20f41df34eefc960ed5cb2cf54afb421573f08545d5492882edd18e00a3c'
-            '5d329d722365c07a28b85a9d1ba9c6c53ad19124662aa1825cdd78ece82c47f3'
-            '86dd06b2a1bd7b050763346d2bd16a63c914c516782df64a3c6c78268ea33e06'
-            '4390d712d64d50e2cd8d0cea3a53317cda4e7a21bd99a346f1bd82d18514b6f5'
-            '73c2780b8efe19f32ea433d2254e0ceeb503f77004812048e3fcef5da363fd31'
-            '272db976e1a219063d87b8ef21537fbe8959c87acbb34de4cbe5b995bc2eb46a'
-            '43c5a589616a200ded1a2c81b2d4c09919dc96b7ed0df50dea97148f373db147'
-            '1fbc2aecb48912ef1f4563f5eb4a1d3f5fad0767052a763cebe72d631cdf1e77'
-            'e7f591f23724529b6f45182352f0a4274d4c09f0a2686d7f6588857c3d81df08'
-            '313ae6611f91ce7c12366035f0271a1bd1fa787f68a652de95f2fd55a71b4e1f'
-            '7de102a3e66bf6aafeb3c0cd0ae49b344e166b902d4d29fd33366883b11f1d5d'
-            '5e9b7c818bd972c694075a0a01d0f44a9d6d6aaf9e3b36174702b8839f30b76b'
-            'b707bf9d69cf866dd776e5c07235161186747607dc24264320784e1222272fcc'
-            '04811ea7c29e15a9d5c63c6f483804ec2538e8e826c3c06019b78a98435b56b2'
-            'ce7dc86c30f160e6d565c579a84e0b0f799b1afa751ebe0748a0e80f8408cb7f'
-            '55959f673e409ea952661cbddfb8b046bec7cda3d8b05686bed82ace4246e273')
+            '2bcfcdfe0fabdb7e7600eb6e1b85d9cda8f86af558a8c09658bc1867cc273ca0'
+            'a053880e1bd15d1eb4ee8fb27a2f1345af88235fb7cf1515461c3525f0be4daf'
+            '779093bfe4fafebf278d39de4f4f3f9b7dc6dd6871c3e86de7af51639290fe69'
+            '4e694cc40009b1a0cb62aa03b6d3d2b692ddca156e776c52f9babdc6e0cb2c32'
+            '3953be3b3cb029f47994779824c7b7875aa7b5c1c21156dbf76bccce68244d28'
+            'b359923aae5cddb7f52d9fc803ed2945a5644d0ae637728a401899ccc09c73af'
+            'ed14103ac853bd72e203ce93c13586dc40bb4d1194e390e5cc631afa29eb920f'
+            '76d49fe063b197b68f9a5c3e09047e4aad581639682c985762341d16e08c95bb'
+            'cbd5f1777ecb380fe6444eb3eb04b8abdc5988c3f97ae1f58da422d214448bd1'
+            '40e287b41d3e09b7fa09804ce1feca87eea1b0a4d662cfb5d7e938c6a43bf155'
+            '818f0a500a37ff2b5a1fe0502ce2321468482423714f4ca4d9ee02a1c8a85120'
+            '7de9a5e4adf4afa4d4a4ba6a90c58df810748d97631e8ee2d7051cb64d312069'
+            'a29667637bbd0949200d6dbb18f8b9b75e55164c6e8dd049296f7dcbe4910a21'
+            '167921dd76e072857413538fbdbd56b4fab19cb53c739a70fe8aa613ca8c5651'
+            '9177a5c59465953777faca9f0651106f0b6e98e6f825e276f81f2dd9e4ce5426'
+            'b5eeae582ddba1b96c600f1cb2b73083cf8ae619af7ade2b45dfc17214497b5e'
+            '80b2cc652b087ac950a398b554842ce66d1b0703d890d52bfffb2af0ea6ab1a7'
+            'bfca3b0894ce1b6764217905835db50b9251ad19084c7f89967f37bfb1366cf4')

 prepare () {
  cd $_pkgfqn
--- a/qt6-base/mingw-w64-static/0018-Fix-crashes-in-rasterization-code-using-setjmp.patch
+++ b/qt6-base/mingw-w64-static/0018-Fix-crashes-in-rasterization-code-using-setjmp.patch
@ -0,0 +1 @@
+../mingw-w64/0018-Fix-crashes-in-rasterization-code-using-setjmp.patch
--- a/qt6-base/mingw-w64-static/PKGBUILD
+++ b/qt6-base/mingw-w64-static/PKGBUILD
@ -13,7 +13,7 @@
 pkgname=mingw-w64-qt6-base-static
 _qtver=6.7.0
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=(any)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
@ -47,33 +47,29 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
        '0014-Fix-setting-exception-flags-of-plugin-targets.patch'
        '0015-Link-corelib-correctly-against-runtimeobject-when-co.patch'
        '0016-Workaround-linker-error-about-missing-symbol-__sync_.patch'
-        '0017-Fix-wrong-cpp-conditional-in-qspan.h.patch')
+        '0017-Fix-wrong-cpp-conditional-in-qspan.h.patch'
+        '0018-Fix-crashes-in-rasterization-code-using-setjmp.patch')
 sha256sums=('11b2e29e2e52fb0e3b453ea13bbe51a10fdff36e1c192d8868c5a40233b8b254'
-            'e25f83ddf9e3f9eefcb833751cff8957f32cb2f13f5a1f033679b45d2c9e544e'
-            'ae4a20f41df34eefc960ed5cb2cf54afb421573f08545d5492882edd18e00a3c'
-            '5d329d722365c07a28b85a9d1ba9c6c53ad19124662aa1825cdd78ece82c47f3'
-            '86dd06b2a1bd7b050763346d2bd16a63c914c516782df64a3c6c78268ea33e06'
-            '4390d712d64d50e2cd8d0cea3a53317cda4e7a21bd99a346f1bd82d18514b6f5'
-            '73c2780b8efe19f32ea433d2254e0ceeb503f77004812048e3fcef5da363fd31'
-            '272db976e1a219063d87b8ef21537fbe8959c87acbb34de4cbe5b995bc2eb46a'
-            '43c5a589616a200ded1a2c81b2d4c09919dc96b7ed0df50dea97148f373db147'
-            '1fbc2aecb48912ef1f4563f5eb4a1d3f5fad0767052a763cebe72d631cdf1e77'
-            'e7f591f23724529b6f45182352f0a4274d4c09f0a2686d7f6588857c3d81df08'
-            '313ae6611f91ce7c12366035f0271a1bd1fa787f68a652de95f2fd55a71b4e1f'
-            '7de102a3e66bf6aafeb3c0cd0ae49b344e166b902d4d29fd33366883b11f1d5d'
-            '5e9b7c818bd972c694075a0a01d0f44a9d6d6aaf9e3b36174702b8839f30b76b'
-            'b707bf9d69cf866dd776e5c07235161186747607dc24264320784e1222272fcc'
-            '04811ea7c29e15a9d5c63c6f483804ec2538e8e826c3c06019b78a98435b56b2'
-            'ce7dc86c30f160e6d565c579a84e0b0f799b1afa751ebe0748a0e80f8408cb7f'
-            '55959f673e409ea952661cbddfb8b046bec7cda3d8b05686bed82ace4246e273')
+            '2bcfcdfe0fabdb7e7600eb6e1b85d9cda8f86af558a8c09658bc1867cc273ca0'
+            'a053880e1bd15d1eb4ee8fb27a2f1345af88235fb7cf1515461c3525f0be4daf'
+            '779093bfe4fafebf278d39de4f4f3f9b7dc6dd6871c3e86de7af51639290fe69'
+            '4e694cc40009b1a0cb62aa03b6d3d2b692ddca156e776c52f9babdc6e0cb2c32'
+            '3953be3b3cb029f47994779824c7b7875aa7b5c1c21156dbf76bccce68244d28'
+            'b359923aae5cddb7f52d9fc803ed2945a5644d0ae637728a401899ccc09c73af'
+            'ed14103ac853bd72e203ce93c13586dc40bb4d1194e390e5cc631afa29eb920f'
+            '76d49fe063b197b68f9a5c3e09047e4aad581639682c985762341d16e08c95bb'
+            'cbd5f1777ecb380fe6444eb3eb04b8abdc5988c3f97ae1f58da422d214448bd1'
+            '40e287b41d3e09b7fa09804ce1feca87eea1b0a4d662cfb5d7e938c6a43bf155'
+            '818f0a500a37ff2b5a1fe0502ce2321468482423714f4ca4d9ee02a1c8a85120'
+            '7de9a5e4adf4afa4d4a4ba6a90c58df810748d97631e8ee2d7051cb64d312069'
+            'a29667637bbd0949200d6dbb18f8b9b75e55164c6e8dd049296f7dcbe4910a21'
+            '167921dd76e072857413538fbdbd56b4fab19cb53c739a70fe8aa613ca8c5651'
+            '9177a5c59465953777faca9f0651106f0b6e98e6f825e276f81f2dd9e4ce5426'
+            'b5eeae582ddba1b96c600f1cb2b73083cf8ae619af7ade2b45dfc17214497b5e'
+            '80b2cc652b087ac950a398b554842ce66d1b0703d890d52bfffb2af0ea6ab1a7'
+            'bfca3b0894ce1b6764217905835db50b9251ad19084c7f89967f37bfb1366cf4')

-# disable i686 build because 32-bit Windows is generally not supported by upstream and
-# 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}
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

 prepare () {
  cd $_pkgfqn
--- a/qt6-base/mingw-w64/0001-Use-CMake-s-default-import-library-suffix.patch
+++ b/qt6-base/mingw-w64/0001-Use-CMake-s-default-import-library-suffix.patch
@ -1,7 +1,7 @@
 From 5ab173c6ee597e09eecf53411ec3726c19a40ce5 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 5 Nov 2020 22:08:10 +0100
-Subject: [PATCH 01/17] Use CMake's default import library suffix
+Subject: [PATCH 01/18] Use CMake's default import library suffix

 Change-Id: I3dbedaec74683e5bfd008f7f2fd1e046dfb921b2
 ---
--- a/qt6-base/mingw-w64/0002-Fix-finding-D-Bus.patch
+++ b/qt6-base/mingw-w64/0002-Fix-finding-D-Bus.patch
@ -1,7 +1,7 @@
 From f6576a2efd85e14323eacb15725f48351e7c6a40 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 7 Oct 2020 12:13:37 +0200
-Subject: [PATCH 02/17] Fix finding D-Bus
+Subject: [PATCH 02/18] Fix finding D-Bus

 Change-Id: Ie21eb9cbc6b1b5d9c8b34eea46f54718e5926986
 ---
--- a/qt6-base/mingw-w64/0003-Fix-using-static-PCRE2-and-DBus-1.patch
+++ b/qt6-base/mingw-w64/0003-Fix-using-static-PCRE2-and-DBus-1.patch
@ -1,7 +1,7 @@
 From 7e76f866f256a65e49dab374c90366f98bcb2415 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 5 Nov 2020 21:13:19 +0100
-Subject: [PATCH 03/17] Fix using static PCRE2 and DBus-1
+Subject: [PATCH 03/18] Fix using static PCRE2 and DBus-1

 When making a static build of Qt we're using the static version of these
 libraries and must define the corresponding macros.
--- a/qt6-base/mingw-w64/0004-Fix-transitive-dependencies-of-static-libraries.patch
+++ b/qt6-base/mingw-w64/0004-Fix-transitive-dependencies-of-static-libraries.patch
@ -1,7 +1,7 @@
 From 1818236acb18356b2fbdd3bca4e7e36f55347c47 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 5 Nov 2020 21:59:33 +0100
-Subject: [PATCH 04/17] Fix transitive dependencies (of static libraries)
+Subject: [PATCH 04/18] Fix transitive dependencies (of static libraries)

 The dependencies of these libraries are not reliably picked up by their
 corresponding find modules. This change allows adding the required
--- a/qt6-base/mingw-w64/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch
+++ b/qt6-base/mingw-w64/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch
@ -1,7 +1,7 @@
 From 4819b1a1a2216cb11ebc847e1aec4f7b2587386b Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Mon, 2 Nov 2020 13:47:45 +0100
-Subject: [PATCH 05/17] Fix libjpeg workaround for conflict with rpcndr.h
+Subject: [PATCH 05/18] Fix libjpeg workaround for conflict with rpcndr.h

 Otherwise it won't compile against mingw-w64-libjpeg-turbo. This version of
 libjpeg seems to take care of the conflict already as long as jconfig.h is
--- a/qt6-base/mingw-w64/0006-Support-finding-static-MariaDB-client-library.patch
+++ b/qt6-base/mingw-w64/0006-Support-finding-static-MariaDB-client-library.patch
@ -1,7 +1,7 @@
 From 31e89a3cc37e127d89a7d004a433be806912e09e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 8 Nov 2020 00:33:12 +0100
-Subject: [PATCH 06/17] Support finding static MariaDB client library
+Subject: [PATCH 06/18] Support finding static MariaDB client library

 We need to reverse the order to look for mariadb first (and only then
 for mysql) because otherwise it would pick up the static library
--- a/qt6-base/mingw-w64/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
+++ b/qt6-base/mingw-w64/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
@ -1,7 +1,7 @@
 From 2ea39a8625fa2a8bd61c91fd479b4299b4181f3f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 8 Nov 2020 00:34:09 +0100
-Subject: [PATCH 07/17] Allow overriding CMAKE_FIND_LIBRARY_SUFFIXES to prefer
+Subject: [PATCH 07/18] Allow overriding CMAKE_FIND_LIBRARY_SUFFIXES to prefer
 static libraries

 Change-Id: Ibb688ac503ecdf1dd3bd838890efdfc01bf706aa
--- a/qt6-base/mingw-w64/0008-Find-fontconfig-via-pkg-config-for-correct-handling-.patch
+++ b/qt6-base/mingw-w64/0008-Find-fontconfig-via-pkg-config-for-correct-handling-.patch
@ -1,7 +1,7 @@
 From 5a4ab8c0fb624472ae7e4ad56c2d74b9cc67d57a Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 24 Apr 2022 23:00:27 +0200
-Subject: [PATCH 08/17] Find fontconfig via pkg-config for correct handling of
+Subject: [PATCH 08/18] Find fontconfig via pkg-config for correct handling of
 its dependencies

 CMake's own find module unforunately does not consider fontconfig's deps so
--- a/qt6-base/mingw-w64/0009-Fix-dependency-of-xcb-image-on-xcb-util.patch
+++ b/qt6-base/mingw-w64/0009-Fix-dependency-of-xcb-image-on-xcb-util.patch
@ -1,7 +1,7 @@
 From 0dbe526b2008f4ceadf5d64f5727c56f186dee20 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 24 Apr 2022 23:49:36 +0200
-Subject: [PATCH 09/17] Fix dependency of xcb-image on xcb-util
+Subject: [PATCH 09/18] Fix dependency of xcb-image on xcb-util

 Considering this linker error, xcb-image apparently depends on xcb-util:
 ```
--- a/qt6-base/mingw-w64/0010-Allow-using-properties-of-PkgConfig-targets-for-glib.patch
+++ b/qt6-base/mingw-w64/0010-Allow-using-properties-of-PkgConfig-targets-for-glib.patch
@ -1,7 +1,7 @@
 From d4755a76385f7168f2571be3e10604579c51e505 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Tue, 26 Apr 2022 20:16:31 +0200
-Subject: [PATCH 10/17] Allow using properties of PkgConfig targets for glib2
+Subject: [PATCH 10/18] Allow using properties of PkgConfig targets for glib2
 to handle deps of static glib2

 Change-Id: I37d20256d17ae9cc0775e32aa479f1e433ece908
--- a/qt6-base/mingw-w64/0011-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch
+++ b/qt6-base/mingw-w64/0011-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch
@ -1,7 +1,7 @@
 From ffc4949b3ef9aba745c39fe137d04ebeb7218e27 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 1 May 2022 23:28:26 +0200
-Subject: [PATCH 11/17] Allow using properties of PkgConfig targets for Wayland
+Subject: [PATCH 11/18] Allow using properties of PkgConfig targets for Wayland
 to handle deps of static libs

 Change-Id: I2a4acf0acaf5a363d551384bb4c33c48a3792f27
--- a/qt6-base/mingw-w64/0012-Allow-overriding-preference-for-shared-libzstd-libra.patch
+++ b/qt6-base/mingw-w64/0012-Allow-overriding-preference-for-shared-libzstd-libra.patch
@ -1,7 +1,7 @@
 From 76d4c957cc1bc010b95a1fd755edd8d5a9b0b5ca Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Tue, 7 Nov 2023 23:58:54 +0100
-Subject: [PATCH 12/17] Allow overriding preference for shared libzstd library
+Subject: [PATCH 12/18] Allow overriding preference for shared libzstd library

 As of 3f45905953d57e0174059d7d9d6bc75c3c1c406c Qt prefers the shared zstd
 library. This breaks static builds. With this change the static library is
--- a/qt6-base/mingw-w64/0013-Fix-errors-due-to-disabled-exceptions-with-cpp_winrt.patch
+++ b/qt6-base/mingw-w64/0013-Fix-errors-due-to-disabled-exceptions-with-cpp_winrt.patch
@ -1,7 +1,7 @@
 From 4c0319dc229bec434f0ac6df9eff6826d3d06f91 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 17 Feb 2024 20:31:12 +0100
-Subject: [PATCH 13/17] Fix errors due to disabled exceptions with cpp_winrt
+Subject: [PATCH 13/18] Fix errors due to disabled exceptions with cpp_winrt
 support

 The winrt headers use exceptions so code using them must be compiled
--- a/qt6-base/mingw-w64/0014-Fix-setting-exception-flags-of-plugin-targets.patch
+++ b/qt6-base/mingw-w64/0014-Fix-setting-exception-flags-of-plugin-targets.patch
@ -1,7 +1,7 @@
 From 5c025309750ea1093f46b2227d76348de5c0d4aa Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 17 Feb 2024 20:48:21 +0100
-Subject: [PATCH 14/17] Fix setting exception flags of plugin targets
+Subject: [PATCH 14/18] Fix setting exception flags of plugin targets

 Change-Id: I93b1b5fa55f3e35e13351d9c981409f1593bf8a8
 ---
--- a/qt6-base/mingw-w64/0015-Link-corelib-correctly-against-runtimeobject-when-co.patch
+++ b/qt6-base/mingw-w64/0015-Link-corelib-correctly-against-runtimeobject-when-co.patch
@ -1,7 +1,7 @@
 From 7ac1996bcf302e058b3537c1fa09b443523fe4e3 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 17 Feb 2024 21:39:39 +0100
-Subject: [PATCH 15/17] Link corelib correctly against runtimeobject when
+Subject: [PATCH 15/18] Link corelib correctly against runtimeobject when
 compiling for Windows

 This library is included by mingw-w64 and also needs to be linked against
--- a/qt6-base/mingw-w64/0016-Workaround-linker-error-about-missing-symbol-__sync_.patch
+++ b/qt6-base/mingw-w64/0016-Workaround-linker-error-about-missing-symbol-__sync_.patch
@ -1,7 +1,7 @@
 From 3176558331d11327354603618f6bb6a26705c50c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 17 Feb 2024 23:11:18 +0100
-Subject: [PATCH 16/17] Workaround linker error about missing symbol
+Subject: [PATCH 16/18] Workaround linker error about missing symbol
 `__sync_bool_compare_and_swap_16`

 This error only happens when compiling for the x86_64-w64-mingw32 target
--- a/qt6-base/mingw-w64/0017-Fix-wrong-cpp-conditional-in-qspan.h.patch
+++ b/qt6-base/mingw-w64/0017-Fix-wrong-cpp-conditional-in-qspan.h.patch
@ -1,7 +1,7 @@
 From 97da3cf6be021886a367ce894425f842059fbdcf Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Tue, 2 Apr 2024 23:29:07 +0200
-Subject: [PATCH 17/17] Fix wrong cpp conditional in qspan.h
+Subject: [PATCH 17/18] Fix wrong cpp conditional in qspan.h

 Picked from https://gitlab.archlinux.org/archlinux/packaging/packages/qt6-base/-/blob/main/fix-wrong-cpp-if.patch

--- a/qt6-base/mingw-w64/0018-Fix-crashes-in-rasterization-code-using-setjmp.patch
+++ b/qt6-base/mingw-w64/0018-Fix-crashes-in-rasterization-code-using-setjmp.patch
@ -0,0 +1,252 @@
+From b27cb80b88f9da8fc5b964ba6c40e6ad816bdc23 Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Sat, 26 Jun 2021 22:24:12 +0200
+Subject: [PATCH 18/18] Fix crashes in rasterization code using setjmp
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* Use C++ exceptions instead of setjmp to workaround crashes
+* The setjmp/longjmp code crashes when compiling for x86_64-w64-mingw32
+  with GCC 11 and optimizations enabled¹. It crashes when jumping back
+  to handle the case of insufficient memory. This change uses C++
+  exceptions instead (turning the compile unit into a C++ unit instead
+  of just using C) which should behave identical but don't seem to
+  crash.
+* Fix rendering certain SVGs and possibly other graphics
+
+Change-Id: I01937d13569dd01ab4cb1f608020544c93bc343c
+
+---
+
+¹ See https://bugreports.qt.io/browse/QTBUG-94692 for details.
+---
+ src/gui/CMakeLists.txt                        |  7 +++-
+ .../{qgrayraster.c => qgrayraster.cpp}        | 41 ++++++++-----------
+ src/gui/painting/qt_attribution.json          |  2 +-
+ 3 files changed, 24 insertions(+), 26 deletions(-)
+ rename src/gui/painting/{qgrayraster.c => qgrayraster.cpp} (98%)
+
+diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
+index b0cbee37bbb..8a161584843 100644
+--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
+@@ -175,7 +175,7 @@ qt_internal_add_module(Gui
+         painting/qdrawingprimitive_sse2_p.h
+         painting/qemulationpaintengine.cpp painting/qemulationpaintengine_p.h
+         painting/qfixed_p.h
+-        painting/qgrayraster.c painting/qgrayraster_p.h
+        painting/qgrayraster.cpp painting/qgrayraster_p.h
+         painting/qicc.cpp painting/qicc_p.h
+         painting/qimagescale.cpp painting/qimagescale_p.h
+         painting/qmath_p.h
+@@ -285,6 +285,11 @@ qt_internal_add_module(Gui
+         "(^|/)qrhi\\.h$|(^|/)qrhi_platform\\.h$|(^|/)qshader\\.h$|(^|/)qshaderdescription\\.h$"
+ )
+ 
+# enable exceptions for painting/qgrayraster.cpp
+set_source_files_properties("painting/qgrayraster.cpp"
+    PROPERTIES COMPILE_FLAGS "-fexceptions" DISABLE_PRECOMPILE_HEADERS ON SKIP_PRECOMPILE_HEADERS ON
+)
+
+ # Resources:
+ if(QT_FEATURE_pdf)
+     set_source_files_properties("../3rdparty/icc/sRGB2014.icc"
+diff --git a/src/gui/painting/qgrayraster.c b/src/gui/painting/qgrayraster.cpp
+similarity index 98%
+rename from src/gui/painting/qgrayraster.c
+rename to src/gui/painting/qgrayraster.cpp
+index 3c222c49e16..813cfc08dcf 100644
+--- a/src/gui/painting/qgrayraster.c
+++ b/src/gui/painting/qgrayraster.cpp
+@@ -3,7 +3,7 @@
+ 
+ /***************************************************************************/
+ /*                                                                         */
+-/*  qgrayraster.c, derived from ftgrays.c                                  */
+/*  qgrayraster.cpp, derived from ftgrays.c                                */
+ /*                                                                         */
+ /*    A new `perfect' anti-aliasing renderer (body).                       */
+ /*                                                                         */
+@@ -121,17 +121,12 @@
+ #  include <vxWorksCommon.h>    /* needed for setjmp.h */
+ #endif
+ #include <string.h>             /* for qt_ft_memcpy() */
+-#include <setjmp.h>
+ #include <limits.h>
+ 
+ #define QT_FT_UINT_MAX  UINT_MAX
+ 
+ #define qt_ft_memset   memset
+ 
+-#define qt_ft_setjmp   setjmp
+-#define qt_ft_longjmp  longjmp
+-#define qt_ft_jmp_buf  jmp_buf
+-
+ #include <stddef.h>
+ typedef ptrdiff_t  QT_FT_PtrDist;
+ 
+@@ -141,6 +136,8 @@ typedef ptrdiff_t  QT_FT_PtrDist;
+ #define ErrRaster_Memory_Overflow   -4
+ #define ErrRaster_OutOfMemory       -6
+ 
+struct RasterMemoryOverflow {};
+
+ #define QT_FT_BEGIN_HEADER
+ #define QT_FT_END_HEADER
+ 
+@@ -274,8 +271,6 @@ QT_FT_END_STMNT
+     int  band_size;
+     int  band_shoot;
+ 
+-    qt_ft_jmp_buf  jump_buffer;
+-
+     void*       buffer;
+     long        buffer_size;
+ 
+@@ -297,12 +292,14 @@ QT_FT_END_STMNT
+ 
+   } TRaster, *PRaster;
+ 
+  extern "C" {
+   int q_gray_rendered_spans(TRaster *raster)
+   {
+     if ( raster && raster->worker )
+       return raster->worker->skip_spans > 0 ? 0 : -raster->worker->skip_spans;
+     return 0;
+   }
+  }
+ 
+   /*************************************************************************/
+   /*                                                                       */
+@@ -368,7 +365,6 @@ QT_FT_END_STMNT
+     ras.max_ey = ( ras.max_ey + 63 ) >> 6;
+   }
+ 
+-
+   /*************************************************************************/
+   /*                                                                       */
+   /* Record the current cell in the table.                                 */
+@@ -397,7 +393,7 @@ QT_FT_END_STMNT
+     }
+ 
+     if ( ras.num_cells >= ras.max_cells )
+-      qt_ft_longjmp( ras.jump_buffer, 1 );
+      throw RasterMemoryOverflow();
+ 
+     cell        = ras.cells + ras.num_cells++;
+     cell->x     = x;
+@@ -1470,7 +1466,7 @@ QT_FT_END_STMNT
+ 
+       QT_FT_TRACE5(( "  move to (%.2f, %.2f)\n",
+                      v_start.x / 64.0, v_start.y / 64.0 ));
+-      error = gray_move_to( &v_start, user );
+      error = gray_move_to( &v_start, static_cast<PWorker>(user) );
+       if ( error )
+         goto Exit;
+ 
+@@ -1492,7 +1488,7 @@ QT_FT_END_STMNT
+ 
+             QT_FT_TRACE5(( "  line to (%.2f, %.2f)\n",
+                            vec.x / 64.0, vec.y / 64.0 ));
+-            gray_render_line(user, UPSCALE(vec.x), UPSCALE(vec.y));
+            gray_render_line(static_cast<PWorker>(user), UPSCALE(vec.x), UPSCALE(vec.y));
+             continue;
+           }
+ 
+@@ -1521,7 +1517,7 @@ QT_FT_END_STMNT
+                                " with control (%.2f, %.2f)\n",
+                                vec.x / 64.0, vec.y / 64.0,
+                                v_control.x / 64.0, v_control.y / 64.0 ));
+-                gray_render_conic(user, &v_control, &vec);
+                gray_render_conic(static_cast<PWorker>(user), &v_control, &vec);
+                 continue;
+               }
+ 
+@@ -1535,7 +1531,7 @@ QT_FT_END_STMNT
+                              " with control (%.2f, %.2f)\n",
+                              v_middle.x / 64.0, v_middle.y / 64.0,
+                              v_control.x / 64.0, v_control.y / 64.0 ));
+-              gray_render_conic(user, &v_control, &v_middle);
+              gray_render_conic(static_cast<PWorker>(user), &v_control, &v_middle);
+ 
+               v_control = vec;
+               goto Do_Conic;
+@@ -1545,7 +1541,7 @@ QT_FT_END_STMNT
+                            " with control (%.2f, %.2f)\n",
+                            v_start.x / 64.0, v_start.y / 64.0,
+                            v_control.x / 64.0, v_control.y / 64.0 ));
+-            gray_render_conic(user, &v_control, &v_start);
+            gray_render_conic(static_cast<PWorker>(user), &v_control, &v_start);
+             goto Close;
+           }
+ 
+@@ -1580,7 +1576,7 @@ QT_FT_END_STMNT
+                              vec.x / 64.0, vec.y / 64.0,
+                              vec1.x / 64.0, vec1.y / 64.0,
+                              vec2.x / 64.0, vec2.y / 64.0 ));
+-              gray_render_cubic(user, &vec1, &vec2, &vec);
+              gray_render_cubic(static_cast<PWorker>(user), &vec1, &vec2, &vec);
+               continue;
+             }
+ 
+@@ -1589,7 +1585,7 @@ QT_FT_END_STMNT
+                            v_start.x / 64.0, v_start.y / 64.0,
+                            vec1.x / 64.0, vec1.y / 64.0,
+                            vec2.x / 64.0, vec2.y / 64.0 ));
+-            gray_render_cubic(user, &vec1, &vec2, &v_start);
+            gray_render_cubic(static_cast<PWorker>(user), &vec1, &vec2, &v_start);
+             goto Close;
+           }
+         }
+@@ -1598,7 +1594,7 @@ QT_FT_END_STMNT
+       /* close the contour with a line segment */
+       QT_FT_TRACE5(( "  line to (%.2f, %.2f)\n",
+                      v_start.x / 64.0, v_start.y / 64.0 ));
+-      gray_render_line(user, UPSCALE(v_start.x), UPSCALE(v_start.y));
+      gray_render_line(static_cast<PWorker>(user), UPSCALE(v_start.x), UPSCALE(v_start.y));
+ 
+    Close:
+       first = last + 1;
+@@ -1626,14 +1622,11 @@ QT_FT_END_STMNT
+   {
+     volatile int  error = 0;
+ 
+-    if ( qt_ft_setjmp( ras.jump_buffer ) == 0 )
+-    {
+    try {
+       error = QT_FT_Outline_Decompose( &ras.outline, &ras );
+       if ( !ras.invalid )
+         gray_record_cell( RAS_VAR );
+-    }
+-    else
+-    {
+    } catch (const RasterMemoryOverflow &) {
+       error = ErrRaster_Memory_Overflow;
+     }
+ 
+@@ -1898,7 +1891,7 @@ QT_FT_END_STMNT
+   static int
+   gray_raster_new( QT_FT_Raster*  araster )
+   {
+-    *araster = malloc(sizeof(TRaster));
+    *araster = static_cast<TRaster *>(malloc(sizeof(TRaster)));
+     if (!*araster) {
+         *araster = 0;
+         return ErrRaster_Memory_Overflow;
+diff --git a/src/gui/painting/qt_attribution.json b/src/gui/painting/qt_attribution.json
+index 33ed2fd5c7b..658547ce4a8 100644
+--- a/src/gui/painting/qt_attribution.json
+++ b/src/gui/painting/qt_attribution.json
+@@ -4,7 +4,7 @@
+         "Name": "Anti-aliasing rasterizer from FreeType 2",
+         "QDocModule": "qtgui",
+         "QtUsage": "Used in Qt GUI.",
+-        "Files": "qgrayraster.c",
+        "Files": "qgrayraster.cpp",
+ 
+         "Description": "FreeType is a freely available software library to render fonts.",
+         "Homepage": "http://www.freetype.org",
+-- 
+2.44.0
+
--- a/qt6-base/mingw-w64/PKGBUILD
+++ b/qt6-base/mingw-w64/PKGBUILD
@ -13,7 +13,7 @@
 pkgname=mingw-w64-qt6-base
 _qtver=6.7.0
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=(any)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
@ -47,33 +47,29 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
        '0014-Fix-setting-exception-flags-of-plugin-targets.patch'
        '0015-Link-corelib-correctly-against-runtimeobject-when-co.patch'
        '0016-Workaround-linker-error-about-missing-symbol-__sync_.patch'
-        '0017-Fix-wrong-cpp-conditional-in-qspan.h.patch')
+        '0017-Fix-wrong-cpp-conditional-in-qspan.h.patch'
+        '0018-Fix-crashes-in-rasterization-code-using-setjmp.patch')
 sha256sums=('11b2e29e2e52fb0e3b453ea13bbe51a10fdff36e1c192d8868c5a40233b8b254'
-            'e25f83ddf9e3f9eefcb833751cff8957f32cb2f13f5a1f033679b45d2c9e544e'
-            'ae4a20f41df34eefc960ed5cb2cf54afb421573f08545d5492882edd18e00a3c'
-            '5d329d722365c07a28b85a9d1ba9c6c53ad19124662aa1825cdd78ece82c47f3'
-            '86dd06b2a1bd7b050763346d2bd16a63c914c516782df64a3c6c78268ea33e06'
-            '4390d712d64d50e2cd8d0cea3a53317cda4e7a21bd99a346f1bd82d18514b6f5'
-            '73c2780b8efe19f32ea433d2254e0ceeb503f77004812048e3fcef5da363fd31'
-            '272db976e1a219063d87b8ef21537fbe8959c87acbb34de4cbe5b995bc2eb46a'
-            '43c5a589616a200ded1a2c81b2d4c09919dc96b7ed0df50dea97148f373db147'
-            '1fbc2aecb48912ef1f4563f5eb4a1d3f5fad0767052a763cebe72d631cdf1e77'
-            'e7f591f23724529b6f45182352f0a4274d4c09f0a2686d7f6588857c3d81df08'
-            '313ae6611f91ce7c12366035f0271a1bd1fa787f68a652de95f2fd55a71b4e1f'
-            '7de102a3e66bf6aafeb3c0cd0ae49b344e166b902d4d29fd33366883b11f1d5d'
-            '5e9b7c818bd972c694075a0a01d0f44a9d6d6aaf9e3b36174702b8839f30b76b'
-            'b707bf9d69cf866dd776e5c07235161186747607dc24264320784e1222272fcc'
-            '04811ea7c29e15a9d5c63c6f483804ec2538e8e826c3c06019b78a98435b56b2'
-            'ce7dc86c30f160e6d565c579a84e0b0f799b1afa751ebe0748a0e80f8408cb7f'
-            '55959f673e409ea952661cbddfb8b046bec7cda3d8b05686bed82ace4246e273')
+            '2bcfcdfe0fabdb7e7600eb6e1b85d9cda8f86af558a8c09658bc1867cc273ca0'
+            'a053880e1bd15d1eb4ee8fb27a2f1345af88235fb7cf1515461c3525f0be4daf'
+            '779093bfe4fafebf278d39de4f4f3f9b7dc6dd6871c3e86de7af51639290fe69'
+            '4e694cc40009b1a0cb62aa03b6d3d2b692ddca156e776c52f9babdc6e0cb2c32'
+            '3953be3b3cb029f47994779824c7b7875aa7b5c1c21156dbf76bccce68244d28'
+            'b359923aae5cddb7f52d9fc803ed2945a5644d0ae637728a401899ccc09c73af'
+            'ed14103ac853bd72e203ce93c13586dc40bb4d1194e390e5cc631afa29eb920f'
+            '76d49fe063b197b68f9a5c3e09047e4aad581639682c985762341d16e08c95bb'
+            'cbd5f1777ecb380fe6444eb3eb04b8abdc5988c3f97ae1f58da422d214448bd1'
+            '40e287b41d3e09b7fa09804ce1feca87eea1b0a4d662cfb5d7e938c6a43bf155'
+            '818f0a500a37ff2b5a1fe0502ce2321468482423714f4ca4d9ee02a1c8a85120'
+            '7de9a5e4adf4afa4d4a4ba6a90c58df810748d97631e8ee2d7051cb64d312069'
+            'a29667637bbd0949200d6dbb18f8b9b75e55164c6e8dd049296f7dcbe4910a21'
+            '167921dd76e072857413538fbdbd56b4fab19cb53c739a70fe8aa613ca8c5651'
+            '9177a5c59465953777faca9f0651106f0b6e98e6f825e276f81f2dd9e4ce5426'
+            'b5eeae582ddba1b96c600f1cb2b73083cf8ae619af7ade2b45dfc17214497b5e'
+            '80b2cc652b087ac950a398b554842ce66d1b0703d890d52bfffb2af0ea6ab1a7'
+            'bfca3b0894ce1b6764217905835db50b9251ad19084c7f89967f37bfb1366cf4')

-# disable i686 build because 32-bit Windows is generally not supported by upstream and
-# 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}
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

 prepare () {
  cd $_pkgfqn
--- a/qt6-base/static-compat/0018-Fix-crashes-in-rasterization-code-using-setjmp.patch
+++ b/qt6-base/static-compat/0018-Fix-crashes-in-rasterization-code-using-setjmp.patch
@ -0,0 +1 @@
+../mingw-w64/0018-Fix-crashes-in-rasterization-code-using-setjmp.patch
--- a/qt6-base/static-compat/PKGBUILD
+++ b/qt6-base/static-compat/PKGBUILD
@ -46,25 +46,27 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
        '0014-Fix-setting-exception-flags-of-plugin-targets.patch'
        '0015-Link-corelib-correctly-against-runtimeobject-when-co.patch'
        '0016-Workaround-linker-error-about-missing-symbol-__sync_.patch'
-        '0017-Fix-wrong-cpp-conditional-in-qspan.h.patch')
+        '0017-Fix-wrong-cpp-conditional-in-qspan.h.patch'
+        '0018-Fix-crashes-in-rasterization-code-using-setjmp.patch')
 sha256sums=('11b2e29e2e52fb0e3b453ea13bbe51a10fdff36e1c192d8868c5a40233b8b254'
-            'e25f83ddf9e3f9eefcb833751cff8957f32cb2f13f5a1f033679b45d2c9e544e'
-            'ae4a20f41df34eefc960ed5cb2cf54afb421573f08545d5492882edd18e00a3c'
-            '5d329d722365c07a28b85a9d1ba9c6c53ad19124662aa1825cdd78ece82c47f3'
-            '86dd06b2a1bd7b050763346d2bd16a63c914c516782df64a3c6c78268ea33e06'
-            '4390d712d64d50e2cd8d0cea3a53317cda4e7a21bd99a346f1bd82d18514b6f5'
-            '73c2780b8efe19f32ea433d2254e0ceeb503f77004812048e3fcef5da363fd31'
-            '272db976e1a219063d87b8ef21537fbe8959c87acbb34de4cbe5b995bc2eb46a'
-            '43c5a589616a200ded1a2c81b2d4c09919dc96b7ed0df50dea97148f373db147'
-            '1fbc2aecb48912ef1f4563f5eb4a1d3f5fad0767052a763cebe72d631cdf1e77'
-            'e7f591f23724529b6f45182352f0a4274d4c09f0a2686d7f6588857c3d81df08'
-            '313ae6611f91ce7c12366035f0271a1bd1fa787f68a652de95f2fd55a71b4e1f'
-            '7de102a3e66bf6aafeb3c0cd0ae49b344e166b902d4d29fd33366883b11f1d5d'
-            '5e9b7c818bd972c694075a0a01d0f44a9d6d6aaf9e3b36174702b8839f30b76b'
-            'b707bf9d69cf866dd776e5c07235161186747607dc24264320784e1222272fcc'
-            '04811ea7c29e15a9d5c63c6f483804ec2538e8e826c3c06019b78a98435b56b2'
-            'ce7dc86c30f160e6d565c579a84e0b0f799b1afa751ebe0748a0e80f8408cb7f'
-            '55959f673e409ea952661cbddfb8b046bec7cda3d8b05686bed82ace4246e273')
+            '2bcfcdfe0fabdb7e7600eb6e1b85d9cda8f86af558a8c09658bc1867cc273ca0'
+            'a053880e1bd15d1eb4ee8fb27a2f1345af88235fb7cf1515461c3525f0be4daf'
+            '779093bfe4fafebf278d39de4f4f3f9b7dc6dd6871c3e86de7af51639290fe69'
+            '4e694cc40009b1a0cb62aa03b6d3d2b692ddca156e776c52f9babdc6e0cb2c32'
+            '3953be3b3cb029f47994779824c7b7875aa7b5c1c21156dbf76bccce68244d28'
+            'b359923aae5cddb7f52d9fc803ed2945a5644d0ae637728a401899ccc09c73af'
+            'ed14103ac853bd72e203ce93c13586dc40bb4d1194e390e5cc631afa29eb920f'
+            '76d49fe063b197b68f9a5c3e09047e4aad581639682c985762341d16e08c95bb'
+            'cbd5f1777ecb380fe6444eb3eb04b8abdc5988c3f97ae1f58da422d214448bd1'
+            '40e287b41d3e09b7fa09804ce1feca87eea1b0a4d662cfb5d7e938c6a43bf155'
+            '818f0a500a37ff2b5a1fe0502ce2321468482423714f4ca4d9ee02a1c8a85120'
+            '7de9a5e4adf4afa4d4a4ba6a90c58df810748d97631e8ee2d7051cb64d312069'
+            'a29667637bbd0949200d6dbb18f8b9b75e55164c6e8dd049296f7dcbe4910a21'
+            '167921dd76e072857413538fbdbd56b4fab19cb53c739a70fe8aa613ca8c5651'
+            '9177a5c59465953777faca9f0651106f0b6e98e6f825e276f81f2dd9e4ce5426'
+            'b5eeae582ddba1b96c600f1cb2b73083cf8ae619af7ade2b45dfc17214497b5e'
+            '80b2cc652b087ac950a398b554842ce66d1b0703d890d52bfffb2af0ea6ab1a7'
+            'bfca3b0894ce1b6764217905835db50b9251ad19084c7f89967f37bfb1366cf4')

 prepare () {
  cd $_pkgfqn
--- a/qt6-charts/mingw-w64-static/PKGBUILD
+++ b/qt6-charts/mingw-w64-static/PKGBUILD
@ -19,7 +19,7 @@ _pkgfqn="qtcharts-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
 sha256sums=('899d5498c91bfb01fde2ff2438c82adf4d4d9b3cf646e7ad7b0036dbf32b7ca4')

-_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

 build() {
  for _arch in ${_architectures}; do
--- a/qt6-charts/mingw-w64/PKGBUILD
+++ b/qt6-charts/mingw-w64/PKGBUILD
@ -19,7 +19,7 @@ _pkgfqn="qtcharts-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
 sha256sums=('899d5498c91bfb01fde2ff2438c82adf4d4d9b3cf646e7ad7b0036dbf32b7ca4')

-_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

 build() {
  for _arch in ${_architectures}; do
--- a/qt6-connectivity/mingw-w64-static/PKGBUILD
+++ b/qt6-connectivity/mingw-w64-static/PKGBUILD
@ -20,7 +20,7 @@ _pkgfqn="qtconnectivity-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
 sha256sums=('07afd6aac19ff73c8ba1471057f43d4ef2737d6a8a772393ec907988dd71244c')

-_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

 build() {
  for _arch in ${_architectures}; do
--- a/qt6-connectivity/mingw-w64/PKGBUILD
+++ b/qt6-connectivity/mingw-w64/PKGBUILD
@ -20,7 +20,7 @@ _pkgfqn="qtconnectivity-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
 sha256sums=('07afd6aac19ff73c8ba1471057f43d4ef2737d6a8a772393ec907988dd71244c')

-_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

 build() {
  for _arch in ${_architectures}; do
--- a/qt6-datavis3d/mingw-w64-static/PKGBUILD
+++ b/qt6-datavis3d/mingw-w64-static/PKGBUILD
@ -20,7 +20,7 @@ _pkgfqn="qtdatavis3d-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
 sha256sums=('5a93248d1893790c5630fcbf7ba8394b7eb62411e4a80aa54d7ba8bd40091ba9')

-_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

 build() {
  for _arch in ${_architectures}; do
--- a/qt6-datavis3d/mingw-w64/PKGBUILD
+++ b/qt6-datavis3d/mingw-w64/PKGBUILD
@ -20,7 +20,7 @@ _pkgfqn="qtdatavis3d-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
 sha256sums=('5a93248d1893790c5630fcbf7ba8394b7eb62411e4a80aa54d7ba8bd40091ba9')

-_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

 build() {
  for _arch in ${_architectures}; do
--- a/qt6-declarative/mingw-w64-static/PKGBUILD
+++ b/qt6-declarative/mingw-w64-static/PKGBUILD
@ -25,7 +25,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
 sha256sums=('5a0c39579a74d7cca581162c866ed0887287d4f8d5abff7ab9492d4a58fa9e2c'
            'b7bac9eb7e662598125640ec9cf3d9cdb7f5d08f02ee49bf8a12fe82941677ce')

-_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

 prepare () {
  cd $_pkgfqn
--- a/qt6-declarative/mingw-w64/PKGBUILD
+++ b/qt6-declarative/mingw-w64/PKGBUILD
@ -25,7 +25,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
 sha256sums=('5a0c39579a74d7cca581162c866ed0887287d4f8d5abff7ab9492d4a58fa9e2c'
            'b7bac9eb7e662598125640ec9cf3d9cdb7f5d08f02ee49bf8a12fe82941677ce')

-_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

 prepare () {
  cd $_pkgfqn
--- a/qt6-grpc/mingw-w64-static/PKGBUILD
+++ b/qt6-grpc/mingw-w64-static/PKGBUILD
@ -19,7 +19,7 @@ _pkgfqn="qtgrpc-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
 sha256sums=('qtgrpc-sha256.txt missing')

-_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

 build() {
  for _arch in ${_architectures}; do
--- a/qt6-grpc/mingw-w64/PKGBUILD
+++ b/qt6-grpc/mingw-w64/PKGBUILD
@ -19,7 +19,7 @@ _pkgfqn="qtgrpc-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
 sha256sums=('qtgrpc-sha256.txt missing')

-_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

 build() {
  for _arch in ${_architectures}; do
--- a/qt6-httpserver/mingw-w64-static/PKGBUILD
+++ b/qt6-httpserver/mingw-w64-static/PKGBUILD
@ -20,7 +20,7 @@ _pkgfqn="qthttpserver-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
 sha256sums=('qthttpserver-sha256.txt missing')

-_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

 build() {
  for _arch in ${_architectures}; do
--- a/qt6-httpserver/mingw-w64/PKGBUILD
+++ b/qt6-httpserver/mingw-w64/PKGBUILD
@ -20,7 +20,7 @@ _pkgfqn="qthttpserver-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
 sha256sums=('qthttpserver-sha256.txt missing')

-_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

 build() {
  for _arch in ${_architectures}; do
--- a/qt6-imageformats/mingw-w64-static/PKGBUILD
+++ b/qt6-imageformats/mingw-w64-static/PKGBUILD
@ -22,7 +22,7 @@ _pkgfqn="qtimageformats-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
 sha256sums=('516ce07ec8dd5a11c59816fe33ddb71d4f691d0ebbc1798ac338f23b86c029a7')

-_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

 build() {
  for _arch in ${_architectures}; do
--- a/qt6-imageformats/mingw-w64/PKGBUILD
+++ b/qt6-imageformats/mingw-w64/PKGBUILD
@ -22,7 +22,7 @@ _pkgfqn="qtimageformats-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
 sha256sums=('516ce07ec8dd5a11c59816fe33ddb71d4f691d0ebbc1798ac338f23b86c029a7')

-_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

 build() {
  for _arch in ${_architectures}; do
--- a/qt6-location/mingw-w64-static/PKGBUILD
+++ b/qt6-location/mingw-w64-static/PKGBUILD
@ -19,7 +19,7 @@ _pkgfqn="qtlocation-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
 sha256sums=('bb044d66bc17db98f526ec1b52d8e94810e046310f288561380774e5903ad46a')

-_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

 build() {
  for _arch in ${_architectures}; do
--- a/qt6-location/mingw-w64/PKGBUILD
+++ b/qt6-location/mingw-w64/PKGBUILD
@ -19,7 +19,7 @@ _pkgfqn="qtlocation-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
 sha256sums=('bb044d66bc17db98f526ec1b52d8e94810e046310f288561380774e5903ad46a')

-_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

 build() {
  for _arch in ${_architectures}; do
--- a/qt6-lottie/mingw-w64-static/PKGBUILD
+++ b/qt6-lottie/mingw-w64-static/PKGBUILD
@ -20,7 +20,7 @@ _pkgfqn="qtlottie-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
 sha256sums=('9c0ffbde3c99e006bd13c844a1d691e275c02db1c3db44d05154c939d23ba2ed')

-_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

 build() {
  for _arch in ${_architectures}; do
--- a/qt6-lottie/mingw-w64/PKGBUILD
+++ b/qt6-lottie/mingw-w64/PKGBUILD
@ -20,7 +20,7 @@ _pkgfqn="qtlottie-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
 sha256sums=('9c0ffbde3c99e006bd13c844a1d691e275c02db1c3db44d05154c939d23ba2ed')

-_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

 build() {
  for _arch in ${_architectures}; do
--- a/qt6-multimedia/mingw-w64-static/PKGBUILD
+++ b/qt6-multimedia/mingw-w64-static/PKGBUILD
@ -22,7 +22,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
 sha256sums=('f394bae49e3d4ee6a3b0c9e1e5e31bb870cc04a4b44f4cda3615baf7bd078c70'
            'c608aae36ce78b4ba09b21542aa5f97987178a52157cae8077fb8df1b30ef9af')

-_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

 prepare () {
  cd $_pkgfqn
--- a/qt6-multimedia/mingw-w64/PKGBUILD
+++ b/qt6-multimedia/mingw-w64/PKGBUILD
@ -22,7 +22,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
 sha256sums=('f394bae49e3d4ee6a3b0c9e1e5e31bb870cc04a4b44f4cda3615baf7bd078c70'
            'c608aae36ce78b4ba09b21542aa5f97987178a52157cae8077fb8df1b30ef9af')

-_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

 prepare () {
  cd $_pkgfqn
--- a/qt6-networkauth/mingw-w64-static/PKGBUILD
+++ b/qt6-networkauth/mingw-w64-static/PKGBUILD
@ -19,7 +19,7 @@ _pkgfqn="qtnetworkauth-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
 sha256sums=('993105616ff0223d3d826e2a497440035721c6e1acdae232935fae3bcfa74a45')

-_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

 build() {
  for _arch in ${_architectures}; do
--- a/qt6-networkauth/mingw-w64/PKGBUILD
+++ b/qt6-networkauth/mingw-w64/PKGBUILD
@ -19,7 +19,7 @@ _pkgfqn="qtnetworkauth-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
 sha256sums=('993105616ff0223d3d826e2a497440035721c6e1acdae232935fae3bcfa74a45')

-_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

 build() {
  for _arch in ${_architectures}; do
--- a/qt6-positioning/mingw-w64-static/PKGBUILD
+++ b/qt6-positioning/mingw-w64-static/PKGBUILD
@ -20,7 +20,7 @@ _pkgfqn="qtpositioning-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
 sha256sums=('1d601ba43c26c8a01db81eeaaeea5943c015da98caa59d7905b86e0e9d609ddf')

-_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

 build() {
  for _arch in ${_architectures}; do
--- a/qt6-positioning/mingw-w64/PKGBUILD
+++ b/qt6-positioning/mingw-w64/PKGBUILD
@ -20,7 +20,7 @@ _pkgfqn="qtpositioning-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
 sha256sums=('1d601ba43c26c8a01db81eeaaeea5943c015da98caa59d7905b86e0e9d609ddf')

-_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

 build() {
  for _arch in ${_architectures}; do
--- a/qt6-quick3d/mingw-w64-static/PKGBUILD
+++ b/qt6-quick3d/mingw-w64-static/PKGBUILD
@ -20,7 +20,7 @@ _pkgfqn="qtquick3d-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
 sha256sums=('8bb943bf3f65a933b74fcd93d927e22b8621484030586c15586728e2f67ed910')

-_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

 build() {
  for _arch in ${_architectures}; do
--- a/qt6-quick3d/mingw-w64/PKGBUILD
+++ b/qt6-quick3d/mingw-w64/PKGBUILD
@ -20,7 +20,7 @@ _pkgfqn="qtquick3d-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
 sha256sums=('8bb943bf3f65a933b74fcd93d927e22b8621484030586c15586728e2f67ed910')

-_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

 build() {
  for _arch in ${_architectures}; do
--- a/qt6-quicktimeline/mingw-w64-static/PKGBUILD
+++ b/qt6-quicktimeline/mingw-w64-static/PKGBUILD
@ -19,7 +19,7 @@ _pkgfqn="qtquicktimeline-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
 sha256sums=('eb45657c6c6b5d57775473d4d69e7d964a17778695ffb2ff50a75aa1b63489bd')

-_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

 build() {
  for _arch in ${_architectures}; do
--- a/qt6-quicktimeline/mingw-w64/PKGBUILD
+++ b/qt6-quicktimeline/mingw-w64/PKGBUILD
@ -19,7 +19,7 @@ _pkgfqn="qtquicktimeline-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
 sha256sums=('eb45657c6c6b5d57775473d4d69e7d964a17778695ffb2ff50a75aa1b63489bd')

-_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

 build() {
  for _arch in ${_architectures}; do
--- a/qt6-scxml/mingw-w64-static/PKGBUILD
+++ b/qt6-scxml/mingw-w64-static/PKGBUILD
@ -20,7 +20,7 @@ _pkgfqn="qtscxml-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
 sha256sums=('725b97bbb8766df733d7588488acd92375c218eeb376a95525572b4268a9257c')

-_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

 build() {
  for _arch in ${_architectures}; do
--- a/qt6-scxml/mingw-w64/PKGBUILD
+++ b/qt6-scxml/mingw-w64/PKGBUILD
@ -20,7 +20,7 @@ _pkgfqn="qtscxml-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
 sha256sums=('725b97bbb8766df733d7588488acd92375c218eeb376a95525572b4268a9257c')

-_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

 build() {
  for _arch in ${_architectures}; do
--- a/qt6-sensors/mingw-w64-static/PKGBUILD
+++ b/qt6-sensors/mingw-w64-static/PKGBUILD
@ -20,7 +20,7 @@ _pkgfqn="qtsensors-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
 sha256sums=('1c3015200a30a64f760818e40794df719e068fc25179e96e88993dff38f7bcab')

-_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

 build() {
  for _arch in ${_architectures}; do
--- a/qt6-sensors/mingw-w64/PKGBUILD
+++ b/qt6-sensors/mingw-w64/PKGBUILD
@ -20,7 +20,7 @@ _pkgfqn="qtsensors-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
 sha256sums=('1c3015200a30a64f760818e40794df719e068fc25179e96e88993dff38f7bcab')

-_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

 build() {
  for _arch in ${_architectures}; do
--- a/qt6-serialbus/mingw-w64-static/PKGBUILD
+++ b/qt6-serialbus/mingw-w64-static/PKGBUILD
@ -19,7 +19,7 @@ _pkgfqn="qtserialbus-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
 sha256sums=('498193a9860664f8a55f676656c45af179ac13d48184af43fc58ddf795bb76dd')

-_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'

 build() {
  for _arch in ${_architectures}; do
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`../mingw-w64/0018-Fix-crashes-in-rasterization-code-using-setjmp.patch`