Re: [PR PATCH] [Updated] flatbuffers: update to 1.11.0

[voidlinux-github@inbox.vuxu.org]

[-- Attachment #1: Type: text/plain, Size: 327 bytes --]

There is an updated pull request by concatime against master on the void-packages repository

https://github.com/concatime/void-packages flatbuffers
https://github.com/void-linux/void-packages/pull/15314

flatbuffers: update to 1.11.0


A patch file from https://github.com/void-linux/void-packages/pull/15314.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-flatbuffers-15314.patch --]
[-- Type: text/x-diff, Size: 2907 bytes --]

From f53a88690117a7fe764a3adec38f8e5ba1c734c5 Mon Sep 17 00:00:00 2001
From: Issam Maghni <me@concati.me>
Date: Thu, 10 Oct 2019 23:39:17 -0400
Subject: [PATCH 1/2] flatbuffers: update to 1.11.0

---
 srcpkgs/flatbuffers/patches/install.patch | 20 --------------------
 srcpkgs/flatbuffers/template              |  7 ++-----
 2 files changed, 2 insertions(+), 25 deletions(-)
 delete mode 100644 srcpkgs/flatbuffers/patches/install.patch

diff --git a/srcpkgs/flatbuffers/patches/install.patch b/srcpkgs/flatbuffers/patches/install.patch
deleted file mode 100644
index 6669eaffaa8..00000000000
--- a/srcpkgs/flatbuffers/patches/install.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -320,7 +320,7 @@ if(FLATBUFFERS_INSTALL)
-     install(
-       TARGETS flatc EXPORT FlatcTargets
-       RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
--      CONFIGURATIONS Release
-+      CONFIGURATIONS Release RelWithDebInfo
-     )
- 
-     install(
-@@ -328,7 +328,7 @@ if(FLATBUFFERS_INSTALL)
-       FILE FlatcTargets.cmake
-       NAMESPACE flatbuffers::
-       DESTINATION ${FB_CMAKE_DIR}
--      CONFIGURATIONS Release
-+      CONFIGURATIONS Release RelWithDebInfo
-     )
-   endif()
- 
diff --git a/srcpkgs/flatbuffers/template b/srcpkgs/flatbuffers/template
index d38db2c5b08..b5603cb4dfc 100644
--- a/srcpkgs/flatbuffers/template
+++ b/srcpkgs/flatbuffers/template
@@ -1,6 +1,6 @@
 # Template file for 'flatbuffers'
 pkgname=flatbuffers
-version=1.10.0
+version=1.11.0
 revision=1
 build_style=cmake
 short_desc="Memory Efficient Serialization Library"
@@ -8,10 +8,7 @@ maintainer="Elie ROUDNINSKI <xademax@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://google.github.io/flatbuffers/"
 distfiles="https://github.com/google/${pkgname}/archive/v${version}.tar.gz"
-checksum=3714e3db8c51e43028e10ad7adffb9a36fc4aa5b1a363c2d0c4303dd1be59a7c
-
-# prevents building of tests on gcc9
-CXXFLAGS="-Wno-error=class-memaccess"
+checksum=3f4a286642094f45b1b77228656fbd7ea123964f19502f9ecfd29933fd23a50b
 
 if [ "$CROSS_BUILD" ]; then
 	# Disable tests to prevent executing target binaries on host

From ba61caaa443f3abd50e9ca57ddeda45cc66bd940 Mon Sep 17 00:00:00 2001
From: Issam Maghni <me@concati.me>
Date: Fri, 11 Oct 2019 00:37:50 -0400
Subject: [PATCH 2/2] flatbuffers: fix build on *-musl

---
 srcpkgs/flatbuffers/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/flatbuffers/template b/srcpkgs/flatbuffers/template
index b5603cb4dfc..a8d5b8237a0 100644
--- a/srcpkgs/flatbuffers/template
+++ b/srcpkgs/flatbuffers/template
@@ -15,6 +15,10 @@ if [ "$CROSS_BUILD" ]; then
 	configure_args="-DFLATBUFFERS_BUILD_TESTS=OFF"
 fi
 
+case "$XBPS_TARGET_MACHINE" in
+	*-musl) cmake_args+=" -DFLATBUFFERS_LOCALE_INDEPENDENT=0";;
+esac
+
 flatbuffers-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"