From 8e2ff131d2e3c84c58315238e803e633a3260942 Mon Sep 17 00:00:00 2001 From: Tasos Sahanidis Date: Tue, 9 Apr 2024 20:40:29 +0300 Subject: extra/protobuf: Clean up patching --- extra/protobuf/PKGBUILD | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/extra/protobuf/PKGBUILD b/extra/protobuf/PKGBUILD index ba06c136..ca6fdb6b 100644 --- a/extra/protobuf/PKGBUILD +++ b/extra/protobuf/PKGBUILD @@ -1,33 +1,10 @@ -source+=('https://github.com/protocolbuffers/protobuf/commit/c94b66706bec17d918495f4715183a5eaf0f8044.patch' - 'fix_static_assert_fail_on_32bit.patch' -) - -sha512sums+=('SKIP' - 'c124cdab5cfb45274d6cfc45d1eb3bb4d6a6e9128a4b84ca0c3b6dd5ddbfa69bb3cf168dc2a5f51ffdd9125246e5e134e22943e56ccdda78a4a0b90eb6ccd164' -) - -_prepare() { - patch -d $pkgbase-$pkgver -p1 < fix_static_assert_fail_on_32bit.patch # Fix 32 bit builds - patch -d $pkgbase-$pkgver -p1 < c94b66706bec17d918495f4715183a5eaf0f8044.patch # Fix some 32 bit tests -} - -eval "$( - { - declare -f prepare || \ - echo 'prepare()' - } | \ - sed '$ i _prepare' -)" - # ignore failing tests eval "$( declare -f check | \ sed ' - s@cmake --build build --target check@cmake --build build --target check || true@ - s@python setup.py test@python setup.py test || true@ + s@\(ctest .*\);@\1 || true;@ ' -) -" +)" # no LTO on i486 if [ "$CARCH" = 'i486' ]; then -- cgit v1.2.3-54-g00ecf