gentoo auto-resync : 10:01:2023 - 06:19:57

4 files changed, 40 insertions, 4 deletions

diff --git a/kde-frameworks/prison/Manifest b/kde-frameworks/prison/Manifest
index 22c690effe8a..3bf71a0cd12d 100644
--- a/kde-frameworks/prison/Manifest
+++ b/kde-frameworks/prison/Manifest
@@ -1,5 +1,6 @@
+AUX prison-5.99.0-zxing-2.patch 1015 BLAKE2B 786193f3c0bff68630868cf019c635e38c0e256daf6c7974b00cc61d61bdbc170534993acbb57306353f0679554ac413f8f93d411845a73c79313a6cb8e9e931 SHA512 c498627a20ca7d7770e1df0e05d0e413f4421a09fb78dd1365d1c5a551f1f10bfe1283e951970ada9ee335f9c53d5eb64e624f60d3539d7cc920a0e7378abc55
 DIST prison-5.101.0.tar.xz 54912 BLAKE2B e9f3c2f09390bb642270ae14590806d1c0c0e74884ab4f8947ca48050379f284756ffeb5d0bd93b9b89d5281079513640dcf799b78499616d1f081d25839093a SHA512 a1de0cfc87e1f8d37b74b0a90fa681b2aa316b324eb30c3197d9a2572d7222a02efd4d16a11d41460a226cfba912311c9c287b5031ca591f8384ca584990c6a8
 DIST prison-5.99.0.tar.xz 78696 BLAKE2B 4594ac4161759c16bf1323c95b60b39ef3e810d1cd52f91ef0a77946b3f1d92e15a88bc912c5f2638739928bfdbf2eae1678851ae7ccc611e7e56d15712103db SHA512 245224a5e76e8e182ec3568bdd833788301fd2014cd4e65fbc5616540464b6a5fd3f3d0fa357f1520bf9e73e65f0e0ef45449631c247e2c0af4f9da4281505a4
-EBUILD prison-5.101.0.ebuild 699 BLAKE2B 20185bf42c76c8675faec7012832766f5b7306858b99c0719c4441eae890f7df622794c5bb905b982e556868a5550c504a3b52ce841ea5e081c1c33674bc56c4 SHA512 48fe68f79517fde720bbf0528200970f93ba0b1f8d40c837a55574703e15d74ac4e6743766539043a358dca3c5b8edaa362dc09f51bec7941cd5df8ecfede6d9
-EBUILD prison-5.99.0.ebuild 696 BLAKE2B 25b07b451132dc05282ef50935fc1548806adec7ef62272a567695bbdb183654ff2abc0db4c1ba48ad01630288c71e66cccbe83e6fac05cdcadead56ec98ed26 SHA512 613fac6aa1abbc2910dbea34b87e2b0191ced8b8945b1cbc21e5219b28ffab9fe99b1ef812cdc141ca2f0f080b658c9cbe14da6d39532b79ba3e440ee363e856
+EBUILD prison-5.101.0.ebuild 753 BLAKE2B e34973d612d1a9da2a0619e484eba885b0955cb69000a77faed04a7eb946f3b1dcc1e7936d97faf6140846ea306d3e932b32f5a85f72d7dd16865d895a874c85 SHA512 8265cd3a34d8a9583daab7d2204c8a122d7eb041cdbdbfad4df75ef7cd93b2add2c6f56b6bfee33bc6ec5e6521ef8cd137e6c91f34f4f387c8a302fefb57fb14
+EBUILD prison-5.99.0.ebuild 742 BLAKE2B 1f1626020cc24a9b75588793e8beb370551b6b2c6cb9aac6f233f0e75ebb154da347c26971bbeab167d9ca5cb828a87d544132268a107172c02671cc649cad2b SHA512 73d30bb2807137d4f1a9a1ebbe16c0ad75b5ae70ae38b849171397571336fb3c8027d905b713352a7e57205c79acbbb55651de931d40a011c83bcb1f8c8b005d
 MISC metadata.xml 560 BLAKE2B 3c60b8b8f04fb43ee27b250985d080758dfb521e4ed3ec0ee94dc36c57db90701504490a0b56bfad2ea9bfc7c6d3e76a4f68995c1b7d9213104d13a8de622259 SHA512 7c3c097098192485a17926575bc5d9a008c480ad01fbd89f94b218f709a2d8b7d913f067548cd51579a65e43c3d0847b0567e37ce9bf1b8ada53f212650f0144
diff --git a/kde-frameworks/prison/files/prison-5.99.0-zxing-2.patch b/kde-frameworks/prison/files/prison-5.99.0-zxing-2.patch
new file mode 100644
index 000000000000..946cf9d1cc34
--- /dev/null
+++ b/kde-frameworks/prison/files/prison-5.99.0-zxing-2.patch
@@ -0,0 +1,31 @@
+From 14fb6f0a31373b242bdeb18cf9f3a36441bf86b5 Mon Sep 17 00:00:00 2001
+From: Volker Krause <vkrause@kde.org>
+Date: Tue, 3 Jan 2023 16:55:59 +0100
+Subject: [PATCH] Add support for ZXing 2.0
+
+As far as we are concerned that is source-compatible, so nothing we need
+to change here apart from adjusting the build system to accept the new
+major version.
+---
+ CMakeLists.txt | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 365a1c9..961262e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -44,7 +44,10 @@ find_package(Dmtx)
+ set_package_properties(Dmtx PROPERTIES
+     PURPOSE "Required for generation of Data Matrix barcodes."
+     TYPE RECOMMENDED)
+-find_package(ZXing 1.2.0)
++find_package(ZXing 2.0)
++if (NOT TARGET ZXing::ZXing)
++  find_package(ZXing 1.2.0)
++endif()
+ set_package_properties(ZXing PROPERTIES
+     PURPOSE "Required for generation of PDF417 barcodes and for scanning of barcodes from live video feed."
+     TYPE RECOMMENDED)
+-- 
+GitLab
+
diff --git a/kde-frameworks/prison/prison-5.101.0.ebuild b/kde-frameworks/prison/prison-5.101.0.ebuild
index 2972465702e6..f16d66fabd46 100644
--- a/kde-frameworks/prison/prison-5.101.0.ebuild
+++ b/kde-frameworks/prison/prison-5.101.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -25,6 +25,8 @@ DEPEND="${RDEPEND}
 	test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
 "
 
+PATCHES=( "${FILESDIR}/${PN}-5.99.0-zxing-2.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package qml Qt5Quick)
diff --git a/kde-frameworks/prison/prison-5.99.0.ebuild b/kde-frameworks/prison/prison-5.99.0.ebuild
index da509e07e78b..0de668735817 100644
--- a/kde-frameworks/prison/prison-5.99.0.ebuild
+++ b/kde-frameworks/prison/prison-5.99.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -25,6 +25,8 @@ DEPEND="${RDEPEND}
 	test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
 "
 
+PATCHES=( "${FILESDIR}/${P}-zxing-2.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package qml Qt5Quick)