From ca2899414f07f6e78385b87539508ada2dd4cfe5 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 22 Apr 2023 17:56:50 +0200 Subject: [PATCH] grpc: bump version --- ...{grpc-1.51.1.recipe => grpc-1.53.0.recipe} | 8 ++--- ...c-1.51.1.patchset => grpc-1.53.0.patchset} | 32 ++++++++++++++++--- 2 files changed, 32 insertions(+), 8 deletions(-) rename net-libs/grpc/{grpc-1.51.1.recipe => grpc-1.53.0.recipe} (97%) rename net-libs/grpc/patches/{grpc-1.51.1.patchset => grpc-1.53.0.patchset} (82%) diff --git a/net-libs/grpc/grpc-1.51.1.recipe b/net-libs/grpc/grpc-1.53.0.recipe similarity index 97% rename from net-libs/grpc/grpc-1.51.1.recipe rename to net-libs/grpc/grpc-1.53.0.recipe index 3e409d712..df725c82c 100644 --- a/net-libs/grpc/grpc-1.51.1.recipe +++ b/net-libs/grpc/grpc-1.53.0.recipe @@ -4,11 +4,11 @@ call (RPC) framework that can run anywhere. gRPC enables client and server \ applications to communicate transparently, and simplifies the building of \ connected systems." HOMEPAGE="https://grpc.io/" -COPYRIGHT="2015-2022 The gRPC Authors" +COPYRIGHT="2015-2023 The gRPC Authors" LICENSE="Apache v2" REVISION="1" SOURCE_URI="https://github.com/grpc/grpc/archive/refs/tags/v$portVersion.tar.gz" -CHECKSUM_SHA256="b55696fb249669744de3e71acc54a9382bea0dce7cd5ba379b356b12b82d4229" +CHECKSUM_SHA256="9717ffc52120861136e478155c2ff3a9c21740e2244de52fa966f376d7471adf" SOURCE_FILENAME="grpc-$portVersion.tar.gz" gtestCommit="0e402173c97aea7a00749e825b194bfede4f2e45" SOURCE_URI_2="https://github.com/google/googletest/archive/$gtestCommit/googletest-$gtestCommit.tar.gz" @@ -17,11 +17,11 @@ SOURCE_DIR_2="googletest-$gtestCommit" PATCHES="grpc-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" -SECONDARY_ARCHITECTURES="x86" +SECONDARY_ARCHITECTURES="!x86" libVersion="29.0.0" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" -libCppVersion="1.51.1" +libCppVersion="1.53" libCppVersionCompat="$libCppVersion compat >= ${libCppVersion%%.*}" PROVIDES=" diff --git a/net-libs/grpc/patches/grpc-1.51.1.patchset b/net-libs/grpc/patches/grpc-1.53.0.patchset similarity index 82% rename from net-libs/grpc/patches/grpc-1.51.1.patchset rename to net-libs/grpc/patches/grpc-1.53.0.patchset index 41eee16b3..2e24207d7 100644 --- a/net-libs/grpc/patches/grpc-1.51.1.patchset +++ b/net-libs/grpc/patches/grpc-1.53.0.patchset @@ -1,4 +1,4 @@ -From 1e4b98d4901ef648e76f63441e2e874d996aba9a Mon Sep 17 00:00:00 2001 +From df331f9560ba484c028ebe7accfc75a455113251 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 16 Oct 2021 21:33:26 +0200 Subject: Haiku: port @@ -21,7 +21,7 @@ index 3055a66..b1ba91d 100644 2.37.3 -From d8f7301ff9813891b3a20ebe980f07881ba1cdef Mon Sep 17 00:00:00 2001 +From 3e7e4891fed196957fba7e9577fb6fe8b1050dcd Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 22 Oct 2021 14:54:43 +0200 Subject: patch needed to help build and run tests on Haiku @@ -41,7 +41,7 @@ index 2174c00..99dd74e 100755 return 'posix' diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py -index 0327aa1..32d5a44 100755 +index 0611925..d9aa5f4 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -297,6 +297,19 @@ class CLanguage(object): @@ -68,7 +68,7 @@ index 0327aa1..32d5a44 100755 2.37.3 -From 7c690075f4c36a035d7bd955ea7f56282e65abab Mon Sep 17 00:00:00 2001 +From 8c00d0cac705ad6970ae05589d58c256d46820a6 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 26 Nov 2021 20:17:18 +0100 Subject: protobuf minimum version 1.16.0 @@ -90,3 +90,27 @@ index f23f65d..83fad47 100644 -- 2.37.3 + +From 797ae139c3e6267025fa47c7352742e47e0d1dd8 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Sat, 22 Apr 2023 15:21:48 +0200 +Subject: Haiku: link with network + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 501e248..1c0cb10 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -405,6 +405,9 @@ endif() + if(WIN32) + set(_gRPC_BASELIB_LIBRARIES ws2_32 crypt32) + endif() ++if(HAIKU) ++ set(_gRPC_BASELIB_LIBRARIES network) ++endif() + + # Create directory for proto source files + set(_gRPC_PROTO_SRCS_DIR ${CMAKE_BINARY_DIR}/protos) +-- +2.37.3 +