git » android-tools.git » commit b3678fc

diff --git a/.SRCINFO b/.SRCINFO
index 863d2d4..a9f20cb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = android-tools
 	pkgdesc = Android platform tools
 	pkgver = 35.0.2
-	pkgrel = 11
+	pkgrel = 12
 	url = http://tools.android.com/
 	arch = x86_64
 	license = Apache
@@ -19,6 +19,8 @@ pkgbase = android-tools
 	depends = pcre2
 	optdepends = python: {mk,unpack_,repack_}bootimg and mkdtboimg support
 	source = https://github.com/nmeum/android-tools/releases/download/35.0.2/android-tools-35.0.2.tar.xz
+	source = android-tools-35.0.2-fix-protobuf-30.0-compilation.patch
 	sha256sums = d2c3222280315f36d8bfa5c02d7632b47e365bfe2e77e99a3564fb6576f04097
+	sha256sums = cd2034ca35c3b5ca82f095106cd099abdbc5a682b7b9892eb0ebead616370e96
 
 pkgname = android-tools
diff --git a/PKGBUILD b/PKGBUILD
index feffbf2..6263048 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=android-tools
 pkgver=35.0.2
 _tag=${pkgver} # https://github.com/nmeum/android-tools sometimes carries extra patch version on top of the upstream versioning
-pkgrel=11
+pkgrel=12
 pkgdesc='Android platform tools'
 arch=(x86_64)
 url='http://tools.android.com/'
@@ -13,8 +13,16 @@ license=(Apache MIT)
 depends=(fmt protobuf brotli zstd android-udev pcre2)
 makedepends=(gtest cmake go ninja git)
 optdepends=('python: {mk,unpack_,repack_}bootimg and mkdtboimg support')
-source=(https://github.com/nmeum/android-tools/releases/download/$_tag/android-tools-$_tag.tar.xz)
-sha256sums=('d2c3222280315f36d8bfa5c02d7632b47e365bfe2e77e99a3564fb6576f04097')
+source=(https://github.com/nmeum/android-tools/releases/download/$_tag/android-tools-$_tag.tar.xz
+        android-tools-35.0.2-fix-protobuf-30.0-compilation.patch)
+sha256sums=('d2c3222280315f36d8bfa5c02d7632b47e365bfe2e77e99a3564fb6576f04097'
+            'cd2034ca35c3b5ca82f095106cd099abdbc5a682b7b9892eb0ebead616370e96')
+
+prepare() {
+  cd android-tools-$_tag
+  patch -Np 1 -d "vendor/extras" < ../android-tools-35.0.2-fix-protobuf-30.0-compilation.patch
+
+}
 
 build() {
   cd android-tools-$_tag
diff --git a/android-tools-35.0.2-fix-protobuf-30.0-compilation.patch b/android-tools-35.0.2-fix-protobuf-30.0-compilation.patch
new file mode 100644
index 0000000..4ba34a0
--- /dev/null
+++ b/android-tools-35.0.2-fix-protobuf-30.0-compilation.patch
@@ -0,0 +1,13 @@
+diff --git a/libjsonpb/parse/jsonpb.cpp b/libjsonpb/parse/jsonpb.cpp
+index 6c428282b..575155709 100644
+--- a/libjsonpb/parse/jsonpb.cpp
++++ b/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) {