Source: android-platform-tools
Version: 34.0.5-13
Severity: normal
Tags: ftbfs patch
Usertags protobuf36_2
X-Debbugs-Cc: [email protected]
Hi,
There's an upcoming Protobuf transition to its 36.2 version. Your
package FTBFS with it. I can provide a basic patch to fix it.
Unfortunately it will still fail with some abseil issues for which I
don't have a solution at the moment. Relevant compiler lines for this
issue:
make[2]: *** [debian/system/adb.mk:114: packages/modules/adb/types.o] Error 1
packages/modules/adb/transport.cpp:1671:13: error: use of undeclared
identifier 'STATELESS'
1671 | LOG(DEBUG) << "ignoring reverse forward that will
fail due to norebind";
| ^~~~~~~~~~
/usr/include/absl/log/log.h:218:23: note: expanded from macro 'LOG'
218 | #define LOG(severity) ABSL_LOG_INTERNAL_LOG_IMPL(_##severity)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/usr/include/absl/log/internal/log_impl.h:27:41: note: expanded from
macro 'ABSL_LOG_INTERNAL_LOG_IMPL'
27 | ABSL_LOG_INTERNAL_CONDITION##severity(STATELESS, true) \
| ^~~~~~~~~
packages/modules/adb/transport.cpp:1671:13: error: expected ';' after expression
/usr/include/absl/log/log.h:218:23: note: expanded from macro 'LOG'
218 | #define LOG(severity) ABSL_LOG_INTERNAL_LOG_IMPL(_##severity)
Regards,
Laszlo/GCS
diff -Nru android-platform-tools-34.0.5/debian/patches/protobuf.patch android-platform-tools-34.0.5/debian/patches/protobuf.patch
--- android-platform-tools-34.0.5/debian/patches/protobuf.patch 1970-01-01 00:00:00.000000000 +0000
+++ android-platform-tools-34.0.5/debian/patches/protobuf.patch 2026-10-10 20:05:03.000000000 +0000
@@ -0,0 +1,28 @@
+From: Laszlo Boszormenyi (GCS) <[email protected]>
+Date: Oct, 10 2026 19:56:51 +0000
+Subject: [PATCH] fix build with Protobuf 36.2+
+
+Forwarded: no
+---
+
+--- a/system/libbase/hex.cpp
++++ b/system/libbase/hex.cpp
+@@ -14,6 +14,8 @@
+ * limitations under the License.
+ */
+
++#include <cstdint>
++
+ #include "android-base/hex.h"
+
+ #include "android-base/logging.h"
+--- a/system/libziparchive/include/ziparchive/zip_writer.h
++++ b/system/libziparchive/include/ziparchive/zip_writer.h
+@@ -18,6 +18,7 @@
+
+ #include <cstdio>
+ #include <ctime>
++#include <cstdint>
+
+ #include <gtest/gtest_prod.h>
+ #include <memory>
diff -Nru android-platform-tools-34.0.5/debian/patches/series android-platform-tools-34.0.5/debian/patches/series
--- android-platform-tools-34.0.5/debian/patches/series 2026-07-12 04:30:39.000000000 +0000
+++ android-platform-tools-34.0.5/debian/patches/series 2026-10-10 20:05:03.000000000 +0000
@@ -27,3 +27,4 @@
adbd/adbd-allow-notifying-systemd.patch
adbd/adbd-usb-drop-property-monitor.patch
adbd/adbd-don-t-require-authorization-on-Linux.patch
+protobuf.patch
