diff options
| author |   Willy Sudiarto Raharjo | 2024-04-16 09:19:51 +0200 |
|---|---|---|
| committer | Willy Sudiarto Raharjo | 2024-05-04 16:45:13 +0200 |
| commit | 256eb49cf970cfe5d97115dafab9ffb64d58afbf (patch) | |
| tree | de4625efd8773a348ecc66395deeb72a4afb59d5 | |
| parent | 8cae48be267d44ebeeeead6868583aead9afb021 (diff) | |
| download | slackbuilds-256eb49cf970cfe5d97115dafab9ffb64d58afbf.tar.gz | |
development/Bear: Fix build.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | development/Bear/Bear.SlackBuild | 3 | ||||
| -rw-r--r-- | development/Bear/fcc90e43eebe9250abeeb81aab429053864da325.patch | 34 |
2 files changed, 36 insertions, 1 deletions
diff --git a/development/Bear/Bear.SlackBuild b/development/Bear/Bear.SlackBuild index b05f008f7e..163f1a6a92 100644 --- a/development/Bear/Bear.SlackBuild +++ b/development/Bear/Bear.SlackBuild @@ -26,7 +26,7 @@ cd "$(dirname "$0")" ; CWD=$(pwd) PRGNAM=Bear VERSION=${VERSION:-3.1.1} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} NAMVER=$PRGNAM-$VERSION @@ -70,6 +70,7 @@ cd "$PRGNAM-$VERSION" chown -R root:root . chmod -R u+w,go+r-w,a-s . +patch -p1 < $CWD/fcc90e43eebe9250abeeb81aab429053864da325.patch INSTPREFIX='/usr' cmake \ diff --git a/development/Bear/fcc90e43eebe9250abeeb81aab429053864da325.patch b/development/Bear/fcc90e43eebe9250abeeb81aab429053864da325.patch new file mode 100644 index 0000000000..3d760041bd --- /dev/null +++ b/development/Bear/fcc90e43eebe9250abeeb81aab429053864da325.patch @@ -0,0 +1,34 @@ +From fcc90e43eebe9250abeeb81aab429053864da325 Mon Sep 17 00:00:00 2001 +From: Ruben Carlo Benante <rcb@beco.cc> +Date: Thu, 28 Mar 2024 23:29:41 -0300 +Subject: [PATCH] always_print_primitive_fields only if GOOGLE_PROTOBUF_VERSION + < 5026000 ref #566 + +--- + source/intercept/source/collect/db/EventsDatabaseWriter.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/source/intercept/source/collect/db/EventsDatabaseWriter.cc b/source/intercept/source/collect/db/EventsDatabaseWriter.cc +index 0403a1ae..bd30cb29 100644 +--- a/source/intercept/source/collect/db/EventsDatabaseWriter.cc ++++ b/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; |