Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package prison-qt5 for openSUSE:Factory checked in at 2021-09-16 23:14:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/prison-qt5 (Old) and /work/SRC/openSUSE:Factory/.prison-qt5.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "prison-qt5" Thu Sep 16 23:14:24 2021 rev:59 rq:919233 version:5.86.0 Changes: -------- --- /work/SRC/openSUSE:Factory/prison-qt5/prison-qt5.changes 2021-08-16 10:12:39.575022926 +0200 +++ /work/SRC/openSUSE:Factory/.prison-qt5.new.1899/prison-qt5.changes 2021-09-16 23:16:32.219914172 +0200 @@ -1,0 +2,14 @@ +Wed Sep 15 08:24:27 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Drop the unneeded baselibs.conf. + +------------------------------------------------------------------- +Mon Sep 6 06:22:25 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 5.86.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.86.0 +- No code change since 5.85.0 + +------------------------------------------------------------------- Old: ---- baselibs.conf prison-5.85.0.tar.xz prison-5.85.0.tar.xz.sig New: ---- prison-5.86.0.tar.xz prison-5.86.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ prison-qt5.spec ++++++ --- /var/tmp/diff_new_pack.wX0WHX/_old 2021-09-16 23:16:32.703914673 +0200 +++ /var/tmp/diff_new_pack.wX0WHX/_new 2021-09-16 23:16:32.703914673 +0200 @@ -19,7 +19,7 @@ %define sonum 5 %define rname prison %define _libname KF5Prison -%define _tar_path 5.85 +%define _tar_path 5.86 # 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.85.0 +Version: 5.86.0 Release: 0 Summary: Barcode abstraction layer library License: MIT @@ -38,7 +38,6 @@ Source1: https://download.kde.org/stable/frameworks/%{_tar_path}/%{rname}-%{version}.tar.xz.sig Source2: frameworks.keyring %endif -Source99: baselibs.conf BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes BuildRequires: kf5-filesystem ++++++ prison-5.85.0.tar.xz -> prison-5.86.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prison-5.85.0/.git-blame-ignore-revs new/prison-5.86.0/.git-blame-ignore-revs --- old/prison-5.85.0/.git-blame-ignore-revs 2021-07-16 21:17:03.000000000 +0200 +++ new/prison-5.86.0/.git-blame-ignore-revs 2021-09-04 17:50:42.000000000 +0200 @@ -1,2 +1,4 @@ #clang-format 7dd564adbcfc6151473c97a3a7737cfaef5694b7 +#clang-tidy +4c41ac844a27089083578eea1b947d7bbbd517c7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prison-5.85.0/CMakeLists.txt new/prison-5.86.0/CMakeLists.txt --- old/prison-5.85.0/CMakeLists.txt 2021-07-16 21:17:03.000000000 +0200 +++ new/prison-5.86.0/CMakeLists.txt 2021-09-04 17:50:42.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.85.0") # handled by release scripts +set(KF_VERSION "5.86.0") # handled by release scripts project(prison VERSION ${KF_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.85.0 NO_MODULE) +find_package(ECM 5.86.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}") @@ -31,7 +31,7 @@ option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF) add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)") -set(REQUIRED_QT_VERSION 5.15.0) +set(REQUIRED_QT_VERSION 5.15.2) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core Gui) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG OPTIONAL_COMPONENTS Quick) find_package(QRencode) @@ -48,7 +48,7 @@ PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5PrisonConfigVersion.cmake" SOVERSION 5 ) -add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00) +add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02) add_subdirectory(src) if(BUILD_TESTING) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test Widgets) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prison-5.85.0/autotests/aztecbarcodetest.cpp new/prison-5.86.0/autotests/aztecbarcodetest.cpp --- old/prison-5.85.0/autotests/aztecbarcodetest.cpp 2021-07-16 21:17:03.000000000 +0200 +++ new/prison-5.86.0/autotests/aztecbarcodetest.cpp 2021-09-04 17:50:42.000000000 +0200 @@ -174,7 +174,8 @@ QTest::addColumn<BitVector>("output"); QTest::addColumn<int>("codeWordSize"); - BitVector in, out; + BitVector in; + BitVector out; QTest::newRow("empty") << in << out << 4; in.appendMSB(0x2, 2); out.appendMSB(0xB, 4); @@ -243,28 +244,33 @@ QTest::addColumn<int>("layer"); BitVector v; - for (int i = 0; i < 1248; ++i) + for (int i = 0; i < 1248; ++i) { v.appendLSB(0x9249, 16); + } QTest::newRow("1001-31") << v << QStringLiteral("aztec-full-data-1001.png") << 32; v.clear(); - for (int i = 0; i < 1248 * 8; ++i) + for (int i = 0; i < 1248 * 8; ++i) { v.appendLSB(0x2, 2); + } QTest::newRow("0101-31") << v << QStringLiteral("aztec-full-data-0101.png") << 32; v.clear(); - for (int i = 0; i < 1248; ++i) + for (int i = 0; i < 1248; ++i) { v.appendLSB(0xffff, 16); + } QTest::newRow("1111-31") << v << QStringLiteral("aztec-full-data-1111.png") << 32; v.clear(); - for (int i = 0; i < 704 * 4; ++i) + for (int i = 0; i < 704 * 4; ++i) { v.appendLSB(0x1, 2); + } QTest::newRow("1010-15") << v << QStringLiteral("aztec-full-data-1010.png") << 16; v.clear(); - for (int i = 0; i < 16; ++i) + for (int i = 0; i < 16; ++i) { v.appendLSB(0xCC, 8); + } QTest::newRow("0011-0") << v << QStringLiteral("aztec-full-data-0011.png") << 1; } @@ -291,18 +297,21 @@ QTest::addColumn<QString>("refName"); BitVector v; - for (int i = 0; i < 8; ++i) + for (int i = 0; i < 8; ++i) { v.appendMSB(i + 1, 5); + } QTest::newRow("1234") << v << QStringLiteral("aztec-full-mode-1234.png"); v.clear(); - for (int i = 0; i < 8; ++i) + for (int i = 0; i < 8; ++i) { v.appendLSB(i + 1, 5); + } QTest::newRow("1234-rev") << v << QStringLiteral("aztec-full-mode-1234-rev.png"); v.clear(); - for (int i = 0; i < 4; ++i) + for (int i = 0; i < 4; ++i) { v.appendMSB(0xffff, 10); + } QTest::newRow("1111") << v << QStringLiteral("aztec-full-mode-1111.png"); } @@ -329,28 +338,33 @@ QTest::addColumn<int>("layer"); BitVector v; - for (int i = 0; i < 304; ++i) + for (int i = 0; i < 304; ++i) { v.appendLSB(0x9249, 16); + } QTest::newRow("1001-3") << v << QStringLiteral("aztec-compact-data-1001.png") << 4; v.clear(); - for (int i = 0; i < 608 * 4; ++i) + for (int i = 0; i < 608 * 4; ++i) { v.appendLSB(0x2, 2); + } QTest::newRow("0101-3") << v << QStringLiteral("aztec-compact-data-0101.png") << 4; v.clear(); - for (int i = 0; i < 304; ++i) + for (int i = 0; i < 304; ++i) { v.appendLSB(0xffff, 16); + } QTest::newRow("1111-3") << v << QStringLiteral("aztec-compact-data-1111.png") << 4; v.clear(); - for (int i = 0; i < 102 * 4; ++i) + for (int i = 0; i < 102 * 4; ++i) { v.appendLSB(0x1, 2); + } QTest::newRow("1010-2") << v << QStringLiteral("aztec-compact-data-1010.png") << 3; v.clear(); - for (int i = 0; i < 13; ++i) + for (int i = 0; i < 13; ++i) { v.appendLSB(0xCC, 8); + } QTest::newRow("0011-0") << v << QStringLiteral("aztec-compact-data-0011.png") << 1; } @@ -377,18 +391,21 @@ QTest::addColumn<QString>("refName"); BitVector v; - for (int i = 0; i < 4; ++i) + for (int i = 0; i < 4; ++i) { v.appendMSB(i + 1, 7); + } QTest::newRow("1234") << v << QStringLiteral("aztec-compact-mode-1234.png"); v.clear(); - for (int i = 0; i < 4; ++i) + for (int i = 0; i < 4; ++i) { v.appendLSB(i + 1, 7); + } QTest::newRow("1234-rev") << v << QStringLiteral("aztec-compact-mode-1234-rev.png"); v.clear(); - for (int i = 0; i < 4; ++i) + for (int i = 0; i < 4; ++i) { v.appendMSB(0xffff, 7); + } QTest::newRow("1111") << v << QStringLiteral("aztec-compact-mode-1111.png"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prison-5.85.0/autotests/reedsolomontest.cpp new/prison-5.86.0/autotests/reedsolomontest.cpp --- old/prison-5.85.0/autotests/reedsolomontest.cpp 2021-07-16 21:17:03.000000000 +0200 +++ new/prison-5.86.0/autotests/reedsolomontest.cpp 2021-09-04 17:50:42.000000000 +0200 @@ -26,7 +26,8 @@ QTest::addColumn<BitVector>("input"); QTest::addColumn<BitVector>("output"); - BitVector in, out; + BitVector in; + BitVector out; out.appendMSB(0, 20); QTest::newRow("empty") << (int)ReedSolomon::GF16 << 5 << in << out; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prison-5.85.0/src/lib/CMakeLists.txt new/prison-5.86.0/src/lib/CMakeLists.txt --- old/prison-5.85.0/src/lib/CMakeLists.txt 2021-07-16 21:17:03.000000000 +0200 +++ new/prison-5.86.0/src/lib/CMakeLists.txt 2021-09-04 17:50:42.000000000 +0200 @@ -4,9 +4,15 @@ endif() configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-prison.h.in ${CMAKE_CURRENT_BINARY_DIR}/config-prison.h) -add_library(KF5Prison SHARED) +add_library(KF5Prison) add_library(KF5::Prison ALIAS KF5Prison) +set_target_properties(KF5Prison PROPERTIES + VERSION ${PRISON_VERSION} + SOVERSION ${PRISON_SOVERSION} + EXPORT_NAME Prison +) + target_sources(KF5Prison PRIVATE abstractbarcode.cpp aztecbarcode.cpp @@ -53,12 +59,6 @@ target_link_libraries(KF5Prison PRIVATE Dmtx::Dmtx) endif() -set_target_properties(KF5Prison PROPERTIES - VERSION ${PRISON_VERSION} - SOVERSION ${PRISON_SOVERSION} - EXPORT_NAME Prison -) - install(TARGETS KF5Prison EXPORT KF5PrisonTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) ecm_generate_headers(Prison_CamelCase_HEADERS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prison-5.85.0/src/lib/code128barcode.cpp new/prison-5.86.0/src/lib/code128barcode.cpp --- old/prison-5.85.0/src/lib/code128barcode.cpp 2021-07-16 21:17:03.000000000 +0200 +++ new/prison-5.86.0/src/lib/code128barcode.cpp 2021-09-04 17:50:42.000000000 +0200 @@ -219,8 +219,9 @@ // determine if Code C makes sense at this point int codeC = 0; for (int i = index; i < data.size(); ++i, ++codeC) { - if (data.at(i) < '0' || data.at(i) > '9') + if (data.at(i) < '0' || data.at(i) > '9') { break; + } } if (currentSet == CodeSetC && codeC >= 2) { // already in C return {CodeSetC, None}; @@ -247,13 +248,15 @@ // count how many following characters we could encode in A or B int countA = 0; for (int i = index + 1; i < data.size(); ++i, ++countA) { - if (!isInCodeSetA(data.at(i))) + if (!isInCodeSetA(data.at(i))) { break; + } } int countB = 0; for (int i = index + 1; i < data.size(); ++i, ++countB) { - if (!isInCodeSetB(data.at(i))) + if (!isInCodeSetB(data.at(i))) { break; + } } // select how we want to switch to Code A or Code B, biased to B as that's the more useful one in general diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prison-5.85.0/src/lib/reedsolomon.cpp new/prison-5.86.0/src/lib/reedsolomon.cpp --- old/prison-5.85.0/src/lib/reedsolomon.cpp 2021-07-16 21:17:03.000000000 +0200 +++ new/prison-5.86.0/src/lib/reedsolomon.cpp 2021-09-04 17:50:42.000000000 +0200 @@ -17,8 +17,9 @@ static int highestBit(int n) { int i = 0; - while (n >= (1 << i)) + while (n >= (1 << i)) { ++i; + } return i - 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prison-5.85.0/src/quick/barcodequickitem.cpp new/prison-5.86.0/src/quick/barcodequickitem.cpp --- old/prison-5.85.0/src/quick/barcodequickitem.cpp 2021-07-16 21:17:03.000000000 +0200 +++ new/prison-5.86.0/src/quick/barcodequickitem.cpp 2021-09-04 17:50:42.000000000 +0200 @@ -26,8 +26,9 @@ void BarcodeQuickItem::setContent(const QVariant &content) { - if (m_content == content) + if (m_content == content) { return; + } m_content = content; Q_EMIT contentChanged(); updateBarcode(); @@ -40,8 +41,9 @@ void BarcodeQuickItem::setBarcodeType(BarcodeQuickItem::BarcodeType type) { - if (m_type == static_cast<Prison::BarcodeType>(type)) + if (m_type == static_cast<Prison::BarcodeType>(type)) { return; + } m_type = static_cast<Prison::BarcodeType>(type); Q_EMIT barcodeTypeChanged(); m_barcode.reset(); @@ -55,8 +57,9 @@ void BarcodeQuickItem::setForegroundColor(const QColor &color) { - if (m_fgColor == color) + if (m_fgColor == color) { return; + } m_fgColor = color; Q_EMIT foregroundColorChanged(); updateBarcode(); @@ -69,8 +72,9 @@ void BarcodeQuickItem::setBackgroundColor(const QColor &color) { - if (m_bgColor == color) + if (m_bgColor == color) { return; + } m_bgColor = color; Q_EMIT backgroundColorChanged(); updateBarcode(); @@ -83,8 +87,9 @@ void BarcodeQuickItem::paint(QPainter *painter) { - if (!m_barcode) + if (!m_barcode) { return; + } const auto w_max = std::max(minimumWidth(), width()); const auto h_max = std::max(minimumHeight(), height()); @@ -126,8 +131,9 @@ void BarcodeQuickItem::updateBarcode() { - if (!isComponentComplete()) + if (!isComponentComplete()) { return; + } QString content; if (m_content.type() == QVariant::String) { @@ -145,8 +151,9 @@ return; } - if (!m_barcode) + if (!m_barcode) { m_barcode.reset(Prison::createBarcode(m_type)); + } if (m_barcode) { if (m_content.type() == QVariant::String) { m_barcode->setData(m_content.toString()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prison-5.85.0/tests/barcodeexamplewidget.cpp new/prison-5.86.0/tests/barcodeexamplewidget.cpp --- old/prison-5.85.0/tests/barcodeexamplewidget.cpp 2021-07-16 21:17:03.000000000 +0200 +++ new/prison-5.86.0/tests/barcodeexamplewidget.cpp 2021-09-04 17:50:42.000000000 +0200 @@ -25,8 +25,9 @@ void BarcodeExampleWidget::setData(const QString &data) { - if (m_barcode) + if (m_barcode) { m_barcode->setData(data); + } updateGeometry(); repaint(); }
