gentoo auto-resync : 14:07:2022 - 13:40:00

4 files changed, 112 insertions, 2 deletions

diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 960a99f64f0d..0d8bd8444bd1 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/prison/Manifest b/kde-frameworks/prison/Manifest
index 642f23674f7c..21676bd448c3 100644
--- a/kde-frameworks/prison/Manifest
+++ b/kde-frameworks/prison/Manifest
@@ -1,7 +1,8 @@
+AUX prison-5.96.0-zxing-cpp-1.4.0.patch 3823 BLAKE2B dca7abe43f82012a23504779556940c039de12ba0154e76d6450026c265c5be7d1af3462fa54ccd12e5c2eae7bbd641a3a0631768932a888f9658e75410a6e62 SHA512 3f3f059440392443c5c4594192b6a9d3597b2af2a11bb960d98269c86448d4740739c497e2b043446a4aca88d5bb5b99d2797849af8271207be9d982cd4503da
 DIST prison-5.92.0.tar.xz 47936 BLAKE2B 72b919e042d471dbcd87faa081b00abdcdb9b708b4cfdeba4ba09c0d013b3b8cbf35220768b821e198b2fefc916472117e50be320268707ff1a5e44ff31074dd SHA512 18bb9f5a804cc80cf3770c1d4149ef075650357e81642a230810a08b780c35c563a3c629839bf8a0ca39d9b1ea01d24862a6cf1992dc5577fd1d853c8ab87b5f
 DIST prison-5.95.0.tar.xz 55364 BLAKE2B 1ac147e0967080ca3fa920f83da42f72edddddeea52dbbfb08f85575b48bd95573e046187c8ce505ea02d44adbecc7ad9a91b91c1222316cbbeb1aa644e2a5c3 SHA512 83369da86f9b7ddd813f7a90367943ffc4eb066260ad9999545aa77cab0f6783531d2cf2081715e3ffd70fac377cdea221b79b626127c8773bf96c249536f990
 DIST prison-5.96.0.tar.xz 55380 BLAKE2B f6fd3467283a1d7980d070f77031d72bec4d94da0da30f99e360ec6cc160c1041d0025227df41649a0c20c4c247e99269c28e146aacbe5dae293a2f13457e562 SHA512 1bb85d4e8e6cd349cae559d5a933e606896ced077b850b4cac1a50f374ac2b938d01095c83a8bdb76af31069c17dfb07102a3a9f3c62ae9832f5b3846335a078
 EBUILD prison-5.92.0.ebuild 642 BLAKE2B deb3edce82f6ae3a545505bda1530f6d6ed0d90f3816647d2f020ff8cd7cc6fd4ab4c9500f59c5cd458f7bbde2af0c6c5e0b09c3d99bd42ec25eef33187cad75 SHA512 1980afcfb4b1e46884c2600bafb046f7dc7adad522f0e11563edec60d6cf92874e98e5a992b0a0160c8a73e24de44f1165f9c10fb4a57e1217d1e0da18c3a51d
 EBUILD prison-5.95.0.ebuild 686 BLAKE2B ca129f97595bf978e7cc3752e712364e890220d8d097029874c08fc5d7fcc270232d3ef5ee6a29c30ebb177e778bb758bfdc2c2e0d57b85aa06f37477b4b7ca9 SHA512 f7692a21c38560e016e73024c6a9c26b86e4451b94ef76fea28a411ab31f83e94e33fc571934635f33bb9a2b42bf2b1808d8873cd24c9b8b783d3bee5557bf3b
-EBUILD prison-5.96.0.ebuild 697 BLAKE2B 7c0828a494cb22ce6574a93af94f55036954c7fb3249512d67c05d1ffd12f9f7dac9d4e4c210db5ddc5a27fef75e3e14564cf8a8f7907dea51c5e8b8618ac90e SHA512 d717572a22f7d5d4467e4a567670dabeb0316210e1f23782dde323aaba2c4b8fe11d5c79902f6ab3faee2fa6498852b409515d9096b3abd4e9ddc2b9159ad98c
+EBUILD prison-5.96.0-r1.ebuild 753 BLAKE2B bc8c3f7fa733acf20017529885c41af537b73bd807d76cba1970310e939f862ab1ea970afac1c4fae94bb68935bed1e32c3780b771e3c7949b3937dacfc721c1 SHA512 d0a62e6396dec36fdddad8a7aa8e9be265fea2c7fdee9acc94f29e8cfa0ad66b393fbd6c4384bb5059e32f62beab7979f78907ac2e5704f180560441add7f0a8
 MISC metadata.xml 560 BLAKE2B 3c60b8b8f04fb43ee27b250985d080758dfb521e4ed3ec0ee94dc36c57db90701504490a0b56bfad2ea9bfc7c6d3e76a4f68995c1b7d9213104d13a8de622259 SHA512 7c3c097098192485a17926575bc5d9a008c480ad01fbd89f94b218f709a2d8b7d913f067548cd51579a65e43c3d0847b0567e37ce9bf1b8ada53f212650f0144
diff --git a/kde-frameworks/prison/files/prison-5.96.0-zxing-cpp-1.4.0.patch b/kde-frameworks/prison/files/prison-5.96.0-zxing-cpp-1.4.0.patch
new file mode 100644
index 000000000000..8971bd919a08
--- /dev/null
+++ b/kde-frameworks/prison/files/prison-5.96.0-zxing-cpp-1.4.0.patch
@@ -0,0 +1,107 @@
+From 74e34fa35a59098db7c4358b788ad3ac0a5745f7 Mon Sep 17 00:00:00 2001
+From: Volker Krause <vkrause@kde.org>
+Date: Fri, 8 Jul 2022 16:18:47 +0200
+Subject: [PATCH] Support ZXing 1.4.0
+
+The previous code doesn't build (and when made to build, crashes) with
+ZXing 1.4.0.
+---
+ src/scanner/CMakeLists.txt             |  2 ++
+ src/scanner/config-prison-scanner.h.in | 14 ++++++++++++++
+ src/scanner/videoscannerworker.cpp     | 17 +++++++++++++++++
+ 3 files changed, 33 insertions(+)
+ create mode 100644 src/scanner/config-prison-scanner.h.in
+
+diff --git a/src/scanner/CMakeLists.txt b/src/scanner/CMakeLists.txt
+index d5b9cf5..ef690c5 100644
+--- a/src/scanner/CMakeLists.txt
++++ b/src/scanner/CMakeLists.txt
+@@ -1,6 +1,8 @@
+ # SPDX-FileCopyrightText: 2022 Volker Krause <vkrause@kde.org>
+ # SPDX-License-Identifier: BSD-3-Clause
+ 
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-prison-scanner.h.in ${CMAKE_CURRENT_BINARY_DIR}/config-prison-scanner.h)
++
+ add_library(KF5PrisonScanner)
+ add_library(KF5::PrisonScanner ALIAS KF5PrisonScanner)
+ 
+diff --git a/src/scanner/config-prison-scanner.h.in b/src/scanner/config-prison-scanner.h.in
+new file mode 100644
+index 0000000..d80ceaf
+--- /dev/null
++++ b/src/scanner/config-prison-scanner.h.in
+@@ -0,0 +1,14 @@
++/*
++   SPDX-FileCopyrightText: 2022 Volker Krause <vkrause@kde.org>
++   SPDX-License-Identifier: LGPL-2.0-or-later
++*/
++
++#ifndef CONFIG_PRISON_SCANNER_H
++#define CONFIG_PRISON_SCANNER_H
++
++#define ZXING_VERSION_MAJOR @ZXing_VERSION_MAJOR@
++#define ZXING_VERSION_MINOR @ZXing_VERSION_MINOR@
++#define ZXING_VERSION_PATCH @ZXing_VERSION_PATCH@
++#define ZXING_VERSION ((@ZXing_VERSION_MAJOR@<<16)|(@ZXing_VERSION_MINOR@<<8)|(@ZXing_VERSION_PATCH@))
++
++#endif // CONFIG_PRISON_SCANNER_H
+diff --git a/src/scanner/videoscannerworker.cpp b/src/scanner/videoscannerworker.cpp
+index 45792dc..947367c 100644
+--- a/src/scanner/videoscannerworker.cpp
++++ b/src/scanner/videoscannerworker.cpp
+@@ -3,6 +3,7 @@
+     SPDX-License-Identifier: MIT
+ */
+ 
++#include "config-prison-scanner.h"
+ #include "format_p.h"
+ #include "scanresult_p.h"
+ #include "videoscannerframe_p.h"
+@@ -12,6 +13,7 @@
+ #include <QImage>
+ #include <QTransform>
+ 
++#define ZX_USE_UTF8 1
+ #include <ZXing/ReadBarcode.h>
+ #include <ZXing/TextUtfEncoding.h>
+ 
+@@ -25,7 +27,11 @@ VideoScannerWorker::VideoScannerWorker(QObject *parent)
+ 
+ void VideoScannerWorker::slotScanFrame(VideoScannerFrame frame)
+ {
++#if ZXING_VERSION < QT_VERSION_CHECK(1, 4, 0)
+     ZXing::Result zxRes(ZXing::DecodeStatus::FormatError);
++#else
++    ZXing::Result zxRes;
++#endif
+     ZXing::DecodeHints hints;
+     hints.setFormats(frame.formats() == Format::NoFormat ? ZXing::BarcodeFormats::all() : Format::toZXing(frame.formats()));
+ 
+@@ -173,6 +179,7 @@ void VideoScannerWorker::slotScanFrame(VideoScannerFrame frame)
+     if (zxRes.isValid()) {
+         auto res = ScanResultPrivate::get(scanResult);
+ 
++#if ZXING_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;
+@@ -188,6 +195,16 @@ void VideoScannerWorker::slotScanFrame(VideoScannerFrame frame)
+             std::copy(zxRes.text().begin(), zxRes.text().end(), b.begin());
+             res->content = b;
+         }
++#else
++        if (zxRes.contentType() == ZXing::ContentType::Text) {
++            res->content = QString::fromStdString(zxRes.text());
++        } else {
++            QByteArray b;
++            b.resize(zxRes.bytes().size());
++            std::copy(zxRes.bytes().begin(), zxRes.bytes().end(), b.begin());
++            res->content = b;
++        }
++#endif
+ 
+         // determine the bounding rect
+         // the cooridinates we get from ZXing are a polygon, we need to determine the
+-- 
+GitLab
+
diff --git a/kde-frameworks/prison/prison-5.96.0.ebuild b/kde-frameworks/prison/prison-5.96.0-r1.ebuild
index 31bf1b57480b..4173c4d0a8ba 100644
--- a/kde-frameworks/prison/prison-5.96.0.ebuild
+++ b/kde-frameworks/prison/prison-5.96.0-r1.ebuild
@@ -18,13 +18,15 @@ RDEPEND="
 	>=dev-qt/qtmultimedia-${QTMIN}:5
 	media-gfx/qrencode:=
 	media-libs/libdmtx
-	media-libs/zxing-cpp
+	media-libs/zxing-cpp:=
 	qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
 "
 DEPEND="${RDEPEND}
 	test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
 "
 
+PATCHES=( "${FILESDIR}/${P}-zxing-cpp-1.4.0.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package qml Qt5Quick)