From 4e6c47afa144fa21a03079c33de8471d9190597e Mon Sep 17 00:00:00 2001
From: ptrcnull <git@ptrcnull.me>
Date: Sat, 9 Jul 2022 02:35:15 +0200
Subject: [PATCH] community/flatbuffers: upgrade to 2.0.6
---
community/flatbuffers/APKBUILD | 16 ++++++++++++----
community/flatbuffers/fix-version.patch | 9 +++------
2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/community/flatbuffers/APKBUILD b/community/flatbuffers/APKBUILD
index d3afb77ef75f..ce8b9aab2cb6 100644
--- a/community/flatbuffers/APKBUILD
+++ b/community/flatbuffers/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=flatbuffers
-pkgver=2.0.0
-pkgrel=1
+pkgver=2.0.6
+pkgrel=0
pkgdesc="Memory Efficient Serialization Library"
url="https://google.github.io/flatbuffers/"
# blocked by bus error in tests
@@ -24,6 +24,14 @@ esac
# 0:
# - CVE-2020-35864
+prepare() {
+ default_prepare
+
+ # flattests fails if out-of-source build directory is used
+ # https://github.com/google/flatbuffers/issues/7282#issuecomment-1163114000
+ sed -r -i 's@//((include|monster)_test)@//../../tests/\1@g' tests/test.cpp
+}
+
build() {
cmake -B build -G Ninja \
-DCMAKE_INSTALL_PREFIX=/usr \
@@ -45,7 +53,7 @@ package() {
}
sha512sums="
-26a06b572c0e4c9685743bd2d2162ac7dcd74b9324624cc3f3ef5b154c0cee7c52a04b77cdc184245d2d6ae38dfdcc4fd66001c318aa8ca001d2bf1d85d66a89 flatbuffers-2.0.0.tar.gz
+be631f34064c28d81876bf137c796e9736623cf2cc4f2a05dd45372e7195729c99fad1fa795f8ce71a408756a842edbdc0c3bc714a7cf63203a1de8681d86fb6 flatbuffers-2.0.6.tar.gz
c80587472f2d498681410f283f8b40a65f8c73711b8086b46a3f4d5b419cfa65331c66d4d5d13a42b449eec673ea283c8170d5bed2b9a15e8b71b4f9a66e18d5 disable-Werror.patch
-c848530b3867bcf4bb3fbc4e5e83cfc838c06102b77e6f6a48cf1da7efac40f43c8eddbe122e9de360343959293af9738f5ac1f1bda0c841f0e24c6c902f8670 fix-version.patch
+e6a13b86211ac9034402c0e5801f31362ee50ba0922e1c6bdedc8f0347490ce0cea230259d7952ced16e5ebe0682c9db7961811bceac4c84627f91bc5dd2401a fix-version.patch
"
diff --git a/community/flatbuffers/fix-version.patch b/community/flatbuffers/fix-version.patch
index cbc08af3fdef..8c0b408d922d 100644
--- a/community/flatbuffers/fix-version.patch
+++ b/community/flatbuffers/fix-version.patch
@@ -1,12 +1,9 @@
gets our aports version otherwise
--- a/CMake/Version.cmake
+++ b/CMake/Version.cmake
-@@ -3,7 +3,7 @@
- set(VERSION_PATCH 0)
- set(VERSION_COMMIT 0)
+@@ -3,5 +3,4 @@
-find_program(GIT git)
-+#find_program(GIT git)
- if(GIT)
+ if(GIT AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git")
execute_process(
- COMMAND ${GIT} describe
+ COMMAND ${GIT} describe --tags
--
GitLab