Source Mage code commit list

[Ismael Luceno <scm AT sourcemage.org>]

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

 devel/android-tools/DEPENDS                                                  
               |   19 +++--
 devel/android-tools/DETAILS                                                  
               |    4 -
 devel/android-tools/HISTORY                                                  
               |    7 +
 
devel/android-tools/patches/0001-libbase-don-t-use-the-non-standard-sys-cdefs.h.patch
       |   31 ++++++++
 
devel/android-tools/patches/0003-extras-libjsonpb-Fix-incompatibility-with-protobuf-v.patch
 |   36 ----------
 5 files changed, 51 insertions(+), 46 deletions(-)

New commits:
commit caac7665a692a4c29e55c3c74c4fe9708403508d
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    android-tools 37.0.0

diff --git a/devel/android-tools/DEPENDS b/devel/android-tools/DEPENDS
index 07f44a7..043d2db 100755
--- a/devel/android-tools/DEPENDS
+++ b/devel/android-tools/DEPENDS
@@ -1,9 +1,12 @@
 . "$GRIMOIRE"/CMAKE_DEPENDS &&
-depends zlib &&
-depends SSL &&
-depends libusb &&
-depends pcre2 &&
-
-# for bundled boringssl
-depends go &&
-depends googletest
+. "$GRIMOIRE"/VDEPENDS &&
+<<-! vdepends
+       libusb
+       pcre2
+       protobuf >= 35.1
+       SSL
+       zlib
+       # for bundled boringssl:
+       go
+       googletest
+!
diff --git a/devel/android-tools/DETAILS b/devel/android-tools/DETAILS
index c7afa53..ba1a4ce 100755
--- a/devel/android-tools/DETAILS
+++ b/devel/android-tools/DETAILS
@@ -1,10 +1,10 @@
 # Watch: https://github.com/nmeum/android-tools/tags
 . "$GRIMOIRE"/CMAKE_FUNCTIONS
            SPELL=android-tools
-         VERSION=35.0.2
+         VERSION=37.0.0
           SOURCE="$SPELL-$VERSION.tar.xz"
       
SOURCE_URL=("https://github.com/nmeum/$SPELL/releases/download/$VERSION/$SOURCE";)
-     
SOURCE_HASH=sha512:391ce4d638b274d7bbae24a3df8de8b5812a982570f29b2aef37d12a3ba7ed6f66b5c0b7f908759e0b0da30d152b5319af0fef16c54bdc3b9f4074fb22f80d10
+     
SOURCE_HASH=sha512:6a0bf2690b81d9e749823231ab4aaac6169f002eb32c54376bdaf6d7c7e64b0107bfaf70c806ce03e6f32d4493d773a9374eb4aaa44549c65d07f5557fb7bda7
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE="https://developer.android.com/tools/help/adb.html";
          LICENSE=(Apache-2.0 ISC GPL-2.0-only MIT)
diff --git a/devel/android-tools/HISTORY b/devel/android-tools/HISTORY
index fb51397..39bab36 100644
--- a/devel/android-tools/HISTORY
+++ b/devel/android-tools/HISTORY
@@ -1,3 +1,10 @@
+2026-08-09 Ismael Luceno <ismael AT sourcemage.org>
+       * DETAILS: updated spell to 37.0.0
+       * patches/0001-libbase-don-t-use-the-non-standard-sys-cdefs.h.patch:
+         fixed build against musl libc
+       * 
patches/0003-extras-libjsonpb-Fix-incompatibility-with-protobuf-v.patch:
+         removed, no longer needed
+
 2026-04-08 Ismael Luceno <ismael AT sourcemage.org>
        * DETAILS: updated spell to 35.0.2
          fixed WEB_SITE
diff --git 
a/devel/android-tools/patches/0001-libbase-don-t-use-the-non-standard-sys-cdefs.h.patch
 
b/devel/android-tools/patches/0001-libbase-don-t-use-the-non-standard-sys-cdefs.h.patch
new file mode 100644
index 0000000..6df0deb
--- /dev/null
+++ 
b/devel/android-tools/patches/0001-libbase-don-t-use-the-non-standard-sys-cdefs.h.patch
@@ -0,0 +1,31 @@
+From e551d960442c903ce00cf5be88a8665cf59ce476 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT sourcemage.org>
+Date: Sun, 9 Aug 2026 08:36:48 +0000
+Subject: [PATCH] libbase: don't use the non-standard sys/cdefs.h
+
+sys/cdefs.h is a glibc/bionic-internal header and does not exist on
+musl libc, which broke the musl build with:
+
+    vendor/libbase/include/android-base/test_utils.h:20:10: fatal error:
+    sys/cdefs.h: No such file or directory
+
+Upstream-Status: Pending
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ vendor/libbase/include/android-base/test_utils.h | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/vendor/libbase/include/android-base/test_utils.h 
b/vendor/libbase/include/android-base/test_utils.h
+index e57138f..1e3cfc6 100644
+--- a/vendor/libbase/include/android-base/test_utils.h
++++ b/vendor/libbase/include/android-base/test_utils.h
+@@ -16,9 +16,6 @@
+ 
+ #pragma once
+ 
+-// For __BIONIC__
+-#include <sys/cdefs.h>
+-
+ #if defined(__BIONIC__)
+ #include <malloc.h>
+ #include <stdio.h>
diff --git 
a/devel/android-tools/patches/0003-extras-libjsonpb-Fix-incompatibility-with-protobuf-v.patch
 
b/devel/android-tools/patches/0003-extras-libjsonpb-Fix-incompatibility-with-protobuf-v.patch
deleted file mode 100644
index 5fb95d7..0000000
--- 
a/devel/android-tools/patches/0003-extras-libjsonpb-Fix-incompatibility-with-protobuf-v.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 36c605004ae1c75813181ffe4c59907016aaf9e9 Mon Sep 17 00:00:00 2001
-From: Biswapriyo Nath <nathbappai AT gmail.com>
-Date: Tue, 22 Apr 2025 15:12:23 +0000
-Subject: [PATCH] extras/libjsonpb: Fix incompatibility with protobuf v30
-
-This commit fixes the following compiler error.
-
-jsonpb.cpp:36:44: error: invalid operands to binary expression (
-'basic_string<char, char_traits<char>, allocator<char>>' and
-'internal::DescriptorStringView' (aka 'basic_string_view<char>'))
-36 |   return std::string(kTypeUrlPrefix) + "/" + 
message.GetDescriptor()->full_name();
-   |          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-More info here https://protobuf.dev/news/2024-10-02/#descriptor-apis
-
-Change-Id: I3c76d51dfdfbe013eaa5031e6194bf5edae1be35
----
- vendor/extras/libjsonpb/parse/jsonpb.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/vendor/extras/libjsonpb/parse/jsonpb.cpp 
b/vendor/extras/libjsonpb/parse/jsonpb.cpp
-index b342c2b..ebd71bf 100644
---- a/vendor/extras/libjsonpb/parse/jsonpb.cpp
-+++ b/vendor/extras/libjsonpb/parse/jsonpb.cpp
-@@ -33,7 +33,7 @@ using google::protobuf::util::TypeResolver;
- static constexpr char kTypeUrlPrefix[] = "type.googleapis.com";
- 
- std::string GetTypeUrl(const Message& message) {
--  return std::string(kTypeUrlPrefix) + "/" + 
message.GetDescriptor()->full_name();
-+  return std::string(kTypeUrlPrefix) + "/" + 
std::string(message.GetDescriptor()->full_name());
- }
- 
- ErrorOr<std::string> MessageToJsonString(const Message& message) {
--- 
-2.49.0
-