Attachment 252798 Details for Bug 280844 – [PATCH] devel/bear: update 3.1.3 → 3.1.4

[patch] [PATCH] devel/bear: update 3.1.3 → 3.1.4

0001-devel-bear-update-3.1.3-3.1.4.patch (text/plain), 2.74 KB, created by Älven on 2024-08-16 03:34:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Älven

Created: 2024-08-16 03:34:39 UTC

Size: 2.74 KB

patch

obsolete

>From 79fc2efd0533ca4557009748622f218ddf175fa0 Mon Sep 17 00:00:00 2001
>From: Ãlven <alster@vinterdalen.se>
>Date: Fri, 16 Aug 2024 07:32:37 +0400
>Subject: [PATCH] devel/bear: update 3.1.3 â 3.1.4
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>---
> devel/bear/Makefile             |  4 ++--
> devel/bear/distinfo             |  6 +++---
> devel/bear/files/patch-protobuf | 24 ------------------------
> 3 files changed, 5 insertions(+), 29 deletions(-)
> delete mode 100644 devel/bear/files/patch-protobuf
>
>diff --git a/devel/bear/Makefile b/devel/bear/Makefile
>index 0dabf69465ed..11706d2a0ef4 100644
>--- a/devel/bear/Makefile
>+++ b/devel/bear/Makefile
>@@ -1,6 +1,5 @@
> PORTNAME=	bear
>-DISTVERSION=	3.1.3
>-PORTREVISION=	10
>+DISTVERSION=	3.1.4
> CATEGORIES=	devel
> 
> MAINTAINER=	jrm@FreeBSD.org
>@@ -8,6 +7,7 @@ COMMENT=	Tool that generates a compilation database for clang tooling
> WWW=		https://github.com/rizsotto/Bear
> 
> LICENSE=	GPLv3+
>+LICENSE_FILE=	${WRKSRC}/COPYING
> 
> BUILD_DEPENDS=	nlohmann-json>0:devel/nlohmann-json
> LIB_DEPENDS=	libabsl_hash.so:devel/abseil \
>diff --git a/devel/bear/distinfo b/devel/bear/distinfo
>index 57d5fc1d7d10..d9d94c3ce7d6 100644
>--- a/devel/bear/distinfo
>+++ b/devel/bear/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1693499687
>-SHA256 (rizsotto-Bear-3.1.3_GH0.tar.gz) = 8314438428069ffeca15e2644eaa51284f884b7a1b2ddfdafe12152581b13398
>-SIZE (rizsotto-Bear-3.1.3_GH0.tar.gz) = 127766
>+TIMESTAMP = 1723773120
>+SHA256 (rizsotto-Bear-3.1.4_GH0.tar.gz) = a1105023795b3e1b9abc29c088cdec5464cc9f3b640b5078dc90a505498da5ff
>+SIZE (rizsotto-Bear-3.1.4_GH0.tar.gz) = 127672
>diff --git a/devel/bear/files/patch-protobuf b/devel/bear/files/patch-protobuf
>deleted file mode 100644
>index 4f7ea7ae961b..000000000000
>--- a/devel/bear/files/patch-protobuf
>+++ /dev/null
>@@ -1,24 +0,0 @@
>-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;
>-- 
>2.46.0
>

Flags:

alster: maintainer-approval? (jrm)

Actions: View | Diff

Attachments on bug 280844: 252798