From c611014212835ea07713ff80d4d570ac875259d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 5 Sep 2023 20:24:42 +0700
Subject: [PATCH] android-tools: update to 34.0.4.

---
 srcpkgs/android-tools/patches/link-absl.patch | 21 +++++++++++++
 .../android-tools/patches/protobuf-23.patch   | 31 -------------------
 srcpkgs/android-tools/template                | 16 +++-------
 3 files changed, 26 insertions(+), 42 deletions(-)
 create mode 100644 srcpkgs/android-tools/patches/link-absl.patch
 delete mode 100644 srcpkgs/android-tools/patches/protobuf-23.patch

diff --git a/srcpkgs/android-tools/patches/link-absl.patch b/srcpkgs/android-tools/patches/link-absl.patch
new file mode 100644
index 0000000000000..16b2a79ccc882
--- /dev/null
+++ b/srcpkgs/android-tools/patches/link-absl.patch
@@ -0,0 +1,21 @@
+--- a/vendor/CMakeLists.partition.txt
++++ b/vendor/CMakeLists.partition.txt
+@@ -28,7 +28,7 @@ add_library(liblpdump STATIC
+ 	${DYNAMIC_PARTITIONS_DEVICE_INFO_PROTO_SRCS} ${DYNAMIC_PARTITIONS_DEVICE_INFO_PROTO_HDRS}
+ 	extras/partition_tools/lpdump.cc)
+ target_link_libraries(liblpdump PRIVATE
+-	libbase libjsonpbparse liblp protobuf::libprotobuf)
++	libbase libjsonpbparse liblp protobuf::libprotobuf absl::status)
+ 
+ add_executable(lpdump
+ 	extras/partition_tools/lpdump_host.cc)
+--- a/vendor/CMakeLists.txt
++++ b/vendor/CMakeLists.txt
+@@ -73,6 +73,7 @@ pkg_check_modules(libpcre2-8 REQUIRED IM
+ pkg_check_modules(libusb-1.0 REQUIRED IMPORTED_TARGET libusb-1.0)
+ pkg_check_modules(libzstd REQUIRED IMPORTED_TARGET libzstd)
+ 
++find_package(absl REQUIRED)
+ find_package(Protobuf CONFIG)
+ find_package(Protobuf REQUIRED)
+ set(THREADS_PREFER_PTHREAD_FLAG ON)
diff --git a/srcpkgs/android-tools/patches/protobuf-23.patch b/srcpkgs/android-tools/patches/protobuf-23.patch
deleted file mode 100644
index 21012126ea9a6..0000000000000
--- a/srcpkgs/android-tools/patches/protobuf-23.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- android-tools-34.0.1.orig/vendor/extras/libjsonpb/parse/jsonpb.cpp  2023-06-28 23:15:15.414236253 +0200
-+++ android-tools-34.0.1/vendor/extras/libjsonpb/parse/jsonpb.cpp       2023-06-28 23:34:21.672962973 +0200
-@@ -51,7 +51,7 @@
- #if GOOGLE_PROTOBUF_VERSION < 3016000
-     return MakeError<std::string>(status.error_message().as_string());
- #else
--    return MakeError<std::string>(status.message().as_string());
-+    return MakeError<std::string>(std::string(status.message()));
- #endif
-   }
-   return ErrorOr<std::string>(std::move(json));
-@@ -68,7 +68,7 @@
- #if GOOGLE_PROTOBUF_VERSION < 3016000
-     return MakeError<std::monostate>(status.error_message().as_string());
- #else
--    return MakeError<std::monostate>(status.message().as_string());
-+    return MakeError<std::monostate>(std::string(status.message()));
- #endif
-   }
-   if (!message->ParseFromString(binary)) {
---- a/vendor/CMakeLists.partition.txt	2023-03-03 17:18:50.000000000 +0100
-+++ -	2023-07-10 23:06:19.290718502 +0200
-@@ -20,7 +20,7 @@
- 
- add_library(libjsonpbparse STATIC
- 	extras/libjsonpb/parse/jsonpb.cpp)
--target_link_libraries(libjsonpbparse PRIVATE libbase)
-+target_link_libraries(libjsonpbparse PRIVATE libbase absl_status)
- target_include_directories(libjsonpbparse PUBLIC
- 	extras/libjsonpb/parse/include)
- 
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index e3953233c2db1..79b41cc645106 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,25 +1,19 @@
 # Template file for 'android-tools'
 pkgname=android-tools
-version=34.0.1
-revision=3
+version=34.0.4
+revision=1
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
-hostmakedepends="perl go go1.20 protobuf pkg-config"
+hostmakedepends="perl go protobuf pkg-config"
 makedepends="gtest-devel zlib-devel libusb-devel pcre2-devel
- liblz4-devel libzstd-devel protobuf-devel brotli-devel"
+ liblz4-devel libzstd-devel protobuf-devel brotli-devel abseil-cpp-devel"
 depends="python3"
 short_desc="Android platform tools (adb and fastboot)"
 maintainer="John <me@johnnynator.dev>"
 license="Apache-2.0, ISC, GPL-2.0-only, MIT"
 homepage="https://developer.android.com/tools/help/adb.html"
 distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=60234ecbca19a17a7e2f46a4581960d645b7c55b870d924a21494c76a6f548ec
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
-fi
-
-export GOTOOLCHAIN=go1.20
+checksum=7a22ff9cea81ff4f38f560687858e8f8fb733624412597e3cc1ab0262f8da3a1
 
 post_install() {
 	# zsh's built in works, while this one doesn't