gentoo auto-resync : 27:11:2022 - 13:17:13

3 files changed, 0 insertions, 146 deletions

diff --git a/kde-frameworks/prison/Manifest b/kde-frameworks/prison/Manifest
index 7350838398b2..a1c5d2ddcaba 100644
--- a/kde-frameworks/prison/Manifest
+++ b/kde-frameworks/prison/Manifest
@@ -1,8 +1,5 @@
-AUX prison-5.96.0-zxing-cpp-1.4.0.patch 3823 BLAKE2B dca7abe43f82012a23504779556940c039de12ba0154e76d6450026c265c5be7d1af3462fa54ccd12e5c2eae7bbd641a3a0631768932a888f9658e75410a6e62 SHA512 3f3f059440392443c5c4594192b6a9d3597b2af2a11bb960d98269c86448d4740739c497e2b043446a4aca88d5bb5b99d2797849af8271207be9d982cd4503da
 DIST prison-5.100.0.tar.xz 54948 BLAKE2B 443e834cd7a0fc0580c3df1a67acb17c1f9b2bafea06926e11cbcadf764170cf640efecc06d181be7cd08c99af07e3cdc723089b1bc18a3843fc981fb561723d SHA512 1b520fc9fcab683861d179d384dfdf081e48b48eeb241fcc3a7239db3057b030deaa720a652b8b2c21ef852625ae4ceb253c515f0785df968361b55d17d230b5
-DIST prison-5.96.0.tar.xz 55380 BLAKE2B f6fd3467283a1d7980d070f77031d72bec4d94da0da30f99e360ec6cc160c1041d0025227df41649a0c20c4c247e99269c28e146aacbe5dae293a2f13457e562 SHA512 1bb85d4e8e6cd349cae559d5a933e606896ced077b850b4cac1a50f374ac2b938d01095c83a8bdb76af31069c17dfb07102a3a9f3c62ae9832f5b3846335a078
 DIST prison-5.99.0.tar.xz 78696 BLAKE2B 4594ac4161759c16bf1323c95b60b39ef3e810d1cd52f91ef0a77946b3f1d92e15a88bc912c5f2638739928bfdbf2eae1678851ae7ccc611e7e56d15712103db SHA512 245224a5e76e8e182ec3568bdd833788301fd2014cd4e65fbc5616540464b6a5fd3f3d0fa357f1520bf9e73e65f0e0ef45449631c247e2c0af4f9da4281505a4
 EBUILD prison-5.100.0.ebuild 699 BLAKE2B 20185bf42c76c8675faec7012832766f5b7306858b99c0719c4441eae890f7df622794c5bb905b982e556868a5550c504a3b52ce841ea5e081c1c33674bc56c4 SHA512 48fe68f79517fde720bbf0528200970f93ba0b1f8d40c837a55574703e15d74ac4e6743766539043a358dca3c5b8edaa362dc09f51bec7941cd5df8ecfede6d9
-EBUILD prison-5.96.0-r1.ebuild 750 BLAKE2B 38e7968af05347c5dfce54fe52d98d4a5d00af150aa4d329e1f8bb4d027cec607b86c7e81aa746ffd7555535db078f80168fdfac0f781d5454c38ba842cb946c SHA512 e72cc87e20ed1dbf022b73ea72276f914cdba28a3d3897d5af625feb2231519d2289a2213418f2046b776bc3e60b8d154df999f3b1aeeac0f45bf3f81167b621
 EBUILD prison-5.99.0.ebuild 696 BLAKE2B 25b07b451132dc05282ef50935fc1548806adec7ef62272a567695bbdb183654ff2abc0db4c1ba48ad01630288c71e66cccbe83e6fac05cdcadead56ec98ed26 SHA512 613fac6aa1abbc2910dbea34b87e2b0191ced8b8945b1cbc21e5219b28ffab9fe99b1ef812cdc141ca2f0f080b658c9cbe14da6d39532b79ba3e440ee363e856
 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
deleted file mode 100644
index 8971bd919a08..000000000000
--- a/kde-frameworks/prison/files/prison-5.96.0-zxing-cpp-1.4.0.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-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-r1.ebuild b/kde-frameworks/prison/prison-5.96.0-r1.ebuild
deleted file mode 100644
index 33b9a8f7bdba..000000000000
--- a/kde-frameworks/prison/prison-5.96.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QTMIN=5.15.4
-inherit ecm frameworks.kde.org
-
-DESCRIPTION="QRCode and data matrix barcode library"
-HOMEPAGE="https://invent.kde.org/frameworks/prison"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="qml"
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5
-	media-gfx/qrencode:=
-	media-libs/libdmtx
-	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)
-	)
-
-	ecm_src_configure
-}