From 22e5ea7ddc7a989d85d811eae16082ca062a9bc8 Mon Sep 17 00:00:00 2001 From: "Vanilla I. Shu" Date: Tue, 7 Nov 2017 09:11:31 +0000 Subject: [PATCH] Due libgrpc_plugin_support interface changed, so it will be failed when user use portmaster to upgrade grpc. bump libgrpc_plug_support's version & ports' revision. PR: 223469 Submitted by: hakan@siktas.com --- devel/grpc/Makefile | 1 + devel/grpc/files/patch-CMakeLists.txt | 10 +++++++++- devel/grpc/pkg-plist | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/devel/grpc/Makefile b/devel/grpc/Makefile index e62d3d37c769..127181b2a01e 100644 --- a/devel/grpc/Makefile +++ b/devel/grpc/Makefile @@ -3,6 +3,7 @@ PORTNAME= grpc PORTVERSION= 1.7.0 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= devel diff --git a/devel/grpc/files/patch-CMakeLists.txt b/devel/grpc/files/patch-CMakeLists.txt index 87985d967491..733990300303 100644 --- a/devel/grpc/files/patch-CMakeLists.txt +++ b/devel/grpc/files/patch-CMakeLists.txt @@ -86,7 +86,7 @@ src/compiler/python_generator.cc src/compiler/ruby_generator.cc ) -+set_target_properties(grpc_plugin_support PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) ++set_target_properties(grpc_plugin_support PROPERTIES VERSION 2.0.0 SOVERSION 2) if(WIN32 AND MSVC) set_target_properties(grpc_plugin_support PROPERTIES COMPILE_PDB_NAME "grpc_plugin_support" @@ -98,3 +98,11 @@ if(WIN32 AND MSVC) set_target_properties(grpc_csharp_ext PROPERTIES COMPILE_PDB_NAME "grpc_csharp_ext" +@@ -10740,7 +10752,6 @@ add_executable(grpc_cpp_plugin + src/compiler/cpp_plugin.cc + ) + +- + target_include_directories(grpc_cpp_plugin + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include diff --git a/devel/grpc/pkg-plist b/devel/grpc/pkg-plist index 6510bd483f16..a3592081913a 100644 --- a/devel/grpc/pkg-plist +++ b/devel/grpc/pkg-plist @@ -197,8 +197,8 @@ lib/libgrpc_csharp_ext.so lib/libgrpc_csharp_ext.so.1 lib/libgrpc_csharp_ext.so.%%SOVERSION%% lib/libgrpc_plugin_support.so -lib/libgrpc_plugin_support.so.1 -lib/libgrpc_plugin_support.so.%%SOVERSION%% +lib/libgrpc_plugin_support.so.2 +lib/libgrpc_plugin_support.so.2.0.0 lib/libgrpc_unsecure.so lib/libgrpc_unsecure.so.1 lib/libgrpc_unsecure.so.%%SOVERSION%%