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 2023-08-20 00:11:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/prison-qt5 (Old) and /work/SRC/openSUSE:Factory/.prison-qt5.new.1766 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "prison-qt5" Sun Aug 20 00:11:29 2023 rev:84 rq:1104616 version:5.109.0 Changes: -------- --- /work/SRC/openSUSE:Factory/prison-qt5/prison-qt5.changes 2023-07-09 20:42:42.093982540 +0200 +++ /work/SRC/openSUSE:Factory/.prison-qt5.new.1766/prison-qt5.changes 2023-08-20 00:14:41.915292086 +0200 @@ -1,0 +2,11 @@ +Tue Aug 8 17:43:12 UTC 2023 - Christophe Marin <christo...@krop.fr> + +- Update to 5.109.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.109.0 +- Changes since 5.108.0: + * Remove code variants for building with Qt 6 + * Add explicit moc includes to sources for moc-covered headers + +------------------------------------------------------------------- Old: ---- prison-5.108.0.tar.xz prison-5.108.0.tar.xz.sig New: ---- prison-5.109.0.tar.xz prison-5.109.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ prison-qt5.spec ++++++ --- /var/tmp/diff_new_pack.SCduh0/_old 2023-08-20 00:14:42.527293290 +0200 +++ /var/tmp/diff_new_pack.SCduh0/_new 2023-08-20 00:14:42.535293306 +0200 @@ -27,7 +27,7 @@ # Only needed for the package signature condition %bcond_without released Name: prison-qt5 -Version: 5.108.0 +Version: 5.109.0 Release: 0 Summary: Barcode abstraction layer library License: MIT ++++++ prison-5.108.0.tar.xz -> prison-5.109.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prison-5.108.0/CMakeLists.txt new/prison-5.109.0/CMakeLists.txt --- old/prison-5.108.0/CMakeLists.txt 2023-07-01 12:04:12.000000000 +0200 +++ new/prison-5.109.0/CMakeLists.txt 2023-08-05 14:40:43.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.108.0") # handled by release scripts +set(KF_VERSION "5.109.0") # handled by release scripts project(prison VERSION ${KF_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.108.0 NO_MODULE) +find_package(ECM 5.109.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.108.0/src/quick/barcodequickitem.cpp new/prison-5.109.0/src/quick/barcodequickitem.cpp --- old/prison-5.108.0/src/quick/barcodequickitem.cpp 2023-07-01 12:04:12.000000000 +0200 +++ new/prison-5.109.0/src/quick/barcodequickitem.cpp 2023-08-05 14:40:43.000000000 +0200 @@ -169,3 +169,5 @@ update(); Q_EMIT dimensionsChanged(); } + +#include "moc_barcodequickitem.cpp" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prison-5.108.0/src/scanner/scanresult.cpp new/prison-5.109.0/src/scanner/scanresult.cpp --- old/prison-5.108.0/src/scanner/scanresult.cpp 2023-07-01 12:04:12.000000000 +0200 +++ new/prison-5.109.0/src/scanner/scanresult.cpp 2023-08-05 14:40:43.000000000 +0200 @@ -61,3 +61,5 @@ { return d->boundingRect; } + +#include "moc_scanresult.cpp" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prison-5.108.0/src/scanner/videoscanner.cpp new/prison-5.109.0/src/scanner/videoscanner.cpp --- old/prison-5.108.0/src/scanner/videoscanner.cpp 2023-07-01 12:04:12.000000000 +0200 +++ new/prison-5.109.0/src/scanner/videoscanner.cpp 2023-08-05 14:40:43.000000000 +0200 @@ -19,9 +19,6 @@ void newFrame(const QVideoFrame &videoFrame, bool verticallyFlipped); void setResult(VideoScanner *q, const ScanResult &result); -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) - QVideoSink *m_sink = nullptr; -#endif VideoScannerThread m_thread; VideoScannerWorker m_worker; QByteArray m_frameDataBuffer; // reused memory when we have to copy frame data @@ -31,7 +28,6 @@ bool m_workerBusy = false; }; -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) class VideoScannerFilterRunnable : public QVideoFilterRunnable { public: @@ -41,8 +37,6 @@ private: VideoScannerPrivate *d = nullptr; }; -#endif - } void VideoScannerPrivate::newFrame(const QVideoFrame &videoFrame, bool verticallyFlipped) @@ -84,7 +78,6 @@ Q_EMIT q->resultContentChanged(result); } -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) VideoScannerFilterRunnable::VideoScannerFilterRunnable(VideoScannerPrivate *dd) : d(dd) { @@ -95,14 +88,9 @@ d->newFrame(*input, surfaceFormat.scanLineDirection() == QVideoSurfaceFormat::BottomToTop); return *input; } -#endif VideoScanner::VideoScanner(QObject *parent) -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) : QAbstractVideoFilter(parent) -#else - : QObject(parent) -#endif , d(new VideoScannerPrivate) { d->m_worker.moveToThread(&d->m_thread); @@ -125,12 +113,10 @@ d->m_thread.wait(); } -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) QVideoFilterRunnable *VideoScanner::createFilterRunnable() { return new VideoScannerFilterRunnable(d.get()); } -#endif ScanResult VideoScanner::result() const { @@ -152,25 +138,4 @@ Q_EMIT formatsChanged(); } -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) -QVideoSink *VideoScanner::videoSink() const -{ - return d->m_sink; -} - -void VideoScanner::setVideoSink(QVideoSink *sink) -{ - if (d->m_sink == sink) { - return; - } - - if (d->m_sink) { - disconnect(d->m_sink, nullptr, this, nullptr); - } - d->m_sink = sink; - connect(d->m_sink, &QVideoSink::videoFrameChanged, this, [this](const QVideoFrame &frame) { - d->newFrame(frame, frame.surfaceFormat().scanLineDirection() == QVideoFrameFormat::BottomToTop); - }); - Q_EMIT videoSinkChanged(); -} -#endif +#include "moc_videoscanner.cpp" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prison-5.108.0/src/scanner/videoscanner.h new/prison-5.109.0/src/scanner/videoscanner.h --- old/prison-5.108.0/src/scanner/videoscanner.h 2023-07-01 12:04:12.000000000 +0200 +++ new/prison-5.109.0/src/scanner/videoscanner.h 2023-08-05 14:40:43.000000000 +0200 @@ -9,12 +9,8 @@ #include "prisonscanner_export.h" #include "scanresult.h" -#include <QObject> -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #include <QAbstractVideoFilter> -#else -#include <QVideoSink> -#endif +#include <QObject> #include <memory> @@ -30,21 +26,12 @@ * * @since 5.94 */ -class PRISONSCANNER_EXPORT VideoScanner -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - : public QAbstractVideoFilter -#else - : public QObject -#endif +class PRISONSCANNER_EXPORT VideoScanner : public QAbstractVideoFilter { Q_OBJECT Q_PROPERTY(Prison::ScanResult result READ result NOTIFY resultChanged) Q_PROPERTY(Prison::Format::BarcodeFormats formats READ formats WRITE setFormats NOTIFY formatsChanged) -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) - Q_PROPERTY(QVideoSink *videoSink READ videoSink WRITE setVideoSink NOTIFY videoSinkChanged) -#endif - public: explicit VideoScanner(QObject *parent = nullptr); ~VideoScanner(); @@ -62,16 +49,9 @@ */ void setFormats(Format::BarcodeFormats formats); -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) /// @cond internal QVideoFilterRunnable *createFilterRunnable() override; /// @endcond -#else - /** The video sink being scanned for barcodes. */ - QVideoSink *videoSink() const; - /** Sets the video sink to scan for barcodes. */ - void setVideoSink(QVideoSink *sink); -#endif Q_SIGNALS: /** Emitted whenever we get a new scan result, as long as any diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prison-5.108.0/src/scanner/videoscannerframe.cpp new/prison-5.109.0/src/scanner/videoscannerframe.cpp --- old/prison-5.108.0/src/scanner/videoscannerframe.cpp 2023-07-01 12:04:12.000000000 +0200 +++ new/prison-5.109.0/src/scanner/videoscannerframe.cpp 2023-08-05 14:40:43.000000000 +0200 @@ -5,9 +5,7 @@ #include "videoscannerframe_p.h" -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #include <QAbstractVideoBuffer> -#endif #include <cstring> @@ -36,18 +34,10 @@ int VideoScannerFrame::bytesPerLine() const { -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) return m_frame.bytesPerLine(); -#else - return m_frame.bytesPerLine(0); -#endif } -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) QVideoFrame::PixelFormat VideoScannerFrame::pixelFormat() const -#else -QVideoFrameFormat::PixelFormat VideoScannerFrame::pixelFormat() const -#endif { return m_frame.pixelFormat(); } @@ -55,11 +45,7 @@ void VideoScannerFrame::map() { if (!m_frameData && m_image.isNull()) { -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) m_frame.map(QAbstractVideoBuffer::ReadOnly); -#else - m_frame.map(QVideoFrame::ReadOnly); -#endif } } @@ -80,20 +66,12 @@ } Q_ASSERT(m_frame.isMapped()); -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) return m_frame.bits(); -#else - return m_frame.bits(0); -#endif } bool VideoScannerFrame::copyRequired() const { -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) return m_frame.handleType() == QAbstractVideoBuffer::GLTextureHandle; -#else - return m_frame.handleType() == QVideoFrame::RhiTextureHandle; -#endif } void VideoScannerFrame::copyFrameData(QByteArray &buffer) @@ -104,11 +82,7 @@ if (buffer.size() != size) { buffer.resize(size); } -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) std::memcpy(buffer.data(), m_frame.bits(), size); -#else - std::memcpy(buffer.data(), m_frame.bits(0), size); -#endif m_frameData = reinterpret_cast<const uint8_t *>(buffer.constData()); } @@ -116,7 +90,6 @@ { Q_ASSERT(m_frame.isMapped()); -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) switch (m_frame.pixelFormat()) { case QVideoFrame::Format_YUV420P: case QVideoFrame::Format_YUV422P: @@ -131,27 +104,10 @@ default: return m_frame.mappedBytes(); } -#else - switch (m_frame.pixelFormat()) { - case QVideoFrameFormat::Format_YUV420P: - case QVideoFrameFormat::Format_YUV422P: - case QVideoFrameFormat::Format_YV12: - case QVideoFrameFormat::Format_NV12: - case QVideoFrameFormat::Format_NV21: - case QVideoFrameFormat::Format_IMC1: - case QVideoFrameFormat::Format_IMC2: - case QVideoFrameFormat::Format_IMC3: - case QVideoFrameFormat::Format_IMC4: - return m_frame.mappedBytes(0) / 2; - default: - return m_frame.mappedBytes(0); - } -#endif } bool VideoScannerFrame::needsConversion() const { -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) switch (m_frame.pixelFormat()) { case QVideoFrame::Format_RGB565: case QVideoFrame::Format_RGB555: @@ -167,16 +123,6 @@ default: return false; } -#else - switch (m_frame.pixelFormat()) { - case QVideoFrameFormat::Format_Jpeg: - case QVideoFrameFormat::Format_SamplerExternalOES: - case QVideoFrameFormat::Format_SamplerRect: - return true; - default: - return false; - } -#endif } void VideoScannerFrame::convertToImage() @@ -186,11 +132,7 @@ } Q_ASSERT(m_frame.isMapped()); -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) m_image = m_frame.image(); -#else - m_image = m_frame.toImage(); -#endif m_image.convertTo(QImage::Format_Grayscale8); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prison-5.108.0/src/scanner/videoscannerframe_p.h new/prison-5.109.0/src/scanner/videoscannerframe_p.h --- old/prison-5.108.0/src/scanner/videoscannerframe_p.h 2023-07-01 12:04:12.000000000 +0200 +++ new/prison-5.109.0/src/scanner/videoscannerframe_p.h 2023-08-05 14:40:43.000000000 +0200 @@ -39,11 +39,7 @@ int width() const; int height() const; int bytesPerLine() const; -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) QVideoFrame::PixelFormat pixelFormat() const; -#else - QVideoFrameFormat::PixelFormat pixelFormat() const; -#endif /** Map/unmap the frame if needed, ie. if we don't already have a copy. */ void map(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prison-5.108.0/src/scanner/videoscannerworker.cpp new/prison-5.109.0/src/scanner/videoscannerworker.cpp --- old/prison-5.108.0/src/scanner/videoscannerworker.cpp 2023-07-01 12:04:12.000000000 +0200 +++ new/prison-5.109.0/src/scanner/videoscannerworker.cpp 2023-08-05 14:40:43.000000000 +0200 @@ -36,7 +36,7 @@ hints.setFormats(frame.formats() == Format::NoFormat ? ZXing::BarcodeFormats::all() : Format::toZXing(frame.formats())); frame.map(); -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + switch (frame.pixelFormat()) { case QVideoFrame::Format_Invalid: // already checked before we get here case QVideoFrame::NPixelFormats: // just to silence the unhandled case warning @@ -108,70 +108,6 @@ zxRes = ZXing::ReadBarcode({frame.bits(), frame.width(), frame.height(), ZXing::ImageFormat::Lum}, hints); break; } -#else - switch (frame.pixelFormat()) { - case QVideoFrameFormat::Format_Invalid: // already checked before we get here - break; - // formats ZXing can consume directly - case QVideoFrameFormat::Format_ARGB8888: - case QVideoFrameFormat::Format_ARGB8888_Premultiplied: - case QVideoFrameFormat::Format_XRGB8888: - zxRes = ZXing::ReadBarcode({frame.bits(), frame.width(), frame.height(), ZXing::ImageFormat::XRGB, frame.bytesPerLine()}, hints); - break; - case QVideoFrameFormat::Format_BGRA8888: - case QVideoFrameFormat::Format_BGRA8888_Premultiplied: - case QVideoFrameFormat::Format_BGRX8888: - zxRes = ZXing::ReadBarcode({frame.bits(), frame.width(), frame.height(), ZXing::ImageFormat::BGRX, frame.bytesPerLine()}, hints); - break; - case QVideoFrameFormat::Format_ABGR8888: - case QVideoFrameFormat::Format_XBGR8888: - zxRes = ZXing::ReadBarcode({frame.bits(), frame.width(), frame.height(), ZXing::ImageFormat::XBGR, frame.bytesPerLine()}, hints); - break; - case QVideoFrameFormat::Format_RGBA8888: - case QVideoFrameFormat::Format_RGBX8888: - zxRes = ZXing::ReadBarcode({frame.bits(), frame.width(), frame.height(), ZXing::ImageFormat::RGBX, frame.bytesPerLine()}, hints); - break; - case QVideoFrameFormat::Format_AYUV: - case QVideoFrameFormat::Format_AYUV_Premultiplied: - zxRes = ZXing::ReadBarcode({frame.bits() + 1, frame.width(), frame.height(), ZXing::ImageFormat::Lum, frame.bytesPerLine(), 4}, hints); - break; - case QVideoFrameFormat::Format_YUV420P: - case QVideoFrameFormat::Format_YUV422P: - case QVideoFrameFormat::Format_YV12: - case QVideoFrameFormat::Format_NV12: - case QVideoFrameFormat::Format_NV21: - case QVideoFrameFormat::Format_IMC1: - case QVideoFrameFormat::Format_IMC2: - case QVideoFrameFormat::Format_IMC3: - case QVideoFrameFormat::Format_IMC4: - zxRes = ZXing::ReadBarcode({frame.bits(), frame.width(), frame.height(), ZXing::ImageFormat::Lum, frame.bytesPerLine()}, hints); - break; - case QVideoFrameFormat::Format_UYVY: - zxRes = ZXing::ReadBarcode({frame.bits() + 1, frame.width(), frame.height(), ZXing::ImageFormat::Lum, frame.bytesPerLine(), 2}, hints); - break; - case QVideoFrameFormat::Format_YUYV: - zxRes = ZXing::ReadBarcode({frame.bits(), frame.width(), frame.height(), ZXing::ImageFormat::Lum, frame.bytesPerLine(), 2}, hints); - break; - case QVideoFrameFormat::Format_Y8: - zxRes = ZXing::ReadBarcode({frame.bits(), frame.width(), frame.height(), ZXing::ImageFormat::Lum, frame.bytesPerLine()}, hints); - break; - case QVideoFrameFormat::Format_Y16: - zxRes = ZXing::ReadBarcode({frame.bits() + 1, frame.width(), frame.height(), ZXing::ImageFormat::Lum, frame.bytesPerLine(), 1}, hints); - break; - case QVideoFrameFormat::Format_P010: - case QVideoFrameFormat::Format_P016: - zxRes = ZXing::ReadBarcode({frame.bits(), frame.width(), frame.height(), ZXing::ImageFormat::Lum, frame.bytesPerLine(), 1}, hints); - break; - - // formats needing conversion before ZXing can consume them - case QVideoFrameFormat::Format_Jpeg: - case QVideoFrameFormat::Format_SamplerExternalOES: - case QVideoFrameFormat::Format_SamplerRect: - frame.convertToImage(); - zxRes = ZXing::ReadBarcode({frame.bits(), frame.width(), frame.height(), ZXing::ImageFormat::Lum, frame.bytesPerLine()}, hints); - break; - } -#endif frame.unmap(); // process scan result diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prison-5.108.0/tests/prisontest.cpp new/prison-5.109.0/tests/prisontest.cpp --- old/prison-5.108.0/tests/prisontest.cpp 2023-07-01 12:04:12.000000000 +0200 +++ new/prison-5.109.0/tests/prisontest.cpp 2023-08-05 14:40:43.000000000 +0200 @@ -130,3 +130,5 @@ m_lineedit->setText(QStringLiteral("AOEUIAOEUIAOEUI")); data_changed(); } + +#include "moc_prisontest.cpp"
