git » android-tools.git » commit 07bcdf7

diff --git a/PKGBUILD b/PKGBUILD
index 59ab8ab..4a53d7f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,24 +3,17 @@
 # Contributor: Alucryd <alucryd at gmail dot com>
 
 pkgname=android-tools
-pkgver=34.0.1
+pkgver=34.0.4
 _tag=${pkgver} # https://github.com/nmeum/android-tools sometimes carries extra patch version on top of the upstream versioning
-pkgrel=3
+pkgrel=1
 pkgdesc='Android platform tools'
 arch=(x86_64)
 url='http://tools.android.com/'
 license=(Apache MIT)
 depends=(libusb protobuf brotli zstd android-udev pcre2)
 makedepends=(gtest cmake go ninja git)
-source=(https://github.com/nmeum/android-tools/releases/download/$_tag/android-tools-$_tag.tar.xz
-        protobuf-23.patch)
-sha256sums=('60234ecbca19a17a7e2f46a4581960d645b7c55b870d924a21494c76a6f548ec'
-            '2b39c68197584fa7b9c06de0b5f27a8bdddb61fa7f245ca02d6fd9cef5d40346')
-
-prepare() {
-  cd android-tools-$_tag
-  patch -p1 -i ../protobuf-23.patch
-}
+source=(https://github.com/nmeum/android-tools/releases/download/$_tag/android-tools-$_tag.tar.xz)
+sha256sums=('7a22ff9cea81ff4f38f560687858e8f8fb733624412597e3cc1ab0262f8da3a1')
 
 build() {
   cd android-tools-$_tag
diff --git a/protobuf-23.patch b/protobuf-23.patch
deleted file mode 100644
index 053b5bc..0000000
--- a/protobuf-23.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- android-tools-34.0.1.orig/vendor/CMakeLists.txt     2023-06-28 23:15:15.544237905 +0200
-+++ android-tools-34.0.1/vendor/CMakeLists.txt  2023-06-28 23:45:28.672277935 +0200
-@@ -73,6 +73,7 @@
- pkg_check_modules(libzstd REQUIRED IMPORTED_TARGET libzstd)
- 
- find_package(Protobuf REQUIRED)
-+set(PROTOBUF_LIBRARIES protobuf::libprotobuf)
- set(THREADS_PREFER_PTHREAD_FLAG ON)
- find_package(Threads REQUIRED)
- 
---- 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)) {