sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (7abbc475151f4e9cca7f2d335f2284f11d06fec8)
- From: Ismael Luceno <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
- Subject: [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (7abbc475151f4e9cca7f2d335f2284f11d06fec8)
- Date: Wed, 8 Apr 2026 15:52:35 +0000
GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:
devel/android-tools/DETAILS
| 6 -
devel/android-tools/HISTORY
| 6 +
devel/android-tools/PRE_BUILD
| 2
devel/android-tools/patches/0003-extras-libjsonpb-Fix-incompatibility-with-protobuf-v.patch
| 36 ++++++++++
4 files changed, 46 insertions(+), 4 deletions(-)
New commits:
commit 7abbc475151f4e9cca7f2d335f2284f11d06fec8
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
android-tools 35.0.2
diff --git a/devel/android-tools/DETAILS b/devel/android-tools/DETAILS
index 6ab9981..c7afa53 100755
--- a/devel/android-tools/DETAILS
+++ b/devel/android-tools/DETAILS
@@ -1,12 +1,12 @@
# Watch: https://github.com/nmeum/android-tools/tags
. "$GRIMOIRE"/CMAKE_FUNCTIONS
SPELL=android-tools
- VERSION=31.0.3p2
+ VERSION=35.0.2
SOURCE="$SPELL-$VERSION.tar.xz"
SOURCE_URL=("https://github.com/nmeum/$SPELL/releases/download/$VERSION/$SOURCE")
-
SOURCE_HASH=sha512:367a502c11a136ff15a060df44df14ceec46eb5eb386babb4d38783622e363421d2ec9a65a5810fb8f2b308912c2bdb980e6fce24ba532a111e413647efe67d5
+
SOURCE_HASH=sha512:391ce4d638b274d7bbae24a3df8de8b5812a982570f29b2aef37d12a3ba7ed6f66b5c0b7f908759e0b0da30d152b5319af0fef16c54bdc3b9f4074fb22f80d10
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- WEB_SITE="http://developer.android.com/tools/help/adb.html"
+ WEB_SITE="https://developer.android.com/tools/help/adb.html"
LICENSE=(Apache-2.0 ISC GPL-2.0-only MIT)
ENTERED=20140622
SHORT="tools for developing android based devices"
diff --git a/devel/android-tools/HISTORY b/devel/android-tools/HISTORY
index ef7e36a..fb51397 100644
--- a/devel/android-tools/HISTORY
+++ b/devel/android-tools/HISTORY
@@ -1,3 +1,9 @@
+2026-04-08 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 35.0.2
+ fixed WEB_SITE
+ * PRE_BUILD,
patches/0003-extras-libjsonpb-Fix-incompatibility-with-protobuf-v.patch:
+ fixed build against protobuf >= 30.x
+
2022-08-20 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: added missing sourcing of CMAKE_FUNCTIONS
updated spell to 31.0.3p2
diff --git a/devel/android-tools/PRE_BUILD b/devel/android-tools/PRE_BUILD
index bebaa5c..3357329 100755
--- a/devel/android-tools/PRE_BUILD
+++ b/devel/android-tools/PRE_BUILD
@@ -1,4 +1,4 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-apply_patch_dir
+apply_patch_dir patches
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
new file mode 100644
index 0000000..5fb95d7
--- /dev/null
+++
b/devel/android-tools/patches/0003-extras-libjsonpb-Fix-incompatibility-with-protobuf-v.patch
@@ -0,0 +1,36 @@
+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
+
- [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (7abbc475151f4e9cca7f2d335f2284f11d06fec8), Ismael Luceno, 04/08/2026
Archive powered by MHonArc 2.6.24.