Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kf6-prison for openSUSE:Factory checked in at 2026-03-16 14:16:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kf6-prison (Old) and /work/SRC/openSUSE:Factory/.kf6-prison.new.8177 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kf6-prison" Mon Mar 16 14:16:16 2026 rev:25 rq:1338953 version:6.24.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kf6-prison/kf6-prison.changes 2026-02-16 13:07:32.641606753 +0100 +++ /work/SRC/openSUSE:Factory/.kf6-prison.new.8177/kf6-prison.changes 2026-03-16 14:19:03.805605169 +0100 @@ -1,0 +2,13 @@ +Mon Mar 9 08:07:43 UTC 2026 - Christophe Marin <[email protected]> + +- Update to 6.24.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/6/6.24.0 +- Changes since 6.23.0: + * Update dependency version to 6.24.0 + * Bump minimum ZXing version from 1.2.0 to 1.4.0 + * Make zxing and libdmtx required dependencies by default + * Update version to 6.24.0 + +------------------------------------------------------------------- Old: ---- prison-6.23.0.tar.xz prison-6.23.0.tar.xz.sig New: ---- prison-6.24.0.tar.xz prison-6.24.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kf6-prison.spec ++++++ --- /var/tmp/diff_new_pack.wym82g/_old 2026-03-16 14:19:04.401629912 +0100 +++ /var/tmp/diff_new_pack.wym82g/_new 2026-03-16 14:19:04.401629912 +0100 @@ -19,11 +19,11 @@ %define qt6_version 6.8.0 %define rname prison -# Full KF6 version (e.g. 6.23.0) +# Full KF6 version (e.g. 6.24.0) %{!?_kf6_version: %global _kf6_version %{version}} %bcond_without released Name: kf6-prison -Version: 6.23.0 +Version: 6.24.0 Release: 0 Summary: Barcode abstraction layer library License: MIT @@ -41,7 +41,7 @@ BuildRequires: cmake(Qt6Multimedia) >= %{qt6_version} BuildRequires: cmake(Qt6Quick) >= %{qt6_version} BuildRequires: cmake(Qt6ToolsTools) >= %{qt6_version} -BuildRequires: cmake(ZXing) >= 1.2.0 +BuildRequires: cmake(ZXing) >= 1.4.0 BuildRequires: pkgconfig(libdmtx) BuildRequires: pkgconfig(libqrencode) ++++++ prison-6.23.0.tar.xz -> prison-6.24.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prison-6.23.0/CMakeLists.txt new/prison-6.24.0/CMakeLists.txt --- old/prison-6.23.0/CMakeLists.txt 2026-02-06 13:18:25.000000000 +0100 +++ new/prison-6.24.0/CMakeLists.txt 2026-03-07 21:33:44.000000000 +0100 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.27) -set(KF_VERSION "6.23.0") # handled by release scripts +set(KF_VERSION "6.24.0") # handled by release scripts project(prison VERSION ${KF_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 6.23.0 NO_MODULE) +find_package(ECM 6.24.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}") @@ -29,6 +29,8 @@ set(REQUIRED_QT_VERSION 6.8.0) +option(WITH_DMTX "Build with DataMatrix generation support" ON) +option(WITH_ZXING "Build with barcode scanning and PDF417 generation support" ON) option(WITH_QUICK "Build QtQuick components" ON) option(WITH_MULTIMEDIA "Build scanner support" ON) @@ -47,19 +49,23 @@ set_package_properties(QRencode PROPERTIES PURPOSE "Required for generation of QRCode barcodes." TYPE REQUIRED) -find_package(Dmtx) -set_package_properties(Dmtx PROPERTIES - PURPOSE "Required for generation of Data Matrix barcodes." - TYPE RECOMMENDED) -foreach(ver 3.0 2.0 1.2.0) - find_package(ZXing ${ver} CONFIG QUIET) - if (TARGET ZXing::ZXing) - break() - endif() -endforeach() -set_package_properties(ZXing PROPERTIES - PURPOSE "Required for generation of PDF417 barcodes and for scanning of barcodes from live video feed." - TYPE RECOMMENDED) +if (WITH_DMTX) + find_package(Dmtx) + set_package_properties(Dmtx PROPERTIES + PURPOSE "Required for generation of Data Matrix barcodes." + TYPE REQUIRED) +endif() +if (WITH_ZXING) + foreach(ver 3.0 2.0 1.4.0) + find_package(ZXing ${ver} CONFIG QUIET) + if (TARGET ZXing::ZXing) + break() + endif() + endforeach() + set_package_properties(ZXing PROPERTIES + PURPOSE "Required for generation of PDF417 barcodes and for scanning of barcodes from live video feed." + TYPE REQUIRED) +endif() ecm_setup_version(PROJECT VARIABLE_PREFIX PRISON VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/prison_version.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prison-6.23.0/src/scanner/imagescanner.cpp new/prison-6.24.0/src/scanner/imagescanner.cpp --- old/prison-6.23.0/src/scanner/imagescanner.cpp 2026-02-06 13:18:25.000000000 +0100 +++ new/prison-6.24.0/src/scanner/imagescanner.cpp 2026-03-07 21:33:44.000000000 +0100 @@ -41,11 +41,7 @@ // handle formats ZXing supports directly switch (image.format()) { case QImage::Format_Invalid: -#if KZXING_VERSION < QT_VERSION_CHECK(1, 4, 0) - return ZXing::Result(ZXing::DecodeStatus::FormatError); -#else return {}; -#endif case QImage::Format_Mono: case QImage::Format_MonoLSB: case QImage::Format_Indexed8: @@ -84,11 +80,7 @@ case QImage::Format_A2RGB30_Premultiplied: break; // needs conversion case QImage::Format_Alpha8: -#if KZXING_VERSION < QT_VERSION_CHECK(1, 4, 0) - return ZXing::Result(ZXing::DecodeStatus::FormatError); -#else return {}; -#endif case QImage::Format_Grayscale8: return ZXing::ReadBarcode({image.bits(), image.width(), image.height(), ZXing::ImageFormat::Lum, (int)image.bytesPerLine()}, hints); case QImage::Format_Grayscale16: @@ -109,11 +101,7 @@ break; // needs conversion case QImage::NImageFormats: // silence warnings -#if KZXING_VERSION < QT_VERSION_CHECK(1, 4, 0) - return ZXing::Result(ZXing::DecodeStatus::FormatError); -#else return {}; -#endif } const auto converted = image.convertedTo(QImage::Format_Grayscale8); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prison-6.23.0/src/scanner/scanresult.cpp new/prison-6.24.0/src/scanner/scanresult.cpp --- old/prison-6.23.0/src/scanner/scanresult.cpp 2026-02-06 13:18:25.000000000 +0100 +++ new/prison-6.24.0/src/scanner/scanresult.cpp 2026-03-07 21:33:44.000000000 +0100 @@ -81,23 +81,6 @@ return res; } -#if KZXING_VERSION < QT_VERSION_CHECK(1, 4, 0) - // distinguish between binary and text content - const auto hasWideChars = std::any_of(zxRes.text().begin(), zxRes.text().end(), [](auto c) { - return c > 255; - }); - const auto hasControlChars = std::any_of(zxRes.text().begin(), zxRes.text().end(), [](auto c) { - return c < 0x20 && c != 0x0a && c != 0x0d; - }); - if (hasWideChars || !hasControlChars) { - res.d->content = QString::fromStdString(ZXing::TextUtfEncoding::ToUtf8(zxRes.text())); - } else { - QByteArray b; - b.resize(zxRes.text().size()); - std::copy(zxRes.text().begin(), zxRes.text().end(), b.begin()); - res.d->content = b; - } -#else bool isText = zxRes.contentType() == ZXing::ContentType::Text; if (zxRes.contentType() == ZXing::ContentType::GS1) { isText = std::ranges::none_of(zxRes.text(), [](auto c) { @@ -113,7 +96,6 @@ std::copy(zxRes.bytes().begin(), zxRes.bytes().end(), b.begin()); res.d->content = b; } -#endif // determine the bounding rect // the cooridinates we get from ZXing are a polygon, we need to determine the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prison-6.23.0/src/scanner/videoscannerworker.cpp new/prison-6.24.0/src/scanner/videoscannerworker.cpp --- old/prison-6.23.0/src/scanner/videoscannerworker.cpp 2026-02-06 13:18:25.000000000 +0100 +++ new/prison-6.24.0/src/scanner/videoscannerworker.cpp 2026-03-07 21:33:44.000000000 +0100 @@ -28,9 +28,7 @@ void VideoScannerWorker::slotScanFrame(VideoScannerFrame frame) { -#if KZXING_VERSION < QT_VERSION_CHECK(1, 4, 0) - ZXing::Result zxRes(ZXing::DecodeStatus::FormatError); -#elif KZXING_VERSION < QT_VERSION_CHECK(2, 3, 0) +#if KZXING_VERSION < QT_VERSION_CHECK(2, 3, 0) ZXing::Result zxRes; #else ZXing::Barcode zxRes;
