Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package android-tools for openSUSE:Factory checked in at 2025-06-05 20:33:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/android-tools (Old) and /work/SRC/openSUSE:Factory/.android-tools.new.19631 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "android-tools" Thu Jun 5 20:33:53 2025 rev:25 rq:1282899 version:35.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/android-tools/android-tools.changes 2025-04-07 17:37:20.686649932 +0200 +++ /work/SRC/openSUSE:Factory/.android-tools.new.19631/android-tools.changes 2025-06-05 20:36:31.542748180 +0200 @@ -1,0 +2,7 @@ +Tue May 27 09:28:29 UTC 2025 - mun...@googlemail.com + +- Add fix-protobuf-30-compat.patch + * vendor/extras/libjsonpb: Fix incompatibility with protobuf v30 + based on https://github.com/nmeum/android-tools/commit/0c4d799 + +------------------------------------------------------------------- New: ---- fix-protobuf-30-compat.patch BETA DEBUG BEGIN: New: - Add fix-protobuf-30-compat.patch * vendor/extras/libjsonpb: Fix incompatibility with protobuf v30 BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ android-tools.spec ++++++ --- /var/tmp/diff_new_pack.u58PA1/_old 2025-06-05 20:36:32.166774127 +0200 +++ /var/tmp/diff_new_pack.u58PA1/_new 2025-06-05 20:36:32.170774293 +0200 @@ -33,6 +33,8 @@ Source0: https://github.com/nmeum/android-tools/releases/download/%{version}/%{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE fix-install-completion.patch boo#1185883 mun...@googlemail.com -- Simplify completion Patch0: fix-install-completion.patch +# PATCH-FIX-UPSTREAM fix-protobuf-30-compat.patch -- based on commit 0c4d799 +Patch1: fix-protobuf-30-compat.patch BuildRequires: cmake >= 3.12 BuildRequires: go BuildRequires: llvm-gold ++++++ fix-protobuf-30-compat.patch ++++++ --- 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) {
