Remove display name in Qt 6 packages as Qt 6 is now probably the standard

Disable i686 for Windows builds of Qt 6 and packages depending on it
See comment added to base package for reasoning.
2024-05-16 23:03:55 +02:00 · 2024-05-14 21:01:25 +02:00 · 2024-05-14 20:40:22 +02:00 · 2024-05-13 19:39:18 +02:00 · 2024-05-13 14:53:10 +02:00 · 2024-05-10 14:10:21 +02:00
76 changed files with 472 additions and 184 deletions
--- 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=('GPL3')
+license=('GPL-3.0-or-later')
 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
@ -38,7 +38,13 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
 sha256sums=('<%== $qt_module_sha256 %>'\
 <%== include 'fragments/sha256_list', relevant_files => $patch_files %>)

-_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
+# 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}

 % 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='i686-w64-mingw32 x86_64-w64-mingw32'
+_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}

 % if ($patch_files->size || content_for('prepare')->size) {
 prepare () {
--- 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
@ -0,0 +1,319 @@
+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=13.2.1
-pkgrel=1
+pkgver=14.1.1+r1+g43b730b9134
+pkgrel=2
 pkgdesc="Cross GCC for the MinGW-w64 cross-compiler"
 arch=('x86_64' 'aarch64')
 url="https://gcc.gnu.org"
@ -12,14 +12,15 @@ 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=d8a0dcd146dd95e2b6b85cf82c445214d364cf3b
-source=(git+https://sourceware.org/git/gcc.git#commit=${_commit})
+_commit=43b730b9134af60a8f1c5b107d625f7127ff23c5
+source=(git+https://sourceware.org/git/gcc.git#commit=${_commit}
+        0001-missing-__thiscall-attribute-on-builtin-declaration-of-__cxa_thread_atexit.patch)
 #source=(https://ftp.gnu.org/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.xz{,.sig})
 validpgpkeys=(F3691687D867B81B51CE07D9BBE43771487328A9  # bpiotrowski@archlinux.org
              86CFFCA918CF3AF47147588051E8B148A9999C34  # evangelos@foutrelis.com
              13975A70E63C361C73AE69EF6EEB81F8981C74C7  # richard.guenther@gmail.com
              D3A93CAD751C2AF4F8C7AD516C35B99309B5FA62) # Jakub Jelinek <jakub@redhat.com>
-sha512sums=('SKIP')
+sha512sums=('SKIP' 'SKIP')

 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"

@ -27,11 +28,17 @@ 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 \
@ -55,7 +62,7 @@ package() {
    make DESTDIR="$pkgdir" install
    ${_arch}-strip "$pkgdir"/usr/${_arch}/lib/*.dll
    strip "$pkgdir"/usr/bin/${_arch}-*
-    strip "$pkgdir"/usr/lib/gcc/${_arch}/${pkgver}/{cc1*,collect2,gnat1,f951,lto*}
+    strip "$pkgdir"/usr/lib/gcc/${_arch}/*/{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-ada,gcc-fortran}-static-compat)
-pkgver=13.2.1
+pkgname=({gcc,gcc-libs,lib32-gcc-libs,gcc-fortran}-static-compat)
+pkgver=14.1.1+r1+g43b730b9134
 _majorver=${pkgver%%.*}
 pkgrel=1
 pkgdesc='The GNU Compiler Collection'
@ -32,11 +32,10 @@ checkdepends=(
 options=(!emptydirs !lto debug)
 _prefix=/usr/static-compat
 _libdir=usr/static-compat/lib/gcc/$CHOST/${pkgver%%+*}
-_commit=d8a0dcd146dd95e2b6b85cf82c445214d364cf3b
-source=(git://gcc.gnu.org/git/gcc.git#commit=$_commit
+_commit=43b730b9134af60a8f1c5b107d625f7127ff23c5
+source=(git+https://sourceware.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
@ -46,8 +45,7 @@ validpgpkeys=(F3691687D867B81B51CE07D9BBE43771487328A9  # bpiotrowski@archlinux.
 #            'SKIP'
 sha256sums=('SKIP'
            'de48736f6e4153f03d0a5d38ceb6c6fdb7f054e8f47ddd6af0a3dbf14f27b931'
-            '2513c6d9984dd0a2058557bf00f06d8d5181734e41dcfe07be7ed86f2959622a'
-            '1773f5137f08ac1f48f0f7297e324d5d868d55201c03068670ee4602babdef2f')
+            '2513c6d9984dd0a2058557bf00f06d8d5181734e41dcfe07be7ed86f2959622a')

 prepare() {
  [[ ! -d gcc ]] && ln -s gcc-${pkgver/+/-} gcc
@ -61,9 +59,6 @@ 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"
 }

@ -123,16 +118,9 @@ build() {
  CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2}

  "$srcdir/gcc/configure" \
-    --enable-languages=ada,c,c++,fortran,lto \
+    --enable-languages=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
 }

@ -167,7 +155,6 @@ 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/
@ -243,7 +230,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,gnat-style,gnat_rm,gnat_ugn}.info
+  rm "$pkgdir"$_prefix/share/info/gfortran.info
  rm -r "$pkgdir"$_prefix/share/info/dir

  make -C libcpp DESTDIR="$pkgdir" install
@ -294,44 +281,6 @@ 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,77 +1,70 @@
 # 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=2.9.0
-pkgrel=1
+pkgver=8.4.0
+pkgrel=2
 pkgdesc="OpenType text shaping engine (mingw-w64)"
 arch=('any')
-url="https://www.freedesktop.org/wiki/Software/HarfBuzz"
+url="https://harfbuzz.github.io/"
 license=('MIT')
 depends=('mingw-w64-crt'
         'mingw-w64-glib2'
         'mingw-w64-graphite'
         'mingw-w64-freetype2')
-makedepends=('mingw-w64-configure'
+makedepends=('mingw-w64-meson'
             'mingw-w64-cairo'
             'mingw-w64-icu'
             'python'
-             'gtk-doc'
             'ragel'
             'git')
 options=('!strip' 'staticlibs' '!buildflags')
-source=("git+https://github.com/harfbuzz/harfbuzz.git#commit=${_commit}")
-sha256sums=('SKIP')
+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)
+)

 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
-    # 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
-    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
+    ${_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
+    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
    popd
  done
 }
@ -79,12 +72,13 @@ build() {
 package_mingw-w64-harfbuzz() {
  for _arch in ${_architectures}; do
    cd "${srcdir}/harfbuzz/build-${_arch}-static"
-    make DESTDIR="${pkgdir}" install
+    DESTDIR="${pkgdir}" ninja install
    cd "${srcdir}/harfbuzz/build-${_arch}-shared"
-    make DESTDIR="${pkgdir}" install
+    DESTDIR="${pkgdir}" ninja install
+    cp "${srcdir}/harfbuzz/src/hb-ft.h" "${pkgdir}/usr/${_arch}/include/harfbuzz/"
    find "${pkgdir}/usr/${_arch}" -name '*.exe' -exec rm {} \;
    find "${pkgdir}/usr/${_arch}" -name '*.dll' -exec ${_arch}-strip --strip-unneeded {} \;
-    find "${pkgdir}/usr/${_arch}" -name '*.a' -o -name '*.dll' | xargs ${_arch}-strip -g
+    find "${pkgdir}/usr/${_arch}" -name '*.a' | 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/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=('i686-w64-mingw32' 'x86_64-w64-mingw32')
+_architectures=(${MINGW_W64_QT6_ARCHS:-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="Qt 6" \
+    -DCONFIGURATION_DISPLAY_NAME="" \
    -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
@ -15,7 +15,7 @@ source=("${_pkgname}::${MARTCHUS_GIT_URL_PREFIX:-git+https://github.com/Martchus
 sha256sums=(SKIP)
 options=(!buildflags staticlibs !strip !emptydirs)

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

 pkgver() {
  cd "${srcdir}/${_pkgname}"
--- 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='i686-w64-mingw32 x86_64-w64-mingw32'
+_architectures=${MINGW_W64_QT6_ARCHS:-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='i686-w64-mingw32 x86_64-w64-mingw32'
+_architectures=${MINGW_W64_QT6_ARCHS:-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='i686-w64-mingw32 x86_64-w64-mingw32'
+_architectures=${MINGW_W64_QT6_ARCHS:-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='i686-w64-mingw32 x86_64-w64-mingw32'
+_architectures=${MINGW_W64_QT6_ARCHS:-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='i686-w64-mingw32 x86_64-w64-mingw32'
+_architectures=${MINGW_W64_QT6_ARCHS:-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='i686-w64-mingw32 x86_64-w64-mingw32'
+_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}

 prepare () {
  cd $_pkgfqn
--- a/qt6-base/mingw-w64-static/PKGBUILD
+++ b/qt6-base/mingw-w64-static/PKGBUILD
@ -67,7 +67,13 @@ sha256sums=('11b2e29e2e52fb0e3b453ea13bbe51a10fdff36e1c192d8868c5a40233b8b254'
            'ce7dc86c30f160e6d565c579a84e0b0f799b1afa751ebe0748a0e80f8408cb7f'
            '55959f673e409ea952661cbddfb8b046bec7cda3d8b05686bed82ace4246e273')

-_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
+# 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}

 prepare () {
  cd $_pkgfqn
--- a/qt6-base/mingw-w64/PKGBUILD
+++ b/qt6-base/mingw-w64/PKGBUILD
@ -67,7 +67,13 @@ sha256sums=('11b2e29e2e52fb0e3b453ea13bbe51a10fdff36e1c192d8868c5a40233b8b254'
            'ce7dc86c30f160e6d565c579a84e0b0f799b1afa751ebe0748a0e80f8408cb7f'
            '55959f673e409ea952661cbddfb8b046bec7cda3d8b05686bed82ace4246e273')

-_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
+# 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}

 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='i686-w64-mingw32 x86_64-w64-mingw32'
+_architectures=${MINGW_W64_QT6_ARCHS:-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='i686-w64-mingw32 x86_64-w64-mingw32'
+_architectures=${MINGW_W64_QT6_ARCHS:-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='i686-w64-mingw32 x86_64-w64-mingw32'
+_architectures=${MINGW_W64_QT6_ARCHS:-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='i686-w64-mingw32 x86_64-w64-mingw32'
+_architectures=${MINGW_W64_QT6_ARCHS:-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='i686-w64-mingw32 x86_64-w64-mingw32'
+_architectures=${MINGW_W64_QT6_ARCHS:-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='i686-w64-mingw32 x86_64-w64-mingw32'
+_architectures=${MINGW_W64_QT6_ARCHS:-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='i686-w64-mingw32 x86_64-w64-mingw32'
+_architectures=${MINGW_W64_QT6_ARCHS:-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='i686-w64-mingw32 x86_64-w64-mingw32'
+_architectures=${MINGW_W64_QT6_ARCHS:-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='i686-w64-mingw32 x86_64-w64-mingw32'
+_architectures=${MINGW_W64_QT6_ARCHS:-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='i686-w64-mingw32 x86_64-w64-mingw32'
+_architectures=${MINGW_W64_QT6_ARCHS:-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='i686-w64-mingw32 x86_64-w64-mingw32'
+_architectures=${MINGW_W64_QT6_ARCHS:-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='i686-w64-mingw32 x86_64-w64-mingw32'
+_architectures=${MINGW_W64_QT6_ARCHS:-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='i686-w64-mingw32 x86_64-w64-mingw32'
+_architectures=${MINGW_W64_QT6_ARCHS:-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='i686-w64-mingw32 x86_64-w64-mingw32'
+_architectures=${MINGW_W64_QT6_ARCHS:-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='i686-w64-mingw32 x86_64-w64-mingw32'
+_architectures=${MINGW_W64_QT6_ARCHS:-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='i686-w64-mingw32 x86_64-w64-mingw32'
+_architectures=${MINGW_W64_QT6_ARCHS:-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='i686-w64-mingw32 x86_64-w64-mingw32'
+_architectures=${MINGW_W64_QT6_ARCHS:-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='i686-w64-mingw32 x86_64-w64-mingw32'
+_architectures=${MINGW_W64_QT6_ARCHS:-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='i686-w64-mingw32 x86_64-w64-mingw32'
+_architectures=${MINGW_W64_QT6_ARCHS:-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='i686-w64-mingw32 x86_64-w64-mingw32'
+_architectures=${MINGW_W64_QT6_ARCHS:-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='i686-w64-mingw32 x86_64-w64-mingw32'
+_architectures=${MINGW_W64_QT6_ARCHS:-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='i686-w64-mingw32 x86_64-w64-mingw32'
+_architectures=${MINGW_W64_QT6_ARCHS:-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='i686-w64-mingw32 x86_64-w64-mingw32'
+_architectures=${MINGW_W64_QT6_ARCHS:-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='i686-w64-mingw32 x86_64-w64-mingw32'
+_architectures=${MINGW_W64_QT6_ARCHS:-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='i686-w64-mingw32 x86_64-w64-mingw32'
+_architectures=${MINGW_W64_QT6_ARCHS:-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='i686-w64-mingw32 x86_64-w64-mingw32'
+_architectures=${MINGW_W64_QT6_ARCHS:-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='i686-w64-mingw32 x86_64-w64-mingw32'
+_architectures=${MINGW_W64_QT6_ARCHS:-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='i686-w64-mingw32 x86_64-w64-mingw32'
+_architectures=${MINGW_W64_QT6_ARCHS:-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='i686-w64-mingw32 x86_64-w64-mingw32'
+_architectures=${MINGW_W64_QT6_ARCHS:-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='i686-w64-mingw32 x86_64-w64-mingw32'
+_architectures=${MINGW_W64_QT6_ARCHS:-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='i686-w64-mingw32 x86_64-w64-mingw32'
+_architectures=${MINGW_W64_QT6_ARCHS:-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='i686-w64-mingw32 x86_64-w64-mingw32'
+_architectures=${MINGW_W64_QT6_ARCHS:-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='i686-w64-mingw32 x86_64-w64-mingw32'
+_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}

 build() {
  for _arch in ${_architectures}; do
--- a/qt6-serialbus/mingw-w64/PKGBUILD
+++ b/qt6-serialbus/mingw-w64/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='i686-w64-mingw32 x86_64-w64-mingw32'
+_architectures=${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 build() {
  for _arch in ${_architectures}; do
--- a/qtforkawesome/mingw-w64-qt6/PKGBUILD
+++ b/qtforkawesome/mingw-w64-qt6/PKGBUILD
@ -28,7 +28,7 @@ sha256sums=('42de641e79b22d4dd44eb179e8818a8a4bf424c3feec1d0d9524bae5fde458cc'
            '23fba5f191f204e0414c547bf4c9b10fd7ca42c151260e8f64698449a75fbdb3')
 options=(!buildflags staticlibs !strip !emptydirs)

-_architectures=('i686-w64-mingw32' 'x86_64-w64-mingw32')
+_architectures=(${MINGW_W64_QT6_ARCHS:-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-declarative-static')
--- a/qtforkawesome/qt6/PKGBUILD
+++ b/qtforkawesome/qt6/PKGBUILD
@ -34,7 +34,7 @@ build() {
    -DCMAKE_BUILD_TYPE:STRING='Release' \
    -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
    -DCONFIGURATION_NAME:STRING="$_cfg" \
-    -DCONFIGURATION_DISPLAY_NAME="Qt 6" \
+    -DCONFIGURATION_DISPLAY_NAME="" \
    -DCONFIGURATION_TARGET_SUFFIX:STRING="$_cfg" \
    -DCONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES:STRING="-$_cfg" \
    -DQT_PACKAGE_PREFIX:STRING='Qt6' \
--- a/qtutilities/mingw-w64-qt6/PKGBUILD
+++ b/qtutilities/mingw-w64-qt6/PKGBUILD
@ -21,7 +21,7 @@ source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/arc
 sha256sums=('4eab9ef26edf67c1c436596bea42890fcc0206f93c50413939ccce8c94bf7bc0')
 options=(!buildflags staticlibs !strip !emptydirs)

-_architectures=('i686-w64-mingw32' 'x86_64-w64-mingw32')
+_architectures=(${MINGW_W64_QT6_ARCHS:-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')
--- a/qtutilities/qt6/PKGBUILD
+++ b/qtutilities/qt6/PKGBUILD
@ -27,7 +27,7 @@ build() {
    -DCMAKE_BUILD_TYPE:STRING='Release' \
    -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
    -DCONFIGURATION_NAME:STRING="$_cfg" \
-    -DCONFIGURATION_DISPLAY_NAME="Qt 6" \
+    -DCONFIGURATION_DISPLAY_NAME="" \
    -DCONFIGURATION_TARGET_SUFFIX:STRING="$_cfg" \
    -DQT_PACKAGE_PREFIX:STRING='Qt6' \
    -DBUILTIN_TRANSLATIONS:BOOL=ON \
--- a/subtitlecomposer/default/PKGBUILD
+++ b/subtitlecomposer/default/PKGBUILD
@ -8,12 +8,12 @@

 pkgname=subtitlecomposer
 pkgver=0.8.0
-pkgrel=3
+pkgrel=4
 pkgdesc='Video subtitle editor'
 arch=('i686' 'x86_64')
 url="https://invent.kde.org/multimedia/${pkgname}"
 license=('GPL')
-depends=('qt5-declarative' 'kcoreaddons5' 'ktextwidgets5' 'kio5' 'sonnet5' 'kcodecs5' 'kxmlgui5' 'ki18n5' 'ffmpeg' 'openal')
+depends=('qt6-declarative' 'qt6-5compat' 'kcoreaddons' 'ktextwidgets' 'kio' 'sonnet' 'kcodecs' 'kxmlgui' 'ki18n' 'ffmpeg' 'openal')
 makedepends=('extra-cmake-modules' 'jack' 'blas' 'xorg-server-xvfb')

 # Comment/uncomment the following dependency to disable/enable
@ -48,6 +48,7 @@ build() {
    -DCMAKE_BUILD_TYPE=Release \
    -DCMAKE_INSTALL_PREFIX=/usr \
    -DKDE_INSTALL_LIBDIR=lib \
+    -DQT_MAJOR_VERSION=6 \
    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
  cmake --build "${srcdir}/build"
 }
--- a/syncthingtray/mingw-w64-qt6/PKGBUILD
+++ b/syncthingtray/mingw-w64-qt6/PKGBUILD
@ -36,7 +36,7 @@ sha256sums=('9a3f0d22b598041403668341282ed9222e0b83bf4eb43b27717b0b253ba7ad9c'
            'SKIP')
 options=(!buildflags staticlibs !strip !emptydirs)

-_architectures=('i686-w64-mingw32' 'x86_64-w64-mingw32')
+_architectures=(${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32})
 _configurations=()
 if ! [[ $NO_SHARED_LIBS ]]; then
    _configurations+=('shared')
--- a/syncthingtray/qt6/PKGBUILD
+++ b/syncthingtray/qt6/PKGBUILD
@ -68,7 +68,7 @@ build() {
    -DCMAKE_BUILD_TYPE:STRING='Release' \
    -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
    -DCONFIGURATION_NAME:STRING="$_cfg" \
-    -DCONFIGURATION_DISPLAY_NAME="Qt 6" \
+    -DCONFIGURATION_DISPLAY_NAME="" \
    -DCONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES:STRING="-$_cfg" \
    -DLIB_SYNCTHING_CONNECTOR_CONFIGURATION_TARGET_SUFFIX:STRING="$_cfg" \
    -DSYNCTHINGFILEITEMACTION_CONFIGURATION_TARGET_SUFFIX:STRING="$_cfg" \
--- a/tageditor/mingw-w64-qt6/PKGBUILD
+++ b/tageditor/mingw-w64-qt6/PKGBUILD
@ -34,7 +34,7 @@ source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/arc
 sha256sums=('ebafac24ab7c3833a018b5848b32d9fa2cfa01cafeff1b1ec1a6e30eb7415b1b')
 options=(!buildflags staticlibs !strip !emptydirs)

-_architectures=('i686-w64-mingw32' 'x86_64-w64-mingw32')
+_architectures=(${MINGW_W64_QT6_ARCHS:-x86_64-w64-mingw32})
 _configurations=()
 if ! [[ $NO_SHARED_LIBS ]]; then
    _configurations+=('shared')
--- a/tageditor/qt6/PKGBUILD
+++ b/tageditor/qt6/PKGBUILD
@ -48,7 +48,7 @@ build() {
    -DCMAKE_BUILD_TYPE:STRING='Release' \
    -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
    -DCONFIGURATION_NAME:STRING="$_cfg" \
-    -DCONFIGURATION_DISPLAY_NAME="Qt 6" \
+    -DCONFIGURATION_DISPLAY_NAME="" \
    -DCONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES:STRING="-$_cfg" \
    -DTAGEDITOR_CONFIGURATION_TARGET_SUFFIX:STRING="$_cfg" \
    -DQT_PACKAGE_PREFIX:STRING='Qt6' \
Author	SHA1	Message	Date
Martchus	7e72091442	Remove display name in Qt 6 packages as Qt 6 is now probably the standard	2024-05-16 23:03:55 +02:00
Martchus	d73c79d876	Disable i686 for Windows builds of Qt 6 and packages depending on it See comment added to base package for reasoning.	2024-05-14 21:01:25 +02:00
Martchus	65e78ad95d	Fix `__cxa_thread_atexit`-related build errors Add patch to mingw-w64-gcc after updating to 14.1.1 to fix build errors like: ``` <built-in>: error: conflicting declaration of C function ‘int __cxxabiv1::__cxa_thread_atexit(void ()(), void, void)’ In file included from /home/devel/.cache/aurman/mingw-w64-paraview/src/ParaView-v5.12.0/build-x86_64-w64-mingw32/VTK/Common/Core/vtkCxxABIConfigure.h:10, from /home/devel/.cache/aurman/mingw-w64-paraview/src/ParaView-v5.12.0/VTK/Common/Core/vtkTypeName.h:7, from /home/devel/.cache/aurman/mingw-w64-paraview/src/ParaView-v5.12.0/VTK/Common/DataModel/vtkCellGrid.h:28: /usr/x86_64-w64-mingw32/include/c++/14.1.1/cxxabi.h:140:3: note: previous declaration ‘int __cxxabiv1::__cxa_thread_atexit(void ()(void), void, void)’ 140 \| __cxa_thread_atexit(void (_GLIBCXX_CDTOR_CALLABI )(void), void, void *) _GLIBCXX_NOTHROW; ```	2024-05-14 20:40:22 +02:00
Martchus	ec900cf8af	Update GCC packages to 14.1.1 * Use `git+https://sourceware.org/git/gcc.git` consistently in both packages * Remove ada from static-compat-gcc because it leads to build failures and adding even more workarounds for this language is not worth it * Workaround certain warnings now being treated as errors in mingw-w64-gcc	2024-05-13 19:39:18 +02:00
Martchus	b8be67ccac	Use SPDX license id in cmake-format	2024-05-13 14:53:10 +02:00
Martchus	40283fc581	Update subtitlecomposer for ICU 75 and switch to Qt 6 The switch to Qt 6 is required for the ICU 75 rebuild because only when using Qt 6 the build system uses C++ 17 which is required as of ICU 75. Unfortunately it doesn't build against Qt 6 / KF6 yet so I'm dropping it from the binary repo for now.	2024-05-10 14:10:21 +02:00
Martchus	047fd65334	Sync mingw-w64-harfbuzz with regular harfbuzz package * Use tag pinning * Update upstream URL * Update releasers list * Add build option for ICU 75 rebuild	2024-05-10 12:11:24 +02:00
Martchus	d965b92487	Sync mingw-w64-harfbuzz with AUR	2024-05-10 10:57:58 +02:00