From 2f114cfdce2bac0fbd757046603c1ba036ce07de Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sat, 28 Mar 2026 11:36:54 +0100
Subject: [PATCH] protobuf_c, revbump, enable 32bit, move cmd's to tools
 (#13875)

---
 dev-libs/protobuf-c/protobuf_c-1.5.2.recipe | 56 ++++++++++++++-------
 1 file changed, 37 insertions(+), 19 deletions(-)

diff --git a/dev-libs/protobuf-c/protobuf_c-1.5.2.recipe b/dev-libs/protobuf-c/protobuf_c-1.5.2.recipe
index 57e3df7c6..50c6af54c 100644
--- a/dev-libs/protobuf-c/protobuf_c-1.5.2.recipe
+++ b/dev-libs/protobuf-c/protobuf_c-1.5.2.recipe
@@ -9,53 +9,69 @@ maintained by a new team. Thanks, Dave!"
 HOMEPAGE="https://github.com/protobuf-c/protobuf-c"
 COPYRIGHT="2008-2025, Dave Benson and the protobuf-c authors"
 LICENSE="BSD (2-clause)"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="$HOMEPAGE/releases/download/v$portVersion/protobuf-c-$portVersion.tar.gz"
 CHECKSUM_SHA256="e2c86271873a79c92b58fef7ebf8de1aa0df4738347a8bd5d4e65a80a16d0d24"
 SOURCE_FILENAME="protobuf-c-$portVersion.tar.gz"
 SOURCE_DIR="protobuf-c-$portVersion"
 
 ARCHITECTURES="all !x86_gcc2"
-SECONDARY_ARCHITECTURES="?x86"
+SECONDARY_ARCHITECTURES="x86"
+
+commandBinDir=$binDir
+commandSuffix=$secondaryArchSuffix
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
 
 libVersion="1.0.0"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
-	protobuf_c = $portVersion
-	lib:libprotobuf_c = $libVersionCompat
+	protobuf_c$secondaryArchSuffix = $portVersion
+	lib:libprotobuf_c$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
-	haiku
+	haiku$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
-	protobuf_c_devel = $portVersion
-	cmd:protoc_c = $portVersion
-	cmd:protoc_gen_c = $portVersion
-	devel:libprotobuf_c = $libVersionCompat
+	protobuf_c${secondaryArchSuffix}_devel = $portVersion
+	devel:libprotobuf_c$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
-	protobuf_c == $portVersion base
-	haiku
-	lib:libprotobuf
+	protobuf_c$secondaryArchSuffix == $portVersion base
+	"
+
+DESCRIPTION_tools="Protocol Buffers C compiler"
+PROVIDES_tools="
+	protobuf_c${secondaryArchSuffix}_tools = $portVersion
+	cmd:protoc_c$commandSuffix = $portVersion
+	cmd:protoc_gen_c$commandSuffix = $portVersion
+	"
+REQUIRES_tools="
+	protobuf_c$secondaryArchSuffix == $portVersion base
+	haiku$secondaryArchSuffix
+	lib:libprotobuf$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku_devel
-	devel:libprotobuf >= 31
+	haiku${secondaryArchSuffix}_devel
+	devel:libprotobuf$secondaryArchSuffix >= 31
 	"
 BUILD_PREREQUIRES="
 	cmd:awk
-	cmd:gcc
+	cmd:gcc$secondaryArchSuffix
 	cmd:make
-	cmd:pkg_config
+	cmd:pkg_config$secondaryArchSuffix
 	"
 
 BUILD()
 {
 	ln -sf "`finddir B_SYSTEM_HEADERS_DIRECTORY`${secondaryArchSubDir}/google"
-	runConfigure ./configure \
+	runConfigure --omit-dirs binDir ./configure \
+		--bindir=$commandBinDir \
 		--disable-static \
 		--enable-shared
 
@@ -74,8 +90,10 @@ INSTALL()
 	fixPkgconfig
 
 	packageEntries devel \
-		$developDir \
-		$binDir
+		$developDir
+
+	packageEntries tools \
+		$commandBinDir
 }
 
 TEST()