--- files/patch-client_portgroup.cpp	(nonexistent)
+++ files/patch-client_portgroup.cpp	(working copy)
@@ -0,0 +1,11 @@ 
+--- client/portgroup.cpp.orig	2016-10-11 20:45:15 UTC
++++ client/portgroup.cpp
+@@ -36,7 +36,7 @@ along with this program.  If not, see <h
+ #include <QtGlobal>
+ #include <QUrl>
+ 
+-using ::google::protobuf::NewCallback;
++using ::google::protobuf::internal::NewCallback;
+ 
+ extern QMainWindow *mainWindow;
+ extern char *version;
--- files/patch-rpc_rpcconn.cpp	(nonexistent)
+++ files/patch-rpc_rpcconn.cpp	(working copy)
@@ -0,0 +1,11 @@ 
+--- rpc/rpcconn.cpp.orig	2016-06-27 11:54:52 UTC
++++ rpc/rpcconn.cpp
+@@ -379,7 +379,7 @@ void RpcConnection::on_clientSock_dataAv
+     //qDebug("before service->callmethod()");
+ 
+     service->CallMethod(methodDesc, controller, req, resp,
+-        google::protobuf::NewCallback(this, &RpcConnection::sendRpcReply, 
++        google::protobuf::internal::NewCallback(this, &RpcConnection::sendRpcReply, 
+                                       controller));
+ 
+     return;