From 882a96da06bdf97d1b854d2acabdd6013daa550e Mon Sep 17 00:00:00 2001 From: yan12125 Date: Wed, 28 Sep 2022 14:53:55 +0000 Subject: [PATCH] upgpkg: flatbuffers 22.9.24-1; revert incompatible changes in the test script [1] (Pushed to [community-testing] for testing if the new version scheme [2] breaks anything) [1] https://github.com/google/flatbuffers/pull/7529 [2] https://github.com/google/flatbuffers/pull/7547 git-svn-id: file:///srv/repos/svn-community/svn@1315604 9fca08f4-af9d-4005-b8df-a31f2cc04f65 --- flatbuffers/trunk/PKGBUILD | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/flatbuffers/trunk/PKGBUILD b/flatbuffers/trunk/PKGBUILD index 9e29e357247b..502d40d23cca 100644 --- a/flatbuffers/trunk/PKGBUILD +++ b/flatbuffers/trunk/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=flatbuffers pkgname=(flatbuffers python-flatbuffers) # https://github.com/google/flatbuffers/blob/master/CHANGELOG.md -pkgver=2.0.8 +pkgver=22.9.24 pkgrel=1 pkgdesc='An efficient cross platform serialization library for C++, with support for Java, C# and Go' arch=(x86_64) @@ -14,7 +14,7 @@ license=(Apache) depends=(gcc-libs) makedepends=(cmake python-setuptools python-numpy) source=(https://github.com/google/$pkgbase/archive/v$pkgver/$pkgbase-$pkgver.tar.gz) -sha256sums=('f97965a727d26386afaefff950badef2db3ab6af9afe23ed6d94bfb65f95f37e') +sha256sums=('40e0788873012def4d66a2fdbac15fbe012784473c01a703ccb5be33383556bf') prepare() { sed -i 's/-Werror=/-W/g;s/-Werror//g' $pkgname-$pkgver/CMakeLists.txt @@ -22,6 +22,11 @@ prepare() { cd $pkgbase-$pkgver # Work-around missing out-of-source build support in Python tests sed -i 's#${test_dir}/../flatc#${test_dir}/../../build/flatc#' tests/PythonTest.sh + # This script no longer works for us after https://github.com/google/flatbuffers/pull/7529 + # TODO: notify upstream about this and that the Python workflow [1] doesn't work [2] + # [1] https://github.com/google/flatbuffers/blob/v22.9.24/.github/workflows/build.yml#L413 + # [2] https://github.com/google/flatbuffers/actions/runs/3103852116/jobs/5034196360 + sed -i 's#${test_dir}/../../python#${test_dir}/../python#' tests/PythonTest.sh } build() {