June 2024 - openSUSE Commits - openSUSE Mailing Lists

commit qt6-httpserver for openSUSE:Factory
by Source-Sync 24 Jun '24

24 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-httpserver for openSUSE:Factory checked in at 2024-06-24 20:52:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-httpserver (Old) and /work/SRC/openSUSE:Factory/.qt6-httpserver.new.18349 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qt6-httpserver" Mon Jun 24 20:52:36 2024 rev:16 rq:1182592 version:6.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-httpserver/qt6-httpserver.changes 2024-05-27 11:54:20.306461170 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-httpserver.new.18349/qt6-httpserver.changes 2024-06-24 20:53:27.084656412 +0200 @@ -1,0 +2,6 @@ +Wed Jun 19 07:25:44 UTC 2024 - Christophe Marin <christophe(a)krop.fr> + +- Update to 6.7.2: + * https://www.qt.io/blog/qt-6.7.2-released + +------------------------------------------------------------------- Old: ---- qthttpserver-everywhere-src-6.7.1.tar.xz New: ---- qthttpserver-everywhere-src-6.7.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-httpserver.spec ++++++ --- /var/tmp/diff_new_pack.YyftQZ/_old 2024-06-24 20:53:27.604675439 +0200 +++ /var/tmp/diff_new_pack.YyftQZ/_new 2024-06-24 20:53:27.608675585 +0200 @@ -16,7 +16,7 @@ # -%define real_version 6.7.1 +%define real_version 6.7.2 %define short_version 6.7 %define tar_name qthttpserver-everywhere-src %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-httpserver%{?pkg_suffix} -Version: 6.7.1 +Version: 6.7.2 Release: 0 Summary: Qt HTTP Server License: GPL-3.0-only ++++++ qthttpserver-everywhere-src-6.7.1.tar.xz -> qthttpserver-everywhere-src-6.7.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qthttpserver-everywhere-src-6.7.1/.cmake.conf new/qthttpserver-everywhere-src-6.7.2/.cmake.conf --- old/qthttpserver-everywhere-src-6.7.1/.cmake.conf 2024-05-09 03:04:50.000000000 +0200 +++ new/qthttpserver-everywhere-src-6.7.2/.cmake.conf 2024-06-08 02:38:38.000000000 +0200 @@ -1,4 +1,4 @@ -set(QT_REPO_MODULE_VERSION "6.7.1") +set(QT_REPO_MODULE_VERSION "6.7.2") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1") list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_CONTEXTLESS_CONNECT=1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qthttpserver-everywhere-src-6.7.1/.tag new/qthttpserver-everywhere-src-6.7.2/.tag --- old/qthttpserver-everywhere-src-6.7.1/.tag 2024-05-09 03:04:50.000000000 +0200 +++ new/qthttpserver-everywhere-src-6.7.2/.tag 2024-06-08 02:38:38.000000000 +0200 @@ -1 +1 @@ -07e4bafdfd178d29c8137041c7fdd1f156884864 +567aee2b7a240b8b90f0590f40909866c023e627 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qthttpserver-everywhere-src-6.7.1/dependencies.yaml new/qthttpserver-everywhere-src-6.7.2/dependencies.yaml --- old/qthttpserver-everywhere-src-6.7.1/dependencies.yaml 2024-05-09 03:04:50.000000000 +0200 +++ new/qthttpserver-everywhere-src-6.7.2/dependencies.yaml 2024-06-08 02:38:38.000000000 +0200 @@ -1,7 +1,7 @@ dependencies: ../qtbase: - ref: c195fe7d33decbd5ddd47ae46dbf8e0d9c20ba85 + ref: b5fbe0923cfc566036b83c3d968f225b26117efc required: true ../qtwebsockets: - ref: f84f65fc877cd7f18554d2eddc6369f17dc53ec6 + ref: 6d040c4762d63746d8c98f65bb3c93acd5df956f required: false

1 0

commit qt6-grpc for openSUSE:Factory
by Source-Sync 24 Jun '24

24 Jun '24

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.changes 2024-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 <christophe(a)krop.fr> + +- 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_protobuf} %{_qt6_pkgconfigdir}/Qt6ProtobufQtCoreTypes.pc %{_qt6_pkgconfigdir}/Qt6ProtobufQtGuiTypes.pc %{_qt6_pkgconfigdir}/Qt6ProtobufWellKnownTypes.pc +%endif %exclude %{_qt6_includedir}/QtProtobuf/%{real_version} %files -n qt6-protobuf-private-devel %{_qt6_includedir}/QtProtobuf/%{real_version}/ %{_qt6_mkspecsdir}/modules/qt_lib_protobuf_private.pri +%if %{with_usable_protobuf} %{_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 %endif ++++++ qtgrpc-everywhere-src-6.7.1.tar.xz -> qtgrpc-everywhere-src-6.7.2.tar.xz ++++++ ++++ 3103 lines of diff (skipped)

1 0

commit qt6-graphs for openSUSE:Factory
by Source-Sync 24 Jun '24

24 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-graphs for openSUSE:Factory checked in at 2024-06-24 20:52:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-graphs (Old) and /work/SRC/openSUSE:Factory/.qt6-graphs.new.18349 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qt6-graphs" Mon Jun 24 20:52:34 2024 rev:7 rq:1182590 version:6.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-graphs/qt6-graphs.changes 2024-05-27 11:54:17.518358921 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-graphs.new.18349/qt6-graphs.changes 2024-06-24 20:53:23.600528934 +0200 @@ -1,0 +2,6 @@ +Wed Jun 19 07:25:42 UTC 2024 - Christophe Marin <christophe(a)krop.fr> + +- Update to 6.7.2: + * https://www.qt.io/blog/qt-6.7.2-released + +------------------------------------------------------------------- Old: ---- qtgraphs-everywhere-src-6.7.1.tar.xz New: ---- qtgraphs-everywhere-src-6.7.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-graphs.spec ++++++ --- /var/tmp/diff_new_pack.OZfpMb/_old 2024-06-24 20:53:24.216551473 +0200 +++ /var/tmp/diff_new_pack.OZfpMb/_new 2024-06-24 20:53:24.216551473 +0200 @@ -16,7 +16,7 @@ # -%define real_version 6.7.1 +%define real_version 6.7.2 %define short_version 6.7 %define tar_name qtgraphs-everywhere-src %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-graphs%{?pkg_suffix} -Version: 6.7.1 +Version: 6.7.2 Release: 0 Summary: 3D visualization module License: GPL-3.0-only ++++++ qtgraphs-everywhere-src-6.7.1.tar.xz -> qtgraphs-everywhere-src-6.7.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/.cmake.conf new/qtgraphs-everywhere-src-6.7.2/.cmake.conf --- old/qtgraphs-everywhere-src-6.7.1/.cmake.conf 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/.cmake.conf 2024-06-08 03:28:33.000000000 +0200 @@ -1,4 +1,4 @@ -set(QT_REPO_MODULE_VERSION "6.7.1") +set(QT_REPO_MODULE_VERSION "6.7.2") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/.tag new/qtgraphs-everywhere-src-6.7.2/.tag --- old/qtgraphs-everywhere-src-6.7.1/.tag 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/.tag 2024-06-08 03:28:33.000000000 +0200 @@ -1 +1 @@ -4cf0173471641eb4ee27054bf320f7187af03571 +4fecd24f1c50064717e45eabcf0a210963f10e14 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/dependencies.yaml new/qtgraphs-everywhere-src-6.7.2/dependencies.yaml --- old/qtgraphs-everywhere-src-6.7.1/dependencies.yaml 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/dependencies.yaml 2024-06-08 03:28:33.000000000 +0200 @@ -1,10 +1,10 @@ dependencies: ../qtbase: - ref: c195fe7d33decbd5ddd47ae46dbf8e0d9c20ba85 + ref: b5fbe0923cfc566036b83c3d968f225b26117efc required: true ../qtdeclarative: - ref: 734849e4577b75e85420b08ddb55974482bbd063 + ref: 12533cc0bd83a2076efb4af0bc1832b0db9568fc required: true ../qtquick3d: - ref: 8c2d9addd9509dec17672b0b94cc636c38215dfc + ref: 8209c3e400ba348590907a4b8bab6c5353237d1e required: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/axis/barcategoryaxis/qbarcategoryaxis.cpp new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/axis/barcategoryaxis/qbarcategoryaxis.cpp --- old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/axis/barcategoryaxis/qbarcategoryaxis.cpp 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/axis/barcategoryaxis/qbarcategoryaxis.cpp 2024-06-08 03:28:33.000000000 +0200 @@ -1,7 +1,6 @@ // Copyright (C) 2023 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#include <QtGraphs/QBarCategoryAxis> #include <private/qbarcategoryaxis_p.h> #include <QtCore/QtMath> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/axis/barcategoryaxis/qbarcategoryaxis.h new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/axis/barcategoryaxis/qbarcategoryaxis.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/axis/barcategoryaxis/qbarcategoryaxis.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/axis/barcategoryaxis/qbarcategoryaxis.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,7 +4,11 @@ #ifndef QBARCATEGORYAXIS_H #define QBARCATEGORYAXIS_H -#include <QtGraphs/QAbstractAxis> +#if 0 +# pragma qt_class(QBarCategoryAxis) +#endif + +#include <QtGraphs/qabstractaxis.h> #include <QtGraphs/qgraphsglobal.h> #include <QtQml/QQmlEngine> @@ -12,7 +16,7 @@ class QBarCategoryAxisPrivate; -class Q_GRAPHS_EXPORT QBarCategoryAxis : public QAbstractAxis +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QBarCategoryAxis : public QAbstractAxis { Q_OBJECT Q_PROPERTY(QStringList categories READ categories WRITE setCategories NOTIFY categoriesChanged) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/axis/barcategoryaxis/qbarcategoryaxis_p.h new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/axis/barcategoryaxis/qbarcategoryaxis_p.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/axis/barcategoryaxis/qbarcategoryaxis_p.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/axis/barcategoryaxis/qbarcategoryaxis_p.h 2024-06-08 03:28:33.000000000 +0200 @@ -13,7 +13,7 @@ #ifndef QBARCATEGORYAXIS_P_H #define QBARCATEGORYAXIS_P_H -#include <QtGraphs/QBarCategoryAxis> +#include <QtGraphs/qbarcategoryaxis.h> #include <private/qabstractaxis_p.h> QT_BEGIN_NAMESPACE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/axis/qabstractaxis.cpp new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/axis/qabstractaxis.cpp --- old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/axis/qabstractaxis.cpp 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/axis/qabstractaxis.cpp 2024-06-08 03:28:33.000000000 +0200 @@ -1,7 +1,7 @@ // Copyright (C) 2023 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#include <QtGraphs/QAbstractAxis> +#include <QtGraphs/qabstractaxis.h> #include <private/qabstractaxis_p.h> QT_BEGIN_NAMESPACE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/axis/qabstractaxis.h new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/axis/qabstractaxis.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/axis/qabstractaxis.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/axis/qabstractaxis.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QABSTRACTAXIS_H #define QABSTRACTAXIS_H +#if 0 +# pragma qt_class(QAbstractAxis) +#endif + #include <QtCore/QObject> #include <QtCore/QVariant> #include <QtGraphs/qgraphsglobal.h> @@ -15,7 +19,7 @@ class QAbstractAxisPrivate; -class Q_GRAPHS_EXPORT QAbstractAxis : public QObject +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QAbstractAxis : public QObject { Q_OBJECT //visibility diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/axis/qabstractaxis_p.h new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/axis/qabstractaxis_p.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/axis/qabstractaxis_p.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/axis/qabstractaxis_p.h 2024-06-08 03:28:33.000000000 +0200 @@ -13,10 +13,10 @@ #ifndef QABSTRACTAXIS_P_H #define QABSTRACTAXIS_P_H -#include <QtGraphs/QAbstractAxis> -#include <private/qgraphsview_p.h> -#include <QtCore/QDebug> #include <QColor> +#include <QtCore/QDebug> +#include <QtGraphs/qabstractaxis.h> +#include <private/qgraphsview_p.h> #include <memory> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/axis/valueaxis/qvalueaxis.cpp new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/axis/valueaxis/qvalueaxis.cpp --- old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/axis/valueaxis/qvalueaxis.cpp 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/axis/valueaxis/qvalueaxis.cpp 2024-06-08 03:28:33.000000000 +0200 @@ -1,7 +1,6 @@ // Copyright (C) 2023 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#include <QtGraphs/QValueAxis> #include <private/qvalueaxis_p.h> #include <private/charthelpers_p.h> #include <QtCore/QtMath> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/axis/valueaxis/qvalueaxis.h new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/axis/valueaxis/qvalueaxis.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/axis/valueaxis/qvalueaxis.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/axis/valueaxis/qvalueaxis.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,7 +4,11 @@ #ifndef QVALUEAXIS_H #define QVALUEAXIS_H -#include <QtGraphs/QAbstractAxis> +#if 0 +# pragma qt_class(QValueAxis) +#endif + +#include <QtGraphs/qabstractaxis.h> #include <QtGraphs/qgraphsglobal.h> #include <QtQml/QQmlEngine> @@ -12,7 +16,7 @@ class QValueAxisPrivate; -class Q_GRAPHS_EXPORT QValueAxis : public QAbstractAxis +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QValueAxis : public QAbstractAxis { Q_OBJECT Q_PROPERTY(qreal min READ min WRITE setMin NOTIFY minChanged) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/axis/valueaxis/qvalueaxis_p.h new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/axis/valueaxis/qvalueaxis_p.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/axis/valueaxis/qvalueaxis_p.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/axis/valueaxis/qvalueaxis_p.h 2024-06-08 03:28:33.000000000 +0200 @@ -13,7 +13,7 @@ #ifndef QVALUEAXIS_P_H #define QVALUEAXIS_P_H -#include <QtGraphs/QValueAxis> +#include <QtGraphs/qvalueaxis.h> #include <private/qabstractaxis_p.h> QT_BEGIN_NAMESPACE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/barchart/qabstractbarseries.h new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/barchart/qabstractbarseries.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/barchart/qabstractbarseries.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/barchart/qabstractbarseries.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QABSTRACTBARSERIES_H #define QABSTRACTBARSERIES_H +#if 0 +# pragma qt_class(QAbstractBarSeries) +#endif + #include <QtGraphs/qabstractseries.h> #include <QtCore/QStringList> #include <QtQml/QQmlEngine> @@ -15,7 +19,7 @@ class QAbstractBarSeriesPrivate; // Container for series -class Q_GRAPHS_EXPORT QAbstractBarSeries : public QAbstractSeries +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QAbstractBarSeries : public QAbstractSeries { Q_OBJECT Q_PROPERTY(qreal barWidth READ barWidth WRITE setBarWidth NOTIFY barWidthChanged) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/barchart/qbarseries.cpp new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/barchart/qbarseries.cpp --- old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/barchart/qbarseries.cpp 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/barchart/qbarseries.cpp 2024-06-08 03:28:33.000000000 +0200 @@ -1,9 +1,9 @@ // Copyright (C) 2023 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#include <QtGraphs/QBarCategoryAxis> -#include <QtGraphs/QValueAxis> +#include <QtGraphs/qbarcategoryaxis.h> #include <QtGraphs/qbarseries.h> +#include <QtGraphs/qvalueaxis.h> #include <private/qbarseries_p.h> #include <private/qgraphsview_p.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/barchart/qbarseries.h new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/barchart/qbarseries.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/barchart/qbarseries.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/barchart/qbarseries.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QBARSERIES_H #define QBARSERIES_H +#if 0 +# pragma qt_class(QBarSeries) +#endif + #include <QtGraphs/qabstractbarseries.h> #include <QtGraphs/qabstractaxis.h> #include <QtGraphs/qgraphsglobal.h> @@ -12,7 +16,7 @@ class QBarSeriesPrivate; -class Q_GRAPHS_EXPORT QBarSeries : public QAbstractBarSeries +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QBarSeries : public QAbstractBarSeries { Q_OBJECT Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/barchart/qbarset.h new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/barchart/qbarset.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/barchart/qbarset.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/barchart/qbarset.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QBARSET_H #define QBARSET_H +#if 0 +# pragma qt_class(QBarSet) +#endif + #include <QtCore/qobject.h> #include <QtGraphs/qgraphsglobal.h> #include <QtGui/qbrush.h> @@ -15,7 +19,7 @@ class QBarSetPrivate; -class Q_GRAPHS_EXPORT QBarSet : public QObject +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QBarSet : public QObject { Q_OBJECT Q_PROPERTY(QString label READ label WRITE setLabel NOTIFY labelChanged) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/linechart/qlineseries.h new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/linechart/qlineseries.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/linechart/qlineseries.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/linechart/qlineseries.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QLINESERIES_H #define QLINESERIES_H +#if 0 +# pragma qt_class(QLineSeries) +#endif + #include <QtGraphs/qxyseries.h> #include <QtGraphs/qgraphsglobal.h> @@ -11,7 +15,7 @@ class QLineSeriesPrivate; -class Q_GRAPHS_EXPORT QLineSeries : public QXYSeries +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QLineSeries : public QXYSeries { Q_OBJECT Q_PROPERTY(qreal width READ width WRITE setWidth NOTIFY widthChanged) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/qabstractseries.h new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/qabstractseries.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/qabstractseries.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/qabstractseries.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,20 +4,24 @@ #ifndef QABSTRACTSERIES_H #define QABSTRACTSERIES_H -#include <QtGraphs/QAbstractAxis> +#if 0 +# pragma qt_class(QAbstractSeries) +#endif + #include <QtCore/QObject> +#include <QtGraphs/qabstractaxis.h> +#include <QtGraphs/qgraphsglobal.h> +#include <QtGraphs/qseriestheme.h> #include <QtGui/QPen> -#include <QtQml/QQmlParserStatus> #include <QtQml/QQmlListProperty> -#include <QtGraphs/qseriestheme.h> -#include <QtGraphs/qgraphsglobal.h> +#include <QtQml/QQmlParserStatus> QT_BEGIN_NAMESPACE class QAbstractSeriesPrivate; class QGraphsView; -class Q_GRAPHS_EXPORT QAbstractSeries : public QObject, public QQmlParserStatus +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QAbstractSeries : public QObject, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/qsgrenderer/axisrenderer.cpp new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/qsgrenderer/axisrenderer.cpp --- old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/qsgrenderer/axisrenderer.cpp 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/qsgrenderer/axisrenderer.cpp 2024-06-08 03:28:33.000000000 +0200 @@ -1,12 +1,12 @@ // Copyright (C) 2023 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only +#include <QtGraphs/qbarcategoryaxis.h> +#include <QtGraphs/qgraphtheme.h> #include <private/axisrenderer_p.h> #include <private/qabstractaxis_p.h> #include <private/qgraphsview_p.h> -#include <QtGraphs/QBarCategoryAxis> #include <private/qvalueaxis_p.h> -#include <QtGraphs/qgraphtheme.h> QT_BEGIN_NAMESPACE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/scatterchart/qscatterseries.h new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/scatterchart/qscatterseries.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/scatterchart/qscatterseries.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/scatterchart/qscatterseries.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QSCATTERSERIES_H #define QSCATTERSERIES_H +#if 0 +# pragma qt_class(QScatterSeries) +#endif + #include <QtGraphs/qxyseries.h> #include <QtGraphs/qgraphsglobal.h> @@ -11,7 +15,7 @@ class QScatterSeriesPrivate; -class Q_GRAPHS_EXPORT QScatterSeries : public QXYSeries +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QScatterSeries : public QXYSeries { Q_OBJECT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/themes/qgraphtheme.h new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/themes/qgraphtheme.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/themes/qgraphtheme.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/themes/qgraphtheme.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef GRAPHTHEME_H #define GRAPHTHEME_H +#if 0 +# pragma qt_class(QGraphTheme) +#endif + #include <QtGui/QColor> #include <QtGui/QFont> #include <QtCore/QObject> @@ -13,7 +17,7 @@ QT_BEGIN_NAMESPACE -class Q_GRAPHS_EXPORT QGraphTheme : public QObject, public QQmlParserStatus +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QGraphTheme : public QObject, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/themes/qseriestheme.h new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/themes/qseriestheme.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/themes/qseriestheme.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/themes/qseriestheme.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef SERIESTHEME_H #define SERIESTHEME_H +#if 0 +# pragma qt_class(QSeriesTheme) +#endif + #include <QtGui/QColor> #include <QtGui/QFont> #include <QtCore/QObject> @@ -13,7 +17,7 @@ QT_BEGIN_NAMESPACE -class Q_GRAPHS_EXPORT QSeriesTheme : public QObject, public QQmlParserStatus +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QSeriesTheme : public QObject, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/xychart/qxyseries.h new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/xychart/qxyseries.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs2d/xychart/qxyseries.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs2d/xychart/qxyseries.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QXYSERIES_H #define QXYSERIES_H +#if 0 +# pragma qt_class(QXYSeries) +#endif + #include <QtGraphs/qabstractseries.h> #include <QtGraphs/qgraphsglobal.h> @@ -16,7 +20,7 @@ class QXYSeriesPrivate; class QXYModelMapper; -class Q_GRAPHS_EXPORT QXYSeries : public QAbstractSeries +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QXYSeries : public QAbstractSeries { Q_OBJECT Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/axis/qabstract3daxis.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/axis/qabstract3daxis.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/axis/qabstract3daxis.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/axis/qabstract3daxis.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QABSTRACT3DAXIS_H #define QABSTRACT3DAXIS_H +#if 0 +# pragma qt_class(QAbstract3DAxis) +#endif + #include <QtCore/QObject> #include <QtCore/QScopedPointer> #include <QtCore/QStringList> @@ -14,7 +18,7 @@ class QAbstract3DAxisPrivate; -class Q_GRAPHS_EXPORT QAbstract3DAxis : public QObject +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QAbstract3DAxis : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QAbstract3DAxis) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/axis/qcategory3daxis.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/axis/qcategory3daxis.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/axis/qcategory3daxis.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/axis/qcategory3daxis.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,13 +4,17 @@ #ifndef QCATEGORY3DAXIS_H #define QCATEGORY3DAXIS_H +#if 0 +# pragma qt_class(QCategory3DAxis) +#endif + #include <QtGraphs/qabstract3daxis.h> QT_BEGIN_NAMESPACE class QCategory3DAxisPrivate; -class Q_GRAPHS_EXPORT QCategory3DAxis : public QAbstract3DAxis +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QCategory3DAxis : public QAbstract3DAxis { Q_OBJECT Q_DECLARE_PRIVATE(QCategory3DAxis) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/axis/qlogvalue3daxisformatter.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/axis/qlogvalue3daxisformatter.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/axis/qlogvalue3daxisformatter.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/axis/qlogvalue3daxisformatter.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,13 +4,17 @@ #ifndef QLOGVALUE3DAXISFORMATTER_H #define QLOGVALUE3DAXISFORMATTER_H +#if 0 +# pragma qt_class(QLogValue3DAxisFormatter) +#endif + #include <QtGraphs/qvalue3daxisformatter.h> QT_BEGIN_NAMESPACE class QLogValue3DAxisFormatterPrivate; -class Q_GRAPHS_EXPORT QLogValue3DAxisFormatter : public QValue3DAxisFormatter +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QLogValue3DAxisFormatter : public QValue3DAxisFormatter { Q_OBJECT Q_DECLARE_PRIVATE(QLogValue3DAxisFormatter) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/axis/qvalue3daxis.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/axis/qvalue3daxis.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/axis/qvalue3daxis.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/axis/qvalue3daxis.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QVALUE3DAXIS_H #define QVALUE3DAXIS_H +#if 0 +# pragma qt_class(QValue3DAxis) +#endif + #include <QtGraphs/qabstract3daxis.h> #include <QtGraphs/qvalue3daxisformatter.h> @@ -11,7 +15,7 @@ class QValue3DAxisPrivate; -class Q_GRAPHS_EXPORT QValue3DAxis : public QAbstract3DAxis +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QValue3DAxis : public QAbstract3DAxis { Q_OBJECT Q_DECLARE_PRIVATE(QValue3DAxis) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/axis/qvalue3daxisformatter.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/axis/qvalue3daxisformatter.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/axis/qvalue3daxisformatter.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/axis/qvalue3daxisformatter.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QVALUE3DAXISFORMATTER_H #define QVALUE3DAXISFORMATTER_H +#if 0 +# pragma qt_class(QValue3DAxisFormatter) +#endif + #include <QtCore/QList> #include <QtCore/QLocale> #include <QtCore/QObject> @@ -16,7 +20,7 @@ class QValue3DAxisFormatterPrivate; class QValue3DAxis; -class Q_GRAPHS_EXPORT QValue3DAxisFormatter : public QObject +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QValue3DAxisFormatter : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QValue3DAxisFormatter) @@ -63,7 +67,6 @@ private: Q_DISABLE_COPY(QValue3DAxisFormatter) - friend class QValue3DAxisFormatterPrivate; friend class QValue3DAxis; friend class QValue3DAxisPrivate; friend class QBar3DSeriesPrivate; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qabstract3dseries.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qabstract3dseries.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qabstract3dseries.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qabstract3dseries.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QABSTRACT3DSERIES_H #define QABSTRACT3DSERIES_H +#if 0 +# pragma qt_class(QAbstract3DSeries) +#endif + #include <QtCore/QObject> #include <QtCore/QScopedPointer> #include <QtCore/QString> @@ -15,7 +19,7 @@ class QAbstract3DSeriesPrivate; -class Q_GRAPHS_EXPORT QAbstract3DSeries : public QObject +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QAbstract3DSeries : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QAbstract3DSeries) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qabstractdataproxy.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qabstractdataproxy.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qabstractdataproxy.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qabstractdataproxy.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QABSTRACTDATAPROXY_H #define QABSTRACTDATAPROXY_H +#if 0 +# pragma qt_class(QAbstractDataProxy) +#endif + #include <QtCore/QObject> #include <QtCore/QScopedPointer> #include <QtGraphs/qgraphsglobal.h> @@ -12,7 +16,7 @@ class QAbstractDataProxyPrivate; -class Q_GRAPHS_EXPORT QAbstractDataProxy : public QObject +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QAbstractDataProxy : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QAbstractDataProxy) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qbar3dseries.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qbar3dseries.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qbar3dseries.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qbar3dseries.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QBAR3DSERIES_H #define QBAR3DSERIES_H +#if 0 +# pragma qt_class(QBar3DSeries) +#endif + #include <QtCore/QPoint> #include <QtGraphs/qabstract3dseries.h> #include <QtGraphs/qbardataproxy.h> @@ -12,7 +16,7 @@ class QBar3DSeriesPrivate; -class Q_GRAPHS_EXPORT QBar3DSeries : public QAbstract3DSeries +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QBar3DSeries : public QAbstract3DSeries { Q_OBJECT Q_DECLARE_PRIVATE(QBar3DSeries) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qbardataproxy.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qbardataproxy.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qbardataproxy.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qbardataproxy.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QBARDATAPROXY_H #define QBARDATAPROXY_H +#if 0 +# pragma qt_class(QBarDataProxy) +#endif + #include <QtCore/QList> #include <QtCore/QStringList> #include <QtGraphs/qabstractdataproxy.h> @@ -19,7 +23,7 @@ using QBarDataRow = QList<QBarDataItem>; using QBarDataArray = QList<QBarDataRow>; -class Q_GRAPHS_EXPORT QBarDataProxy : public QAbstractDataProxy +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QBarDataProxy : public QAbstractDataProxy { Q_OBJECT Q_DECLARE_PRIVATE(QBarDataProxy) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qcustom3ditem.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qcustom3ditem.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qcustom3ditem.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qcustom3ditem.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QCUSTOM3DITEM_H #define QCUSTOM3DITEM_H +#if 0 +# pragma qt_class(QCustom3DItem) +#endif + #include <QtCore/QObject> #include <QtGraphs/qgraphsglobal.h> #include <QtGui/QImage> @@ -14,7 +18,7 @@ class QCustom3DItemPrivate; -class Q_GRAPHS_EXPORT QCustom3DItem : public QObject +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QCustom3DItem : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QCustom3DItem) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qcustom3dlabel.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qcustom3dlabel.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qcustom3dlabel.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qcustom3dlabel.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,7 +4,11 @@ #ifndef QCUSTOMLABELITEM_H #define QCUSTOMLABELITEM_H -#include <QtGraphs/QCustom3DItem> +#if 0 +# pragma qt_class(QCustom3DLabel) +#endif + +#include <QtGraphs/qcustom3ditem.h> #include <QtGraphs/qgraphsglobal.h> #include <QtGui/QColor> #include <QtGui/QFont> @@ -15,7 +19,7 @@ class QCustom3DLabelPrivate; -class Q_GRAPHS_EXPORT QCustom3DLabel : public QCustom3DItem +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QCustom3DLabel : public QCustom3DItem { Q_OBJECT Q_DECLARE_PRIVATE(QCustom3DLabel) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qcustom3dvolume.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qcustom3dvolume.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qcustom3dvolume.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qcustom3dvolume.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,7 +4,11 @@ #ifndef QCUSTOM3DVOLUME_H #define QCUSTOM3DVOLUME_H -#include <QtGraphs/QCustom3DItem> +#if 0 +# pragma qt_class(QCustom3DVolume) +#endif + +#include <QtGraphs/qcustom3ditem.h> #include <QtGraphs/qgraphsglobal.h> #include <QtGui/QColor> #include <QtGui/QImage> @@ -13,7 +17,7 @@ class QCustom3DVolumePrivate; -class Q_GRAPHS_EXPORT QCustom3DVolume : public QCustom3DItem +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QCustom3DVolume : public QCustom3DItem { Q_OBJECT Q_DECLARE_PRIVATE(QCustom3DVolume) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qheightmapsurfacedataproxy.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qheightmapsurfacedataproxy.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qheightmapsurfacedataproxy.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qheightmapsurfacedataproxy.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QHEIGHTMAPSURFACEDATAPROXY_H #define QHEIGHTMAPSURFACEDATAPROXY_H +#if 0 +# pragma qt_class(QHeightMapSurfaceDataProxy) +#endif + #include <QtCore/QString> #include <QtGraphs/qsurfacedataproxy.h> #include <QtGui/QImage> @@ -12,7 +16,7 @@ class QHeightMapSurfaceDataProxyPrivate; -class Q_GRAPHS_EXPORT QHeightMapSurfaceDataProxy : public QSurfaceDataProxy +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QHeightMapSurfaceDataProxy : public QSurfaceDataProxy { Q_OBJECT Q_DECLARE_PRIVATE(QHeightMapSurfaceDataProxy) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qitemmodelbardataproxy.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qitemmodelbardataproxy.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qitemmodelbardataproxy.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qitemmodelbardataproxy.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QITEMMODELBARDATAPROXY_H #define QITEMMODELBARDATAPROXY_H +#if 0 +# pragma qt_class(QItemModelBarDataProxy) +#endif + #include <QtCore/QAbstractItemModel> #include <QtCore/QRegularExpression> #include <QtGraphs/qbardataproxy.h> @@ -12,7 +16,7 @@ class QItemModelBarDataProxyPrivate; -class Q_GRAPHS_EXPORT QItemModelBarDataProxy : public QBarDataProxy +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QItemModelBarDataProxy : public QBarDataProxy { Q_OBJECT Q_DECLARE_PRIVATE(QItemModelBarDataProxy) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qitemmodelscatterdataproxy.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qitemmodelscatterdataproxy.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qitemmodelscatterdataproxy.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qitemmodelscatterdataproxy.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QITEMMODELSCATTERDATAPROXY_H #define QITEMMODELSCATTERDATAPROXY_H +#if 0 +# pragma qt_class(QItemModelScatterDataProxy) +#endif + #include <QtCore/QAbstractItemModel> #include <QtCore/QRegularExpression> #include <QtCore/QString> @@ -13,7 +17,7 @@ class QItemModelScatterDataProxyPrivate; -class Q_GRAPHS_EXPORT QItemModelScatterDataProxy : public QScatterDataProxy +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QItemModelScatterDataProxy : public QScatterDataProxy { Q_OBJECT Q_DECLARE_PRIVATE(QItemModelScatterDataProxy) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qitemmodelsurfacedataproxy.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qitemmodelsurfacedataproxy.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qitemmodelsurfacedataproxy.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qitemmodelsurfacedataproxy.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QITEMMODELSURFACEDATAPROXY_H #define QITEMMODELSURFACEDATAPROXY_H +#if 0 +# pragma qt_class(QItemModelSurfaceDataProxy) +#endif + #include <QtCore/QAbstractItemModel> #include <QtCore/QRegularExpression> #include <QtCore/QStringList> @@ -13,7 +17,7 @@ class QItemModelSurfaceDataProxyPrivate; -class Q_GRAPHS_EXPORT QItemModelSurfaceDataProxy : public QSurfaceDataProxy +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QItemModelSurfaceDataProxy : public QSurfaceDataProxy { Q_OBJECT Q_DECLARE_PRIVATE(QItemModelSurfaceDataProxy) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qscatter3dseries.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qscatter3dseries.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qscatter3dseries.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qscatter3dseries.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QSCATTER3DSERIES_H #define QSCATTER3DSERIES_H +#if 0 +# pragma qt_class(QScatter3DSeries) +#endif + #include <QtGraphs/qabstract3dseries.h> #include <QtGraphs/qscatterdataproxy.h> @@ -11,7 +15,7 @@ class QScatter3DSeriesPrivate; -class Q_GRAPHS_EXPORT QScatter3DSeries : public QAbstract3DSeries +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QScatter3DSeries : public QAbstract3DSeries { Q_OBJECT Q_DECLARE_PRIVATE(QScatter3DSeries) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qscatterdataproxy.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qscatterdataproxy.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qscatterdataproxy.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qscatterdataproxy.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QSCATTERDATAPROXY_H #define QSCATTERDATAPROXY_H +#if 0 +# pragma qt_class(QScatterDataProxy) +#endif + #include <QtGraphs/qabstractdataproxy.h> #include <QtGraphs/qscatterdataitem.h> @@ -16,7 +20,7 @@ using QScatterDataArray = QList<QScatterDataItem>; -class Q_GRAPHS_EXPORT QScatterDataProxy : public QAbstractDataProxy +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QScatterDataProxy : public QAbstractDataProxy { Q_OBJECT Q_DECLARE_PRIVATE(QScatterDataProxy) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qsurface3dseries.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qsurface3dseries.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qsurface3dseries.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qsurface3dseries.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QSURFACE3DSERIES_H #define QSURFACE3DSERIES_H +#if 0 +# pragma qt_class(QSurface3DSeries) +#endif + #include <QtGraphs/qabstract3dseries.h> #include <QtGraphs/qsurfacedataproxy.h> @@ -11,7 +15,7 @@ class QSurface3DSeriesPrivate; -class Q_GRAPHS_EXPORT QSurface3DSeries : public QAbstract3DSeries +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QSurface3DSeries : public QAbstract3DSeries { Q_OBJECT Q_DECLARE_PRIVATE(QSurface3DSeries) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qsurfacedataproxy.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qsurfacedataproxy.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/data/qsurfacedataproxy.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/data/qsurfacedataproxy.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QSURFACEDATAPROXY_H #define QSURFACEDATAPROXY_H +#if 0 +# pragma qt_class(QSurfaceDataProxy) +#endif + #include <QtGraphs/qabstractdataproxy.h> #include <QtGraphs/qsurfacedataitem.h> @@ -17,7 +21,7 @@ using QSurfaceDataRow = QList<QSurfaceDataItem>; using QSurfaceDataArray = QList<QSurfaceDataRow>; -class Q_GRAPHS_EXPORT QSurfaceDataProxy : public QAbstractDataProxy +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QSurfaceDataProxy : public QAbstractDataProxy { Q_OBJECT Q_DECLARE_PRIVATE(QSurfaceDataProxy) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/engine/q3dbars.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/engine/q3dbars.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/engine/q3dbars.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/engine/q3dbars.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef Q3DBARS_H #define Q3DBARS_H +#if 0 +# pragma qt_class(Q3DBars) +#endif + #include <QtGraphs/qabstract3dgraph.h> #include <QtGraphs/qbar3dseries.h> #include <QtGraphs/qcategory3daxis.h> @@ -13,7 +17,7 @@ class QQuickGraphsBars; -class Q_GRAPHS_EXPORT Q3DBars : public QAbstract3DGraph +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT Q3DBars : public QAbstract3DGraph { Q_OBJECT Q_PROPERTY(bool multiSeriesUniform READ isMultiSeriesUniform WRITE setMultiSeriesUniform NOTIFY diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/engine/q3dscatter.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/engine/q3dscatter.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/engine/q3dscatter.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/engine/q3dscatter.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef Q3DSCATTER_H #define Q3DSCATTER_H +#if 0 +# pragma qt_class(Q3DScatter) +#endif + #include <QtGraphs/qabstract3dgraph.h> #include <QtGraphs/qscatter3dseries.h> #include <QtGraphs/qvalue3daxis.h> @@ -12,7 +16,7 @@ class QQuickGraphsScatter; -class Q_GRAPHS_EXPORT Q3DScatter : public QAbstract3DGraph +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT Q3DScatter : public QAbstract3DGraph { Q_OBJECT Q_PROPERTY(QValue3DAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/engine/q3dscene.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/engine/q3dscene.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/engine/q3dscene.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/engine/q3dscene.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef Q3DSCENE_H #define Q3DSCENE_H +#if 0 +# pragma qt_class(Q3DScene) +#endif + #include <QtCore/QObject> #include <QtCore/QRect> #include <QtGraphs/qgraphsglobal.h> @@ -13,7 +17,7 @@ class Q3DScenePrivate; -class Q_GRAPHS_EXPORT Q3DScene : public QObject +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT Q3DScene : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(Q3DScene) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/engine/q3dsurface.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/engine/q3dsurface.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/engine/q3dsurface.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/engine/q3dsurface.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef Q3DSURFACE_H #define Q3DSURFACE_H +#if 0 +# pragma qt_class(Q3DSurface) +#endif + #include <QtGraphs/qabstract3dgraph.h> #include <QtGraphs/qsurface3dseries.h> #include <QtGraphs/qvalue3daxis.h> @@ -12,7 +16,7 @@ class QQuickGraphsSurface; -class Q_GRAPHS_EXPORT Q3DSurface : public QAbstract3DGraph +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT Q3DSurface : public QAbstract3DGraph { Q_OBJECT Q_PROPERTY(QValue3DAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/engine/qabstract3dgraph.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/engine/qabstract3dgraph.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/engine/qabstract3dgraph.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/engine/qabstract3dgraph.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QABSTRACT3DGRAPH_H #define QABSTRACT3DGRAPH_H +#if 0 +# pragma qt_class(QAbstract3DGraph) +#endif + #include <QtCore/qlocale.h> #include <QtGraphs/q3dscene.h> #include <QtGraphs/q3dtheme.h> @@ -19,7 +23,7 @@ class QAbstract3DSeries; class QQuickGraphsItem; -class Q_GRAPHS_EXPORT QAbstract3DGraph : public QQuickWidget +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QAbstract3DGraph : public QQuickWidget { Q_OBJECT Q_CLASSINFO("RegisterEnumClassesUnscoped", "false") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/input/q3dinputhandler.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/input/q3dinputhandler.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/input/q3dinputhandler.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/input/q3dinputhandler.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,13 +4,17 @@ #ifndef Q3DINPUTHANDLER_H #define Q3DINPUTHANDLER_H +#if 0 +# pragma qt_class(Q3DInputHandler) +#endif + #include <QtGraphs/qabstract3dinputhandler.h> QT_BEGIN_NAMESPACE class Q3DInputHandlerPrivate; -class Q_GRAPHS_EXPORT Q3DInputHandler : public QAbstract3DInputHandler +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT Q3DInputHandler : public QAbstract3DInputHandler { Q_OBJECT Q_DECLARE_PRIVATE(Q3DInputHandler) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/input/qabstract3dinputhandler.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/input/qabstract3dinputhandler.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/input/qabstract3dinputhandler.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/input/qabstract3dinputhandler.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef QABSTRACT3DINPUTHANDLER_H #define QABSTRACT3DINPUTHANDLER_H +#if 0 +# pragma qt_class(QAbstract3DInputHandler) +#endif + #include <QtCore/QObject> #include <QtCore/QPoint> #include <QtGraphs/q3dscene.h> @@ -17,7 +21,7 @@ class QAbstract3DInputHandlerPrivate; class QQuickGraphsItem; -class Q_GRAPHS_EXPORT QAbstract3DInputHandler : public QObject +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QAbstract3DInputHandler : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QAbstract3DInputHandler) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/input/qtouch3dinputhandler.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/input/qtouch3dinputhandler.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/input/qtouch3dinputhandler.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/input/qtouch3dinputhandler.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,13 +4,17 @@ #ifndef QTOUCH3DINPUTHANDLER_H #define QTOUCH3DINPUTHANDLER_H +#if 0 +# pragma qt_class(QTouch3DInputHandler) +#endif + #include <QtGraphs/q3dinputhandler.h> QT_BEGIN_NAMESPACE class QTouch3DInputHandlerPrivate; -class Q_GRAPHS_EXPORT QTouch3DInputHandler : public Q3DInputHandler +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT QTouch3DInputHandler : public Q3DInputHandler { Q_DECLARE_PRIVATE(QTouch3DInputHandler) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/qml/qquickgraphsbars.cpp new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/qml/qquickgraphsbars.cpp --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/qml/qquickgraphsbars.cpp 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/qml/qquickgraphsbars.cpp 2024-06-08 03:28:33.000000000 +0200 @@ -44,24 +44,6 @@ void QQuickGraphsBars::setRowAxis(QCategory3DAxis *axis) { QQuickGraphsItem::setAxisZ(axis); - handleDataRowLabelsChanged(); - // labelsChanged and rangeChanged signals are required to update the row and - // column numbers. The same situation exists in the barscontroller. (see - // setAxisZ and setAxisHelper) A better implementation may apply once - // controllers are removed - QObject::connect(axis, - &QAbstract3DAxis::labelsChanged, - this, - &QQuickGraphsBars::handleRowCountChanged); - QObject::connect(axis, - &QAbstract3DAxis::rangeChanged, - this, - &QQuickGraphsBars::handleRowCountChanged); - QObject::connect(axis, - &QCategory3DAxis::rowLabelsChanged, - this, - &QQuickGraphsBars::handleDataRowLabelsChanged); - handleRowCountChanged(); } QValue3DAxis *QQuickGraphsBars::valueAxis() const @@ -71,7 +53,7 @@ void QQuickGraphsBars::setValueAxis(QValue3DAxis *axis) { - setAxisY(axis); + QQuickGraphsItem::setAxisY(axis); } QCategory3DAxis *QQuickGraphsBars::columnAxis() const @@ -82,20 +64,6 @@ void QQuickGraphsBars::setColumnAxis(QCategory3DAxis *axis) { QQuickGraphsItem::setAxisX(axis); - handleDataColumnLabelsChanged(); - QObject::connect(axis, - &QAbstract3DAxis::labelsChanged, - this, - &QQuickGraphsBars::handleColCountChanged); - QObject::connect(axis, - &QAbstract3DAxis::rangeChanged, - this, - &QQuickGraphsBars::handleColCountChanged); - QObject::connect(axis, - &QCategory3DAxis::columnLabelsChanged, - this, - &QQuickGraphsBars::handleDataColumnLabelsChanged); - handleColCountChanged(); } void QQuickGraphsBars::setMultiSeriesScaling(bool uniform) @@ -275,8 +243,6 @@ resetClickedStatus(); series->setParent(this); // Reparent as removing will leave series parentless disconnectSeries(series); - handleRowCountChanged(); - handleColCountChanged(); } void QQuickGraphsBars::insertSeries(int index, QBar3DSeries *series) @@ -301,9 +267,6 @@ if (!oldSize) emit primarySeriesChanged(m_primarySeries); } - - handleRowCountChanged(); - handleColCountChanged(); } void QQuickGraphsBars::clearSelection() @@ -327,8 +290,6 @@ handleDataColumnLabelsChanged(); emit primarySeriesChanged(m_primarySeries); } - handleRowCountChanged(); - handleColCountChanged(); } QBar3DSeries *QQuickGraphsBars::primarySeries() const @@ -890,26 +851,6 @@ m_smooth = enable; } -void QQuickGraphsBars::handleRowCountChanged() -{ - QCategory3DAxis *categoryAxisZ = static_cast<QCategory3DAxis *>(axisZ()); - if (repeaterZ()) { - updateParameters(); - repeaterZ()->model().clear(); - repeaterZ()->setModel(categoryAxisZ->labels().size()); - } -} - -void QQuickGraphsBars::handleColCountChanged() -{ - QCategory3DAxis *categoryAxisX = static_cast<QCategory3DAxis *>(axisX()); - if (repeaterX()) { - updateParameters(); - repeaterX()->model().clear(); - repeaterX()->setModel(categoryAxisX->labels().size()); - } -} - void QQuickGraphsBars::handleCameraRotationChanged() { updateLabels(); @@ -1078,6 +1019,11 @@ subList = m_primarySeries->dataProxy()->rowLabels().mid(min, count); static_cast<QCategory3DAxis *>(m_axisZ)->d_func()->setDataLabels(subList); } + + if (repeaterZ()) { + updateParameters(); + repeaterZ()->setModel(m_axisZ->labels().size()); + } } void QQuickGraphsBars::handleDataColumnLabelsChanged() @@ -1094,6 +1040,11 @@ } static_cast<QCategory3DAxis *>(m_axisX)->d_func()->setDataLabels(subList); } + + if (repeaterX()) { + updateParameters(); + repeaterX()->setModel(m_axisX->labels().size()); + } } void QQuickGraphsBars::handleRowColorsChanged() @@ -1115,14 +1066,6 @@ &QBar3DSeries::meshSmoothChanged, this, &QQuickGraphsBars::handleMeshSmoothChanged); - QObject::connect(series->dataProxy(), - &QBarDataProxy::colCountChanged, - this, - &QQuickGraphsBars::handleColCountChanged); - QObject::connect(series->dataProxy(), - &QBarDataProxy::rowCountChanged, - this, - &QQuickGraphsBars::handleRowCountChanged); QObject::connect(series, &QBar3DSeries::rowColorsChanged, this, @@ -2155,9 +2098,9 @@ QQuickGraphsItem::handleLabelCountChanged(repeater); if (repeater == repeaterX()) - handleColCountChanged(); + handleDataColumnLabelsChanged(); if (repeater == repeaterZ()) - handleRowCountChanged(); + handleDataRowLabelsChanged(); } void QQuickGraphsBars::removeSlicedBarModels() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/qml/qquickgraphsbars_p.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/qml/qquickgraphsbars_p.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/qml/qquickgraphsbars_p.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/qml/qquickgraphsbars_p.h 2024-06-08 03:28:33.000000000 +0200 @@ -180,8 +180,6 @@ void handleAxisZChanged(QAbstract3DAxis *axis) override; void handleSeriesMeshChanged(QAbstract3DSeries::Mesh mesh); void handleMeshSmoothChanged(bool enable); - void handleRowCountChanged(); - void handleColCountChanged(); void handleCameraRotationChanged(); void handleArrayReset(); void handleRowsAdded(int startIndex, int count); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/qml/qquickgraphsitem.cpp new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/qml/qquickgraphsitem.cpp --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/qml/qquickgraphsitem.cpp 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/qml/qquickgraphsitem.cpp 2024-06-08 03:28:33.000000000 +0200 @@ -2388,7 +2388,7 @@ float QQuickGraphsItem::fontScaleFactor(float pointSize) { - return m_fontScaleFactorA * pointSize + m_fontScaleFactorB; + return 0.00007f + pointSize / (500000.0f * pointSize); } float QQuickGraphsItem::labelAdjustment(float width) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/qml/qquickgraphsitem_p.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/qml/qquickgraphsitem_p.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/qml/qquickgraphsitem_p.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/qml/qquickgraphsitem_p.h 2024-06-08 03:28:33.000000000 +0200 @@ -780,9 +780,6 @@ float m_lineWidthScaleFactor = 0.0001f; float m_lineLengthScaleFactor = 0.02f; - float m_fontScaleFactorA = -1.130435e-06f; - float m_fontScaleFactorB = 0.000115652f; - float m_labelMargin = .1f; bool m_sliceEnabled = false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/theme/q3dtheme.h new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/theme/q3dtheme.h --- old/qtgraphs-everywhere-src-6.7.1/src/graphs3d/theme/q3dtheme.h 2024-05-09 05:10:12.000000000 +0200 +++ new/qtgraphs-everywhere-src-6.7.2/src/graphs3d/theme/q3dtheme.h 2024-06-08 03:28:33.000000000 +0200 @@ -4,6 +4,10 @@ #ifndef Q3DTHEME_H #define Q3DTHEME_H +#if 0 +# pragma qt_class(Q3DTheme) +#endif + #include <QtCore/QObject> #include <QtGraphs/qgraphsglobal.h> #include <QtGui/QColor> @@ -19,7 +23,7 @@ class QQuickGraphsColor; class QQuickGradient; -class Q_GRAPHS_EXPORT Q3DTheme : public QObject, public QQmlParserStatus +class QT_TECH_PREVIEW_API Q_GRAPHS_EXPORT Q3DTheme : public QObject, public QQmlParserStatus { Q_OBJECT Q_DECLARE_PRIVATE(Q3DTheme) @@ -164,7 +168,7 @@ private: QQmlListProperty<QObject> themeChildren(); static void appendThemeChildren(QQmlListProperty<QObject> *list, QObject *element); - + QQmlListProperty<QQuickGraphsColor> baseColorsQML(); static void appendBaseColorsFunc(QQmlListProperty<QQuickGraphsColor> *list, QQuickGraphsColor *color); @@ -184,7 +188,7 @@ void setMultiHighlightGradient(QJSValue gradient); QJSValue multiHighlightGradientQML() const; - + void addColor(QQuickGraphsColor *color); QList<QQuickGraphsColor *> colorList(); void clearColors();

1 0

commit qt6-datavis3d for openSUSE:Factory
by Source-Sync 24 Jun '24

24 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-datavis3d for openSUSE:Factory checked in at 2024-06-24 20:52:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-datavis3d (Old) and /work/SRC/openSUSE:Factory/.qt6-datavis3d.new.18349 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qt6-datavis3d" Mon Jun 24 20:52:33 2024 rev:28 rq:1182588 version:6.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-datavis3d/qt6-datavis3d.changes 2024-05-27 11:54:15.818296575 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-datavis3d.new.18349/qt6-datavis3d.changes 2024-06-24 20:53:22.296481221 +0200 @@ -1,0 +2,6 @@ +Wed Jun 19 07:25:40 UTC 2024 - Christophe Marin <christophe(a)krop.fr> + +- Update to 6.7.2: + * https://www.qt.io/blog/qt-6.7.2-released + +------------------------------------------------------------------- Old: ---- qtdatavis3d-everywhere-src-6.7.1.tar.xz New: ---- qtdatavis3d-everywhere-src-6.7.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-datavis3d.spec ++++++ --- /var/tmp/diff_new_pack.1RjMdW/_old 2024-06-24 20:53:22.868502151 +0200 +++ /var/tmp/diff_new_pack.1RjMdW/_new 2024-06-24 20:53:22.868502151 +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 qtdatavis3d %define tar_name qtdatavis3d-everywhere-src @@ -28,7 +28,7 @@ %endif # Name: qt6-datavis3d%{?pkg_suffix} -Version: 6.7.1 +Version: 6.7.2 Release: 0 Summary: Qt 6 data visualization framework License: GPL-3.0-or-later ++++++ qtdatavis3d-everywhere-src-6.7.1.tar.xz -> qtdatavis3d-everywhere-src-6.7.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.7.1/.cmake.conf new/qtdatavis3d-everywhere-src-6.7.2/.cmake.conf --- old/qtdatavis3d-everywhere-src-6.7.1/.cmake.conf 2024-05-09 07:15:41.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.7.2/.cmake.conf 2024-06-08 04:17:14.000000000 +0200 @@ -1,4 +1,4 @@ -set(QT_REPO_MODULE_VERSION "6.7.1") +set(QT_REPO_MODULE_VERSION "6.7.2") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.7.1/.tag new/qtdatavis3d-everywhere-src-6.7.2/.tag --- old/qtdatavis3d-everywhere-src-6.7.1/.tag 2024-05-09 07:15:41.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.7.2/.tag 2024-06-08 04:17:14.000000000 +0200 @@ -1 +1 @@ -8b2224b90ef21eb3d0feaf72c9412d080b501cf3 +5b5fa3358255704562b541fca53d7bdabc24554b diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.7.1/dependencies.yaml new/qtdatavis3d-everywhere-src-6.7.2/dependencies.yaml --- old/qtdatavis3d-everywhere-src-6.7.1/dependencies.yaml 2024-05-09 07:15:41.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.7.2/dependencies.yaml 2024-06-08 04:17:14.000000000 +0200 @@ -1,10 +1,10 @@ dependencies: ../qtbase: - ref: c195fe7d33decbd5ddd47ae46dbf8e0d9c20ba85 + ref: b5fbe0923cfc566036b83c3d968f225b26117efc required: true ../qtdeclarative: - ref: 734849e4577b75e85420b08ddb55974482bbd063 + ref: 12533cc0bd83a2076efb4af0bc1832b0db9568fc required: false ../qtmultimedia: - ref: 103cde748b78844f01d4972a3c3069a78b97cbd4 + ref: a3f871eb133673ea5460425712cc68d7458bf0ef required: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtdatavis3d-everywhere-src-6.7.1/licenseRule.json new/qtdatavis3d-everywhere-src-6.7.2/licenseRule.json --- old/qtdatavis3d-everywhere-src-6.7.1/licenseRule.json 2024-05-09 07:15:41.000000000 +0200 +++ new/qtdatavis3d-everywhere-src-6.7.2/licenseRule.json 2024-06-08 04:17:14.000000000 +0200 @@ -79,7 +79,7 @@ "file type" : "examples and snippets", "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] }, - "tests/auto/cpptest/common/cpptestutil.h" : { + "tests/auto/cpptest/common/cpptestutil\\.h" : { "comment" : "", "file type" : "util", "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0"]

1 0

commit qt6-coap for openSUSE:Factory
by Source-Sync 24 Jun '24

24 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-coap for openSUSE:Factory checked in at 2024-06-24 20:52:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-coap (Old) and /work/SRC/openSUSE:Factory/.qt6-coap.new.18349 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qt6-coap" Mon Jun 24 20:52:31 2024 rev:31 rq:1182586 version:6.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-coap/qt6-coap.changes 2024-05-27 11:54:14.946264594 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-coap.new.18349/qt6-coap.changes 2024-06-24 20:53:21.476451218 +0200 @@ -1,0 +2,6 @@ +Wed Jun 19 07:25:39 UTC 2024 - Christophe Marin <christophe(a)krop.fr> + +- Update to 6.7.2: + * https://www.qt.io/blog/qt-6.7.2-released + +------------------------------------------------------------------- Old: ---- qtcoap-everywhere-src-6.7.1.tar.xz New: ---- qtcoap-everywhere-src-6.7.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-coap.spec ++++++ --- /var/tmp/diff_new_pack.v4Nopu/_old 2024-06-24 20:53:22.020471123 +0200 +++ /var/tmp/diff_new_pack.v4Nopu/_new 2024-06-24 20:53:22.020471123 +0200 @@ -16,7 +16,7 @@ # -%define real_version 6.7.1 +%define real_version 6.7.2 %define short_version 6.7 %define tar_name qtcoap-everywhere-src %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-coap%{?pkg_suffix} -Version: 6.7.1 +Version: 6.7.2 Release: 0 Summary: Qt 6 CoAP client module License: GPL-3.0-or-later ++++++ _service ++++++ --- /var/tmp/diff_new_pack.v4Nopu/_old 2024-06-24 20:53:22.080473318 +0200 +++ /var/tmp/diff_new_pack.v4Nopu/_new 2024-06-24 20:53:22.080473318 +0200 @@ -1,9 +1,9 @@ <services> <service name="tar_scm" mode="disabled"> <param name="changesgenerate">disable</param> - <param name="version">6.7.1</param> + <param name="version">6.7.2</param> <param name="url">git://code.qt.io/qt/qtcoap.git</param> - <param name="revision">v6.7.1</param> + <param name="revision">v6.7.2</param> <param name="scm">git</param> <param name="filename">qtcoap-everywhere-src</param> </service> ++++++ qtcoap-everywhere-src-6.7.1.tar.xz -> qtcoap-everywhere-src-6.7.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-everywhere-src-6.7.1/.cmake.conf new/qtcoap-everywhere-src-6.7.2/.cmake.conf --- old/qtcoap-everywhere-src-6.7.1/.cmake.conf 2024-05-08 20:42:03.000000000 +0200 +++ new/qtcoap-everywhere-src-6.7.2/.cmake.conf 2024-06-07 23:03:44.000000000 +0200 @@ -1,4 +1,4 @@ -set(QT_REPO_MODULE_VERSION "6.7.1") +set(QT_REPO_MODULE_VERSION "6.7.2") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-everywhere-src-6.7.1/dependencies.yaml new/qtcoap-everywhere-src-6.7.2/dependencies.yaml --- old/qtcoap-everywhere-src-6.7.1/dependencies.yaml 2024-05-08 20:42:03.000000000 +0200 +++ new/qtcoap-everywhere-src-6.7.2/dependencies.yaml 2024-06-07 23:03:44.000000000 +0200 @@ -1,4 +1,4 @@ dependencies: ../qtbase: - ref: c195fe7d33decbd5ddd47ae46dbf8e0d9c20ba85 + ref: b5fbe0923cfc566036b83c3d968f225b26117efc required: true

1 0

commit qt6-3d for openSUSE:Factory
by Source-Sync 24 Jun '24

24 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-3d for openSUSE:Factory checked in at 2024-06-24 20:52:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-3d (Old) and /work/SRC/openSUSE:Factory/.qt6-3d.new.18349 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qt6-3d" Mon Jun 24 20:52:28 2024 rev:31 rq:1182583 version:6.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-3d/qt6-3d.changes 2024-05-27 11:54:13.090196526 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-3d.new.18349/qt6-3d.changes 2024-06-24 20:53:20.252406432 +0200 @@ -1,0 +2,6 @@ +Wed Jun 19 07:25:36 UTC 2024 - Christophe Marin <christophe(a)krop.fr> + +- Update to 6.7.2: + * https://www.qt.io/blog/qt-6.7.2-released + +------------------------------------------------------------------- Old: ---- qt3d-everywhere-src-6.7.1.tar.xz New: ---- qt3d-everywhere-src-6.7.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-3d.spec ++++++ --- /var/tmp/diff_new_pack.ljm8rG/_old 2024-06-24 20:53:21.160439656 +0200 +++ /var/tmp/diff_new_pack.ljm8rG/_new 2024-06-24 20:53:21.164439802 +0200 @@ -16,7 +16,7 @@ # -%define real_version 6.7.1 +%define real_version 6.7.2 %define short_version 6.7 %define tar_name qt3d-everywhere-src %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-3d%{?pkg_suffix} -Version: 6.7.1 +Version: 6.7.2 Release: 0 Summary: Qt 6 3D Library License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) ++++++ qt3d-everywhere-src-6.7.1.tar.xz -> qt3d-everywhere-src-6.7.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/qt6-3d/qt3d-everywhere-src-6.7.1.tar.xz /work/SRC/openSUSE:Factory/.qt6-3d.new.18349/qt3d-everywhere-src-6.7.2.tar.xz differ: char 27, line 1

1 0

commit python3-pyside6 for openSUSE:Factory
by Source-Sync 24 Jun '24

24 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python3-pyside6 for openSUSE:Factory checked in at 2024-06-24 20:52:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-pyside6 (Old) and /work/SRC/openSUSE:Factory/.python3-pyside6.new.18349 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3-pyside6" Mon Jun 24 20:52:26 2024 rev:32 rq:1182582 version:6.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python3-pyside6/python3-pyside6.changes 2024-06-11 18:33:04.121149049 +0200 +++ /work/SRC/openSUSE:Factory/.python3-pyside6.new.18349/python3-pyside6.changes 2024-06-24 20:53:16.064253196 +0200 @@ -1,0 +2,8 @@ +Wed Jun 19 07:48:28 UTC 2024 - Christophe Marin <christophe(a)krop.fr> + +- Update to 6.7.2. Check the installed changes-6.7.2 file for the + full list of changes +- Drop patch, merged upstream: + * 0001-shiboken-add-missing-include.patch + +------------------------------------------------------------------- Old: ---- 0001-shiboken-add-missing-include.patch pyside-setup-everywhere-src-6.7.1.tar.xz New: ---- pyside-setup-everywhere-src-6.7.2.tar.xz BETA DEBUG BEGIN: Old:- Drop patch, merged upstream: * 0001-shiboken-add-missing-include.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-pyside6.spec ++++++ --- /var/tmp/diff_new_pack.EMRg8C/_old 2024-06-24 20:53:16.968286272 +0200 +++ /var/tmp/diff_new_pack.EMRg8C/_new 2024-06-24 20:53:16.972286419 +0200 @@ -43,7 +43,7 @@ %endif Name: %{mypython}-%{pyside_flavor} -Version: 6.7.1 +Version: 6.7.2 Release: 0 Summary: Python bindings for Qt 6 License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) AND GPL-2.0-only AND GPL-3.0-only WITH Qt-GPL-exception-1.0 @@ -51,10 +51,8 @@ Source: https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-%{vers… # PATCH-FIX-OPENSUSE Patch0: 0001-Always-link-to-python-libraries.patch -# PATCH-FIX-UPSTREAM -Patch1: 0001-shiboken-add-missing-include.patch # PATCH-FIX-UPSTREAM https://codereview.qt-project.org/c/pyside/pyside-setup/+/567559 -Patch2: fix-pytest-qt.patch +Patch1: fix-pytest-qt.patch # SECTION common_dependencies BuildRequires: clang-devel BuildRequires: %{mypython}-Sphinx ++++++ pyside-setup-everywhere-src-6.7.1.tar.xz -> pyside-setup-everywhere-src-6.7.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/python3-pyside6/pyside-setup-everywhere-src-6.7.1.tar.xz /work/SRC/openSUSE:Factory/.python3-pyside6.new.18349/pyside-setup-everywhere-src-6.7.2.tar.xz differ: char 26, line 1

1 0

commit tuba for openSUSE:Factory
by Source-Sync 24 Jun '24

24 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package tuba for openSUSE:Factory checked in at 2024-06-24 20:52:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tuba (Old) and /work/SRC/openSUSE:Factory/.tuba.new.18349 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tuba" Mon Jun 24 20:52:25 2024 rev:2 rq:1182857 version:0.8.1 Changes: -------- --- /work/SRC/openSUSE:Factory/tuba/tuba.changes 2024-05-08 11:39:24.684070335 +0200 +++ /work/SRC/openSUSE:Factory/.tuba.new.18349/tuba.changes 2024-06-24 20:53:14.828207971 +0200 @@ -1,0 +2,77 @@ +Sun Jun 23 12:06:58 UTC 2024 - Richard Rahl <rrahl0(a)disroot.org> + +- update to version 0.8.1: + * gsettings options to disable graphics offload in runtime, in case it crashes + * Media Viewer gestures requiring an extra click sometimes to work + * Media Viewer images not being marked as loaded + +------------------------------------------------------------------- +Sat Jun 22 11:34:02 UTC 2024 - Richard Rahl <rrahl0(a)disroot.org> + +- update to version 0.8.0: + * Admin Dashboard + * Advanced Search Dialog + * Ability to dim non-trivial notifications like favorites and boosts + * Notification clearing + * Notification filtering + * Notification requests + * In-app proxy settings + * Optional Clapper support + * Replaced the Media Viewer headerbar with a floating button on fullscreen + * Reactive relationship updates + * 'Replying to older post' reminder switch in settings + * Preview card redesign into a vertical layout + * Use different icons per view for their empty state status + * New account window settings + * Crossed out boost icon when disabled + * Custom aria labels that contain a summary of the containers + * Set default poll expiration date to 1 day if available + * Link opening optimizations + * Open web+ap links in-app + * Notify about new sign ups and new reports for admins + * Notify about severed relationships + * Post translations when possible + * Mini profiles on avatar click + * Profile notes + * Blocked-by relationship status + * Network monitoring and graceful recover + * Profile fields redesign + * Media Viewer videos will remember the last volume set between restarts + * GraphicsOffload for Media Viewer videos + * Profile fields custom emojis + * In-reply indicator + * Account Switcher rows using markup + * Bundle icons that are either missing or have lost their meaning in Breeze/Yaru + * Snap CI for x86-64 and GNOME 46 sdk + * Multiple bulk-relationship requests due to multiple content-changed triggers + * Duplicate posts in 'Home' due to race conditions + * High-contrast theme borders on profile fields + * Libsoup not respecting cache and instead re-downloading emojis when it shouldn't + * Refactored the Custom Emoji Picker to use custom widgets + * Completion provider capturing + * Removed all optional chaining instances + * Scale revealer measuring + * Focus grabbing of links in labels + * Segfault when closing the composer quickly due to a dispose hack + * Min width due to strict headerbar centering policy + * Segfault when inspecting labels with widgets due to infinite loop of a property + * Singular and plural versions of some counters + * Accessibility of icons + * Better aria labels for dates + * Missing tooltips + * Accessibility of containers + * Accessibility of custom widgets + * Lower height request so it fits with OSK + * Stricter resolvable link detection rules + * Stricter hashtag url matching when clicking a link + * Many random segfaults when going back caused by a disposing hack + * Hiding inline quotes when there's no actual quote and the class wasn't sanitized + * Composer highlighting hashtags accepting invalid characters + * Composer highlighting being too loose on whole word matching + * Horizontal swiping on the Media Viewer + * Crash when opening the composer while the instance doesn't have custom emojis due to optional chaining + * Some strings not being marked for translations + * Other bug and memory leak fixes + + +------------------------------------------------------------------- Old: ---- tuba-0.7.2.tar.gz New: ---- tuba-0.8.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tuba.spec ++++++ --- /var/tmp/diff_new_pack.1gPuQH/_old 2024-06-24 20:53:15.252223485 +0200 +++ /var/tmp/diff_new_pack.1gPuQH/_new 2024-06-24 20:53:15.256223631 +0200 @@ -18,7 +18,7 @@ %define appname dev.geopjr.Tuba Name: tuba -Version: 0.7.2 +Version: 0.8.1 Release: 0 Summary: Browse the Fediverse License: GPL-3.0-only ++++++ tuba-0.7.2.tar.gz -> tuba-0.8.1.tar.gz ++++++ ++++ 134279 lines of diff (skipped)

1 0

commit minio-client for openSUSE:Factory
by Source-Sync 24 Jun '24

24 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package minio-client for openSUSE:Factory checked in at 2024-06-24 20:52:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/minio-client (Old) and /work/SRC/openSUSE:Factory/.minio-client.new.18349 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "minio-client" Mon Jun 24 20:52:23 2024 rev:84 rq:1182577 version:20240620T145054Z Changes: -------- --- /work/SRC/openSUSE:Factory/minio-client/minio-client.changes 2024-06-17 19:28:45.924652259 +0200 +++ /work/SRC/openSUSE:Factory/.minio-client.new.18349/minio-client.changes 2024-06-24 20:53:12.848135524 +0200 @@ -1,0 +2,12 @@ +Sat Jun 22 10:07:34 UTC 2024 - opensuse_buildservice(a)ojkastl.de + +- Update to version 20240620T145054Z: + * make 'mc admin service restart' more descriptive of what it + does (#4965) + * list versions including DEL marker when figuring out Stat() + (#4951) + * enable batch expiry option in trace (#4964) + * fix: support 'mc put --if-not-exists' (#4963) + * Adding support for Hex keys (#4962) + +------------------------------------------------------------------- Old: ---- mc-20240612T143403Z.obscpio New: ---- mc-20240620T145054Z.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ minio-client.spec ++++++ --- /var/tmp/diff_new_pack.uZEvXv/_old 2024-06-24 20:53:13.708166991 +0200 +++ /var/tmp/diff_new_pack.uZEvXv/_new 2024-06-24 20:53:13.712167137 +0200 @@ -22,7 +22,7 @@ %define binary_name minio-client Name: minio-client -Version: 20240612T143403Z +Version: 20240620T145054Z Release: 0 Summary: Client for MinIO License: AGPL-3.0-only ++++++ _service ++++++ --- /var/tmp/diff_new_pack.uZEvXv/_old 2024-06-24 20:53:13.740168161 +0200 +++ /var/tmp/diff_new_pack.uZEvXv/_new 2024-06-24 20:53:13.744168308 +0200 @@ -5,7 +5,7 @@ <param name="exclude">.git</param> <param name="changesgenerate">enable</param> <param name="versionformat">@PARENT_TAG@</param> - <param name="revision">RELEASE.2024-06-12T14-34-03Z</param> + <param name="revision">RELEASE.2024-06-20T14-50-54Z</param> <param name="match-tag">RELEASE.*</param> <param name="versionrewrite-pattern">RELEASE\.(.*)-(.*)-(.*)-(.*)-(.*)</param> <param name="versionrewrite-replacement">\1\2\3\4\5</param> @@ -19,7 +19,7 @@ <param name="compression">gz</param> </service> <service name="go_modules" mode="manual"> - <param name="archive">mc-20240612T143403Z.obscpio</param> + <param name="archive">mc-20240620T145054Z.obscpio</param> </service> </services> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.uZEvXv/_old 2024-06-24 20:53:13.764169039 +0200 +++ /var/tmp/diff_new_pack.uZEvXv/_new 2024-06-24 20:53:13.764169039 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/minio/mc</param> - <param name="changesrevision">e7c9a733c680fe62066d24e8718f81938b4f6606</param></service></servicedata> + <param name="changesrevision">dda9e96887a452b60f23ef18ea68e8898836c017</param></service></servicedata> (No newline at EOF) ++++++ mc-20240612T143403Z.obscpio -> mc-20240620T145054Z.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mc-20240612T143403Z/cmd/admin-service-restart.go new/mc-20240620T145054Z/cmd/admin-service-restart.go --- old/mc-20240612T143403Z/cmd/admin-service-restart.go 2024-06-12 16:34:03.000000000 +0200 +++ new/mc-20240620T145054Z/cmd/admin-service-restart.go 2024-06-20 16:50:54.000000000 +0200 @@ -67,12 +67,13 @@ Status string `json:"status"` ServerURL string `json:"serverURL"` Result madmin.ServiceActionResult `json:"result"` + TimeTaken time.Duration `json:"timeTaken"` } // String colorized service restart command message. func (s serviceRestartCommand) String() string { var s1 strings.Builder - s1.WriteString("Restart command successfully sent to `" + s.ServerURL + "`. Type Ctrl-C to quit or wait to follow the status of the restart process.") + s1.WriteString("Restart command successfully acknowledged by `" + s.ServerURL + "` in " + timeDurationToHumanizedDuration(s.TimeTaken).StringShort() + ". Type Ctrl-C to quit or wait to follow the status of the restart process.") if len(s.Result.Results) > 0 { s1.WriteString("\n") @@ -119,7 +120,7 @@ // String colorized service restart message. func (s serviceRestartMessage) String() string { if s.Err == nil { - return console.Colorize("ServiceRestart", fmt.Sprintf("\nRestarted `%s` successfully in %s", s.ServerURL, timeDurationToHumanizedDuration(s.TimeTaken).StringShort())) + return console.Colorize("ServiceRestart", fmt.Sprintf("\nEstablished quorum on `%s` successfully in %s", s.ServerURL, timeDurationToHumanizedDuration(s.TimeTaken).StringShort())) } return console.Colorize("FailedServiceRestart", "Failed to restart `"+s.ServerURL+"`. error: "+s.Err.Error()) } @@ -159,6 +160,7 @@ client, err := newAdminClient(aliasedURL) fatalIf(err, "Unable to initialize admin connection.") + t := time.Now() // Restart the specified MinIO server result, e := client.ServiceAction(ctxt, madmin.ServiceActionOpts{ Action: madmin.ServiceActionRestart, @@ -171,7 +173,7 @@ fatalIf(probe.NewError(e), "Unable to restart the server.") // Success.. - printMsg(serviceRestartCommand{Status: "success", ServerURL: aliasedURL, Result: result}) + printMsg(serviceRestartCommand{Status: "success", ServerURL: aliasedURL, Result: result, TimeTaken: time.Since(t)}) // Start pinging the service until it is ready @@ -191,7 +193,7 @@ printProgress() mark = "." - t := time.Now() + t = time.Now() for { healthCtx, healthCancel := context.WithTimeout(ctxt, 2*time.Second) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mc-20240612T143403Z/cmd/admin-trace.go new/mc-20240620T145054Z/cmd/admin-trace.go --- old/mc-20240612T143403Z/cmd/admin-trace.go 2024-06-12 16:34:03.000000000 +0200 +++ new/mc-20240620T145054Z/cmd/admin-trace.go 2024-06-20 16:50:54.000000000 +0200 @@ -169,6 +169,7 @@ "resync": traceCallTypes["replication-resync"], "brep": traceCallTypes["batch-replication"], "brot": traceCallTypes["batch-keyrotation"], + "bexp": traceCallTypes["batch-expiration"], } func traceCallsHelp() string { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mc-20240612T143403Z/cmd/client-s3.go new/mc-20240620T145054Z/cmd/client-s3.go --- old/mc-20240612T143403Z/cmd/client-s3.go 2024-06-12 16:34:03.000000000 +0200 +++ new/mc-20240620T145054Z/cmd/client-s3.go 2024-06-20 16:50:54.000000000 +0200 @@ -1168,6 +1168,11 @@ opts.SendContentMd5 = true } + if putOpts.ifNotExists { + // Only supported in newer MinIO releases. + opts.SetMatchETagExcept("*") + } + ui, e := c.api.PutObject(ctx, bucket, object, reader, size, opts) if e != nil { errResponse := minio.ToErrorResponse(e) @@ -1716,7 +1721,7 @@ nonRecursive := false maxKeys := 1 - for objectStat := range c.listObjectWrapper(ctx, bucket, path, nonRecursive, opts.timeRef, false, false, false, maxKeys, opts.isZip) { + for objectStat := range c.listObjectWrapper(ctx, bucket, path, nonRecursive, opts.timeRef, opts.includeVersions, opts.includeVersions, false, maxKeys, opts.isZip) { if objectStat.Err != nil { return nil, probe.NewError(objectStat.Err) } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mc-20240612T143403Z/cmd/client.go new/mc-20240620T145054Z/cmd/client.go --- old/mc-20240612T143403Z/cmd/client.go 2024-06-12 16:34:03.000000000 +0200 +++ new/mc-20240620T145054Z/cmd/client.go 2024-06-20 16:50:54.000000000 +0200 @@ -62,6 +62,7 @@ multipartSize uint64 multipartThreads uint concurrentStream bool + ifNotExists bool } // StatOptions holds options of the HEAD operation @@ -71,6 +72,7 @@ sse encrypt.ServerSide timeRef time.Time versionID string + includeVersions bool isZip bool ignoreBucketExists bool } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mc-20240612T143403Z/cmd/common-methods.go new/mc-20240620T145054Z/cmd/common-methods.go --- old/mc-20240612T143403Z/cmd/common-methods.go 2024-06-12 16:34:03.000000000 +0200 +++ new/mc-20240620T145054Z/cmd/common-methods.go 2024-06-20 16:50:54.000000000 +0200 @@ -494,6 +494,7 @@ isPreserve: uploadOpts.preserve, multipartSize: multipartSize, multipartThreads: uint(multipartThreads), + ifNotExists: uploadOpts.ifNotExists, } if isReadAt(reader) || length == 0 { @@ -576,4 +577,5 @@ multipartSize string multipartThreads string updateProgressTotal bool + ifNotExists bool } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mc-20240612T143403Z/cmd/cp-main.go new/mc-20240620T145054Z/cmd/cp-main.go --- old/mc-20240612T143403Z/cmd/cp-main.go 2024-06-12 16:34:03.000000000 +0200 +++ new/mc-20240620T145054Z/cmd/cp-main.go 2024-06-20 16:50:54.000000000 +0200 @@ -264,6 +264,7 @@ multipartSize: copyOpts.multipartSize, multipartThreads: copyOpts.multipartThreads, updateProgressTotal: copyOpts.updateProgressTotal, + ifNotExists: copyOpts.ifNotExists, }) if copyOpts.isMvCmd && urls.Error == nil { rmManager.add(ctx, sourceAlias, sourceURL.String()) @@ -557,4 +558,5 @@ updateProgressTotal bool multipartSize string multipartThreads string + ifNotExists bool } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mc-20240612T143403Z/cmd/encryption-methods.go new/mc-20240620T145054Z/cmd/encryption-methods.go --- old/mc-20240612T143403Z/cmd/encryption-methods.go 2024-06-12 16:34:03.000000000 +0200 +++ new/mc-20240620T145054Z/cmd/encryption-methods.go 2024-06-20 16:50:54.000000000 +0200 @@ -18,9 +18,11 @@ package cmd import ( + "bytes" "encoding/base64" + "encoding/hex" + "fmt" "sort" - "strconv" "strings" "github.com/minio/cli" @@ -194,41 +196,49 @@ key string, err *probe.Error, ) { - if keyType == sseS3 { - alias, prefix = splitKey(sseKey) + sseKeyBytes := []byte(sseKey) + + separatorIndex := bytes.LastIndex(sseKeyBytes, []byte("=")) + if separatorIndex < 0 { + err = errSSEKeyMissing().Trace(sseKey) return } - var path string - alias, path = splitKey(sseKey) - splitPath := strings.Split(path, "=") - if len(splitPath) == 0 { + encodedKey := string(sseKeyBytes[separatorIndex+1:]) + if separatorIndex == len(sseKeyBytes)-1 { err = errSSEKeyMissing().Trace(sseKey) return } - aliasPlusPrefix := strings.Join(splitPath[:len(splitPath)-1], "=") - prefix = strings.Replace(aliasPlusPrefix, alias+"/", "", 1) - key = splitPath[len(splitPath)-1] - - if keyType == sseC { - keyB, de := base64.RawStdEncoding.DecodeString(key) - if de != nil { - err = errSSEClientKeyFormat("One of the inserted keys was " + strconv.Itoa(len(key)) + " bytes and did not have valid base64 raw encoding.").Trace(sseKey) - return - } - key = string(keyB) - if len(key) != 32 { - err = errSSEClientKeyFormat("The plain text key was " + strconv.Itoa(len(key)) + " bytes but should be 32 bytes long").Trace(sseKey) - return - } + alias, prefix = splitKey(string(sseKeyBytes[:separatorIndex])) + + if keyType == sseS3 { + return } if keyType == sseKMS { - if !validKMSKeyName(key) { - err = errSSEKMSKeyFormat("One of the inserted keys was " + strconv.Itoa(len(key)) + " bytes and did not have a valid KMS key name.").Trace(sseKey) - return + if !validKMSKeyName(encodedKey) { + err = errSSEKMSKeyFormat(fmt.Sprintf("Key (%s) is badly formatted.", encodedKey)).Trace(sseKey) } + return + } + + var keyB []byte + var decodeError error + if len(encodedKey) == 64 { + keyB, decodeError = hex.DecodeString(encodedKey) + } else { + keyB, decodeError = base64.RawStdEncoding.DecodeString(encodedKey) + } + + if decodeError != nil { + err = errSSEClientKeyFormat(fmt.Sprintf("Key (%s) was neither base64 raw encoded nor hex encoded.", encodedKey)).Trace(sseKey) + } + + key = string(keyB) + if len(key) != 32 { + err = errSSEClientKeyFormat(fmt.Sprintf("Plain text from key (%s) is only %d bytes, but should be 32 bytes.", encodedKey, len(key))).Trace(sseKey) + return } return diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mc-20240612T143403Z/cmd/encryption-methods_test.go new/mc-20240620T145054Z/cmd/encryption-methods_test.go --- old/mc-20240612T143403Z/cmd/encryption-methods_test.go 2024-06-12 16:34:03.000000000 +0200 +++ new/mc-20240620T145054Z/cmd/encryption-methods_test.go 2024-06-20 16:50:54.000000000 +0200 @@ -28,6 +28,7 @@ baseObject := "object_name" sseKey := "MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDA" sseKeyPlain := "01234567890123456789012345678900" + sseHexKey := "3031323334353637383930313233343536373839303132333435363738393030" // INVALID KEYS sseKeyInvalidShort := "MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2" @@ -46,6 +47,14 @@ success bool }{ { + encryptionKey: fmt.Sprintf("%s/%s/%s=%s", baseAlias, basePrefix, baseObject, sseHexKey), + keyPlain: sseKeyPlain, + alias: baseAlias, + prefix: basePrefix, + object: baseObject, + success: true, + }, + { encryptionKey: fmt.Sprintf("%s/%s/%s=%s", baseAlias, basePrefix, baseObject, sseKey), keyPlain: sseKeyPlain, alias: baseAlias, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mc-20240612T143403Z/cmd/find-main.go new/mc-20240620T145054Z/cmd/find-main.go --- old/mc-20240612T143403Z/cmd/find-main.go 2024-06-12 16:34:03.000000000 +0200 +++ new/mc-20240620T145054Z/cmd/find-main.go 2024-06-20 16:50:54.000000000 +0200 @@ -207,21 +207,21 @@ // ease of repurposing. type findContext struct { *cli.Context - execCmd string - ignorePattern string - namePattern string - pathPattern string - regexPattern *regexp.Regexp - maxDepth uint - printFmt string - olderThan string - newerThan string - largerSize uint64 - smallerSize uint64 - watch bool - withOlderVersions bool - matchMeta map[string]*regexp.Regexp - matchTags map[string]*regexp.Regexp + execCmd string + ignorePattern string + namePattern string + pathPattern string + regexPattern *regexp.Regexp + maxDepth uint + printFmt string + olderThan string + newerThan string + largerSize uint64 + smallerSize uint64 + watch bool + withVersions bool + matchMeta map[string]*regexp.Regexp + matchTags map[string]*regexp.Regexp // Internal values targetAlias string @@ -295,25 +295,25 @@ } return doFind(ctx, &findContext{ - Context: cliCtx, - maxDepth: cliCtx.Uint("maxdepth"), - execCmd: cliCtx.String("exec"), - printFmt: cliCtx.String("print"), - namePattern: cliCtx.String("name"), - pathPattern: cliCtx.String("path"), - regexPattern: regMatch, - ignorePattern: cliCtx.String("ignore"), - withOlderVersions: withVersions, - olderThan: olderThan, - newerThan: newerThan, - largerSize: largerSize, - smallerSize: smallerSize, - watch: cliCtx.Bool("watch"), - targetAlias: targetAlias, - targetURL: args[0], - targetFullURL: targetFullURL, - clnt: clnt, - matchMeta: getRegexMap(cliCtx, "metadata"), - matchTags: getRegexMap(cliCtx, "tags"), + Context: cliCtx, + maxDepth: cliCtx.Uint("maxdepth"), + execCmd: cliCtx.String("exec"), + printFmt: cliCtx.String("print"), + namePattern: cliCtx.String("name"), + pathPattern: cliCtx.String("path"), + regexPattern: regMatch, + ignorePattern: cliCtx.String("ignore"), + withVersions: withVersions, + olderThan: olderThan, + newerThan: newerThan, + largerSize: largerSize, + smallerSize: smallerSize, + watch: cliCtx.Bool("watch"), + targetAlias: targetAlias, + targetURL: args[0], + targetFullURL: targetFullURL, + clnt: clnt, + matchMeta: getRegexMap(cliCtx, "metadata"), + matchTags: getRegexMap(cliCtx, "tags"), }) } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mc-20240612T143403Z/cmd/find.go new/mc-20240620T145054Z/cmd/find.go --- old/mc-20240612T143403Z/cmd/find.go 2024-06-12 16:34:03.000000000 +0200 +++ new/mc-20240620T145054Z/cmd/find.go 2024-06-20 16:50:54.000000000 +0200 @@ -272,7 +272,7 @@ defer watchFind(ctxCtx, ctx) lstOptions := ListOptions{ - WithOlderVersions: ctx.withOlderVersions, + WithOlderVersions: ctx.withVersions, WithDeleteMarkers: false, Recursive: true, ShowDir: DirFirst, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mc-20240612T143403Z/cmd/flags.go new/mc-20240620T145054Z/cmd/flags.go --- old/mc-20240612T143403Z/cmd/flags.go 2024-06-12 16:34:03.000000000 +0200 +++ new/mc-20240620T145054Z/cmd/flags.go 2024-06-20 16:50:54.000000000 +0200 @@ -97,7 +97,7 @@ var encCFlag = cli.StringSliceFlag{ Name: "enc-c", - Usage: "encrypt/decrypt objects using client provided keys. (multiple keys can be provided) Format: Raw base64 encoding.", + Usage: "encrypt/decrypt objects using client provided keys. (multiple keys can be provided) Formats: RawBase64 or Hex.", } var encKSMFlag = cli.StringSliceFlag{ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mc-20240612T143403Z/cmd/get-main.go new/mc-20240620T145054Z/cmd/get-main.go --- old/mc-20240612T143403Z/cmd/get-main.go 2024-06-12 16:34:03.000000000 +0200 +++ new/mc-20240620T145054Z/cmd/get-main.go 2024-06-20 16:50:54.000000000 +0200 @@ -27,7 +27,12 @@ // get command flags. var ( - getFlags = []cli.Flag{} + getFlags = []cli.Flag{ + cli.StringFlag{ + Name: "version-id, vid", + Usage: "get a specific version of an object", + }, + } ) // Get command. @@ -50,10 +55,10 @@ EXAMPLES: 1. Get an object from MinIO storage to local file system - {{.Prompt}} {{.HelpName}} play/mybucket/object path-to/object + {{.Prompt}} {{.HelpName}} play/mybucket/object path-to/object 2. Get an object from MinIO storage using encryption - {{.Prompt}} {{.HelpName}} --enc-c "play/mybucket/object=MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDA" play/mybucket/object path-to/object + {{.Prompt}} {{.HelpName}} --enc-c "play/mybucket/object=MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDA" play/mybucket/object path-to/object `, } @@ -94,6 +99,7 @@ targetURL: targetURL, encKeyDB: encryptionKeys, ignoreBucketExistsCheck: true, + versionID: cliCtx.String("version-id"), } for getURLs := range prepareGetURLs(ctx, opts) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mc-20240612T143403Z/cmd/legalhold-info.go new/mc-20240620T145054Z/cmd/legalhold-info.go --- old/mc-20240612T143403Z/cmd/legalhold-info.go 2024-06-12 16:34:03.000000000 +0200 +++ new/mc-20240620T145054Z/cmd/legalhold-info.go 2024-06-20 16:50:54.000000000 +0200 @@ -129,7 +129,7 @@ } // showLegalHoldInfo - show legalhold for one or many objects within a given prefix, with or without versioning -func showLegalHoldInfo(ctx context.Context, urlStr, versionID string, timeRef time.Time, withOlderVersions, recursive bool) error { +func showLegalHoldInfo(ctx context.Context, urlStr, versionID string, timeRef time.Time, withVersions, recursive bool) error { clnt, err := newClient(urlStr) if err != nil { fatalIf(err.Trace(), "Unable to parse the provided url.") @@ -142,7 +142,7 @@ } prefixPath = strings.TrimPrefix(prefixPath, "./") - if !recursive && !withOlderVersions { + if !recursive && !withVersions { lhold, err := clnt.GetObjectLegalHold(ctx, versionID) if err != nil { fatalIf(err.Trace(urlStr), "Failed to show legal hold information of `"+urlStr+"`.") @@ -167,7 +167,7 @@ objectsFound := false lstOptions := ListOptions{Recursive: recursive, ShowDir: DirNone} if !timeRef.IsZero() { - lstOptions.WithOlderVersions = withOlderVersions + lstOptions.WithOlderVersions = withVersions lstOptions.TimeRef = timeRef } for content := range clnt.List(ctx, lstOptions) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mc-20240612T143403Z/cmd/legalhold-set.go new/mc-20240620T145054Z/cmd/legalhold-set.go --- old/mc-20240612T143403Z/cmd/legalhold-set.go 2024-06-12 16:34:03.000000000 +0200 +++ new/mc-20240620T145054Z/cmd/legalhold-set.go 2024-06-20 16:50:54.000000000 +0200 @@ -82,7 +82,7 @@ } // setLegalHold - Set legalhold for all objects within a given prefix. -func setLegalHold(ctx context.Context, urlStr, versionID string, timeRef time.Time, withOlderVersions, recursive bool, lhold minio.LegalHoldStatus) error { +func setLegalHold(ctx context.Context, urlStr, versionID string, timeRef time.Time, withVersions, recursive bool, lhold minio.LegalHoldStatus) error { clnt, err := newClient(urlStr) if err != nil { fatalIf(err.Trace(), "Unable to parse the provided url.") @@ -95,7 +95,7 @@ } prefixPath = strings.TrimPrefix(prefixPath, "./") - if !recursive && !withOlderVersions { + if !recursive && !withVersions { err = clnt.PutObjectLegalHold(ctx, versionID, lhold) if err != nil { errorIf(err.Trace(urlStr), "Failed to set legal hold on `"+urlStr+"` successfully") @@ -119,7 +119,7 @@ objectsFound := false lstOptions := ListOptions{Recursive: recursive, ShowDir: DirNone} if !timeRef.IsZero() { - lstOptions.WithOlderVersions = withOlderVersions + lstOptions.WithOlderVersions = withVersions lstOptions.TimeRef = timeRef } for content := range clnt.List(ctx, lstOptions) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mc-20240612T143403Z/cmd/ls-main.go new/mc-20240620T145054Z/cmd/ls-main.go --- old/mc-20240612T143403Z/cmd/ls-main.go 2024-06-12 16:34:03.000000000 +0200 +++ new/mc-20240620T145054Z/cmd/ls-main.go 2024-06-20 16:50:54.000000000 +0200 @@ -170,24 +170,24 @@ isRecursive := cliCtx.Bool("recursive") isIncomplete := cliCtx.Bool("incomplete") - withOlderVersions := cliCtx.Bool("versions") + withVersions := cliCtx.Bool("versions") isSummary := cliCtx.Bool("summarize") listZip := cliCtx.Bool("zip") timeRef := parseRewindFlag(cliCtx.String("rewind")) - if listZip && (withOlderVersions || !timeRef.IsZero()) { + if listZip && (withVersions || !timeRef.IsZero()) { fatalIf(errInvalidArgument().Trace(args...), "Zip file listing can only be performed on the latest version") } storageClasss := cliCtx.String("storage-class") opts := doListOptions{ - timeRef: timeRef, - isRecursive: isRecursive, - isIncomplete: isIncomplete, - isSummary: isSummary, - withOlderVersions: withOlderVersions, - listZip: listZip, - filter: storageClasss, + timeRef: timeRef, + isRecursive: isRecursive, + isIncomplete: isIncomplete, + isSummary: isSummary, + withVersions: withVersions, + listZip: listZip, + filter: storageClasss, } return args, opts } @@ -218,7 +218,7 @@ fatalIf(err.Trace(targetURL), "Unable to initialize target `"+targetURL+"`.") if !strings.HasSuffix(targetURL, string(clnt.GetURL().Separator)) { var st *ClientContent - st, err = clnt.Stat(ctx, StatOptions{incomplete: opts.isIncomplete}) + st, err = clnt.Stat(ctx, StatOptions{incomplete: opts.isIncomplete, includeVersions: opts.withVersions}) if st != nil && err == nil && st.Type.IsDir() { targetURL = targetURL + string(clnt.GetURL().Separator) clnt, err = newClient(targetURL) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mc-20240612T143403Z/cmd/ls.go new/mc-20240620T145054Z/cmd/ls.go --- old/mc-20240612T143403Z/cmd/ls.go 2024-06-12 16:34:03.000000000 +0200 +++ new/mc-20240620T145054Z/cmd/ls.go 2024-06-20 16:50:54.000000000 +0200 @@ -207,13 +207,13 @@ } type doListOptions struct { - timeRef time.Time - isRecursive bool - isIncomplete bool - isSummary bool - withOlderVersions bool - listZip bool - filter string + timeRef time.Time + isRecursive bool + isIncomplete bool + isSummary bool + withVersions bool + listZip bool + filter string } // doList - list all entities inside a folder. @@ -230,7 +230,7 @@ Recursive: o.isRecursive, Incomplete: o.isIncomplete, TimeRef: o.timeRef, - WithOlderVersions: o.withOlderVersions || !o.timeRef.IsZero(), + WithOlderVersions: o.withVersions || !o.timeRef.IsZero(), WithDeleteMarkers: true, ShowDir: DirNone, ListZip: o.listZip, @@ -247,7 +247,7 @@ if lastPath != content.URL.Path { // Print any object in the current list before reinitializing it - printObjectVersions(clnt.GetURL(), perObjectVersions, o.withOlderVersions) + printObjectVersions(clnt.GetURL(), perObjectVersions, o.withVersions) lastPath = content.URL.Path perObjectVersions = []*ClientContent{} } @@ -257,7 +257,7 @@ totalObjects++ } - printObjectVersions(clnt.GetURL(), perObjectVersions, o.withOlderVersions) + printObjectVersions(clnt.GetURL(), perObjectVersions, o.withVersions) if o.isSummary { printMsg(summaryMessage{ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mc-20240612T143403Z/cmd/put-main.go new/mc-20240620T145054Z/cmd/put-main.go --- old/mc-20240612T143403Z/cmd/put-main.go 2024-06-12 16:34:03.000000000 +0200 +++ new/mc-20240620T145054Z/cmd/put-main.go 2024-06-20 16:50:54.000000000 +0200 @@ -41,6 +41,11 @@ Usage: "each part size", Value: "16MiB", }, + cli.BoolFlag{ + Name: "if-not-exists", + Usage: "upload only if object does not exist", + Hidden: true, + }, } ) @@ -68,19 +73,19 @@ EXAMPLES: 1. Put an object from local file system to S3 storage - {{.Prompt}} {{.HelpName}} path-to/object play/mybucket + {{.Prompt}} {{.HelpName}} path-to/object play/mybucket 2. Put an object from local file system to S3 bucket with name - {{.Prompt}} {{.HelpName}} path-to/object play/mybucket/object + {{.Prompt}} {{.HelpName}} path-to/object play/mybucket/object 3. Put an object from local file system to S3 bucket under a prefix - {{.Prompt}} {{.HelpName}} path-to/object play/mybucket/object-prefix/ + {{.Prompt}} {{.HelpName}} path-to/object play/mybucket/object-prefix/ - 4. Put an object to MinIO storage using sse-c encryption - {{.Prompt}} {{.HelpName}} --enc-c "play/mybucket/object=MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDA" path-to/object play/mybucket/object + 4. Put an object to MinIO storage using sse-c encryption + {{.Prompt}} {{.HelpName}} --enc-c "play/mybucket/object=MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDA" path-to/object play/mybucket/object - 5. Put an object to MinIO storage using sse-kms encryption - {{.Prompt}} {{.HelpName}} --enc-kms path-to/object play/mybucket/object + 5. Put an object to MinIO storage using sse-kms encryption + {{.Prompt}} {{.HelpName}} --enc-kms path-to/object play/mybucket/object `, } @@ -93,11 +98,13 @@ ctx, cancelPut := context.WithCancel(globalContext) defer cancelPut() + // part size size := cliCtx.String("s") if size == "" { - size = "16mb" + size = "32MiB" } + _, perr := humanize.ParseBytes(size) if perr != nil { fatalIf(probe.NewError(perr), "Unable to parse part size") @@ -175,10 +182,11 @@ encryptionKeys: encryptionKeys, multipartSize: size, multipartThreads: strconv.Itoa(threads), + ifNotExists: cliCtx.Bool("if-not-exists"), }) if urls.Error != nil { - e = urls.Error.ToGoError() - showLastProgressBar(pg, e) + showLastProgressBar(pg, urls.Error.ToGoError()) + fatalIf(urls.Error.Trace(), "unable to upload") return } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mc-20240612T143403Z/cmd/retention-clear.go new/mc-20240620T145054Z/cmd/retention-clear.go --- old/mc-20240612T143403Z/cmd/retention-clear.go 2024-06-12 16:34:03.000000000 +0200 +++ new/mc-20240620T145054Z/cmd/retention-clear.go 2024-06-20 16:50:54.000000000 +0200 @@ -114,8 +114,8 @@ } // Clear Retention for one object/version or many objects within a given prefix, bypass governance is always enabled -func clearRetention(ctx context.Context, target, versionID string, timeRef time.Time, withOlderVersions, isRecursive bool) error { - return applyRetention(ctx, lockOpClear, target, versionID, timeRef, withOlderVersions, isRecursive, "", 0, minio.Days, true) +func clearRetention(ctx context.Context, target, versionID string, timeRef time.Time, withVersions, isRecursive bool) error { + return applyRetention(ctx, lockOpClear, target, versionID, timeRef, withVersions, isRecursive, "", 0, minio.Days, true) } func clearBucketLock(urlStr string) error { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mc-20240612T143403Z/cmd/retention-common.go new/mc-20240620T145054Z/cmd/retention-common.go --- old/mc-20240612T143403Z/cmd/retention-common.go 2024-06-12 16:34:03.000000000 +0200 +++ new/mc-20240620T145054Z/cmd/retention-common.go 2024-06-20 16:50:54.000000000 +0200 @@ -178,7 +178,7 @@ } // Apply Retention for one object/version or many objects within a given prefix. -func applyRetention(ctx context.Context, op lockOpType, target, versionID string, timeRef time.Time, withOlderVersions, isRecursive bool, +func applyRetention(ctx context.Context, op lockOpType, target, versionID string, timeRef time.Time, withVersions, isRecursive bool, mode minio.RetentionMode, validity uint64, unit minio.ValidityUnit, bypassGovernance bool, ) error { clnt, err := newClient(target) @@ -207,7 +207,7 @@ } alias, urlStr, _ := mustExpandAlias(target) - if versionID != "" || !isRecursive && !withOlderVersions { + if versionID != "" || !isRecursive && !withVersions { err := setRetentionSingle(ctx, op, alias, urlStr, versionID, mode, until, bypassGovernance) fatalIf(err.Trace(), "Unable to set retention on `%s`", target) return nil @@ -215,7 +215,7 @@ lstOptions := ListOptions{Recursive: isRecursive, ShowDir: DirNone} if !timeRef.IsZero() { - lstOptions.WithOlderVersions = withOlderVersions + lstOptions.WithOlderVersions = withVersions lstOptions.WithDeleteMarkers = true lstOptions.TimeRef = timeRef } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mc-20240612T143403Z/cmd/retention-info.go new/mc-20240620T145054Z/cmd/retention-info.go --- old/mc-20240612T143403Z/cmd/retention-info.go 2024-06-12 16:34:03.000000000 +0200 +++ new/mc-20240620T145054Z/cmd/retention-info.go 2024-06-20 16:50:54.000000000 +0200 @@ -300,7 +300,7 @@ } // Get Retention for one object/version or many objects within a given prefix. -func getRetention(ctx context.Context, target, versionID string, timeRef time.Time, withOlderVersions, isRecursive bool) error { +func getRetention(ctx context.Context, target, versionID string, timeRef time.Time, withVersions, isRecursive bool) error { clnt, err := newClient(target) if err != nil { fatalIf(err.Trace(), "Unable to parse the provided url.") @@ -314,7 +314,7 @@ } alias, urlStr, _ := mustExpandAlias(target) - if versionID != "" || !isRecursive && !withOlderVersions { + if versionID != "" || !isRecursive && !withVersions { err := infoRetentionSingle(ctx, alias, urlStr, versionID, false) if err != nil { if _, ok := err.ToGoError().(ObjectNameEmpty); ok { @@ -327,7 +327,7 @@ lstOptions := ListOptions{Recursive: isRecursive, ShowDir: DirNone} if !timeRef.IsZero() { - lstOptions.WithOlderVersions = withOlderVersions + lstOptions.WithOlderVersions = withVersions lstOptions.WithDeleteMarkers = true lstOptions.TimeRef = timeRef } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mc-20240612T143403Z/cmd/retention-set.go new/mc-20240620T145054Z/cmd/retention-set.go --- old/mc-20240612T143403Z/cmd/retention-set.go 2024-06-12 16:34:03.000000000 +0200 +++ new/mc-20240620T145054Z/cmd/retention-set.go 2024-06-20 16:50:54.000000000 +0200 @@ -128,10 +128,10 @@ } // Set Retention for one object/version or many objects within a given prefix. -func setRetention(ctx context.Context, target, versionID string, timeRef time.Time, withOlderVersions, isRecursive bool, +func setRetention(ctx context.Context, target, versionID string, timeRef time.Time, withVersions, isRecursive bool, mode minio.RetentionMode, validity uint64, unit minio.ValidityUnit, bypassGovernance bool, ) error { - return applyRetention(ctx, lockOpSet, target, versionID, timeRef, withOlderVersions, isRecursive, mode, validity, unit, bypassGovernance) + return applyRetention(ctx, lockOpSet, target, versionID, timeRef, withVersions, isRecursive, mode, validity, unit, bypassGovernance) } func setBucketLock(urlStr string, mode minio.RetentionMode, validity uint64, unit minio.ValidityUnit) error { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mc-20240612T143403Z/cmd/suite_test.go new/mc-20240620T145054Z/cmd/suite_test.go --- old/mc-20240612T143403Z/cmd/suite_test.go 2024-06-12 16:34:03.000000000 +0200 +++ new/mc-20240620T145054Z/cmd/suite_test.go 2024-06-20 16:50:54.000000000 +0200 @@ -84,6 +84,9 @@ // MC_TEST_ENABLE_HTTPS=true // needs to be set in order to run these tests if protocol == "https://" { + PutObjectWithSSECHexKey(t) + GetObjectWithSSEC(t) + PutObjectWithSSEC(t) PutObjectWithSSECPartialPrefixMatch(t) PutObjectWithSSECMultipart(t) @@ -207,7 +210,8 @@ bucketList = make([]string, 0) userList = make(map[string]TestUser, 0) - // KMS + // ENCRYPTION + sseHexKey = "8fe4d820587c427d5cc207d75cb76f3c6874808174b04050fa209206bfd08ebb" sseBaseEncodedKey = "MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDA" invalidSSEBaseEncodedKey = "MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5" sseBaseEncodedKey2 = "MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5YWE" @@ -1292,6 +1296,22 @@ fatalIfErrorWMsg(err, out, t) } +func PutObjectWithSSECHexKey(t *testing.T) { + file := createFile(newTestFile{ + addToGlobalFileMap: false, + tag: "encputhex", + sizeInMBS: 1, + }) + + out, err := RunMC( + "cp", + "--enc-c="+sseTestBucket+"="+sseHexKey, + file.diskFile.Name(), + sseTestBucket+"/"+file.fileNameWithoutPath, + ) + fatalIfErrorWMsg(err, out, t) +} + func PutObjectWithSSEC(t *testing.T) { file := createFile(newTestFile{ addToGlobalFileMap: false, @@ -1340,6 +1360,36 @@ fatalIfNoErrorWMsg(err, out, t) } +func GetObjectWithSSECHexKey(t *testing.T) { + file := createFile(newTestFile{ + addToGlobalFileMap: false, + tag: "encgethex", + sizeInMBS: 1, + }) + + out, err := RunMC( + "cp", + "--enc-c="+sseTestBucket+"="+sseHexKey, + file.diskFile.Name(), + sseTestBucket+"/"+file.fileNameWithoutPath, + ) + fatalIfErrorWMsg(err, out, t) + + out, err = RunMC( + "cp", + "--enc-c="+sseTestBucket+"="+sseHexKey, + sseTestBucket+"/"+file.fileNameWithoutPath, + file.diskFile.Name()+".download", + ) + fatalIfErrorWMsg(err, out, t) + + md5s, err := openFileAndGetMd5Sum(file.diskFile.Name() + ".download") + fatalIfError(err, t) + if md5s != file.md5Sum { + fatalMsgOnly(fmt.Sprintf("expecting md5sum (%s) but got sum (%s)", file.md5Sum, md5s), t) + } +} + func GetObjectWithSSEC(t *testing.T) { file := createFile(newTestFile{ addToGlobalFileMap: false, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mc-20240612T143403Z/cmd/tag-list.go new/mc-20240620T145054Z/cmd/tag-list.go --- old/mc-20240612T143403Z/cmd/tag-list.go 2024-06-12 16:34:03.000000000 +0200 +++ new/mc-20240620T145054Z/cmd/tag-list.go 2024-06-20 16:50:54.000000000 +0200 @@ -147,14 +147,14 @@ } // parseTagListSyntax performs command-line input validation for tag list command. -func parseTagListSyntax(ctx *cli.Context) (targetURL, versionID string, timeRef time.Time, withOlderVersions, recursive bool) { +func parseTagListSyntax(ctx *cli.Context) (targetURL, versionID string, timeRef time.Time, withVersions, recursive bool) { if len(ctx.Args()) != 1 { showCommandHelpAndExit(ctx, globalErrorExitStatus) } targetURL = ctx.Args().Get(0) versionID = ctx.String("version-id") - withOlderVersions = ctx.Bool("versions") + withVersions = ctx.Bool("versions") rewind := ctx.String("rewind") recursive = ctx.Bool("recursive") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mc-20240612T143403Z/cmd/tree-main.go new/mc-20240620T145054Z/cmd/tree-main.go --- old/mc-20240612T143403Z/cmd/tree-main.go 2024-06-12 16:34:03.000000000 +0200 +++ new/mc-20240620T145054Z/cmd/tree-main.go 2024-06-20 16:50:54.000000000 +0200 @@ -294,13 +294,13 @@ clnt, err := newClientFromAlias(targetAlias, targetURL) fatalIf(err.Trace(targetURL), "Unable to initialize target `"+targetURL+"`.") opts := doListOptions{ - timeRef: timeRef, - isRecursive: true, - isIncomplete: false, - isSummary: false, - withOlderVersions: false, - listZip: false, - filter: "*", + timeRef: timeRef, + isRecursive: true, + isIncomplete: false, + isSummary: false, + withVersions: false, + listZip: false, + filter: "*", } if e := doList(ctx, clnt, opts); e != nil { cErr = e diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mc-20240612T143403Z/cmd/typed-errors.go new/mc-20240620T145054Z/cmd/typed-errors.go --- old/mc-20240612T143403Z/cmd/typed-errors.go 2024-06-12 16:34:03.000000000 +0200 +++ new/mc-20240620T145054Z/cmd/typed-errors.go 2024-06-20 16:50:54.000000000 +0200 @@ -187,7 +187,7 @@ type sseClientKeyFormatErr error var errSSEClientKeyFormat = func(msg string) *probe.Error { - m := "Encryption key should be 44 bytes raw base64 encoded key." + m := "Encryption key should be either raw base64 encoded or hex encoded. " m += msg return probe.NewError(sseClientKeyFormatErr(errors.New(m))).Untrace() } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mc-20240612T143403Z/functional-tests.sh new/mc-20240620T145054Z/functional-tests.sh --- old/mc-20240612T143403Z/functional-tests.sh 2024-06-12 16:34:03.000000000 +0200 +++ new/mc-20240620T145054Z/functional-tests.sh 2024-06-20 16:50:54.000000000 +0200 @@ -1038,7 +1038,6 @@ test_copy_object_preserve_filesystem_attr test_find test_find_empty - test_bucket_replication if [ -z "$MINT_MODE" ]; then test_watch_object fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mc-20240612T143403Z/go.mod new/mc-20240620T145054Z/go.mod --- old/mc-20240612T143403Z/go.mod 2024-06-12 16:34:03.000000000 +0200 +++ new/mc-20240620T145054Z/go.mod 2024-06-20 16:50:54.000000000 +0200 @@ -19,7 +19,7 @@ github.com/minio/colorjson v1.0.7 github.com/minio/filepath v1.0.0 github.com/minio/md5-simd v1.1.2 // indirect - github.com/minio/minio-go/v7 v7.0.70 + github.com/minio/minio-go/v7 v7.0.72-0.20240618070918-0b004e328e1e github.com/mitchellh/go-homedir v1.1.0 github.com/pkg/xattr v0.4.9 github.com/posener/complete v1.2.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mc-20240612T143403Z/go.sum new/mc-20240620T145054Z/go.sum --- old/mc-20240612T143403Z/go.sum 2024-06-12 16:34:03.000000000 +0200 +++ new/mc-20240620T145054Z/go.sum 2024-06-20 16:50:54.000000000 +0200 @@ -134,8 +134,8 @@ github.com/minio/madmin-go/v3 v3.0.55-0.20240603092915-420a67132c32/go.mod h1:IFAwr0XMrdsLovxAdCcuq/eoL4nRuMVQQv0iubJANQw= github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34= github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM= -github.com/minio/minio-go/v7 v7.0.70 h1:1u9NtMgfK1U42kUxcsl5v0yj6TEOPR497OAQxpJnn2g= -github.com/minio/minio-go/v7 v7.0.70/go.mod h1:4yBA8v80xGA30cfM3fz0DKYMXunWl/AV/6tWEs9ryzo= +github.com/minio/minio-go/v7 v7.0.72-0.20240618070918-0b004e328e1e h1:Ye/gsaKgKD9lg1BgjG5fsGZdKevVpJO9bzqQg7badV8= +github.com/minio/minio-go/v7 v7.0.72-0.20240618070918-0b004e328e1e/go.mod h1:4yBA8v80xGA30cfM3fz0DKYMXunWl/AV/6tWEs9ryzo= github.com/minio/mux v1.9.0 h1:dWafQFyEfGhJvK6AwLOt83bIG5bxKxKJnKMCi0XAaoA= github.com/minio/mux v1.9.0/go.mod h1:1pAare17ZRL5GpmNL+9YmqHoWnLmMZF9C/ioUCfy0BQ= github.com/minio/pkg/v3 v3.0.0 h1:0vOKHgwpya//mb7RH0i1lyPMH2IBBF5hJMNY5Bk2WlY= ++++++ mc.obsinfo ++++++ --- /var/tmp/diff_new_pack.uZEvXv/_old 2024-06-24 20:53:14.068180163 +0200 +++ /var/tmp/diff_new_pack.uZEvXv/_new 2024-06-24 20:53:14.072180309 +0200 @@ -1,5 +1,5 @@ name: mc -version: 20240612T143403Z -mtime: 1718202843 -commit: e7c9a733c680fe62066d24e8718f81938b4f6606 +version: 20240620T145054Z +mtime: 1718895054 +commit: dda9e96887a452b60f23ef18ea68e8898836c017 ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/minio-client/vendor.tar.gz /work/SRC/openSUSE:Factory/.minio-client.new.18349/vendor.tar.gz differ: char 5, line 1

1 0

commit tio for openSUSE:Factory
by Source-Sync 24 Jun '24

24 Jun '24

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package tio for openSUSE:Factory checked in at 2024-06-24 20:52:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tio (Old) and /work/SRC/openSUSE:Factory/.tio.new.18349 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tio" Mon Jun 24 20:52:21 2024 rev:19 rq:1182571 version:3.4 Changes: -------- --- /work/SRC/openSUSE:Factory/tio/tio.changes 2024-06-04 12:51:40.949027037 +0200 +++ /work/SRC/openSUSE:Factory/.tio.new.18349/tio.changes 2024-06-24 20:53:09.816024584 +0200 @@ -1,0 +2,25 @@ +Sat Jun 15 17:42:52 UTC 2024 - Martin Hauke <mardnh(a)gmx.de> + +- Update to version 3.4 + * Update configuration output. + * Clean up script run interaction text. + * Fix unbounded writes. + * Add history and editing feature to line input mode. + * Use up and down arrow keys to navigate history. + * Use left and right arrow keys to move cursor back and forth. + * We try mimic the behaviour of GNU readline which we can not + use because. + * Reuse socket address. + * Fix line input mode. + * Fix so that ABCD are no longer ignored. + * Make sure ICRNL, IGNCR, INLCR take effect. + * Include correct header for poll(). + * Add group write permission to xymodem received file. + * Fix missing open() flags in xymodem_receive(). + * Show current mappings in the configuration printout. + * Use "ctrl-t m" to change mappings interactively. + * Prompt for Lua script or shell command in interactive session. + * Added support to receive XMODEM-CRC files from the connected + serial port. + +------------------------------------------------------------------- Old: ---- tio-3.3.tar.xz New: ---- tio-3.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tio.spec ++++++ --- /var/tmp/diff_new_pack.fSMrHs/_old 2024-06-24 20:53:10.260040829 +0200 +++ /var/tmp/diff_new_pack.fSMrHs/_new 2024-06-24 20:53:10.264040976 +0200 @@ -17,7 +17,7 @@ Name: tio -Version: 3.3 +Version: 3.4 Release: 0 Summary: Simple TTY terminal I/O application License: GPL-2.0-or-later ++++++ tio-3.3.tar.xz -> tio-3.4.tar.xz ++++++ ++++ 1909 lines of diff (skipped)

1 0