From fa9780afd66bd0428ffaedbf9e13be9d915b9579 Mon Sep 17 00:00:00 2001
From: Wildan Mubarok <willnode@wellosoft.net>
Date: Sun, 13 Jul 2025 10:30:41 +0000
Subject: [PATCH] Update libsodium and protobuf

---
 recipes/libs/libsodium/recipe.toml         |  1 +
 recipes/wip/dev/other/protobuf/recipe.toml | 28 +++++++++++-----------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/recipes/libs/libsodium/recipe.toml b/recipes/libs/libsodium/recipe.toml
index d3e1a3c6..8f6a2db3 100644
--- a/recipes/libs/libsodium/recipe.toml
+++ b/recipes/libs/libsodium/recipe.toml
@@ -4,6 +4,7 @@ blake3 = "2482633f872c173f9a42e6badb44c3efb042e783e664fdf8b1046babfa2405e7"
 script = """
 DYNAMIC_INIT
 autotools_recursive_regenerate
+wget -O build-aux/config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false"
 """
 
 [build]
diff --git a/recipes/wip/dev/other/protobuf/recipe.toml b/recipes/wip/dev/other/protobuf/recipe.toml
index d8504735..f0827b2a 100644
--- a/recipes/wip/dev/other/protobuf/recipe.toml
+++ b/recipes/wip/dev/other/protobuf/recipe.toml
@@ -1,20 +1,20 @@
-#TODO maybe incomplete script, see https://github.com/protocolbuffers/protobuf/blob/main/cmake/README.md
+#TODO: Compilation error (relibc issues?)
+# Also see https://github.com/protocolbuffers/protobuf/blob/main/cmake/README.md
 [source]
-tar = "https://github.com/protocolbuffers/protobuf/releases/download/v25.1/protobuf-25.1.tar.gz"
+git = "https://github.com/protocolbuffers/protobuf"
+# Latest release: v31.1
+rev = "74211c0dfc2777318ab53c2cd2c317a2ef9012de"
+shallow_clone = true
+
 [build]
 template = "custom"
+dependencies = [
+    "zlib",
+]
 script = """
-COOKBOOK_CONFIGURE="cmake"
-COOKBOOK_CONFIGURE_FLAGS=(
-    -DCMAKE_BUILD_TYPE=Release
-    -DCMAKE_CROSSCOMPILING=True
-    -DCMAKE_EXE_LINKER_FLAGS="-static"
-    -DCMAKE_INSTALL_PREFIX="/"
-    -DCMAKE_PREFIX_PATH="${COOKBOOK_SYSROOT}"
-    -DCMAKE_SYSTEM_NAME=Generic
-    -DCMAKE_SYSTEM_PROCESSOR="$(echo "${TARGET}" | cut -d - -f1)"
-    -DCMAKE_VERBOSE_MAKEFILE=On
-"${COOKBOOK_SOURCE}"
+DYNAMIC_INIT
+COOKBOOK_CMAKE_FLAGS=(
+    -Dprotobuf_BUILD_TESTS=OFF
 )
-cookbook_configure
+cookbook_cmake
 """