Jan Alexander Steffens (heftig) pushed to branch main at Arch Linux / Packaging
/ Packages / bear
Commits:
13879419 by Jan Alexander Steffens (heftig) at 2023-08-26T11:17:03+02:00
3.1.2-5: spdlog 1.12.0
- - - - -
2 changed files:
- PKGBUILD
- − fmt-10.patch
Changes:
=====================================
PKGBUILD
=====================================
@@ -4,7 +4,7 @@
pkgname=bear
pkgver=3.1.2
-pkgrel=4
+pkgrel=5
pkgdesc='A tool to generate compilation database for clang tooling'
arch=('x86_64')
url='https://github.com/rizsotto/Bear'
@@ -31,10 +31,8 @@ makedepends=(
'llvm'
)
_commit='0c48ae75892c8ace741a87209e7293c50687c9f0'
-source=("$pkgname::git+$url.git#commit=$_commit"
- fmt-10.patch)
-b2sums=('SKIP'
-
'cd0e74b2ff376aec19b8dad0d578697d70b73bf29f3bb6b72155815798d98ad51aae0cbce61faa16adc6579a5f0433826cb1a9d55924a344b6bb2113cfe627d9')
+source=("$pkgname::git+$url.git#commit=$_commit")
+b2sums=('SKIP')
pkgver() {
cd "$pkgname"
@@ -46,7 +44,10 @@ pkgver() {
# there must be some environment variables that
# are discarded inbetween functions.
prepare() {
- patch -d $pkgname -p1 < fmt-10.patch # Fix build with fmt 10
+ # fix build with fmt 10
+ git -C "$pkgname" cherry-pick -n \
+ 46a032fa0fc8131779ece13f26735ec84be891e8 \
+ 4ef4e438c7b0125aeeb8ee6fc5c5992c7af76199
cmake \
-B build \
=====================================
fmt-10.patch deleted
=====================================
@@ -1,13 +0,0 @@
-diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
-index 6da1131..fe6b710 100644
---- a/source/CMakeLists.txt
-+++ b/source/CMakeLists.txt
-@@ -29,7 +29,7 @@ find_package(spdlog REQUIRED)
- find_package(PkgConfig REQUIRED)
- pkg_check_modules(gRPC REQUIRED IMPORTED_TARGET protobuf grpc++)
-
--if (fmt_VERSION_MAJOR EQUAL 9)
-+if (fmt_VERSION_MAJOR GREATER_EQUAL 9)
- set(FMT_NEEDS_OSTREAM_FORMATTER 1)
- set(HAVE_FMT_STD_H 1) # FIXME: this should be done with
`check_include_file`
- endif ()
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/bear/-/commit/13879419a271b5e7843f8454567aff5b6a971cd3
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/bear/-/commit/13879419a271b5e7843f8454567aff5b6a971cd3
You're receiving this email because of your account on gitlab.archlinux.org.
