From acdf02e1d25b7f8df56414122c676b6654a5c7f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
Date: Sun, 20 Dec 2020 20:06:20 +0100
Subject: [PATCH] community/bear: upgrade to 3.0.4
---
community/bear/0001-cmake-fix-337.patch | 24 ------------------------
community/bear/APKBUILD | 10 ++++------
2 files changed, 4 insertions(+), 30 deletions(-)
delete mode 100644 community/bear/0001-cmake-fix-337.patch
diff --git a/community/bear/0001-cmake-fix-337.patch b/community/bear/0001-cmake-fix-337.patch
deleted file mode 100644
index 193540dec40d..000000000000
--- a/community/bear/0001-cmake-fix-337.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-See: https://github.com/rizsotto/Bear/issues/337
-
-From 87ba190cf16569d219d44d3c204051b91172a66c Mon Sep 17 00:00:00 2001
-From: Laszlo Nagy <rizsotto@gmail.com>
-Date: Wed, 9 Dec 2020 00:06:18 +1100
-Subject: [PATCH] cmake: fix #337
-
----
- CMakeLists.txt | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 78e71a1..f15c14f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -58,8 +58,6 @@ ExternalProject_Add(BearSource
- -DROOT_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
- -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
- -DENABLE_UNIT_TESTS:BOOL=${ENABLE_UNIT_TESTS}
-- BUILD_ALWAYS
-- 1
- TEST_BEFORE_INSTALL
- 1
- TEST_COMMAND
diff --git a/community/bear/APKBUILD b/community/bear/APKBUILD
index 19c6bbbf3501..9c018b0db9c6 100644
--- a/community/bear/APKBUILD
+++ b/community/bear/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
pkgname=bear
-pkgver=3.0.3
-pkgrel=2
+pkgver=3.0.4
+pkgrel=0
pkgdesc="Tool which generates a compilation database for clang tooling"
url="https://github.com/rizsotto/Bear"
# ppc64le armv7 armhf: Limited by grpc
@@ -12,8 +12,7 @@ license="GPL-3.0-or-later"
makedepends="cmake grpc grpc-dev fmt-dev spdlog-dev
nlohmann-json protobuf-dev gtest-dev c-ares-dev"
subpackages="$pkgname-doc"
-source="https://github.com/rizsotto/Bear/archive/$pkgver/bear-$pkgver.tar.gz
- 0001-cmake-fix-337.patch"
+source="https://github.com/rizsotto/Bear/archive/$pkgver/bear-$pkgver.tar.gz"
builddir="$srcdir/Bear-$pkgver"
build() {
@@ -35,5 +34,4 @@ package() {
make -C build DESTDIR="$pkgdir" install
}
-sha512sums="7e90aabcbbf138c4fd1cac0f187094874027e4d48c59389cfa6bef06e07fd4eaf18e9b83173d699131225ae88c6566e73849e9a5630bb2c7ec51f9af55652b67 bear-3.0.3.tar.gz
-f16c59d816531b494b8f6767b377fe57127c310dd491e826413eeba429b8cbd2653f905fbbf30638cfd117e826064f1bffd7a7244d8e813e022d1960a87c814a 0001-cmake-fix-337.patch"
+sha512sums="d0329d4fcf307a8ebe66c56ffec196515fed468ea542078adf9d1990c8da8d4dc0cef869189b234b8abab13d4e81d69bcc9dfe328c666442b9ab79b66810181a bear-3.0.4.tar.gz"
--
GitLab