[rpms/bear] epel10: New upstream release 3.1.5, fixes rhbz#2315396

[rpms/bear] epel10: New upstream release 3.1.5, fixes rhbz#2315396

[@ 2026-07-11 2:31 UTC (permalink / raw)]

A new commit has been pushed.

Repo   : rpms/bear
Branch : epel10
Commit : b56d17dd9443c22b574397e95a655e69dc1fd048
Author : Dan Čermák <dan.cermak@cgc-instruments.com>
Date   : 2024-10-09T23:17:52+02:00
Stats  : +3/-64 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/bear/c/b56d17dd9443c22b574397e95a655e69dc1fd048?branch=epel10

Log:
New upstream release 3.1.5, fixes rhbz#2315396

---
diff --git a/.gitignore b/.gitignore
index 9d3321c..b979ef1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@
 /bear-3.1.2.tar.gz
 /bear-3.1.3.tar.gz
 /bear-3.1.4.tar.gz
+/bear-3.1.5.tar.gz

diff --git a/0001-citnames-include-fmt-ranges.h-for-using-fmt-join.patch b/0001-citnames-include-fmt-ranges.h-for-using-fmt-join.patch
deleted file mode 100644
index 2351bfa..0000000
--- a/0001-citnames-include-fmt-ranges.h-for-using-fmt-join.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 3b2c43cb2a3e6fcd09c42e1c1399ffa54d8d972a Mon Sep 17 00:00:00 2001
-From: Kefu Chai <tchaikov@gmail.com>
-Date: Sun, 14 Jul 2024 08:47:53 +0800
-Subject: [PATCH] citnames: include fmt/ranges.h for using fmt::join()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-fmt::join() was moved into fmt/ranges.h since fmt v11, so include
-this header for using fmt::join(). otherwise, we'd have following
-compilation failure when building Bear with fmt v11 and up:
-
-```
-/builddir/build/BUILD/bear-3.1.4-build/Bear-3.1.4/source/citnames/source/semantic/Parsers.h:255:73: error: ‘join’ is not a member of ‘fmt’
-  255 |                             fmt::format("Failed to recognize: {}", fmt::join(remainder.begin(), remainder.end(), ", "))
-      |                                                                         ^~~~
-```
-
-Signed-off-by: Kefu Chai <tchaikov@gmail.com>
----
- source/citnames/source/semantic/Parsers.h   | 1 +
- source/citnames/source/semantic/Semantic.cc | 3 ++-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/source/citnames/source/semantic/Parsers.h b/source/citnames/source/semantic/Parsers.h
-index 90e64f9..34203a1 100644
---- a/source/citnames/source/semantic/Parsers.h
-+++ b/source/citnames/source/semantic/Parsers.h
-@@ -30,6 +30,7 @@
- #include <optional>
- 
- #include <fmt/format.h>
-+#include <fmt/ranges.h>
- 
- namespace cs::semantic {
- 
-diff --git a/source/citnames/source/semantic/Semantic.cc b/source/citnames/source/semantic/Semantic.cc
-index da76295..54d3e62 100644
---- a/source/citnames/source/semantic/Semantic.cc
-+++ b/source/citnames/source/semantic/Semantic.cc
-@@ -21,6 +21,7 @@
- #include "semantic/Semantic.h"
- 
- #include <fmt/format.h>
-+#include <fmt/ranges.h>
- #ifdef HAVE_FMT_STD_H
- #include <fmt/std.h>
- #else
-@@ -133,4 +134,4 @@ namespace cs::semantic {
-         }
-         return results;
-     }
--}
-\ No newline at end of file
-+}
--- 
-2.45.2
-

diff --git a/bear.spec b/bear.spec
index 63462c4..ca289ea 100644
--- a/bear.spec
+++ b/bear.spec
@@ -1,5 +1,5 @@
 Name:           bear
-Version:        3.1.4
+Version:        3.1.5
 Release:        %autorelease
 Summary:        Tool that generates a compilation database for clang tooling
 
@@ -7,9 +7,6 @@ License:        GPL-3.0-or-later
 URL:            https://github.com/rizsotto/%{name}
 Source:         %{url}/archive/%{version}/%{name}-%{version}.tar.gz
 
-# https://github.com/rizsotto/Bear/pull/586
-Patch:          0001-citnames-include-fmt-ranges.h-for-using-fmt-join.patch
-
 # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
 ExcludeArch:    %{ix86}
 

diff --git a/sources b/sources
index 34227c7..e83eb25 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (bear-3.1.3.tar.gz) = 34039b51a7cd636bdb7fb716f69d6c70de3e7bfc5e2c83a3040942010fb7effe49b0afa0d29be182eb550d57b024fbe5bea779a7fda5f86201865bf491ba1672
-SHA512 (bear-3.1.4.tar.gz) = c63da7586d25a64dd8b3ff82f37505b36071dd064deb973c012840bc52ff6aec861fca21422b86b11629e86dc43d156b233d21b01e689369f0726799083afa98
+SHA512 (bear-3.1.5.tar.gz) = acf233f7bb8215694734b6c947c965323c0a5ea0c2a6bbb210a37e38fdf545326ca8de3a7b31ce81469756afd1c02233775ddc5936fd04132f216def6e3ce1de