diff options
Diffstat (limited to '')
-rw-r--r-- | development/Bear/Bear.SlackBuild | 3 | ||||
-rw-r--r-- | development/Bear/Bear.info | 6 | ||||
-rw-r--r-- | development/Bear/fcc90e43eebe9250abeeb81aab429053864da325.patch | 34 |
3 files changed, 4 insertions, 39 deletions
diff --git a/development/Bear/Bear.SlackBuild b/development/Bear/Bear.SlackBuild index 5ee668e122..4b4b8eef89 100644 --- a/development/Bear/Bear.SlackBuild +++ b/development/Bear/Bear.SlackBuild @@ -25,7 +25,7 @@ cd "$(dirname "$0")" ; CWD=$(pwd) PRGNAM=Bear -VERSION=${VERSION:-3.1.3} +VERSION=${VERSION:-3.1.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -70,7 +70,6 @@ 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/Bear.info b/development/Bear/Bear.info index 59893d6079..5db41e2dbe 100644 --- a/development/Bear/Bear.info +++ b/development/Bear/Bear.info @@ -1,8 +1,8 @@ PRGNAM="Bear" -VERSION="3.1.3" +VERSION="3.1.4" HOMEPAGE="https://github.com/rizsotto/Bear" -DOWNLOAD="https://github.com/rizsotto/Bear/archive/3.1.3/Bear-3.1.3.tar.gz" -MD5SUM="95dd52be536907a672df211de22fa15c" +DOWNLOAD="https://github.com/rizsotto/Bear/archive/3.1.4/Bear-3.1.4.tar.gz" +MD5SUM="a3ed915ce8d65d30c792adcef27beea0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="grpc spdlog nlohmann_json" diff --git a/development/Bear/fcc90e43eebe9250abeeb81aab429053864da325.patch b/development/Bear/fcc90e43eebe9250abeeb81aab429053864da325.patch deleted file mode 100644 index 3d760041bd..0000000000 --- a/development/Bear/fcc90e43eebe9250abeeb81aab429053864da325.patch +++ /dev/null @@ -1,34 +0,0 @@ -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; |