mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-16 14:29:05 -07:00
net-fs/cvmfs: fix compilation with >=protobuf-30, bug 954089
Closes: https://bugs.gentoo.org/954089 Signed-off-by: Guilherme Amadio <amadio@gentoo.org>
This commit is contained in:
@@ -46,6 +46,7 @@ DEPEND="${CDEPEND}
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2.10.1-gentoo.patch
|
||||
"${FILESDIR}"/${PN}-2.12.7-protobuf.patch
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
|
||||
27
net-fs/cvmfs/files/cvmfs-2.12.7-protobuf.patch
Normal file
27
net-fs/cvmfs/files/cvmfs-2.12.7-protobuf.patch
Normal file
@@ -0,0 +1,27 @@
|
||||
|
||||
Fix build with protobuf >= 30
|
||||
https://protobuf.dev/support/migration/#string_view-return-type
|
||||
|
||||
--- a/cvmfs/cache_extern.cc
|
||||
+++ b/cvmfs/cache_extern.cc
|
||||
@@ -538,7 +538,7 @@ void *ExternalCacheManager::MainRead(void *data) {
|
||||
continue;
|
||||
} else {
|
||||
PANIC(kLogSyslogErr | kLogDebug, "unexpected message %s",
|
||||
- msg->GetTypeName().c_str());
|
||||
+ msg->GetTypeName().data());
|
||||
}
|
||||
|
||||
RpcInFlight rpc_inflight;
|
||||
diff --git a/cvmfs/cache_plugin/channel.cc b/cvmfs/cache_plugin/channel.cc
|
||||
index 4c52d7604..e74d3aa8a 100644
|
||||
--- a/cvmfs/cache_plugin/channel.cc
|
||||
+++ b/cvmfs/cache_plugin/channel.cc
|
||||
@@ -550,7 +550,7 @@ bool CachePlugin::HandleRequest(int fd_con) {
|
||||
} else {
|
||||
LogCvmfs(kLogCache, kLogSyslogErr | kLogDebug,
|
||||
"unexpected message from client: %s",
|
||||
- msg_typed->GetTypeName().c_str());
|
||||
+ msg_typed->GetTypeName().data());
|
||||
return false;
|
||||
}
|
||||
Reference in New Issue
Block a user