[packages/bear] - added libfmt patch to support libfmt 10+; release 2

qboosh qboosh at pld-linux.org
Tue Jul 25 17:49:33 CEST 2023


commit 5f1487c2a306382d6641cd0ac216f22acca3636c
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Jul 25 17:17:15 2023 +0200

    - added libfmt patch to support libfmt 10+; release 2

 bear-libfmt.patch | 11 +++++++++++
 bear.spec         |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/bear.spec b/bear.spec
index 962a5c7..4441eb3 100644
--- a/bear.spec
+++ b/bear.spec
@@ -2,11 +2,12 @@ Summary:	Tool that generates a compilation database for clang tooling
 Summary(pl.UTF-8):	Narzędzie generujące bazę danych kompilacji do obróbki clanga
 Name:		bear
 Version:	3.1.2
-Release:	1
+Release:	2
 License:	GPL v3+
 Group:		Development/Building
 Source0:	https://github.com/rizsotto/Bear/archive/%{version}/%{name}-%{version}.tar.gz
 # Source0-md5:	00dff45a771dcf3dcef1491b2a8c475f
+Patch0:		%{name}-libfmt.patch
 URL:		https://github.com/rizsotto/Bear
 BuildRequires:	cmake >= 3.13
 BuildRequires:	gmock-devel >= 1.10
@@ -47,6 +48,7 @@ trakcie procesu budowania.
 
 %prep
 %setup -q -n Bear-%{version}
+%patch0 -p1
 
 %build
 export CC="%{__cc}"
diff --git a/bear-libfmt.patch b/bear-libfmt.patch
new file mode 100644
index 0000000..a752ee5
--- /dev/null
+++ b/bear-libfmt.patch
@@ -0,0 +1,11 @@
+--- Bear-3.1.2/source/CMakeLists.txt.orig	2023-04-21 14:49:25.000000000 +0200
++++ Bear-3.1.2/source/CMakeLists.txt	2023-07-25 17:07:10.705516409 +0200
+@@ -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 ()
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/bear.git/commitdiff/5f1487c2a306382d6641cd0ac216f22acca3636c



More information about the pld-cvs-commit mailing list