libavro: update to 1.12.0

mingw-w64-libavro/001-libavro-1.10.0-fix-mingw-build.patch

@@ -200,8 +200,8 @@ index 6c8d7aaf3f0a20832699448a82d43f9236330f60..f3a013c4ab6c838fe485dc4b046d53f3
  # add_definitions(-DAVRO_ALLOW_MISSING_FIELDS_IN_RESOLVED_WRITER)
 diff --git a/lang/c++/api/Config.hh b/lang/c++/api/Config.hh
 index 69d36f2abe1622ca50f319a6340e778051c10073..cea6ce39965ed461c1e6ef8339c18d899b11e5c0 100644
---- a/lang/c++/api/Config.hh
-+++ b/lang/c++/api/Config.hh
+--- a/lang/c++/include/avro/Config.hh
++++ b/lang/c++/include/avro/Config.hh
 @@ -33,7 +33,9 @@
  #endif // AVRO_DYN_LINK
  
@@ -212,6 +212,16 @@ index 69d36f2abe1622ca50f319a6340e778051c10073..cea6ce39965ed461c1e6ef8339c18d89
  #endif // _WIN32
  
  #ifndef AVRO_DECL
+--- a/lang/c++/include/avro/LogicalType.hh
++++ b/lang/c++/include/avro/LogicalType.hh
+@@ -20,6 +20,7 @@
+ #define avro_LogicalType_hh__
+ 
+ #include <iostream>
++#include <cstdint>
+ 
+ #include "Config.hh"
+ 
 diff --git a/lang/c++/test/DataFileTests.cc b/lang/c++/test/DataFileTests.cc
 index 4f94d80daa7ad902b5d0b6852ce6c9d216651e05..72213e3b3d79a71f7ed24f8a1ca54b9ee7046e23 100644
 --- a/lang/c++/test/DataFileTests.cc
@@ -224,7 +234,7 @@ index 4f94d80daa7ad902b5d0b6852ce6c9d216651e05..72213e3b3d79a71f7ed24f8a1ca54b9e
          avro::DataFileReader<ComplexInteger> df(filename, writerSchema);
 -        std::ifstream just_for_length(
 -            filename, std::ifstream::ate | std::ifstream::binary);
--        int length = just_for_length.tellg();
+-        int length = static_cast<int>(just_for_length.tellg());
          int splits = 10;
          int end = length;     // end of split
          int remaining = end;  // bytes remaining
@@ -232,7 +242,7 @@ diff --git a/lang/c++/CMakeLists.txt b/lang/c++/CMakeLists.txt
 index 69feee5b1197350da889f1d8cb3d2385f7cb1cc8..b79d9d4cfd855e5697b4c9fcca113285a306a84a 100644
 --- a/lang/c++/CMakeLists.txt
 +++ b/lang/c++/CMakeLists.txt
-@@ -51,7 +51,7 @@ list(GET AVRO_VERSION 2 AVRO_VERSION_PATCH)
+@@ -55,7 +55,7 @@ list(GET AVRO_VERSION 2 AVRO_VERSION_PATCH)
  project (Avro-cpp)
  set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR})
  
@@ -241,16 +251,16 @@ index 69feee5b1197350da889f1d8cb3d2385f7cb1cc8..b79d9d4cfd855e5697b4c9fcca113285
      add_definitions (/EHa)
      add_definitions (
          -DNOMINMAX
-@@ -64,7 +64,7 @@ if (WIN32 AND NOT CYGWIN AND NOT MSYS)
+@@ -68,7 +68,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} -Wall -Wextra -Wduplicated-cond -Wduplicated-branches -Wlogical-op -Wuseless-cast -Wconversion -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)
+@@ -211,7 +211,6 @@ unittest (CodecTests)
  unittest (StreamTests)
  unittest (SpecificTests)
  unittest (DataFileTests)
@@ -258,7 +268,7 @@ index 69feee5b1197350da889f1d8cb3d2385f7cb1cc8..b79d9d4cfd855e5697b4c9fcca113285
  unittest (AvrogencppTests)
  unittest (CompilerTests)
  unittest (AvrogencppTestReservedWords)
-@@ -205,9 +204,9 @@ set (CPACK_PACKAGE_FILE_NAME "avrocpp-${AVRO_VERSION_MAJOR}")
+@@ -233,9 +232,9 @@ set (CPACK_PACKAGE_FILE_NAME "avrocpp-${AVRO_VERSION_MAJOR}")
  include (CPack)
  
  install (TARGETS avrocpp avrocpp_s

mingw-w64-libavro/003-libavro-fix-pkgconfig-file.patch

@@ -1,25 +1,3 @@
-diff --git a/lang/c/CMakeLists.txt b/lang/c/CMakeLists.txt
-index aba949b..946a3e0 100644
---- a/lang/c/CMakeLists.txt
-+++ b/lang/c/CMakeLists.txt
-@@ -152,7 +152,7 @@ endif (ZLIB_FOUND)
- 
- find_package(Snappy)
- if (SNAPPY_FOUND AND ZLIB_FOUND)  # Snappy borrows crc32 from zlib
--    set(SNAPPY_PKG libsnappy)
-+    set(SNAPPY_PKG snappy)
-     add_definitions(-DSNAPPY_CODEC)
-     include_directories(${SNAPPY_INCLUDE_DIRS})
-     message("Enabled snappy codec")
-@@ -177,7 +177,7 @@ else (LZMA_FOUND)
- endif (LZMA_FOUND)
- 
- set(CODEC_LIBRARIES ${ZLIB_LIBRARIES} ${LZMA_LIBRARIES} ${SNAPPY_LIBRARIES})
--set(CODEC_PKG "@ZLIB_PKG@ @LZMA_PKG@ @SNAPPY_PKG@")
-+set(CODEC_PKG "${ZLIB_PKG} ${LZMA_PKG} ${SNAPPY_PKG}")
- 
- # Jansson JSON library
- pkg_check_modules(JANSSON jansson>=2.3)
 diff --git a/lang/c/src/CMakeLists.txt b/lang/c/src/CMakeLists.txt
 index 2323182..7ec0048 100644
 --- a/lang/c/src/CMakeLists.txt

mingw-w64-libavro/PKGBUILD

@@ -3,15 +3,15 @@
 _realname=libavro
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=1.11.3
-pkgrel=3
+pkgver=1.12.0
+pkgrel=1
 pkgdesc="The Apache Avro data serialization system (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url="https://github.com/apache/avro"
 msys2_references=(
   'aur: avro-c'
 )
-url="https://github.com/apache/avro"
 license=('spdx:Apache-2.0')
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
@@ -26,14 +26,17 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-snappy"
          "${MINGW_PACKAGE_PREFIX}-xz"
          "${MINGW_PACKAGE_PREFIX}-zlib")
+options=(!emptydirs)
 source=("https://github.com/apache/avro/archive/release-${pkgver}/${_realname}-${pkgver}.tar.gz"
         "001-libavro-1.10.0-fix-mingw-build.patch"
         "002-libavro-1.10.0-add-threadsafe-option.patch"
-        "003-libavro-fix-pkgconfig-file.patch")
-sha256sums=('da377ac1cf8b91458bf702cbcfb214eecb5c399b267f0ca9c0aade6cabaf126e'
-            '5fe8808455773299305f68e715c8936612e83970cde7f32237f708882460e83f'
+        "003-libavro-fix-pkgconfig-file.patch"
+        "004-Fix-bad-filesystem_path-conversion-type-on-windows.patch::https://github.com/apache/avro/commit/ed85a819.patch")
+sha256sums=('51832f9c2e81fa95addb74be627dac27b4883ec2c8627ec8471d99cfea787555'
+            '8ffe71a02c0aa62d9b4e29eaaccb7374ae7a98fb5b00ec189d4ce350fa25e739'
             '346e37dc9adb52739e672483ee895299da6e00121ae0061beb2df3063234d62b'
-            '0dd04ae3557fc2bee2e738d1285d494f0dc1685707d98aeb28c98fc4036b66e4')
+            'eafde6b9ec2fbd06f926b76d017d0d0971fd136ccee1d5cab2842f53c05ae611'
+            '94ac77939e2b21864cbf1881f05f802da82a0c430590bc9bb34e8cb67f74986b')
 
 _apply_patch_with_msg() {
   for _patch in "$@"
@@ -49,7 +52,8 @@ prepare() {
   _apply_patch_with_msg \
     001-libavro-1.10.0-fix-mingw-build.patch \
     002-libavro-1.10.0-add-threadsafe-option.patch \
-    003-libavro-fix-pkgconfig-file.patch
+    003-libavro-fix-pkgconfig-file.patch \
+    004-Fix-bad-filesystem_path-conversion-type-on-windows.patch
 }
 
 build() {
@@ -91,5 +95,11 @@ package() {
     cd "${srcdir}/build-${MSYSTEM}-${lang}"
     DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install .
   done
+
   rm "${pkgdir}${MINGW_PREFIX}"/include/avro/{msinttypes,msstdint}.h
+
+  rm -r "${pkgdir}${MINGW_PREFIX}"/include/fmt/
+  rm -r "${pkgdir}${MINGW_PREFIX}"/lib/cmake/fmt/
+  rm "${pkgdir}${MINGW_PREFIX}"/lib/pkgconfig/fmt.pc
+  rm "${pkgdir}${MINGW_PREFIX}"/lib/libfmt.a
 }