diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2022-11-27 12:12:22 +0100 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2022-11-27 12:20:17 +0100 |
commit | 70ebbc171aa717ca60308361b6ba46768748250a (patch) | |
tree | 470efd7e1adf6ffc422b8bf99adf08b06d180c95 | |
parent | kde-frameworks/oxygen-icons: drop 5.96.0 (diff) | |
download | gentoo-70ebbc171aa717ca60308361b6ba46768748250a.tar.gz gentoo-70ebbc171aa717ca60308361b6ba46768748250a.tar.bz2 gentoo-70ebbc171aa717ca60308361b6ba46768748250a.zip |
kde-frameworks/prison: drop 5.96.0-r1
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r-- | kde-frameworks/prison/Manifest | 1 | ||||
-rw-r--r-- | kde-frameworks/prison/files/prison-5.96.0-zxing-cpp-1.4.0.patch | 107 | ||||
-rw-r--r-- | kde-frameworks/prison/prison-5.96.0-r1.ebuild | 36 |
3 files changed, 0 insertions, 144 deletions
diff --git a/kde-frameworks/prison/Manifest b/kde-frameworks/prison/Manifest index 8c5206af0e11..79333426c72e 100644 --- a/kde-frameworks/prison/Manifest +++ b/kde-frameworks/prison/Manifest @@ -1,3 +1,2 @@ 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 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 -} |