public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/android-tools] f43: Update to 37.0.0
@ 2026-08-01 7:49 LuK1337
0 siblings, 0 replies; only message in thread
From: LuK1337 @ 2026-08-01 7:49 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/android-tools
Branch : f43
Commit : c7bc72878d425ef3f807f1fbf90e3d34baf475ba
Author : LuK1337 <priv.luk@gmail.com>
Date : 2026-08-01T09:47:30+02:00
Stats : +5/-178 in 6 file(s)
URL : https://src.fedoraproject.org/rpms/android-tools/c/c7bc72878d425ef3f807f1fbf90e3d34baf475ba?branch=f43
Log:
Update to 37.0.0
---
diff --git a/0001-Fix-libusb-enumeration.patch b/0001-Fix-libusb-enumeration.patch
deleted file mode 100644
index e2de8f4..0000000
--- a/0001-Fix-libusb-enumeration.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From d349fae010f6c780d76e89c5d6b81d45119137c0 Mon Sep 17 00:00:00 2001
-From: Arnav Singh <me@arnavion.dev>
-Date: Sat, 3 Aug 2024 21:55:23 -0700
-Subject: [PATCH] Fix libusb enumeration to handle PINE64 PinePhone modem.
-
-The PINE64 PinePhone modem exposes itself as an adb-accessible device over USB
-but its device class is LIBUSB_CLASS_MISCELLANEOUS, so allow that too.
----
- vendor/adb/client/usb_libusb.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/vendor/adb/client/usb_libusb.cpp b/vendor/adb/client/usb_libusb.cpp
-index 6133e7c8..9af91eb7 100644
---- a/vendor/adb/client/usb_libusb.cpp
-+++ b/vendor/adb/client/usb_libusb.cpp
-@@ -364,8 +364,8 @@ struct LibusbConnection : public Connection {
- }
-
- bool FindInterface(libusb_device_descriptor* device_desc) {
-- if (device_desc->bDeviceClass != LIBUSB_CLASS_PER_INTERFACE) {
-- // Assume that all Android devices have the device class set to per interface.
-+ if (device_desc->bDeviceClass != LIBUSB_CLASS_PER_INTERFACE && device_desc->bDeviceClass != LIBUSB_CLASS_MISCELLANEOUS) {
-+ // Assume that all Android devices have the device class set to per interface or miscellaneous.
- // TODO: Is this assumption valid?
- VLOG(USB) << "skipping device with incorrect class at " << device_address_;
- return false;
-@@ -1039,7 +1039,7 @@ void usb_init() {
- static_cast<libusb_hotplug_event>(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED |
- LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT),
- LIBUSB_HOTPLUG_ENUMERATE, LIBUSB_HOTPLUG_MATCH_ANY, LIBUSB_HOTPLUG_MATCH_ANY,
-- LIBUSB_CLASS_PER_INTERFACE, hotplug_callback, nullptr, nullptr);
-+ LIBUSB_HOTPLUG_MATCH_ANY, hotplug_callback, nullptr, nullptr);
-
- if (rc != LIBUSB_SUCCESS) {
- LOG(FATAL) << "failed to register libusb hotplug callback";
---
-2.46.0
-
diff --git a/0002-extras-libjsonpb-Fix-incompatibility-with-protobuf-v30.patch b/0002-extras-libjsonpb-Fix-incompatibility-with-protobuf-v30.patch
deleted file mode 100644
index fd6a890..0000000
--- a/0002-extras-libjsonpb-Fix-incompatibility-with-protobuf-v30.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 36c605004ae1c75813181ffe4c59907016aaf9e9 Mon Sep 17 00:00:00 2001
-From: Biswapriyo Nath <nathbappai@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
----
- 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
-
diff --git a/0003-Make-legacy-USB-driver-default-on-Linux.patch b/0003-Make-legacy-USB-driver-default-on-Linux.patch
deleted file mode 100644
index 15291f2..0000000
--- a/0003-Make-legacy-USB-driver-default-on-Linux.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 55d30a3098c29431bcbeb2d2a5f1a0c40844c311 Mon Sep 17 00:00:00 2001
-From: Fabien Sanglard <sanglardf@google.com>
-Date: Mon, 23 Jun 2025 11:21:16 -0700
-Subject: [PATCH] Make legacy USB driver default on Linux
-
-Bug: 366314975
-Bug: 398328647
-Test: Manual
-Flag: EXEMPT (adb.exe)
-Change-Id: Id49df58587d3f479d263a5b2da1679a1e675feb5
----
- client/transport_usb.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/vendor/adb/client/transport_usb.cpp b/vendor/adb/client/transport_usb.cpp
-index 3b0b4906..d3b4929c 100644
---- a/vendor/adb/client/transport_usb.cpp
-+++ b/vendor/adb/client/transport_usb.cpp
-@@ -177,9 +177,9 @@ bool is_adb_interface(int usb_class, int usb_subclass, int usb_protocol) {
- }
-
- bool is_libusb_enabled() {
-- bool enable = true;
--#if defined(_WIN32)
-- enable = false;
-+ bool enable = false;
-+#if defined(__APPLE__)
-+ enable = true;
- #endif
- char* env = getenv("ADB_LIBUSB");
- if (env) {
---
-2.52.0
-
diff --git a/0004-Add-missing-cstdint-includes-for-GCC-16-Fedora.patch b/0004-Add-missing-cstdint-includes-for-GCC-16-Fedora.patch
deleted file mode 100644
index 017f27b..0000000
--- a/0004-Add-missing-cstdint-includes-for-GCC-16-Fedora.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 5b417e7577075ebef7c80bfdb75f89a4be4cd8de Mon Sep 17 00:00:00 2001
-From: meator <meator.dev@gmail.com>
-Date: Wed, 14 Jan 2026 11:57:22 +0100
-Subject: [PATCH 1/2] Include missing cstdint header
-
-This code relied on the fact that some system headers pulled <cstdint>,
-so it did not bother to include it itself. However, this behavior is not
-specified, so compiler updates can break the code by no longer including
-this header.
----
- vendor/libbase/hex.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/vendor/libbase/hex.cpp b/vendor/libbase/hex.cpp
-index a4b7715..c46f42d 100644
---- a/vendor/libbase/hex.cpp
-+++ b/vendor/libbase/hex.cpp
-@@ -18,6 +18,8 @@
-
- #include "android-base/logging.h"
-
-+#include <cstdint>
-+
- namespace android {
- namespace base {
-
---
-2.52.0
-
-
-From f97ee86871920bdf4c7bd3278c1ad0234cd81251 Mon Sep 17 00:00:00 2001
-From: meator <meator.dev@gmail.com>
-Date: Wed, 14 Jan 2026 12:13:37 +0100
-Subject: [PATCH 2/2] Include missing cstdint header
-
-This code relied on the fact that some system headers pulled <cstdint>,
-so it did not bother to include it itself. However, this behavior is not
-specified, so compiler updates can break the code by no longer including
-this header.
----
- vendor/libziparchive/include/ziparchive/zip_writer.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/vendor/libziparchive/include/ziparchive/zip_writer.h b/vendor/libziparchive/include/ziparchive/zip_writer.h
-index 268e8b6..c85be2a 100644
---- a/vendor/libziparchive/include/ziparchive/zip_writer.h
-+++ b/vendor/libziparchive/include/ziparchive/zip_writer.h
-@@ -18,6 +18,7 @@
-
- #include <cstdio>
- #include <ctime>
-+#include <cstdint>
-
- #include <gtest/gtest_prod.h>
- #include <memory>
---
-2.52.0
-
diff --git a/android-tools.spec b/android-tools.spec
index 5fc6a43..842b096 100644
--- a/android-tools.spec
+++ b/android-tools.spec
@@ -1,5 +1,5 @@
Name: android-tools
-Version: 35.0.2
+Version: 37.0.0
Release: %autorelease
Epoch: 1
Summary: Android platform tools(adb, fastboot)
@@ -11,14 +11,6 @@ URL: http://developer.android.com/guide/developing/tools/
# Sources with all needed patches and cmakelists live there now:
Source0: https://github.com/nmeum/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz
-# https://github.com/nmeum/android-tools/issues/153
-Patch0: 0001-Fix-libusb-enumeration.patch
-# https://github.com/nmeum/android-tools/pull/172
-Patch1: 0002-extras-libjsonpb-Fix-incompatibility-with-protobuf-v30.patch
-# https://github.com/nmeum/android-tools/pull/190
-Patch2: 0003-Make-legacy-USB-driver-default-on-Linux.patch
-# https://github.com/nmeum/android-tools/pull/191
-Patch3: 0004-Add-missing-cstdint-includes-for-GCC-16-Fedora.patch
BuildRequires: brotli-devel
BuildRequires: cmake
@@ -40,8 +32,7 @@ Provides: mke2fs.android = %{epoch}:%{version}-%{release}
Provides: bundled(boringssl)
# Bundled boringssl doesn't support the big endian architectures rhbz 1431379
-# And dropped ppc64le support: https://github.com/google/boringssl/commit/7d2338d000eb1468a5bbf78e91854236e18fb9e4
-ExcludeArch: ppc ppc64 s390x ppc64le
+ExcludeArch: ppc ppc64 s390x
%description
@@ -102,6 +93,8 @@ setup between the host and the target phone as adb.
%{_datadir}/android-tools/mkbootimg/mkbootimg.py
%{_datadir}/bash-completion/completions/adb
%{_datadir}/bash-completion/completions/fastboot
+%{_datadir}/zsh/site-functions/_adb
+%{_datadir}/zsh/site-functions/_fastboot
%{_mandir}/man1/adb.1.*
%changelog
diff --git a/sources b/sources
index 40b919f..a46442d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (android-tools-35.0.2.tar.xz) = 391ce4d638b274d7bbae24a3df8de8b5812a982570f29b2aef37d12a3ba7ed6f66b5c0b7f908759e0b0da30d152b5319af0fef16c54bdc3b9f4074fb22f80d10
+SHA512 (android-tools-37.0.0.tar.xz) = 6a0bf2690b81d9e749823231ab4aaac6169f002eb32c54376bdaf6d7c7e64b0107bfaf70c806ce03e6f32d4493d773a9374eb4aaa44549c65d07f5557fb7bda7
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-08-01 7:49 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-01 7:49 [rpms/android-tools] f43: Update to 37.0.0 LuK1337
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox