Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-grpc for openSUSE:Factory checked in at 2023-07-06 18:28:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-grpc (Old) and /work/SRC/openSUSE:Factory/.qt6-grpc.new.23466 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-grpc" Thu Jul 6 18:28:38 2023 rev:3 rq:1097103 version:6.5.1 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-grpc/qt6-grpc.changes 2023-05-28 19:22:07.436705491 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-grpc.new.23466/qt6-grpc.changes 2023-07-06 18:28:42.739160270 +0200 @@ -1,0 +2,13 @@ +Thu Jul 6 10:43:38 UTC 2023 - Fabian Vogt <fv...@suse.com> + +- Request protobuf < 22 (QTBUG-114833) + +------------------------------------------------------------------- +Tue Jul 4 22:16:25 UTC 2023 - Christophe Marin <christo...@krop.fr> + +- Add upstream changes: + * 0001-Fix-include-of-std-set.patch + * 0002-Remove-protobuf-logging.h-include.patch + * 0003-Add-missing-memory-include.patch + +------------------------------------------------------------------- New: ---- 0001-Fix-include-of-std-set.patch 0002-Remove-protobuf-logging.h-include.patch 0003-Add-missing-memory-include.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-grpc.spec ++++++ --- /var/tmp/diff_new_pack.EuEvJR/_old 2023-07-06 18:28:43.475164788 +0200 +++ /var/tmp/diff_new_pack.EuEvJR/_new 2023-07-06 18:28:43.483164837 +0200 @@ -34,6 +34,10 @@ License: GPL-3.0-or-later URL: https://www.qt.io Source: https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz +# PATCH-FIX-UPSTREAM +Patch0: 0001-Fix-include-of-std-set.patch +Patch1: 0002-Remove-protobuf-logging.h-include.patch +Patch2: 0003-Add-missing-memory-include.patch BuildRequires: pkgconfig BuildRequires: qt6-core-private-devel BuildRequires: cmake(Qt6Core) = %{real_version} @@ -44,7 +48,8 @@ BuildRequires: cmake(Qt6Widgets) = %{real_version} BuildRequires: pkgconfig(grpc++) BuildRequires: pkgconfig(libprotobuf-c) -BuildRequires: pkgconfig(protobuf) +# qtgrpc is not compatible with protobuf 23 and protobuf-c is not compatible with 22 either +BuildRequires: pkgconfig(protobuf) < 22 %if "%{qt6_flavor}" == "docs" BuildRequires: qt6-tools %{qt6_doc_packages} ++++++ 0001-Fix-include-of-std-set.patch ++++++ >From 0d0d14e5510127e9c5162e140a9ef6d004c2616a Mon Sep 17 00:00:00 2001 From: Konrad Kujawa <konrad.kuj...@qt.io> Date: Thu, 22 Jun 2023 15:30:20 +0200 Subject: [PATCH 1/3] Fix include of std::set With new version of gRPC, compiler complains about missing include of the std::set. Move include from .cpp to .h files. Pick-to: 6.6 Change-Id: Ibfef277598cb9e620ab1b693a42564706302c9cc Reviewed-by: Alexey Edelev <alexey.ede...@qt.io> --- src/tools/qtgrpcgen/qgrpcgenerator.cpp | 1 - src/tools/qtgrpcgen/qgrpcgenerator.h | 3 ++- src/tools/qtprotobufgen/qprotobufgenerator.cpp | 4 ++-- src/tools/qtprotobufgen/qprotobufgenerator.h | 2 ++ 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/tools/qtgrpcgen/qgrpcgenerator.cpp b/src/tools/qtgrpcgen/qgrpcgenerator.cpp index 4cab74d..3c2597e 100644 --- a/src/tools/qtgrpcgen/qgrpcgenerator.cpp +++ b/src/tools/qtgrpcgen/qgrpcgenerator.cpp @@ -10,7 +10,6 @@ #include "utils.h" #include "options.h" -#include <set> #include <google/protobuf/compiler/code_generator.h> #include <google/protobuf/stubs/logging.h> #include <google/protobuf/stubs/common.h> diff --git a/src/tools/qtgrpcgen/qgrpcgenerator.h b/src/tools/qtgrpcgen/qgrpcgenerator.h index 809925e..996d37c 100644 --- a/src/tools/qtgrpcgen/qgrpcgenerator.h +++ b/src/tools/qtgrpcgen/qgrpcgenerator.h @@ -4,8 +4,9 @@ #ifndef QGRPCGENERATOR_H #define QGRPCGENERATOR_H -#include <memory> #include "generatorbase.h" +#include <memory> +#include <set> namespace google::protobuf { class FileDescriptor; diff --git a/src/tools/qtprotobufgen/qprotobufgenerator.cpp b/src/tools/qtprotobufgen/qprotobufgenerator.cpp index 5a1ccc2..8eaab81 100644 --- a/src/tools/qtprotobufgen/qprotobufgenerator.cpp +++ b/src/tools/qtprotobufgen/qprotobufgenerator.cpp @@ -12,11 +12,10 @@ #include "utils.h" #include "options.h" -#include <cassert> - #include <array> +#include <cassert> #include <numeric> -#include <set> + #include <google/protobuf/stubs/logging.h> #include <google/protobuf/stubs/common.h> #include <google/protobuf/io/printer.h> diff --git a/src/tools/qtprotobufgen/qprotobufgenerator.h b/src/tools/qtprotobufgen/qprotobufgenerator.h index 8aec33a..6239fd4 100644 --- a/src/tools/qtprotobufgen/qprotobufgenerator.h +++ b/src/tools/qtprotobufgen/qprotobufgenerator.h @@ -7,6 +7,8 @@ #include "generatorbase.h" +#include <set> + namespace google::protobuf { class FileDescriptor; class Descriptor; ++++++ 0002-Remove-protobuf-logging.h-include.patch ++++++ >From 13905778c4b04e18bf19f4bf47055068613d86bd Mon Sep 17 00:00:00 2001 From: Konrad Kujawa <konrad.kuj...@qt.io> Date: Thu, 22 Jun 2023 15:33:11 +0200 Subject: [PATCH] Remove protobuf logging.h include This include was removed in the new version of the protobuf, and it was unused anyway. Pick-to: 6.6 Change-Id: I5c68f960c031d7f366ab3dc1b690dc9050369975 Reviewed-by: Alexey Edelev <alexey.ede...@qt.io> --- src/tools/qtgrpcgen/clientdeclarationprinter.cpp | 1 - src/tools/qtgrpcgen/qgrpcgenerator.cpp | 5 ++--- src/tools/qtprotobufgen/qprotobufgenerator.cpp | 1 - src/tools/qtprotoccommon/generatorbase.cpp | 3 +-- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/tools/qtgrpcgen/clientdeclarationprinter.cpp b/src/tools/qtgrpcgen/clientdeclarationprinter.cpp index 9bd57a1..eedb91f 100644 --- a/src/tools/qtgrpcgen/clientdeclarationprinter.cpp +++ b/src/tools/qtgrpcgen/clientdeclarationprinter.cpp @@ -8,7 +8,6 @@ #include <google/protobuf/io/printer.h> #include <google/protobuf/io/zero_copy_stream.h> #include <google/protobuf/stubs/common.h> -#include <google/protobuf/stubs/logging.h> #include <string> #include <unordered_set> diff --git a/src/tools/qtgrpcgen/qgrpcgenerator.cpp b/src/tools/qtgrpcgen/qgrpcgenerator.cpp index 3c2597e..ef2ce62 100644 --- a/src/tools/qtgrpcgen/qgrpcgenerator.cpp +++ b/src/tools/qtgrpcgen/qgrpcgenerator.cpp @@ -11,11 +11,10 @@ #include "options.h" #include <google/protobuf/compiler/code_generator.h> -#include <google/protobuf/stubs/logging.h> -#include <google/protobuf/stubs/common.h> +#include <google/protobuf/descriptor.h> #include <google/protobuf/io/printer.h> #include <google/protobuf/io/zero_copy_stream.h> -#include <google/protobuf/descriptor.h> +#include <google/protobuf/stubs/common.h> using namespace ::QtGrpc; using namespace ::qtprotoccommon; diff --git a/src/tools/qtprotobufgen/qprotobufgenerator.cpp b/src/tools/qtprotobufgen/qprotobufgenerator.cpp index 8eaab81..941ef97 100644 --- a/src/tools/qtprotobufgen/qprotobufgenerator.cpp +++ b/src/tools/qtprotobufgen/qprotobufgenerator.cpp @@ -16,7 +16,6 @@ #include <cassert> #include <numeric> -#include <google/protobuf/stubs/logging.h> #include <google/protobuf/stubs/common.h> #include <google/protobuf/io/printer.h> #include <google/protobuf/io/zero_copy_stream.h> diff --git a/src/tools/qtprotoccommon/generatorbase.cpp b/src/tools/qtprotoccommon/generatorbase.cpp index bc51206..eeb05f2 100644 --- a/src/tools/qtprotoccommon/generatorbase.cpp +++ b/src/tools/qtprotoccommon/generatorbase.cpp @@ -5,10 +5,9 @@ #include "generatorbase.h" #include <google/protobuf/descriptor.h> -#include <google/protobuf/stubs/logging.h> -#include <google/protobuf/stubs/common.h> #include <google/protobuf/io/printer.h> #include <google/protobuf/io/zero_copy_stream.h> +#include <google/protobuf/stubs/common.h> #include "utils.h" #include "commontemplates.h" -- 2.41.0 ++++++ 0003-Add-missing-memory-include.patch ++++++ >From 994f268079d4c56262e19f874b0e7091b9199e70 Mon Sep 17 00:00:00 2001 From: Konrad Kujawa <konrad.kuj...@qt.io> Date: Thu, 22 Jun 2023 16:00:22 +0200 Subject: [PATCH 3/3] Add missing memory include Pick-to: 6.6 Change-Id: I1235a410865cc7f7dfab37c6b73aebd6f9cbb14e Reviewed-by: Alexey Edelev <alexey.ede...@qt.io> --- src/tools/qtprotobufgen/qprotobufgenerator.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/tools/qtprotobufgen/qprotobufgenerator.h b/src/tools/qtprotobufgen/qprotobufgenerator.h index 1266f02..552f7f2 100644 --- a/src/tools/qtprotobufgen/qprotobufgenerator.h +++ b/src/tools/qtprotobufgen/qprotobufgenerator.h @@ -7,6 +7,7 @@ #include "generatorbase.h" +#include <memory> #include <set> namespace google::protobuf { -- 2.41.0
