From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 846BF15800F for ; Tue, 10 Jan 2023 00:04:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 38D85E07E6; Tue, 10 Jan 2023 00:04:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B5E89E07E1 for ; Tue, 10 Jan 2023 00:04:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 81E9E340E39 for ; Tue, 10 Jan 2023 00:04:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A0EF7807 for ; Tue, 10 Jan 2023 00:04:49 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1673309073.4eb458f6148a654b3670207fe0c0301bb4b24c07.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/prison/, kde-frameworks/prison/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-frameworks/prison/files/prison-5.99.0-zxing-2.patch kde-frameworks/prison/prison-5.101.0.ebuild kde-frameworks/prison/prison-5.99.0.ebuild X-VCS-Directories: kde-frameworks/prison/files/ kde-frameworks/prison/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 4eb458f6148a654b3670207fe0c0301bb4b24c07 X-VCS-Branch: master Date: Tue, 10 Jan 2023 00:04:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ca105baa-0766-4206-9a77-19b4f4aa46c3 X-Archives-Hash: fd7480a5040de86ce7a2c1249a7be5b4 commit: 4eb458f6148a654b3670207fe0c0301bb4b24c07 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Jan 9 23:04:26 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jan 10 00:04:33 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4eb458f6 kde-frameworks/prison: backport patch for >=zxing-cpp-2.0.0 Signed-off-by: Andreas Sturmlechner gentoo.org> .../prison/files/prison-5.99.0-zxing-2.patch | 31 ++++++++++++++++++++++ kde-frameworks/prison/prison-5.101.0.ebuild | 4 ++- kde-frameworks/prison/prison-5.99.0.ebuild | 4 ++- 3 files changed, 37 insertions(+), 2 deletions(-) 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 +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)