diff --git a/dev-util/bear/bear-3.1.2.recipe b/dev-util/bear/bear-3.1.5.recipe similarity index 94% rename from dev-util/bear/bear-3.1.2.recipe rename to dev-util/bear/bear-3.1.5.recipe index f3cb565fe..13b8a76e6 100644 --- a/dev-util/bear/bear-3.1.2.recipe +++ b/dev-util/bear/bear-3.1.5.recipe @@ -9,9 +9,9 @@ instead to intercept the invocation of the compiler." HOMEPAGE="https://github.com/rizsotto/Bear" COPYRIGHT="2012-2023 by László Nagy" LICENSE="GNU GPL v3" -REVISION="3" +REVISION="1" SOURCE_URI="https://github.com/rizsotto/Bear/archive/$portVersion.tar.gz" -CHECKSUM_SHA256="5f94e98480bd8576a64cd1d59649f34b09b4e02a81f1d983c92af1113e061fc3" +CHECKSUM_SHA256="4ac7b041222dcfc7231c6570d5bd76c39eaeda7a075ee2385b84256e7d659733" SOURCE_DIR="Bear-$portVersion" PATCHES="bear-$portVersion.patchset" @@ -55,7 +55,6 @@ REQUIRES=" lib:libabsl_time_zone$secondaryArchSuffix lib:libaddress_sorting$secondaryArchSuffix lib:libcares$secondaryArchSuffix - lib:libcrypto$secondaryArchSuffix lib:libfmt$secondaryArchSuffix lib:libgpr$secondaryArchSuffix lib:libgrpc++$secondaryArchSuffix @@ -63,7 +62,6 @@ REQUIRES=" lib:libprotobuf$secondaryArchSuffix lib:libre2$secondaryArchSuffix lib:libspdlog$secondaryArchSuffix - lib:libssl$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix lib:libupb$secondaryArchSuffix lib:libz$secondaryArchSuffix @@ -71,7 +69,7 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libfmt$secondaryArchSuffix + devel:libfmt$secondaryArchSuffix >= 11 devel:libgrpc$secondaryArchSuffix devel:libgtest$secondaryArchSuffix devel:libspdlog$secondaryArchSuffix diff --git a/dev-util/bear/patches/bear-3.1.2.patchset b/dev-util/bear/patches/bear-3.1.5.patchset similarity index 89% rename from dev-util/bear/patches/bear-3.1.2.patchset rename to dev-util/bear/patches/bear-3.1.5.patchset index cd0e47146..c8018e59e 100644 --- a/dev-util/bear/patches/bear-3.1.2.patchset +++ b/dev-util/bear/patches/bear-3.1.5.patchset @@ -1,4 +1,4 @@ -From ef3bea3e7fa9da72efb196a3debd754a38c9bd73 Mon Sep 17 00:00:00 2001 +From 26abb7c684801b3cda7212d9d2570333ea96971e Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Mon, 18 Oct 2021 11:19:05 +0200 Subject: protobuf search path @@ -25,17 +25,17 @@ index e4fb8c1..8bbd58c 100644 --cpp_out "${CMAKE_CURRENT_BINARY_DIR}" --plugin=protoc-gen-grpc="${_GRPC_CPP_PLUGIN_EXECUTABLE}" -- -2.30.2 +2.45.2 -From 82d33658418af633de38d255157b6bc015d70e17 Mon Sep 17 00:00:00 2001 +From db77e4b93a1923ca30d05da8a67ac944d9e24fdb Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Mon, 18 Oct 2021 15:22:06 +0200 Subject: workaround gtest with Haiku error definition diff --git a/source/libsys/test/ErrorsTest.cc b/source/libsys/test/ErrorsTest.cc -index 0ead223..9360cef 100644 +index caea6bd..7b870ca 100644 --- a/source/libsys/test/ErrorsTest.cc +++ b/source/libsys/test/ErrorsTest.cc @@ -23,6 +23,9 @@ @@ -49,5 +49,5 @@ index 0ead223..9360cef 100644 TEST(errors, ENOENT) -- -2.30.2 +2.45.2