jsonnet: Update to 0.21.0

mingw-w64-jsonnet/007-jsonnet-0.20.0-rapidyaml-aarch64.patch

@@ -1,24 +1,20 @@
-diff -bur jsonnet-0.20.0-o/third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float/include/fast_float/float_common.h jsonnet-0.20.0/third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float/include/fast_float/float_common.h
---- jsonnet-0.20.0-o/third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float/include/fast_float/float_common.h	2025-04-26 15:36:14.324363700 -0600
-+++ jsonnet-0.20.0/third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float/include/fast_float/float_common.h	2025-04-26 15:37:59.341711900 -0600
-@@ -161,8 +161,13 @@
+--- jsonnet-0.21.0/third_party/rapidyaml/ryml_all.hpp.orig	2025-05-07 14:28:56.000000000 +0200
++++ jsonnet-0.21.0/third_party/rapidyaml/ryml_all.hpp	2026-01-09 15:50:47.657489300 +0100
+@@ -7670,11 +7670,11 @@
+ fastfloat_really_inline value128 full_multiplication(uint64_t a,
                                                       uint64_t b) {
    value128 answer;
- #ifdef _M_ARM64
-+#ifdef __GNUC__
-+  __uint128_t mul = ((__uint128_t)a) * b;
-+  answer.high = mul >> 64;
-+#else
+-#ifdef _M_ARM64
++#if defined(_M_ARM64) && !defined(__GNUC__)
    // ARM64 has native support for 64-bit multiplications, no need to emulate
    answer.high = __umulh(a, b);
-+#endif 
    answer.low = a * b;
- #elif defined(FASTFLOAT_32BIT) || (defined(_WIN64) && !defined(__clang__))
+-#elif defined(FASTFLOAT_32BIT) || (defined(_WIN64) && !defined(__clang__))
++#elif defined(FASTFLOAT_32BIT) || (defined(_WIN64) && !defined(__clang__) && defined(_MSC_VER))
    answer.low = _umul128(a, b, &answer.high); // _umul128 not available on ARM64
-diff -bur jsonnet-0.20.0-o/third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/windows_pop.hpp jsonnet-0.20.0/third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/windows_pop.hpp
---- jsonnet-0.20.0-o/third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/windows_pop.hpp	2025-04-26 15:36:14.304344400 -0600
-+++ jsonnet-0.20.0/third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/windows_pop.hpp	2025-04-26 15:36:38.916843100 -0600
-@@ -13,6 +13,10 @@
+ #elif defined(FASTFLOAT_64BIT)
+   __uint128_t r = ((__uint128_t)a) * b;
+@@ -18140,6 +18140,10 @@
  #    undef _c4_ARM_
  #    undef _ARM_
  #endif
@@ -29,20 +25,3 @@ diff -bur jsonnet-0.20.0-o/third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/win
 
  #ifdef _c4_NOMINMAX
  #    undef _c4_NOMINMAX
-diff -bur jsonnet-0.20.0-o/third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/windows_push.hpp jsonnet-0.20.0/third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/windows_push.hpp
---- jsonnet-0.20.0-o/third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/windows_push.hpp	2025-04-26 15:36:14.332363500 -0600
-+++ jsonnet-0.20.0/third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/windows_push.hpp	2025-04-26 15:37:10.262450900 -0600
-@@ -8,7 +8,12 @@
-  *
-  * @see https://aras-p.info/blog/2018/01/12/Minimizing-windows.h/ */
-
--#if defined(_WIN64)
-+#if defined(_M_ARM64)
-+#   ifndef _ARM64_
-+#       define _c4_ARM64_
-+#       define _ARM64_
-+#   endif
-+#elif defined(_WIN64)
- #   ifndef _AMD64_
- #       define _c4_AMD64_
- #       define _AMD64_

mingw-w64-jsonnet/PKGBUILD

@@ -4,8 +4,8 @@ _realname=jsonnet
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-python-${_realname}")
-pkgver=0.20.0
-pkgrel=6
+pkgver=0.21.0
+pkgrel=1
 pkgdesc="The data templating language (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -24,21 +24,9 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('!strip')
 source=("${url}/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz"
-        '001-jsonnet-0.20.0-cxx17.patch'
-        '002-jsonnet-0.20.0-include-nlohmann-json.patch'
-        '003-jsonnet-0.20.0-link-libraries.patch'
-        '004-jsonnet-0.20.0-core-runtime.patch'
-        '005-jsonnet-0.20.0-cpp-runtime.patch'
-        '006-jsonnet-0.20.0-c4core-nopack.patch'
         '007-jsonnet-0.20.0-rapidyaml-aarch64.patch')
-sha256sums=('77bd269073807731f6b11ff8d7c03e9065aafb8e4d038935deb388325e52511b'
-            '83dc8dabde1caa87a5d59f945952f61fb1b7d77079d3c849772464674eef6c6d'
-            '606fa576a6ad4c71ce5c3bfd5ab6dc9461ccfc36e959830e133123a0cb652c93'
-            'e2ea63010cbe37296715139878393d26c5b3c04ca1f3cd8cb60bc6a2ec8e9402'
-            'dfe3393b4eb6a3f4d0b18b683970bb50d8267d8041221beeb4a8e9386f7f4ce2'
-            'f75f4330f6b18219a01660a4f4d4b3cb9928441def0a0e739c2503870363ca40'
-            '38dfe387e68d67ac85c21a19ae8ec5e6af18fbd3649b44f3ddde1866bea3b974'
-            '9be36ff6405ee9dbe868654f1cdd2e38527ca8cde7bc357711109b47b3c05de5')
+sha256sums=('a12ebca72e43e7061ffe4ef910e572b95edd7778a543d6bf85f6355bd290300e'
+            'f80ffb6cb68e53489e20a1c87c33133d0d9b36d3097ee0dbc37d203bf2c8a8ce')
 
 apply_patch_with_msg() {
   for _patch in "$@"
@@ -52,12 +40,6 @@ prepare() {
   cd "${srcdir}"/${_realname}-${pkgver}
 
   apply_patch_with_msg \
-    001-jsonnet-0.20.0-cxx17.patch \
-    002-jsonnet-0.20.0-include-nlohmann-json.patch \
-    003-jsonnet-0.20.0-link-libraries.patch \
-    004-jsonnet-0.20.0-core-runtime.patch \
-    005-jsonnet-0.20.0-cpp-runtime.patch \
-    006-jsonnet-0.20.0-c4core-nopack.patch \
     007-jsonnet-0.20.0-rapidyaml-aarch64.patch
 }