commit qt6-grpc for openSUSE:Factory
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 2024-10-03 17:37:31 Comparing /work/SRC/openSUSE:Factory/qt6-grpc (Old) and /work/SRC/openSUSE:Factory/.qt6-grpc.new.19354 (New) Package is "qt6-grpc" Thu Oct 3 17:37:31 2024 rev:14 rq:1205125 version:6.7.3 Changes: --- /work/SRC/openSUSE:Factory/qt6-grpc/qt6-grpc.changes2024-07-02 18:17:11.161035696 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-grpc.new.19354/qt6-grpc.changes 2024-10-03 17:37:50.821884093 +0200 @@ -1,0 +2,6 @@ +Sat Sep 28 08:22:57 UTC 2024 - Christophe Marin + +- Update to 6.7.3 + * https://www.qt.io/blog/qt-6.7.3-released + +--- Old: qtgrpc-everywhere-src-6.7.2.tar.xz New: qtgrpc-everywhere-src-6.7.3.tar.xz Other differences: -- ++ qt6-grpc.spec ++ --- /var/tmp/diff_new_pack.24lYfN/_old 2024-10-03 17:37:51.477911494 +0200 +++ /var/tmp/diff_new_pack.24lYfN/_new 2024-10-03 17:37:51.481911661 +0200 @@ -16,7 +16,7 @@ # -%define real_version 6.7.2 +%define real_version 6.7.3 %define short_version 6.7 %define short_name qtgrpc %define tar_name qtgrpc-everywhere-src @@ -28,7 +28,7 @@ %endif Name: qt6-grpc%{?pkg_suffix} -Version:6.7.2 +Version:6.7.3 Release:0 Summary:gRPC and Protobuf generator and bindings for Qt framework License:GPL-3.0-or-later ++ qtgrpc-everywhere-src-6.7.2.tar.xz -> qtgrpc-everywhere-src-6.7.3.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.7.2/.cmake.conf new/qtgrpc-everywhere-src-6.7.3/.cmake.conf --- old/qtgrpc-everywhere-src-6.7.2/.cmake.conf 2024-06-08 01:54:43.0 +0200 +++ new/qtgrpc-everywhere-src-6.7.3/.cmake.conf 2024-09-19 20:58:41.0 +0200 @@ -1,4 +1,4 @@ -set(QT_REPO_MODULE_VERSION "6.7.2") +set(QT_REPO_MODULE_VERSION "6.7.3") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_LEAN_HEADERS=1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.7.2/.tag new/qtgrpc-everywhere-src-6.7.3/.tag --- old/qtgrpc-everywhere-src-6.7.2/.tag2024-06-08 01:54:43.0 +0200 +++ new/qtgrpc-everywhere-src-6.7.3/.tag2024-09-19 20:58:41.0 +0200 @@ -1 +1 @@ -2d93de389eb25c14267c45df031951a4e9eefbfb +8b7193ab0d86e090d43422056d0864c4e5bece70 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.7.2/dependencies.yaml new/qtgrpc-everywhere-src-6.7.3/dependencies.yaml --- old/qtgrpc-everywhere-src-6.7.2/dependencies.yaml 2024-06-08 01:54:43.0 +0200 +++ new/qtgrpc-everywhere-src-6.7.3/dependencies.yaml 2024-09-19 20:58:41.0 +0200 @@ -1,7 +1,7 @@ dependencies: ../qtbase: -ref: b5fbe0923cfc566036b83c3d968f225b26117efc +ref: 92b685784960eea6eb353688cf0edeb94d69c6cd required: true ../qtdeclarative: -ref: 12533cc0bd83a2076efb4af0bc1832b0db9568fc +ref: 34ffe0c15a9564fefcf01a738eb0bde370399959 required: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.7.2/src/grpc/qgrpchttp2channel.cpp new/qtgrpc-everywhere-src-6.7.3/src/grpc/qgrpchttp2channel.cpp --- old/qtgrpc-everywhere-src-6.7.2/src/grpc/qgrpchttp2channel.cpp 2024-06-08 01:54:43.0 +0200 +++ new/qtgrpc-everywhere-src-6.7.3/src/grpc/qgrpchttp2channel.cpp 2024-09-19 20:58:41.0 +0200 @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -68,8 +69,44 @@ constexpr QByteArrayView GrpcStatusHeader("grpc-status"); constexpr QByteArrayView GrpcStatusMessageHeader("grpc-message"); constexpr qsizetype GrpcMessageSizeHeaderSize = 5; + +// This HTTP/2 Error Codes to QGrpcStatus::StatusCode mapping should be kept in sync +// with the following docs: +// https://www.rfc-editor.org/rfc/rfc7540#section-7 +// https://github.com/grpc/grpc/blob/master/doc/statuscodes.md +// https://github.com/grpc/grpc/blob/master/doc/PROTOCOL-HTTP2.md +constexpr QGrpcStatus::StatusCode http2ErrorToStatusCode(const quint32 http2Error) +{ +using StatusCode = QGrpcStatus::StatusCode; +using Http2Error = Http2::Http2Error; +switch (http2Error) { +case Http2Error::HTTP2_NO_ERROR: +case Http2Error::PROTOCOL_ERROR: +case Http2Error::INTERNAL_ERROR: +case Http2Error::FLOW_CONTROL_ERROR: +case Http2Error::SETTINGS_TIMEOUT: +case Http2Error::STREAM_CLOSED: +ca
commit qt6-grpc for openSUSE:Factory
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 2024-06-24 20:52:35 Comparing /work/SRC/openSUSE:Factory/qt6-grpc (Old) and /work/SRC/openSUSE:Factory/.qt6-grpc.new.18349 (New) Package is "qt6-grpc" Mon Jun 24 20:52:35 2024 rev:12 rq:1182591 version:6.7.2 Changes: --- /work/SRC/openSUSE:Factory/qt6-grpc/qt6-grpc.changes2024-05-27 11:54:19.186420095 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-grpc.new.18349/qt6-grpc.changes 2024-06-24 20:53:26.000616750 +0200 @@ -1,0 +2,6 @@ +Wed Jun 19 07:25:43 UTC 2024 - Christophe Marin + +- Update to 6.7.2: + * https://www.qt.io/blog/qt-6.7.2-released + +--- Old: qtgrpc-everywhere-src-6.7.1.tar.xz New: qtgrpc-everywhere-src-6.7.2.tar.xz Other differences: -- ++ qt6-grpc.spec ++ --- /var/tmp/diff_new_pack.XmsF3r/_old 2024-06-24 20:53:26.500635044 +0200 +++ /var/tmp/diff_new_pack.XmsF3r/_new 2024-06-24 20:53:26.500635044 +0200 @@ -16,7 +16,7 @@ # -%define real_version 6.7.1 +%define real_version 6.7.2 %define short_version 6.7 %define short_name qtgrpc %define tar_name qtgrpc-everywhere-src @@ -27,8 +27,16 @@ %define pkg_suffix -docs %endif # +# protobuf and absl packages in Leap 15.5 are incompatible, qtgrpcgen and +# protobuf types libraries can't be built (https://bugzilla.suse.com/show_bug.cgi?id=1222343) +%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150500 +%define with_usable_protobuf 1 +%else +%define with_usable_protobuf 0 +%endif + Name: qt6-grpc%{?pkg_suffix} -Version:6.7.1 +Version:6.7.2 Release:0 Summary:gRPC and Protobuf generator and bindings for Qt framework License:GPL-3.0-or-later @@ -109,7 +117,9 @@ This package provides private headers of libQt6Protobuf that do not have any ABI or API guarantees. +%if %{with_usable_protobuf} %{qt6_examples_package} +%endif %endif @@ -146,7 +156,9 @@ %{_qt6_cmakedir}/Qt6BuildInternals/StandaloneTests/QtGrpcTestsConfig.cmake %{_qt6_cmakedir}/Qt6Grpc/ %{_qt6_cmakedir}/Qt6GrpcQuick/ +%if %{with_usable_protobuf} %{_qt6_cmakedir}/Qt6GrpcTools/ +%endif %{_qt6_descriptionsdir}/Grpc.json %{_qt6_descriptionsdir}/GrpcQuick.json %{_qt6_includedir}/QtGrpc/ @@ -155,7 +167,9 @@ %{_qt6_libdir}/libQt6Grpc.so %{_qt6_libdir}/libQt6GrpcQuick.prl %{_qt6_libdir}/libQt6GrpcQuick.so +%if %{with_usable_protobuf} %{_qt6_libexecdir}/qtgrpcgen +%endif %{_qt6_metatypesdir}/qt6grpc_*_metatypes.json %{_qt6_metatypesdir}/qt6grpcquick_*_metatypes.json %{_qt6_mkspecsdir}/modules/qt_lib_grpc.pri @@ -174,28 +188,37 @@ %files -n libQt6Protobuf6 %license LICENSES/* %{_qt6_libdir}/libQt6Protobuf.so.* +%if %{with_usable_protobuf} %{_qt6_libdir}/libQt6ProtobufQtCoreTypes.so.* %{_qt6_libdir}/libQt6ProtobufQtGuiTypes.so.* %{_qt6_libdir}/libQt6ProtobufWellKnownTypes.so.* +%endif %files -n qt6-protobuf-devel %{_qt6_cmakedir}/Qt6/FindWrapProtobuf.cmake %{_qt6_cmakedir}/Qt6/FindWrapProtoc.cmake %{_qt6_cmakedir}/Qt6Protobuf/ +%if %{with_usable_protobuf} %{_qt6_cmakedir}/Qt6ProtobufQtCoreTypes/ %{_qt6_cmakedir}/Qt6ProtobufQtGuiTypes/ %{_qt6_cmakedir}/Qt6ProtobufWellKnownTypes/ %{_qt6_cmakedir}/Qt6ProtobufTools/ +%endif %{_qt6_descriptionsdir}/Protobuf.json +%if %{with_usable_protobuf} %{_qt6_descriptionsdir}/ProtobufQtCoreTypes.json %{_qt6_descriptionsdir}/ProtobufQtGuiTypes.json %{_qt6_descriptionsdir}/ProtobufWellKnownTypes.json +%endif %{_qt6_includedir}/QtProtobuf/ +%if %{with_usable_protobuf} %{_qt6_includedir}/QtProtobufQtCoreTypes/ %{_qt6_includedir}/QtProtobufQtGuiTypes/ %{_qt6_includedir}/QtProtobufWellKnownTypes/ +%endif %{_qt6_libdir}/libQt6Protobuf.prl %{_qt6_libdir}/libQt6Protobuf.so +%if %{with_usable_protobuf} %{_qt6_libdir}/libQt6ProtobufQtCoreTypes.prl %{_qt6_libdir}/libQt6ProtobufQtCoreTypes.so %{_qt6_libdir}/libQt6ProtobufQtGuiTypes.prl @@ -203,26 +226,35 @@ %{_qt6_libdir}/libQt6ProtobufWellKnownTypes.prl %{_qt6_libdir}/libQt6ProtobufWellKnownTypes.so %{_qt6_libexecdir}/qtprotobufgen +%endif %{_qt6_metatypesdir}/qt6protobuf_*_metatypes.json +%if %{with_usable_protobuf} %{_qt6_metatypesdir}/qt6protobufqtcoretypes_*_metatypes.json %{_qt6_metatypesdir}/qt6protobufqtguitypes_*_metatypes.json %{_qt6_metatypesdir}/qt6protobufwellknowntypes_*_metatypes.json +%endif %{_qt6_mkspecsdir}/modules/qt_lib_protobuf.pri +%if %{with_usable_protobuf} %{_qt6_mkspecsdir}/modules/qt_lib_protobufqtcoretypes.pri %{_qt6_mkspecsdir}/modules/qt_lib_protobufqtguitypes.pri %{_qt6_mkspecsdir}/modules/qt_lib_protobufwellknowntypes.pri +%endif %{_qt6_pkgconfigdir}/Qt6Protobuf.pc +%if %{with_usable_p
commit qt6-grpc for openSUSE:Factory
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 2024-05-27 11:48:22 Comparing /work/SRC/openSUSE:Factory/qt6-grpc (Old) and /work/SRC/openSUSE:Factory/.qt6-grpc.new.24587 (New) Package is "qt6-grpc" Mon May 27 11:48:22 2024 rev:11 rq:1176052 version:6.7.1 Changes: --- /work/SRC/openSUSE:Factory/qt6-grpc/qt6-grpc.changes2024-04-08 17:51:10.863269602 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-grpc.new.24587/qt6-grpc.changes 2024-05-27 11:54:19.186420095 +0200 @@ -1,0 +2,6 @@ +Tue May 21 08:31:29 UTC 2024 - Christophe Marin + +- Update to 6.7.1: + * https://www.qt.io/blog/qt-6.7.1-released + +--- Old: qtgrpc-everywhere-src-6.7.0.tar.xz New: qtgrpc-everywhere-src-6.7.1.tar.xz Other differences: -- ++ qt6-grpc.spec ++ --- /var/tmp/diff_new_pack.rRbU32/_old 2024-05-27 11:54:19.870445180 +0200 +++ /var/tmp/diff_new_pack.rRbU32/_new 2024-05-27 11:54:19.874445326 +0200 @@ -16,7 +16,7 @@ # -%define real_version 6.7.0 +%define real_version 6.7.1 %define short_version 6.7 %define short_name qtgrpc %define tar_name qtgrpc-everywhere-src @@ -28,12 +28,12 @@ %endif # Name: qt6-grpc%{?pkg_suffix} -Version:6.7.0 +Version:6.7.1 Release:0 Summary:gRPC and Protobuf generator and bindings for Qt framework 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 +Source0: https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz BuildRequires: pkgconfig BuildRequires: qt6-core-private-devel = %{version} BuildRequires: qt6-network-private-devel = %{version} ++ qtgrpc-everywhere-src-6.7.0.tar.xz -> qtgrpc-everywhere-src-6.7.1.tar.xz ++ 2214 lines of diff (skipped)
commit qt6-grpc for openSUSE:Factory
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-12-04 22:59:46 Comparing /work/SRC/openSUSE:Factory/qt6-grpc (Old) and /work/SRC/openSUSE:Factory/.qt6-grpc.new.25432 (New) Package is "qt6-grpc" Mon Dec 4 22:59:46 2023 rev:7 rq:1130408 version:6.6.1 Changes: --- /work/SRC/openSUSE:Factory/qt6-grpc/qt6-grpc.changes2023-10-13 23:14:38.998969396 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-grpc.new.25432/qt6-grpc.changes 2023-12-04 22:59:50.852007651 +0100 @@ -1,0 +2,8 @@ +Mon Nov 27 14:00:09 UTC 2023 - Christophe Marin + +- Update to 6.6.1: + * https://www.qt.io/blog/qt-6.6.1-released +- Add upstream changes: + * 0001-Fix-re-initializing-a-moved-from-QProtobufMessage-us.patch + +--- Old: qtgrpc-everywhere-src-6.6.0.tar.xz New: 0001-Fix-re-initializing-a-moved-from-QProtobufMessage-us.patch qtgrpc-everywhere-src-6.6.1.tar.xz BETA DEBUG BEGIN: New:- Add upstream changes: * 0001-Fix-re-initializing-a-moved-from-QProtobufMessage-us.patch BETA DEBUG END: Other differences: -- ++ qt6-grpc.spec ++ --- /var/tmp/diff_new_pack.QmsFJ5/_old 2023-12-04 22:59:51.560033706 +0100 +++ /var/tmp/diff_new_pack.QmsFJ5/_new 2023-12-04 22:59:51.564033853 +0100 @@ -16,7 +16,7 @@ # -%define real_version 6.6.0 +%define real_version 6.6.1 %define short_version 6.6 %define short_name qtgrpc %define tar_name qtgrpc-everywhere-src @@ -28,12 +28,14 @@ %endif # Name: qt6-grpc%{?pkg_suffix} -Version:6.6.0 +Version:6.6.1 Release:0 Summary:gRPC and Protobuf generator and bindings for Qt framework 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-re-initializing-a-moved-from-QProtobufMessage-us.patch BuildRequires: pkgconfig BuildRequires: qt6-core-private-devel BuildRequires: cmake(Qt6Core) = %{real_version} @@ -44,8 +46,7 @@ BuildRequires: cmake(Qt6Widgets) = %{real_version} BuildRequires: pkgconfig(grpc++) BuildRequires: pkgconfig(libprotobuf-c) -# qtgrpc is not compatible with protobuf 23 and protobuf-c is not compatible with 22 either -BuildRequires: pkgconfig(protobuf) < 22 +BuildRequires: pkgconfig(protobuf) %if "%{qt6_flavor}" == "docs" BuildRequires: qt6-tools %{qt6_doc_packages} ++ 0001-Fix-re-initializing-a-moved-from-QProtobufMessage-us.patch ++ >From 0ce7f59cc15da9759d55e6a6b332d2a1bd7f78b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Fri, 17 Nov 2023 15:32:14 +0100 Subject: [PATCH] Fix re-initializing a moved-from QProtobufMessage using copy It was expecting the data-pointer was not nullptr, but after moving out it is. Fixes: QTBUG-119227 Change-Id: I3a8907dd0e16b33604481d9d6c382c238b067676 Reviewed-by: Alexey Edelev (cherry picked from commit 0bc538fa9a544255753bfc387e6b620a10b6d1fa) Reviewed-by: Qt Cherry-pick Bot --- src/protobuf/qprotobufmessage.cpp | 6 - .../basic/tst_protobuf_basictypes.cpp | 26 +++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/src/protobuf/qprotobufmessage.cpp b/src/protobuf/qprotobufmessage.cpp index 124ec50..2e29b43 100644 --- a/src/protobuf/qprotobufmessage.cpp +++ b/src/protobuf/qprotobufmessage.cpp @@ -148,7 +148,11 @@ QProtobufMessage::QProtobufMessage(const QProtobufMessage &other) */ QProtobufMessage &QProtobufMessage::operator=(const QProtobufMessage &other) { -if (this != &other) +if (!other.d_ptr) +delete std::exchange(d_ptr, {}); // delete d_ptr if other.d_ptr is null +else if (!d_ptr) +d_ptr = new QProtobufMessagePrivate(*other.d_ptr); +else if (this != &other) *d_ptr = *other.d_ptr; return *this; } diff --git a/tests/auto/protobuf/basic/tst_protobuf_basictypes.cpp b/tests/auto/protobuf/basic/tst_protobuf_basictypes.cpp index 83d3c6e..b2e8270 100644 --- a/tests/auto/protobuf/basic/tst_protobuf_basictypes.cpp +++ b/tests/auto/protobuf/basic/tst_protobuf_basictypes.cpp @@ -62,6 +62,18 @@ void QtProtobufTypesGenerationTest::EmptyMessageTest() QProtobufMessagePointer rawMessage( QProtobufMessage::constructByName("qtprotobufnamespace.tests.EmptyMessage")); QVERIFY(reinterpret_cast(rawMessage.get()) != nullptr); + +// Move from and reuse. This should compile and run: +qtprotobufnamespace::tests::EmptyMessage from; +qtprotobufnamespace::tests::EmptyMe
commit qt6-grpc for openSUSE:Factory
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-10-13 23:14:13 Comparing /work/SRC/openSUSE:Factory/qt6-grpc (Old) and /work/SRC/openSUSE:Factory/.qt6-grpc.new.20540 (New) Package is "qt6-grpc" Fri Oct 13 23:14:13 2023 rev:6 rq:1116933 version:6.6.0 Changes: --- /work/SRC/openSUSE:Factory/qt6-grpc/qt6-grpc.changes2023-10-02 20:07:15.392509364 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-grpc.new.20540/qt6-grpc.changes 2023-10-13 23:14:38.998969396 +0200 @@ -1,0 +2,13 @@ +Tue Oct 10 09:39:50 UTC 2023 - Christophe Marin + +- Update to 6.6.0 + * https://www.qt.io/blog/qt-6.6-released + +--- +Wed Oct 4 12:25:05 UTC 2023 - Christophe Marin + +- Drop patches, merged upstream: + * 0001-Fix-include-of-std-set.patch + * 0003-Add-missing-memory-include.patch + +--- Old: 0001-Fix-include-of-std-set.patch 0003-Add-missing-memory-include.patch qtgrpc-everywhere-src-6.5.3.tar.xz New: qtgrpc-everywhere-src-6.6.0.tar.xz Other differences: -- ++ qt6-grpc.spec ++ --- /var/tmp/diff_new_pack.qj9URN/_old 2023-10-13 23:14:39.630992320 +0200 +++ /var/tmp/diff_new_pack.qj9URN/_new 2023-10-13 23:14:39.630992320 +0200 @@ -16,8 +16,8 @@ # -%define real_version 6.5.3 -%define short_version 6.5 +%define real_version 6.6.0 +%define short_version 6.6 %define short_name qtgrpc %define tar_name qtgrpc-everywhere-src %define tar_suffix %{nil} @@ -28,15 +28,12 @@ %endif # Name: qt6-grpc%{?pkg_suffix} -Version:6.5.3 +Version:6.6.0 Release:0 Summary:gRPC and Protobuf generator and bindings for Qt framework 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: 0003-Add-missing-memory-include.patch BuildRequires: pkgconfig BuildRequires: qt6-core-private-devel BuildRequires: cmake(Qt6Core) = %{real_version} @@ -152,25 +149,55 @@ %files -n libQt6Protobuf6 %license LICENSES/* %{_qt6_libdir}/libQt6Protobuf.so.* +%{_qt6_libdir}/libQt6ProtobufQtCoreTypes.so.* +%{_qt6_libdir}/libQt6ProtobufQtGuiTypes.so.* +%{_qt6_libdir}/libQt6ProtobufWellKnownTypes.so.* %files -n qt6-protobuf-devel %{_qt6_cmakedir}/Qt6/FindWrapProtobuf.cmake %{_qt6_cmakedir}/Qt6/FindWrapProtoc.cmake %{_qt6_cmakedir}/Qt6Protobuf/ +%{_qt6_cmakedir}/Qt6ProtobufQtCoreTypes/ +%{_qt6_cmakedir}/Qt6ProtobufQtGuiTypes/ +%{_qt6_cmakedir}/Qt6ProtobufWellKnownTypes/ %{_qt6_cmakedir}/Qt6ProtobufTools/ %{_qt6_descriptionsdir}/Protobuf.json +%{_qt6_descriptionsdir}/ProtobufQtCoreTypes.json +%{_qt6_descriptionsdir}/ProtobufQtGuiTypes.json +%{_qt6_descriptionsdir}/ProtobufWellKnownTypes.json %{_qt6_includedir}/QtProtobuf/ +%{_qt6_includedir}/QtProtobufQtCoreTypes/ +%{_qt6_includedir}/QtProtobufQtGuiTypes/ +%{_qt6_includedir}/QtProtobufWellKnownTypes/ %{_qt6_libdir}/libQt6Protobuf.prl %{_qt6_libdir}/libQt6Protobuf.so +%{_qt6_libdir}/libQt6ProtobufQtCoreTypes.prl +%{_qt6_libdir}/libQt6ProtobufQtCoreTypes.so +%{_qt6_libdir}/libQt6ProtobufQtGuiTypes.prl +%{_qt6_libdir}/libQt6ProtobufQtGuiTypes.so +%{_qt6_libdir}/libQt6ProtobufWellKnownTypes.prl +%{_qt6_libdir}/libQt6ProtobufWellKnownTypes.so %{_qt6_libexecdir}/qtprotobufgen %{_qt6_metatypesdir}/qt6protobuf_*_metatypes.json +%{_qt6_metatypesdir}/qt6protobufqtcoretypes_*_metatypes.json +%{_qt6_metatypesdir}/qt6protobufqtguitypes_*_metatypes.json +%{_qt6_metatypesdir}/qt6protobufwellknowntypes_*_metatypes.json %{_qt6_mkspecsdir}/modules/qt_lib_protobuf.pri +%{_qt6_mkspecsdir}/modules/qt_lib_protobufqtcoretypes.pri +%{_qt6_mkspecsdir}/modules/qt_lib_protobufqtguitypes.pri +%{_qt6_mkspecsdir}/modules/qt_lib_protobufwellknowntypes.pri %{_qt6_pkgconfigdir}/Qt6Protobuf.pc +%{_qt6_pkgconfigdir}/Qt6ProtobufQtCoreTypes.pc +%{_qt6_pkgconfigdir}/Qt6ProtobufQtGuiTypes.pc +%{_qt6_pkgconfigdir}/Qt6ProtobufWellKnownTypes.pc %exclude %{_qt6_includedir}/QtProtobuf/%{real_version} %files -n qt6-protobuf-private-devel -%{_qt6_includedir}/QtProtobuf/%{real_version} +%{_qt6_includedir}/QtProtobuf/%{real_version}/ %{_qt6_mkspecsdir}/modules/qt_lib_protobuf_private.pri +%{_qt6_mkspecsdir}/modules/qt_lib_protobufqtcoretypes_private.pri +%{_qt6_mkspecsdir}/modules/qt_lib_protobufqtguitypes_private.pri +%{_qt6_mkspecsdir}/modules/qt_lib_protobufwellknowntypes_private.pri %endif ++ qtgrpc-everywhere-sr
commit qt6-grpc for openSUSE:Factory
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-10-02 20:05:30 Comparing /work/SRC/openSUSE:Factory/qt6-grpc (Old) and /work/SRC/openSUSE:Factory/.qt6-grpc.new.28202 (New) Package is "qt6-grpc" Mon Oct 2 20:05:30 2023 rev:5 rq:1114492 version:6.5.3 Changes: --- /work/SRC/openSUSE:Factory/qt6-grpc/qt6-grpc.changes2023-07-26 13:22:57.387657141 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-grpc.new.28202/qt6-grpc.changes 2023-10-02 20:07:15.392509364 +0200 @@ -1,0 +2,8 @@ +Thu Sep 28 07:34:09 UTC 2023 - Christophe Marin + +- Update to 6.5.3 + * https://www.qt.io/blog/qt-6.5.3-released +- Drop patch, merged upstream: + * 0002-Remove-protobuf-logging.h-include.patch + +--- Old: 0002-Remove-protobuf-logging.h-include.patch qtgrpc-everywhere-src-6.5.2.tar.xz New: qtgrpc-everywhere-src-6.5.3.tar.xz Other differences: -- ++ qt6-grpc.spec ++ --- /var/tmp/diff_new_pack.CKzhOK/_old 2023-10-02 20:07:16.660554966 +0200 +++ /var/tmp/diff_new_pack.CKzhOK/_new 2023-10-02 20:07:16.660554966 +0200 @@ -16,7 +16,7 @@ # -%define real_version 6.5.2 +%define real_version 6.5.3 %define short_version 6.5 %define short_name qtgrpc %define tar_name qtgrpc-everywhere-src @@ -28,16 +28,15 @@ %endif # Name: qt6-grpc%{?pkg_suffix} -Version:6.5.2 +Version:6.5.3 Release:0 Summary:gRPC and Protobuf generator and bindings for Qt framework License:GPL-3.0-or-later URL:https://www.qt.io -Source: https://www.nic.funet.fi/pub/mirrors/download.qt-project.org/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz +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 +Patch1: 0003-Add-missing-memory-include.patch BuildRequires: pkgconfig BuildRequires: qt6-core-private-devel BuildRequires: cmake(Qt6Core) = %{real_version} ++ 0001-Fix-include-of-std-set.patch ++ --- /var/tmp/diff_new_pack.CKzhOK/_old 2023-10-02 20:07:16.680555686 +0200 +++ /var/tmp/diff_new_pack.CKzhOK/_new 2023-10-02 20:07:16.684555830 +0200 @@ -1,7 +1,7 @@ -From 0d0d14e5510127e9c5162e140a9ef6d004c2616a Mon Sep 17 00:00:00 2001 +From d47efe2e8f26657c15567fef949cf9137e7f056a Mon Sep 17 00:00:00 2001 From: Konrad Kujawa Date: Thu, 22 Jun 2023 15:30:20 +0200 -Subject: [PATCH 1/3] Fix include of std::set +Subject: [PATCH] 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. @@ -12,12 +12,12 @@ --- src/tools/qtgrpcgen/qgrpcgenerator.cpp | 1 - src/tools/qtgrpcgen/qgrpcgenerator.h | 3 ++- - src/tools/qtprotobufgen/qprotobufgenerator.cpp | 4 ++-- + src/tools/qtprotobufgen/qprotobufgenerator.cpp | 2 +- src/tools/qtprotobufgen/qprotobufgenerator.h | 2 ++ - 4 files changed, 6 insertions(+), 4 deletions(-) + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/tools/qtgrpcgen/qgrpcgenerator.cpp b/src/tools/qtgrpcgen/qgrpcgenerator.cpp -index 4cab74d..3c2597e 100644 +index a715bae..9a11c3c 100644 --- a/src/tools/qtgrpcgen/qgrpcgenerator.cpp +++ b/src/tools/qtgrpcgen/qgrpcgenerator.cpp @@ -10,7 +10,6 @@ @@ -26,8 +26,8 @@ -#include #include - #include - #include + #include + #include diff --git a/src/tools/qtgrpcgen/qgrpcgenerator.h b/src/tools/qtgrpcgen/qgrpcgenerator.h index 809925e..996d37c 100644 --- a/src/tools/qtgrpcgen/qgrpcgenerator.h @@ -44,23 +44,19 @@ namespace google::protobuf { class FileDescriptor; diff --git a/src/tools/qtprotobufgen/qprotobufgenerator.cpp b/src/tools/qtprotobufgen/qprotobufgenerator.cpp -index 5a1ccc2..8eaab81 100644 +index 85f7444..0c878ee 100644 --- a/src/tools/qtprotobufgen/qprotobufgenerator.cpp +++ b/src/tools/qtprotobufgen/qprotobufgenerator.cpp -@@ -12,11 +12,10 @@ - #include "utils.h" - #include "options.h" +@@ -15,8 +15,8 @@ + #include --#include -- #include +#include #include -#include -+ - #include #include #include + #include diff --git a/src/tools/qtprotobufgen/qprotobufgenerator.h b/src/tools/qtprotobufgen/qprotobufgenerator.h index 8aec33a..6239fd4 100644 --- a/src/tools/qtprotobufgen/qprotobufgenerator.h @@ -74,4 +70,7 @@ nam
commit qt6-grpc for openSUSE:Factory
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-26 13:22:34 Comparing /work/SRC/openSUSE:Factory/qt6-grpc (Old) and /work/SRC/openSUSE:Factory/.qt6-grpc.new.15225 (New) Package is "qt6-grpc" Wed Jul 26 13:22:34 2023 rev:4 rq:100 version:6.5.2 Changes: --- /work/SRC/openSUSE:Factory/qt6-grpc/qt6-grpc.changes2023-07-06 18:28:42.739160270 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-grpc.new.15225/qt6-grpc.changes 2023-07-26 13:22:57.387657141 +0200 @@ -1,0 +2,6 @@ +Thu Jul 20 08:50:52 UTC 2023 - Christophe Marin + +- Update to 6.5.2 + * https://www.qt.io/blog/qt-6.5.2-released-1 + +--- Old: qtgrpc-everywhere-src-6.5.1.tar.xz New: qtgrpc-everywhere-src-6.5.2.tar.xz Other differences: -- ++ qt6-grpc.spec ++ --- /var/tmp/diff_new_pack.9gPUD7/_old 2023-07-26 13:22:58.523663570 +0200 +++ /var/tmp/diff_new_pack.9gPUD7/_new 2023-07-26 13:22:58.527663593 +0200 @@ -16,7 +16,7 @@ # -%define real_version 6.5.1 +%define real_version 6.5.2 %define short_version 6.5 %define short_name qtgrpc %define tar_name qtgrpc-everywhere-src @@ -28,12 +28,12 @@ %endif # Name: qt6-grpc%{?pkg_suffix} -Version:6.5.1 +Version:6.5.2 Release:0 Summary:gRPC and Protobuf generator and bindings for Qt framework 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 +Source: https://www.nic.funet.fi/pub/mirrors/download.qt-project.org/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 ++ qtgrpc-everywhere-src-6.5.1.tar.xz -> qtgrpc-everywhere-src-6.5.2.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.5.1/.cmake.conf new/qtgrpc-everywhere-src-6.5.2/.cmake.conf --- old/qtgrpc-everywhere-src-6.5.1/.cmake.conf 2023-05-16 11:46:03.0 +0200 +++ new/qtgrpc-everywhere-src-6.5.2/.cmake.conf 2023-07-07 14:29:20.0 +0200 @@ -1,4 +1,4 @@ -set(QT_REPO_MODULE_VERSION "6.5.1") +set(QT_REPO_MODULE_VERSION "6.5.2") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_LEAN_HEADERS=1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.5.1/.tag new/qtgrpc-everywhere-src-6.5.2/.tag --- old/qtgrpc-everywhere-src-6.5.1/.tag2023-05-16 11:46:03.0 +0200 +++ new/qtgrpc-everywhere-src-6.5.2/.tag2023-07-07 14:29:20.0 +0200 @@ -1 +1 @@ -94446d021a34daee99dbcda389dcd8a5e9a0c76c +0646deb7aeb7410febd0419dcbd964505f178690 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.5.1/CMakeLists.txt new/qtgrpc-everywhere-src-6.5.2/CMakeLists.txt --- old/qtgrpc-everywhere-src-6.5.1/CMakeLists.txt 2023-05-16 11:46:03.0 +0200 +++ new/qtgrpc-everywhere-src-6.5.2/CMakeLists.txt 2023-07-07 14:29:20.0 +0200 @@ -14,6 +14,7 @@ find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS Network Gui Widgets Quick QuickControls2) +qt_internal_project_setup() # Try to find Qt6::qtprotobufgen and Qt6::qtgrpcgen targets from host tools # when cross-compiling. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.5.1/dependencies.yaml new/qtgrpc-everywhere-src-6.5.2/dependencies.yaml --- old/qtgrpc-everywhere-src-6.5.1/dependencies.yaml 2023-05-16 11:46:03.0 +0200 +++ new/qtgrpc-everywhere-src-6.5.2/dependencies.yaml 2023-07-07 14:29:20.0 +0200 @@ -1,7 +1,7 @@ dependencies: ../qtbase: -ref: 55aee8697512af105dfefabc1e2ec41d4df1e45e +ref: af457a9f0f7eb1a2a7d11f495da508faab91a442 required: true ../qtdeclarative: -ref: 65651dc1d333e2aded18b0d6f0b71c35e5b40c1c +ref: f289063ff19588a11dd79213632785cfda2909a0 required: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgrpc-everywhere-src-6.5.1/examples/grpc/chat/client/CMakeLists.txt new/qtgrpc-everywhere-src-6.5.2/examples/grpc/chat/client/
commit qt6-grpc for openSUSE:Factory
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.changes2023-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 + +- Request protobuf < 22 (QTBUG-114833) + +--- +Tue Jul 4 22:16:25 UTC 2023 - Christophe Marin + +- 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 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 --- 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 #include #include #include 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 #include "generatorbase.h" +#include +#include 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 - #include +#include #include -#include + #include #include #include 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 + 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 Date: Thu, 22 Jun 2023 15:33:11 +0200 Subject: [PATCH] Remove pro
commit qt6-grpc for openSUSE:Factory
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-05-28 19:21:53 Comparing /work/SRC/openSUSE:Factory/qt6-grpc (Old) and /work/SRC/openSUSE:Factory/.qt6-grpc.new.1533 (New) Package is "qt6-grpc" Sun May 28 19:21:53 2023 rev:2 rq:1089085 version:6.5.1 Changes: --- /work/SRC/openSUSE:Factory/qt6-grpc/qt6-grpc.changes2023-04-05 21:37:28.939194214 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-grpc.new.1533/qt6-grpc.changes 2023-05-28 19:22:07.436705491 +0200 @@ -1,0 +2,6 @@ +Wed May 24 07:45:36 UTC 2023 - Christophe Marin + +- Update to 6.5.1 + * https://www.qt.io/blog/qt-6.5.1-released + +--- Old: qtgrpc-everywhere-src-6.5.0.tar.xz New: qtgrpc-everywhere-src-6.5.1.tar.xz Other differences: -- ++ qt6-grpc.spec ++ --- /var/tmp/diff_new_pack.FuZ9YI/_old 2023-05-28 19:22:07.956708586 +0200 +++ /var/tmp/diff_new_pack.FuZ9YI/_new 2023-05-28 19:22:07.960708610 +0200 @@ -16,7 +16,7 @@ # -%define real_version 6.5.0 +%define real_version 6.5.1 %define short_version 6.5 %define short_name qtgrpc %define tar_name qtgrpc-everywhere-src @@ -28,7 +28,7 @@ %endif # Name: qt6-grpc%{?pkg_suffix} -Version:6.5.0 +Version:6.5.1 Release:0 Summary:gRPC and Protobuf generator and bindings for Qt framework License:GPL-3.0-or-later ++ qtgrpc-everywhere-src-6.5.0.tar.xz -> qtgrpc-everywhere-src-6.5.1.tar.xz ++ 4630 lines of diff (skipped)