From 656690cb2a0af9cffbbbb8f38a9a07f73e3be8a7 Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Mon, 5 Sep 2022 01:52:10 +0530 Subject: [PATCH] flatbuffers: update to 2.0.8 --- .../0002-cmake-prevent-libcxxabi.patch | 4 ++-- mingw-w64-flatbuffers/PKGBUILD | 13 ++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/mingw-w64-flatbuffers/0002-cmake-prevent-libcxxabi.patch b/mingw-w64-flatbuffers/0002-cmake-prevent-libcxxabi.patch index 040c39dffc..13d3c95b5e 100644 --- a/mingw-w64-flatbuffers/0002-cmake-prevent-libcxxabi.patch +++ b/mingw-w64-flatbuffers/0002-cmake-prevent-libcxxabi.patch @@ -1,5 +1,5 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt +--- a/CMake/CMakeLists_legacy.cmake.in ++++ b/CMake/CMakeLists_legacy.cmake.in @@ -333,6 +333,7 @@ "${CMAKE_CXX_FLAGS} -stdlib=libc++") endif() diff --git a/mingw-w64-flatbuffers/PKGBUILD b/mingw-w64-flatbuffers/PKGBUILD index ed7111cb46..5d9d671936 100644 --- a/mingw-w64-flatbuffers/PKGBUILD +++ b/mingw-w64-flatbuffers/PKGBUILD @@ -3,13 +3,13 @@ _realname=flatbuffers pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=2.0.6 +pkgver=2.0.8 pkgrel=1 pkgdesc='Memory Efficient Serialization Library (mingw-w64)' arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') url='https://google.github.io/flatbuffers/' -license=('Apache') +license=('spdx:Apache-2.0') makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja" "${MINGW_PACKAGE_PREFIX}-cc") @@ -17,9 +17,9 @@ depends=("${MINGW_PACKAGE_PREFIX}-libsystre") source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/google/${_realname}/archive/v${pkgver}.tar.gz" 0001-cmake-fix-install.patch 0002-cmake-prevent-libcxxabi.patch) -sha256sums=('e2dc24985a85b278dd06313481a9ca051d048f9474e0f199e372fea3ea4248c9' +sha256sums=('f97965a727d26386afaefff950badef2db3ab6af9afe23ed6d94bfb65f95f37e' '3a7900943c5a95a0350052ed29a982c65bc821ca50f0f56a7b9482e6361a10f0' - 'c0800d6a26399fcadb118fd685c817f345fc81567c673df109faac2b33a295f3') + 'b33d9a0bf2d87f0948a83deac699b94ac4592f8aa422eb45961b36b768edd72e') prepare() { cd "${_realname}-${pkgver}" @@ -31,8 +31,7 @@ prepare() { } build() { - [[ -d "${srcdir}"/build-${MINGW_CHOST} ]] && rm -rf "${srcdir}"/build-${MINGW_CHOST} - mkdir -p "${srcdir}"/build-${MINGW_CHOST} && cd "${srcdir}"/build-${MINGW_CHOST} + mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}" MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake.exe \ @@ -46,7 +45,7 @@ build() { } package() { - cd "${srcdir}/build-${MINGW_CHOST}" + cd "${srcdir}/build-${MSYSTEM}" DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --install ./ install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE.txt" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE.txt"