Hello community, here is the log from the commit of package prison-qt5 for openSUSE:Factory checked in at 2020-07-14 07:55:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/prison-qt5 (Old) and /work/SRC/openSUSE:Factory/.prison-qt5.new.3060 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "prison-qt5" Tue Jul 14 07:55:02 2020 rev:45 rq:820406 version:5.72.0 Changes: -------- --- /work/SRC/openSUSE:Factory/prison-qt5/prison-qt5.changes 2020-06-16 13:44:51.921557573 +0200 +++ /work/SRC/openSUSE:Factory/.prison-qt5.new.3060/prison-qt5.changes 2020-07-14 07:57:13.957390015 +0200 @@ -1,0 +2,10 @@ +Sun Jul 5 07:55:54 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Update to 5.72.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/kde-frameworks-5.72.0 +- Changes since 5.71.0: + * Deprecate AbstractBarcode::minimumSize() also for the compiler + +------------------------------------------------------------------- Old: ---- prison-5.71.0.tar.xz prison-5.71.0.tar.xz.sig New: ---- prison-5.72.0.tar.xz prison-5.72.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ prison-qt5.spec ++++++ --- /var/tmp/diff_new_pack.P7FRVR/_old 2020-07-14 07:57:15.757395844 +0200 +++ /var/tmp/diff_new_pack.P7FRVR/_new 2020-07-14 07:57:15.757395844 +0200 @@ -19,7 +19,7 @@ %define sonum 5 %define rname prison %define _libname KF5Prison -%define _tar_path 5.71 +%define _tar_path 5.72 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) @@ -27,7 +27,7 @@ # Only needed for the package signature condition %bcond_without lang Name: prison-qt5 -Version: 5.71.0 +Version: 5.72.0 Release: 0 Summary: Barcode abstraction layer library License: MIT @@ -39,14 +39,13 @@ Source2: frameworks.keyring %endif Source99: baselibs.conf -BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes BuildRequires: kf5-filesystem BuildRequires: pkgconfig -BuildRequires: cmake(Qt5Core) >= 5.5.0 -BuildRequires: cmake(Qt5Gui) >= 5.5.0 -BuildRequires: cmake(Qt5Quick) >= 5.5.0 +BuildRequires: cmake(Qt5Core) >= 5.12.0 +BuildRequires: cmake(Qt5Gui) >= 5.12.0 +BuildRequires: cmake(Qt5Quick) >= 5.12.0 BuildRequires: pkgconfig(libdmtx) BuildRequires: pkgconfig(libqrencode) @@ -77,7 +76,7 @@ Summary: Development files for prison-qt5, a barcode abstraction library Group: Development/Libraries/C and C++ Requires: lib%{_libname}%{sonum} = %{version} -Requires: cmake(Qt5Gui) >= 5.5.0 +Requires: cmake(Qt5Gui) >= 5.12.0 %description -n prison-qt5-devel Development files for prison, a barcode abstraction layer library providing @@ -98,13 +97,13 @@ %postun -n lib%{_libname}%{sonum} -p /sbin/ldconfig %files -n lib%{_libname}%{sonum} -%license LICENSE +%license LICENSES/* %doc README* -%{_libqt5_libdir}/lib%{_libname}*.so.* %{_kf5_debugdir}/*.categories +%{_libqt5_libdir}/lib%{_libname}*.so.* %files imports -%license LICENSE +%license LICENSES/* %doc README* %dir %{_kf5_qmldir}/org/ %dir %{_kf5_qmldir}/org/kde/ @@ -113,9 +112,10 @@ %{_kf5_qmldir}/org/kde/prison/qmldir %files -n prison-qt5-devel -%{_kf5_libdir}/cmake/KF5Prison/ -%{_libqt5_libdir}/lib%{_libname}*.so +%license LICENSES/* %{_kf5_includedir}/ +%{_kf5_libdir}/cmake/KF5Prison/ %{_kf5_mkspecsdir}/qt_Prison.pri +%{_libqt5_libdir}/lib%{_libname}*.so %changelog ++++++ prison-5.71.0.tar.xz -> prison-5.72.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prison-5.71.0/CMakeLists.txt new/prison-5.72.0/CMakeLists.txt --- old/prison-5.71.0/CMakeLists.txt 2020-06-06 21:36:34.000000000 +0200 +++ new/prison-5.72.0/CMakeLists.txt 2020-07-04 11:59:12.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.71.0") # handled by release scripts +set(KF5_VERSION "5.72.0") # handled by release scripts project(prison VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.71.0 NO_MODULE) +find_package(ECM 5.72.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" "${ECM_MODULE_PATH}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prison-5.71.0/autotests/aztecbarcodetest.cpp new/prison-5.72.0/autotests/aztecbarcodetest.cpp --- old/prison-5.71.0/autotests/aztecbarcodetest.cpp 2020-06-06 21:36:34.000000000 +0200 +++ new/prison-5.72.0/autotests/aztecbarcodetest.cpp 2020-07-04 11:59:12.000000000 +0200 @@ -388,13 +388,20 @@ { std::unique_ptr<Prison::AbstractBarcode> barcode(Prison::createBarcode(Prison::Aztec)); QVERIFY(barcode); +#if PRISON_BUILD_DEPRECATED_SINCE(5, 72) QVERIFY(!barcode->minimumSize().isValid()); +#endif barcode->setData(QStringLiteral("UNIT TEST")); +#if PRISON_BUILD_DEPRECATED_SINCE(5, 72) QCOMPARE(barcode->minimumSize(), QSize(60, 60)); +#endif QCOMPARE(barcode->trueMinimumSize(), QSize(15, 15)); QCOMPARE(barcode->preferredSize(1), QSize(60, 60)); QCOMPARE(barcode->preferredSize(2), QSize(30, 30)); +#if PRISON_BUILD_DEPRECATED_SINCE(5, 72) QCOMPARE(barcode->toImage(barcode->minimumSize()).size(), QSize(60, 60)); +#endif + QCOMPARE(barcode->toImage(barcode->preferredSize(1)).size(), QSize(60, 60)); QCOMPARE(barcode->toImage({1, 1}).isNull(), true); } }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prison-5.71.0/autotests/code128barcodetest.cpp new/prison-5.72.0/autotests/code128barcodetest.cpp --- old/prison-5.71.0/autotests/code128barcodetest.cpp 2020-06-06 21:36:34.000000000 +0200 +++ new/prison-5.72.0/autotests/code128barcodetest.cpp 2020-07-04 11:59:12.000000000 +0200 @@ -105,13 +105,20 @@ { std::unique_ptr<Prison::AbstractBarcode> barcode(Prison::createBarcode(Prison::Code128)); QVERIFY(barcode); +#if PRISON_BUILD_DEPRECATED_SINCE(5, 72) QVERIFY(!barcode->minimumSize().isValid()); +#endif barcode->setData(QStringLiteral("UNIT TEST")); +#if PRISON_BUILD_DEPRECATED_SINCE(5, 72) QCOMPARE(barcode->minimumSize(), QSize(154, 10)); +#endif QCOMPARE(barcode->trueMinimumSize(), QSize(154, 1)); QCOMPARE(barcode->preferredSize(1), QSize(308, 50)); QCOMPARE(barcode->preferredSize(2), QSize(154, 50)); +#if PRISON_BUILD_DEPRECATED_SINCE(5, 72) QCOMPARE(barcode->toImage(barcode->minimumSize()).size(), QSize(154, 10)); +#endif + QCOMPARE(barcode->toImage(barcode->preferredSize(1)).size(), QSize(308, 50)); QCOMPARE(barcode->toImage({1, 1}).isNull(), true); } }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prison-5.71.0/docs/Doxyfile.local new/prison-5.72.0/docs/Doxyfile.local --- old/prison-5.71.0/docs/Doxyfile.local 1970-01-01 01:00:00.000000000 +0100 +++ new/prison-5.72.0/docs/Doxyfile.local 2020-07-04 11:59:12.000000000 +0200 @@ -0,0 +1,8 @@ +### KApiDox Project-specific Overrides File + +# define so that deprecated API is not skipped +PREDEFINED += \ + "PRISON_ENABLE_DEPRECATED_SINCE(x, y)=1" \ + "PRISON_BUILD_DEPRECATED_SINCE(x, y)=1" \ + "PRISON_DEPRECATED_VERSION(x, y, t)=" \ + "PRISON_DEPRECATED_VERSION_BELATED(x, y, xt, yt, t)=" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prison-5.71.0/src/lib/CMakeLists.txt new/prison-5.72.0/src/lib/CMakeLists.txt --- old/prison-5.71.0/src/lib/CMakeLists.txt 2020-06-06 21:36:34.000000000 +0200 +++ new/prison-5.72.0/src/lib/CMakeLists.txt 2020-07-04 11:59:12.000000000 +0200 @@ -33,7 +33,7 @@ GROUP_BASE_NAME KF VERSION ${KF5_VERSION} DEPRECATED_BASE_VERSION 0 - DEPRECATION_VERSIONS 5.69 + DEPRECATION_VERSIONS 5.69 5.72 EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} ) add_library(KF5::Prison ALIAS KF5Prison) @@ -104,6 +104,8 @@ PRISON_EXPORT PRISON_DEPRECATED PRISON_DEPRECATED_EXPORT + "PRISON_DEPRECATED_VERSION(x, y, t)" + "PRISON_DEPRECATED_VERSION_BELATED(x, y, xt, yt, t)" TAGFILE_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} QCH_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} COMPONENT Devel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prison-5.71.0/src/lib/abstractbarcode.cpp new/prison-5.72.0/src/lib/abstractbarcode.cpp --- old/prison-5.71.0/src/lib/abstractbarcode.cpp 2020-06-06 21:36:34.000000000 +0200 +++ new/prison-5.72.0/src/lib/abstractbarcode.cpp 2020-07-04 11:59:12.000000000 +0200 @@ -85,6 +85,7 @@ d->m_cache=QImage(); } +#if PRISON_BUILD_DEPRECATED_SINCE(5, 72) QSizeF AbstractBarcode::minimumSize() const { d->recompute(); @@ -105,6 +106,7 @@ return d->m_cache.size(); } +#endif QSizeF AbstractBarcode::trueMinimumSize() const { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prison-5.71.0/src/lib/abstractbarcode.h new/prison-5.72.0/src/lib/abstractbarcode.h --- old/prison-5.71.0/src/lib/abstractbarcode.h 2020-06-06 21:36:34.000000000 +0200 +++ new/prison-5.72.0/src/lib/abstractbarcode.h 2020-07-04 11:59:12.000000000 +0200 @@ -59,13 +59,17 @@ * a null QImage will be returned */ QImage toImage(const QSizeF& size) ; + +#if PRISON_ENABLE_DEPRECATED_SINCE(5, 72) /** * The minimal size of this barcode. * @note This isn't the absolute minimum, but closer to the result of preferredSize(1). * @return the minimal size for this barcode. - * @deprecated since 5.69 Prefer preferredSize() or trueMinimumSize(). + * @deprecated Since 5.69, use preferredSize() or trueMinimumSize(). */ + PRISON_DEPRECATED_VERSION_BELATED(5, 72, 5, 69, "Use preferredSize() or trueMinimumSize()") QSizeF minimumSize() const; +#endif /** * The minimal amount of pixels needed to represent this barcode without loss of information. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prison-5.71.0/tests/barcodeexamplewidget.cpp new/prison-5.72.0/tests/barcodeexamplewidget.cpp --- old/prison-5.71.0/tests/barcodeexamplewidget.cpp 2020-06-06 21:36:34.000000000 +0200 +++ new/prison-5.72.0/tests/barcodeexamplewidget.cpp 2020-07-04 11:59:12.000000000 +0200 @@ -6,6 +6,8 @@ #include "barcodeexamplewidget.h" #include "src/lib/abstractbarcode.h" +#include <QGuiApplication> +#include <QScreen> #include <QResizeEvent> #include <QPainter> #include <QMimeData> @@ -72,7 +74,7 @@ QSize BarcodeExampleWidget::minimumSizeHint() const { if(m_barcode) { - return m_barcode->minimumSize().toSize(); + return m_barcode->preferredSize(QGuiApplication::primaryScreen()->devicePixelRatio()).toSize(); } else { return QWidget::minimumSizeHint(); }
