From 03ed71c97fa32182cb41e6dff305f92a48a05a3a Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath <nathbappai@gmail.com>
Date: Thu, 28 Sep 2023 20:06:50 +0000
Subject: [PATCH] libavro: update to 1.11.3

---
 .../001-libavro-1.10.0-fix-mingw-build.patch     | 14 +++++++++++---
 mingw-w64-libavro/PKGBUILD                       | 16 ++++++++--------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/mingw-w64-libavro/001-libavro-1.10.0-fix-mingw-build.patch b/mingw-w64-libavro/001-libavro-1.10.0-fix-mingw-build.patch
index 65471daf7a..9048d870ab 100644
--- a/mingw-w64-libavro/001-libavro-1.10.0-fix-mingw-build.patch
+++ b/mingw-w64-libavro/001-libavro-1.10.0-fix-mingw-build.patch
@@ -241,16 +241,24 @@ index 69feee5b1197350da889f1d8cb3d2385f7cb1cc8..b79d9d4cfd855e5697b4c9fcca113285
      add_definitions (/EHa)
      add_definitions (
          -DNOMINMAX
-@@ -185,7 +185,6 @@
+@@ -64,7 +64,7 @@ if (WIN32 AND NOT CYGWIN AND NOT MSYS)
+ endif()
+ 
+ if (CMAKE_COMPILER_IS_GNUCXX)
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -Werror")
++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+ if (AVRO_ADD_PROTECTOR_FLAGS)
+     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fstack-protector-all -D_GLIBCXX_DEBUG")
+     # Unset _GLIBCXX_DEBUG for avrogencpp.cc because using Boost Program Options
+@@ -185,7 +185,6 @@ unittest (CodecTests)
  unittest (StreamTests)
  unittest (SpecificTests)
  unittest (DataFileTests)
 -unittest (JsonTests)
-#unittest (JsonTests)
  unittest (AvrogencppTests)
  unittest (CompilerTests)
  unittest (AvrogencppTestReservedWords)
-@@ -205,9 +205,9 @@ set (CPACK_PACKAGE_FILE_NAME "avrocpp-${AVRO_VERSION_MAJOR}")
+@@ -205,9 +204,9 @@ set (CPACK_PACKAGE_FILE_NAME "avrocpp-${AVRO_VERSION_MAJOR}")
  include (CPack)
  
  install (TARGETS avrocpp avrocpp_s
diff --git a/mingw-w64-libavro/PKGBUILD b/mingw-w64-libavro/PKGBUILD
index ec0fdbf89e..c557bcb4e4 100644
--- a/mingw-w64-libavro/PKGBUILD
+++ b/mingw-w64-libavro/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=libavro
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=1.11.1
+pkgver=1.11.3
 pkgrel=1
 pkgdesc="The Apache Avro data serialization system (mingw-w64)"
 arch=('any')
@@ -12,7 +12,7 @@ msys2_references=(
   'aur: avro-c'
 )
 url="https://github.com/apache/avro"
-license=('Apache')
+license=('spdx:Apache-2.0')
 makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-pkgconf"
@@ -26,14 +26,14 @@ depends=("${MINGW_PACKAGE_PREFIX}-boost"
 source=("${_realname}-${pkgver}.tar.gz::https://github.com/apache/avro/archive/release-${pkgver}.tar.gz"
         "001-libavro-1.10.0-fix-mingw-build.patch"
         "002-libavro-1.10.0-add-threadsafe-option.patch")
-sha256sums=('599f96bb405f72a35154b2477caa6254d723bb4e3f6a0e54e9ae540664321752'
-            'e4c7648ef90268a9ce561e6a4028ff63a206f28e82fe8f4dc01630825b266761'
+sha256sums=('da377ac1cf8b91458bf702cbcfb214eecb5c399b267f0ca9c0aade6cabaf126e'
+            '5fe8808455773299305f68e715c8936612e83970cde7f32237f708882460e83f'
             '346e37dc9adb52739e672483ee895299da6e00121ae0061beb2df3063234d62b')
 
 prepare() {
   cd "${srcdir}/avro-release-${pkgver}"
-  patch -Np1 -i "${srcdir}/001-libavro-1.10.0-fix-mingw-build.patch"
-  patch -Np1 -i "${srcdir}/002-libavro-1.10.0-add-threadsafe-option.patch"
+  patch -p1 -i "${srcdir}/001-libavro-1.10.0-fix-mingw-build.patch"
+  patch -p1 -i "${srcdir}/002-libavro-1.10.0-add-threadsafe-option.patch"
 }
 
 build() {
@@ -45,7 +45,7 @@ build() {
 
     MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
     ${MINGW_PREFIX}/bin/cmake.exe \
-      -G"Ninja" \
+      -GNinja \
       -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
       -DCMAKE_BUILD_TYPE="Release" \
       -DTHREADSAFE=ON \
@@ -59,7 +59,7 @@ check() {
   for lang in c c++
   do
     cd "${srcdir}/build-${MSYSTEM}-${lang}"
-    ${MINGW_PREFIX}/bin/ctest
+    ${MINGW_PREFIX}/bin/ctest .
   done
 }