From cb2e8152e1910de86adab41459feafcc9d43cbef Mon Sep 17 00:00:00 2001
From: Guilherme Amadio <amadio@gentoo.org>
Date: Tue, 22 Apr 2025 11:18:43 +0200
Subject: [PATCH] net-fs/cvmfs: fix compilation with >=protobuf-30, bug 954089

Closes: https://bugs.gentoo.org/954089
Signed-off-by: Guilherme Amadio <amadio@gentoo.org>
---
 net-fs/cvmfs/cvmfs-2.12.7.ebuild              |  1 +
 .../cvmfs/files/cvmfs-2.12.7-protobuf.patch   | 27 +++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 net-fs/cvmfs/files/cvmfs-2.12.7-protobuf.patch

diff --git a/net-fs/cvmfs/cvmfs-2.12.7.ebuild b/net-fs/cvmfs/cvmfs-2.12.7.ebuild
index f929cf78f411c..0ea9638a1c44f 100644
--- a/net-fs/cvmfs/cvmfs-2.12.7.ebuild
+++ b/net-fs/cvmfs/cvmfs-2.12.7.ebuild
@@ -46,6 +46,7 @@ DEPEND="${CDEPEND}
 
 PATCHES=(
 		"${FILESDIR}"/${PN}-2.10.1-gentoo.patch
+		"${FILESDIR}"/${PN}-2.12.7-protobuf.patch
 )
 
 pkg_setup() {
diff --git a/net-fs/cvmfs/files/cvmfs-2.12.7-protobuf.patch b/net-fs/cvmfs/files/cvmfs-2.12.7-protobuf.patch
new file mode 100644
index 0000000000000..29e5dfc17234d
--- /dev/null
+++ b/net-fs/cvmfs/files/cvmfs-2.12.7-protobuf.patch
@@ -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;
+   }