Attachment #252798 for bug #280844

View | Details | Raw Unified | Return to bug 280844
Collapse All | Expand All

Lines 1-6 Link Here

(-)b/devel/bear/Makefile (-2 / +2 lines)
1	PORTNAME= bear	1	PORTNAME= bear
2	DISTVERSION= 3.1.3	2	DISTVERSION= 3.1.4
3	PORTREVISION= 10
4	CATEGORIES= devel	3	CATEGORIES= devel
5		4
6	MAINTAINER= jrm@FreeBSD.org	5	MAINTAINER= jrm@FreeBSD.org
Lines 8-13 COMMENT= Tool that generates a compilation database for clang tooling Link Here
8	WWW= https://github.com/rizsotto/Bear	7	WWW= https://github.com/rizsotto/Bear
9		8
10	LICENSE= GPLv3+	9	LICENSE= GPLv3+
		10	LICENSE_FILE= ${WRKSRC}/COPYING
11		11
12	BUILD_DEPENDS= nlohmann-json>0:devel/nlohmann-json	12	BUILD_DEPENDS= nlohmann-json>0:devel/nlohmann-json
13	LIB_DEPENDS= libabsl_hash.so:devel/abseil \	13	LIB_DEPENDS= libabsl_hash.so:devel/abseil \

Lines 1-3 Link Here

(-)b/devel/bear/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1693499687	1	TIMESTAMP = 1723773120
2	SHA256 (rizsotto-Bear-3.1.3_GH0.tar.gz) = 8314438428069ffeca15e2644eaa51284f884b7a1b2ddfdafe12152581b13398	2	SHA256 (rizsotto-Bear-3.1.4_GH0.tar.gz) = a1105023795b3e1b9abc29c088cdec5464cc9f3b640b5078dc90a505498da5ff
3	SIZE (rizsotto-Bear-3.1.3_GH0.tar.gz) = 127766	3	SIZE (rizsotto-Bear-3.1.4_GH0.tar.gz) = 127672




Obtained from:	https://github.com/rizsotto/Bear/commit/3ba056a6cdebd1608279e89b021e7c28bcee3ea3

--- source/intercept/source/collect/db/EventsDatabaseWriter.cc.orig	2023-08-28 08:46:17 UTC
+++ source/intercept/source/collect/db/EventsDatabaseWriter.cc
@@ -21,6 +21,8 @@
 #include "libsys/Errors.h"
 
 #include <google/protobuf/util/json_util.h>
+#include <google/protobuf/stubs/common.h>
+
 #include <fmt/format.h>
 
 #include <sys/types.h>
@@ -36,7 +38,9 @@ namespace {
     JsonPrintOptions create_print_options() {
         JsonPrintOptions print_options;
         print_options.add_whitespace = false;
-        print_options.always_print_primitive_fields = true;
+#if GOOGLE_PROTOBUF_VERSION < 5026000
+            print_options.always_print_primitive_fields = true;
+#endif
         print_options.preserve_proto_field_names = true;
         print_options.always_print_enums_as_ints = false;
         return print_options;
- 

Return to bug 280844

Removed Link Here

(-)a/devel/bear/files/patch-protobuf (-25 lines)
1	Obtained from: https://github.com/rizsotto/Bear/commit/3ba056a6cdebd1608279e89b021e7c28bcee3ea3
2
3	--- source/intercept/source/collect/db/EventsDatabaseWriter.cc.orig 2023-08-28 08:46:17 UTC
4	+++ source/intercept/source/collect/db/EventsDatabaseWriter.cc
5	@@ -21,6 +21,8 @@
6	#include "libsys/Errors.h"
7
8	#include <google/protobuf/util/json_util.h>
9	+#include <google/protobuf/stubs/common.h>
10	+
11	#include <fmt/format.h>
12
13	#include <sys/types.h>
14	@@ -36,7 +38,9 @@ namespace {
15	JsonPrintOptions create_print_options() {
16	JsonPrintOptions print_options;
17	print_options.add_whitespace = false;
18	- print_options.always_print_primitive_fields = true;
19	+#if GOOGLE_PROTOBUF_VERSION < 5026000
20	+ print_options.always_print_primitive_fields = true;
21	+#endif
22	print_options.preserve_proto_field_names = true;
23	print_options.always_print_enums_as_ints = false;
24	return print_options;
25	-