From ba1dc56813012ed6e1a43f8b87f50b85e72ce91f Mon Sep 17 00:00:00 2001
From: Dennis Ameling <dennis@dennisameling.com>
Date: Mon, 27 Dec 2021 17:40:08 +0100
Subject: [PATCH 1/6] gtk3 (and deps): first work to enable clangarm64

---
 mingw-w64-atk/PKGBUILD         | 2 +-
 mingw-w64-gdk-pixbuf2/PKGBUILD | 2 +-
 mingw-w64-giflib/PKGBUILD      | 2 +-
 mingw-w64-gtk3/PKGBUILD        | 2 +-
 mingw-w64-jbigkit/PKGBUILD     | 2 +-
 mingw-w64-json-glib/PKGBUILD   | 3 +--
 mingw-w64-lerc/PKGBUILD        | 2 +-
 mingw-w64-libdeflate/PKGBUILD  | 2 +-
 mingw-w64-libepoxy/PKGBUILD    | 2 +-
 mingw-w64-libsass/PKGBUILD     | 2 +-
 mingw-w64-libtiff/PKGBUILD     | 2 +-
 mingw-w64-sassc/PKGBUILD       | 2 +-
 12 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/mingw-w64-atk/PKGBUILD b/mingw-w64-atk/PKGBUILD
index d28c16ee48..2e4400686b 100644
--- a/mingw-w64-atk/PKGBUILD
+++ b/mingw-w64-atk/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=2.36.0
 pkgrel=2
 pkgdesc="Interface definitions of accessibility infrastructure (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://gitlab.gnome.org/GNOME/atk"
 license=(LGPL)
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
diff --git a/mingw-w64-gdk-pixbuf2/PKGBUILD b/mingw-w64-gdk-pixbuf2/PKGBUILD
index 790b2978af..616c784b8d 100644
--- a/mingw-w64-gdk-pixbuf2/PKGBUILD
+++ b/mingw-w64-gdk-pixbuf2/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=2.42.6
 pkgrel=2
 pkgdesc="An image loading library (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://gitlab.gnome.org/GNOME/gdk-pixbuf"
 license=(LGPL2.1)
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
diff --git a/mingw-w64-giflib/PKGBUILD b/mingw-w64-giflib/PKGBUILD
index c288cbd5c9..bbdb4fbdee 100644
--- a/mingw-w64-giflib/PKGBUILD
+++ b/mingw-w64-giflib/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=5.2.1
 pkgrel=3
 pkgdesc="A library for reading and writing gif images (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://sourceforge.net/projects/giflib"
 license=("MIT")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "xmlto")
diff --git a/mingw-w64-gtk3/PKGBUILD b/mingw-w64-gtk3/PKGBUILD
index ac4f8bcd25..0c9707bc10 100644
--- a/mingw-w64-gtk3/PKGBUILD
+++ b/mingw-w64-gtk3/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=3.24.31
 pkgrel=1
 pkgdesc="GObject-based multi-platform GUI toolkit (v3) (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://www.gtk.org/"
 license=("LGPL")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
diff --git a/mingw-w64-jbigkit/PKGBUILD b/mingw-w64-jbigkit/PKGBUILD
index 5421fd927f..8e05d4c45f 100644
--- a/mingw-w64-jbigkit/PKGBUILD
+++ b/mingw-w64-jbigkit/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=2.1
 pkgrel=4
 pkgdesc="Data compression library/utilities for bi-level high-resolution images (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://www.cl.cam.ac.uk/~mgk25/jbigkit/"
 license=(GPL2)
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
diff --git a/mingw-w64-json-glib/PKGBUILD b/mingw-w64-json-glib/PKGBUILD
index 898bc6ae37..f136e843ec 100644
--- a/mingw-w64-json-glib/PKGBUILD
+++ b/mingw-w64-json-glib/PKGBUILD
@@ -6,7 +6,7 @@ pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.6.6
 pkgrel=1
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 pkgdesc="JSON-GLib implements a full suite of JSON-related tools using GLib and GObject (mingw-w64)"
 depends=("${MINGW_PACKAGE_PREFIX}-glib2")
 makedepends=("${MINGW_PACKAGE_PREFIX}-meson"
@@ -33,7 +33,6 @@ build() {
   meson \
     --prefix="${MINGW_PREFIX}" \
     --buildtype plain \
-    -Ddocs=true \
     -Dman=true \
     ../${_realname}-${pkgver}
 
diff --git a/mingw-w64-lerc/PKGBUILD b/mingw-w64-lerc/PKGBUILD
index 295f8a20b4..8e18dead99 100644
--- a/mingw-w64-lerc/PKGBUILD
+++ b/mingw-w64-lerc/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=3.0
 pkgrel=2
 pkgdesc="Limited Error Raster Compression library (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://github.com/Esri/lerc"
 license=('Apache-2.0')
 makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
diff --git a/mingw-w64-libdeflate/PKGBUILD b/mingw-w64-libdeflate/PKGBUILD
index b93e95d2d1..3582588dc0 100644
--- a/mingw-w64-libdeflate/PKGBUILD
+++ b/mingw-w64-libdeflate/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.8
 pkgrel=2
 pkgdesc="Heavily optimized library for DEFLATE/zlib/gzip compression and decompression (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url='https://github.com/ebiggers/libdeflate'
 license=('MIT')
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc")
diff --git a/mingw-w64-libepoxy/PKGBUILD b/mingw-w64-libepoxy/PKGBUILD
index c9c919f275..ba9e36556f 100644
--- a/mingw-w64-libepoxy/PKGBUILD
+++ b/mingw-w64-libepoxy/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.5.9
 pkgrel=1
 pkgdesc="A library for handling OpenGL function pointer management for you (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://github.com/anholt/libepoxy"
 license=("MIT")
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
diff --git a/mingw-w64-libsass/PKGBUILD b/mingw-w64-libsass/PKGBUILD
index 25e777eb78..7f098e44f3 100644
--- a/mingw-w64-libsass/PKGBUILD
+++ b/mingw-w64-libsass/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=3.6.5
 pkgrel=1
 pkgdesc="C implementation of Sass CSS preprocessor (library) (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://sass-lang.com/libsass"
 license=("MIT")
 options=('strip' 'staticlibs')
diff --git a/mingw-w64-libtiff/PKGBUILD b/mingw-w64-libtiff/PKGBUILD
index b1cc845eb4..55bc61339f 100644
--- a/mingw-w64-libtiff/PKGBUILD
+++ b/mingw-w64-libtiff/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=4.3.0
 pkgrel=6
 pkgdesc="Library for manipulation of TIFF images (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://libtiff.gitlab.io/libtiff/"
 license=(MIT)
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
diff --git a/mingw-w64-sassc/PKGBUILD b/mingw-w64-sassc/PKGBUILD
index f3e0f6be79..f3b42db7fa 100644
--- a/mingw-w64-sassc/PKGBUILD
+++ b/mingw-w64-sassc/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=3.6.2
 pkgrel=1
 pkgdesc="C implementation of Sass CSS preprocessor (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://sass-lang.com/libsass#sassc"
 license=("MIT")
 depends=("${MINGW_PACKAGE_PREFIX}-libsass")

From 7df5e7d2a20389b5b6c42a9178141c049910ba31 Mon Sep 17 00:00:00 2001
From: Dennis Ameling <dennis@dennisameling.com>
Date: Mon, 27 Dec 2021 20:18:23 +0100
Subject: [PATCH 2/6] Patch shared-mime-info

---
 .../002-fix-meson-build.patch                 | 40 +++++++++++++++++++
 mingw-w64-shared-mime-info/PKGBUILD           | 11 +++--
 2 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 mingw-w64-shared-mime-info/002-fix-meson-build.patch

diff --git a/mingw-w64-shared-mime-info/002-fix-meson-build.patch b/mingw-w64-shared-mime-info/002-fix-meson-build.patch
new file mode 100644
index 0000000000..db7679920f
--- /dev/null
+++ b/mingw-w64-shared-mime-info/002-fix-meson-build.patch
@@ -0,0 +1,40 @@
+diff --unified --recursive --text --color shared-mime-info-2.1-old/data/meson.build shared-mime-info-2.1/data/meson.build
+--- shared-mime-info-2.1-old/data/meson.build	2021-12-27 20:10:18.072978600 +0100
++++ shared-mime-info-2.1/data/meson.build	2021-12-27 20:11:32.565565200 +0100
+@@ -1,20 +1,12 @@
+ 
+ install_man('update-mime-database.1')
+ 
+-freedesktop_org_xml = custom_target('freedesktop.org.xml',
+-    input : files(
+-        'freedesktop.org.xml.in',
+-        'its/shared-mime-info.its',
+-        'its/shared-mime-info.loc',
+-    ),
++freedesktop_org_xml = i18n.merge_file(
++    input: 'freedesktop.org.xml.in',
+     output: 'freedesktop.org.xml',
+-    command: [
+-        find_program('bash.exe'),
+-        '-e',
+-        meson.current_source_dir() / 'freedesktop_generate.sh',
+-        meson.source_root(),
+-        meson.build_root()
+-    ],
++    data_dirs: '.',
++    po_dir: '../po',
++    type: 'xml',
+     install: true,
+     install_dir: get_option('datadir') / 'mime' / 'packages',
+ )
+diff --unified --recursive --text --color shared-mime-info-2.1-old/meson.build shared-mime-info-2.1/meson.build
+--- shared-mime-info-2.1-old/meson.build	2020-12-31 20:12:16.000000000 +0100
++++ shared-mime-info-2.1/meson.build	2021-12-27 20:11:45.781172900 +0100
+@@ -20,7 +20,6 @@
+ ###############################################################################
+ # Find tools
+ 
+-itstool = find_program('itstool')
+ xmllint = find_program('xmllint')
+ xmlto   = find_program('xmlto')
+ 
diff --git a/mingw-w64-shared-mime-info/PKGBUILD b/mingw-w64-shared-mime-info/PKGBUILD
index d65434fe71..340e19d1f4 100644
--- a/mingw-w64-shared-mime-info/PKGBUILD
+++ b/mingw-w64-shared-mime-info/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=2.1
 pkgrel=1
 pkgdesc="Freedesktop.org Shared MIME Info (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 license=(GPL2)
 depends=("${MINGW_PACKAGE_PREFIX}-libxml2"
          "${MINGW_PACKAGE_PREFIX}-glib2")
@@ -20,16 +20,21 @@ install=${_realname}-${MSYSTEM}.install
 url="https://freedesktop.org/Software/shared-mime-info"
 source=(https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/${pkgver}/shared-mime-info-${pkgver}.tar.bz2
         program.manifest
-        001-fix-fdo-generate.patch)
+        001-fix-fdo-generate.patch
+        002-fix-meson-build.patch)
 sha256sums=('37df6475da31a8b5fc63a54ba0770a3eefa0a708b778cb6366dccee96393cb60'
             'f93191ad3e217ef9939cf16885ffe50ce920a0b639e183e46415f10df4b4db72'
-            'e49b3232579dad5da4bbdc68980f30f7f9f36f75a32c6b6fe1357a8b788e1935')
+            'e49b3232579dad5da4bbdc68980f30f7f9f36f75a32c6b6fe1357a8b788e1935'
+            'ce2e34629e742b6d87377d09ae645ea6e19c997fc761c267266e0d0bb5e797d4')
 options=(!makeflags)
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
 
   patch -Np1 -i "${srcdir}"/001-fix-fdo-generate.patch
+  # Already fixed upstream in https://gitlab.freedesktop.org/xdg/shared-mime-info/-/commit/5a406b06792e26a83c7346b3c2443c0bd8d4cdb2,
+  # just waiting for new release to be done
+  patch -Np1 -i "${srcdir}"/002-fix-meson-build.patch
 }
 
 build() {

From dc5eced3c04077c6ee667dbe01d9c7e491798530 Mon Sep 17 00:00:00 2001
From: Dennis Ameling <dennis@dennisameling.com>
Date: Mon, 27 Dec 2021 22:21:02 +0100
Subject: [PATCH 3/6] gtk3: enable deps for clangarm64 support

---
 mingw-w64-adwaita-icon-theme/PKGBUILD | 2 +-
 mingw-w64-gtk3/PKGBUILD               | 3 +--
 mingw-w64-hicolor-icon-theme/PKGBUILD | 2 +-
 mingw-w64-librsvg-2.40/PKGBUILD       | 2 +-
 mingw-w64-vala/PKGBUILD               | 5 ++---
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/mingw-w64-adwaita-icon-theme/PKGBUILD b/mingw-w64-adwaita-icon-theme/PKGBUILD
index d144cecc84..7bbc92d35e 100644
--- a/mingw-w64-adwaita-icon-theme/PKGBUILD
+++ b/mingw-w64-adwaita-icon-theme/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=41.0
 pkgrel=1
 pkgdesc="GNOME icon theme (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://www.gnome.org"
 license=("GPL")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gtk3" "${MINGW_PACKAGE_PREFIX}-autotools")
diff --git a/mingw-w64-gtk3/PKGBUILD b/mingw-w64-gtk3/PKGBUILD
index 0c9707bc10..cc72a4c837 100644
--- a/mingw-w64-gtk3/PKGBUILD
+++ b/mingw-w64-gtk3/PKGBUILD
@@ -18,8 +18,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
              "${MINGW_PACKAGE_PREFIX}-sassc"
              "${MINGW_PACKAGE_PREFIX}-libxslt")
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
-         $( [[ ${MINGW_PACKAGE_PREFIX} == *-clang-aarch64* ]] || \
-              echo "${MINGW_PACKAGE_PREFIX}-adwaita-icon-theme" )
+         "${MINGW_PACKAGE_PREFIX}-adwaita-icon-theme"
          "${MINGW_PACKAGE_PREFIX}-atk"
          "${MINGW_PACKAGE_PREFIX}-cairo"
          "${MINGW_PACKAGE_PREFIX}-gdk-pixbuf2"
diff --git a/mingw-w64-hicolor-icon-theme/PKGBUILD b/mingw-w64-hicolor-icon-theme/PKGBUILD
index d4c992cc56..af61fc8ff8 100644
--- a/mingw-w64-hicolor-icon-theme/PKGBUILD
+++ b/mingw-w64-hicolor-icon-theme/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.17
 pkgrel=2
 pkgdesc="Freedesktop.org Hicolor icon theme (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://wiki.freedesktop.org/www/Software/icon-theme/"
 license=("GPL2")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-autotools")
diff --git a/mingw-w64-librsvg-2.40/PKGBUILD b/mingw-w64-librsvg-2.40/PKGBUILD
index 10fb109b0f..735fac338a 100644
--- a/mingw-w64-librsvg-2.40/PKGBUILD
+++ b/mingw-w64-librsvg-2.40/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc="A SVG viewing library (mingw-w64)"
 arch=('any')
 # only for arches where rust doesn't work (otherwise use librsvg)
-mingw_arch=('clang32') # and someday 'clangarm64'
+mingw_arch=('clang32' 'clangarm64')
 url="https://live.gnome.org/LibRsvg"
 license=("LGPL")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
diff --git a/mingw-w64-vala/PKGBUILD b/mingw-w64-vala/PKGBUILD
index dcc930079a..1ef20e91d0 100644
--- a/mingw-w64-vala/PKGBUILD
+++ b/mingw-w64-vala/PKGBUILD
@@ -7,14 +7,13 @@ pkgver=0.54.5
 pkgrel=2
 pkgdesc="Compiler for the GObject type system (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://wiki.gnome.org/Projects/Vala"
 license=("LGPL")
 makedepends=("help2man"
              "${MINGW_PACKAGE_PREFIX}-libxslt"
              "${MINGW_PACKAGE_PREFIX}-autotools"
-              $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-aarch64* ]] || \
-              echo "${MINGW_PACKAGE_PREFIX}-vala")) # Remove this workaround after vala available
+             "${MINGW_PACKAGE_PREFIX}-vala"
 depends=("${MINGW_PACKAGE_PREFIX}-glib2"
           $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-aarch64* ]] || \
             echo "${MINGW_PACKAGE_PREFIX}-graphviz")) # Remove this workaround afer graphviz available

From b296f91f4cef7968123afc31efa132cad53c8987 Mon Sep 17 00:00:00 2001
From: Dennis Ameling <dennis@dennisameling.com>
Date: Tue, 28 Dec 2021 10:28:35 +0100
Subject: [PATCH 4/6] Apply review feedback

---
 mingw-w64-gtk3/PKGBUILD             | 3 ++-
 mingw-w64-json-glib/PKGBUILD        | 2 +-
 mingw-w64-shared-mime-info/PKGBUILD | 2 +-
 mingw-w64-vala/PKGBUILD             | 5 +++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/mingw-w64-gtk3/PKGBUILD b/mingw-w64-gtk3/PKGBUILD
index cc72a4c837..0c9707bc10 100644
--- a/mingw-w64-gtk3/PKGBUILD
+++ b/mingw-w64-gtk3/PKGBUILD
@@ -18,7 +18,8 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
              "${MINGW_PACKAGE_PREFIX}-sassc"
              "${MINGW_PACKAGE_PREFIX}-libxslt")
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
-         "${MINGW_PACKAGE_PREFIX}-adwaita-icon-theme"
+         $( [[ ${MINGW_PACKAGE_PREFIX} == *-clang-aarch64* ]] || \
+              echo "${MINGW_PACKAGE_PREFIX}-adwaita-icon-theme" )
          "${MINGW_PACKAGE_PREFIX}-atk"
          "${MINGW_PACKAGE_PREFIX}-cairo"
          "${MINGW_PACKAGE_PREFIX}-gdk-pixbuf2"
diff --git a/mingw-w64-json-glib/PKGBUILD b/mingw-w64-json-glib/PKGBUILD
index f136e843ec..51bc15f4aa 100644
--- a/mingw-w64-json-glib/PKGBUILD
+++ b/mingw-w64-json-glib/PKGBUILD
@@ -4,7 +4,7 @@ _realname=json-glib
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.6.6
-pkgrel=1
+pkgrel=2
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 pkgdesc="JSON-GLib implements a full suite of JSON-related tools using GLib and GObject (mingw-w64)"
diff --git a/mingw-w64-shared-mime-info/PKGBUILD b/mingw-w64-shared-mime-info/PKGBUILD
index 340e19d1f4..470e9546f7 100644
--- a/mingw-w64-shared-mime-info/PKGBUILD
+++ b/mingw-w64-shared-mime-info/PKGBUILD
@@ -5,7 +5,7 @@ _realname=shared-mime-info
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Freedesktop.org Shared MIME Info (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
diff --git a/mingw-w64-vala/PKGBUILD b/mingw-w64-vala/PKGBUILD
index 1ef20e91d0..b31c9d6c1f 100644
--- a/mingw-w64-vala/PKGBUILD
+++ b/mingw-w64-vala/PKGBUILD
@@ -13,10 +13,11 @@ license=("LGPL")
 makedepends=("help2man"
              "${MINGW_PACKAGE_PREFIX}-libxslt"
              "${MINGW_PACKAGE_PREFIX}-autotools"
-             "${MINGW_PACKAGE_PREFIX}-vala"
+             $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-aarch64* ]] || \
+              echo "${MINGW_PACKAGE_PREFIX}-vala")) # Remove this workaround when vala is available
 depends=("${MINGW_PACKAGE_PREFIX}-glib2"
           $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-aarch64* ]] || \
-            echo "${MINGW_PACKAGE_PREFIX}-graphviz")) # Remove this workaround afer graphviz available
+            echo "${MINGW_PACKAGE_PREFIX}-graphviz")) # Remove this workaround when graphviz is available
 source=(https://download.gnome.org/sources/${_realname}/${pkgver%.*}/${_realname}-${pkgver}.tar.xz)
 sha256sums=('0028da1685dedca993792bfb5f460db5ba548c9aa44323b1899f733a89121587')
 

From c24dcddeca2a9e860529c25c8f7d04fb542e5d6a Mon Sep 17 00:00:00 2001
From: Dennis Ameling <dennis@dennisameling.com>
Date: Tue, 28 Dec 2021 11:14:34 +0100
Subject: [PATCH 5/6] gtk2: enable for clangarm64

---
 mingw-w64-gtk2/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mingw-w64-gtk2/PKGBUILD b/mingw-w64-gtk2/PKGBUILD
index 237b40242f..76f859bbd9 100644
--- a/mingw-w64-gtk2/PKGBUILD
+++ b/mingw-w64-gtk2/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=2.24.33
 pkgrel=4
 pkgdesc="GTK+ is a multi-platform toolkit (v2) (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://www.gtk.org/"
 
 # According to gtk/gtk.h, this is either LGPL2+ or LGPL2.1+, if that makes any

From 1dd8ba7feeeb4f22ff19fe168af0dd4262cde88d Mon Sep 17 00:00:00 2001
From: Dennis Ameling <dennis@dennisameling.com>
Date: Tue, 28 Dec 2021 11:21:18 +0100
Subject: [PATCH 6/6] Tiny changes

---
 mingw-w64-vala/PKGBUILD | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mingw-w64-vala/PKGBUILD b/mingw-w64-vala/PKGBUILD
index b31c9d6c1f..29b2603ce8 100644
--- a/mingw-w64-vala/PKGBUILD
+++ b/mingw-w64-vala/PKGBUILD
@@ -13,11 +13,11 @@ license=("LGPL")
 makedepends=("help2man"
              "${MINGW_PACKAGE_PREFIX}-libxslt"
              "${MINGW_PACKAGE_PREFIX}-autotools"
-             $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-aarch64* ]] || \
-              echo "${MINGW_PACKAGE_PREFIX}-vala")) # Remove this workaround when vala is available
+              $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-aarch64* ]] || \
+              echo "${MINGW_PACKAGE_PREFIX}-vala")) # Remove this workaround after vala available
 depends=("${MINGW_PACKAGE_PREFIX}-glib2"
           $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-aarch64* ]] || \
-            echo "${MINGW_PACKAGE_PREFIX}-graphviz")) # Remove this workaround when graphviz is available
+            echo "${MINGW_PACKAGE_PREFIX}-graphviz")) # Remove this workaround afer graphviz available
 source=(https://download.gnome.org/sources/${_realname}/${pkgver%.*}/${_realname}-${pkgver}.tar.xz)
 sha256sums=('0028da1685dedca993792bfb5f460db5ba548c9aa44323b1899f733a89121587')