diff --git a/srcpkgs/android-tools/patches/protobuf-23.patch b/srcpkgs/android-tools/patches/protobuf-23.patch new file mode 100644 index 00000000000..21012126ea9 --- /dev/null +++ b/srcpkgs/android-tools/patches/protobuf-23.patch @@ -0,0 +1,31 @@ +--- 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(status.error_message().as_string()); + #else +- return MakeError(status.message().as_string()); ++ return MakeError(std::string(status.message())); + #endif + } + return ErrorOr(std::move(json)); +@@ -68,7 +68,7 @@ + #if GOOGLE_PROTOBUF_VERSION < 3016000 + return MakeError(status.error_message().as_string()); + #else +- return MakeError(status.message().as_string()); ++ return MakeError(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 329674482b6..b813474eace 100644 --- a/srcpkgs/android-tools/template +++ b/srcpkgs/android-tools/template @@ -1,7 +1,7 @@ # Template file for 'android-tools' pkgname=android-tools version=34.0.1 -revision=1 +revision=2 archs="armv* aarch64* x86_64* i686* ppc64le*" build_style=cmake hostmakedepends="perl go protobuf pkg-config"