From nobody Tue Jan 10 16:42:38 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NrxSH1nLBz2r8Zk; Tue, 10 Jan 2023 16:42:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NrxSH1J2Nz42Qk; Tue, 10 Jan 2023 16:42:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673368959; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FcwdKAyNW4a5P8bC3gRGjVE2pwpEKsNa8+3Vt9+0GEg=; b=Ta5HT6RNI21gv3WsPnTwuOXZ72/YqJ0FWGkGxkhI0bh+JaRtzd9t9Wo13OabxFIq1gz3ek sajGvqYq8/ezm6Rx2LMVPox/Y+QUu8iNtdD0m6gMLHOLCvsm+U6a9S5GTAqCzJ68T8qhFe 23RYvkqLqXkAyQUIh/TwPzrkuqlp/VWR3U36+86apHslPCGhJUdIh714rMd9f1mE8rlxJr 5lAMJhsFIJdIsjVzZz7+auXx1b+762f9a915SsljebGFlk8RlOfseYYk75OB1f3KgKPGmb oURMpN+2cwVv8PEfIFhocfKER0sbWVni5oLao4XVcS8S31Cb7E6EAAg29cBQdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673368959; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FcwdKAyNW4a5P8bC3gRGjVE2pwpEKsNa8+3Vt9+0GEg=; b=d2VY2aHDizB9roLhHM6UTNhiN/XLW6AetsOWnalnWenNx2rAZU5k8d8NUmUD/MOeJ30n/F vNUrZ7i39/JLh6vMvgXu8OyeOB6TZZHCh6HowaN5Ui+1z62mzo8fOfhQ3EnW3ycLBWo27N ZW5qtQRq+J1fahNbAjZOIiYDhZAmFiIbjkSvjYjLiS4lo6ifCA25VgNwWW58d+uTflIlNH rZ4O6vCXiUfD5rqmnd92//zr/xp6CYORpJ0apjtN1rkNt99xPK6vbcULauUzw7heZTccKF rSkZ71o40+1q3W32ODco9ZM3b5YbZyU+yYyNKQxMwdxZ7y9QOJFDq16vSpIH4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673368959; a=rsa-sha256; cv=none; b=Ik6bFEPPv8YP1/uftKjRjVqwSWwemEOUsuYQhN4nx+XkWd4t+d6UKW7R1cUQdkj7jXgjgU w6y4phh539eX+S2WBclHLLqc0qx40r4tWUmRWKxn/xylORPuhLXVZoy6bUaLpsbGtyXOVr X5CnK2i+nsyj/wVmJCsVX+O+zsWVvu9kZry915tFp5V9ZqX00QWJgPURQ4LMJyXRo1q58m MT8wL1X7Fz28rAFetAGJVbaXvTKfrCdp5dQBXdV9VZPkusz9cdBNI6OTPeMaQJQ3cOlx8H qcj8iQl6r9cyQyHPhQiqNp2uEq8Oc9r9xEwbzpSJlDouuogIftlNqwstC/BHTA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NrxSH0LhwzFjB; Tue, 10 Jan 2023 16:42:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30AGgccs038178; Tue, 10 Jan 2023 16:42:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30AGgcuf038177; Tue, 10 Jan 2023 16:42:38 GMT (envelope-from git) Date: Tue, 10 Jan 2023 16:42:38 GMT Message-Id: <202301101642.30AGgcuf038177@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: 49c02cde16e2 - main - deskutils/kodaskanna: prepare for textproc/zxing-cpp 2.0.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 49c02cde16e2518fafc37e7025ac1ec0bda70aad Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=49c02cde16e2518fafc37e7025ac1ec0bda70aad commit 49c02cde16e2518fafc37e7025ac1ec0bda70aad Author: Tobias C. Berner AuthorDate: 2023-01-10 09:07:41 +0000 Commit: Tobias C. Berner CommitDate: 2023-01-10 16:41:14 +0000 deskutils/kodaskanna: prepare for textproc/zxing-cpp 2.0.0 --- deskutils/kodaskanna/Makefile | 5 +++- deskutils/kodaskanna/distinfo | 4 +++- .../files/patch-src_core_scanimagerunner.cpp | 27 ++++++++++++++++++++++ 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/deskutils/kodaskanna/Makefile b/deskutils/kodaskanna/Makefile index 7ac0951748bc..11db8dff00c5 100644 --- a/deskutils/kodaskanna/Makefile +++ b/deskutils/kodaskanna/Makefile @@ -4,6 +4,9 @@ PORTREVISION= 1 CATEGORIES= deskutils MASTER_SITES= KDE/unstable/${PORTNAME}/${DISTVERSION}/src +PATCH_SITES= https://invent.kde.org/graphics/kodaskanna/-/commit/ +PATCHFILES= 1656f7e66aec20ecd4a66f041bd7fc1850721e08.diff:-p1 + MAINTAINER= adridg@FreeBSD.org COMMENT= Barcode and QR-code scanner WWW= https://invent.kde.org/graphics/kodaskanna @@ -11,7 +14,7 @@ WWW= https://invent.kde.org/graphics/kodaskanna LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/LICENSES/LGPL-2.1-or-later.txt -LIB_DEPENDS= libZXing.so.1:textproc/zxing-cpp +LIB_DEPENDS= libZXing.so:textproc/zxing-cpp USES= cmake compiler:c++17-lang gl kde:5 pkgconfig qt:5 tar:xz xorg USE_GL= gl diff --git a/deskutils/kodaskanna/distinfo b/deskutils/kodaskanna/distinfo index 7067c1949065..67b6e541e78d 100644 --- a/deskutils/kodaskanna/distinfo +++ b/deskutils/kodaskanna/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1643278462 +TIMESTAMP = 1673343046 SHA256 (kodaskanna-0.1.0.tar.xz) = 2860cfdae922a29749421f3b4e3281ef88fc5713002345bc725082fb47cd627f SIZE (kodaskanna-0.1.0.tar.xz) = 40656 +SHA256 (1656f7e66aec20ecd4a66f041bd7fc1850721e08.diff) = 198a2f22fd574bb6a9e4b02406d04847921caacf9c709f974f1e9025438940a5 +SIZE (1656f7e66aec20ecd4a66f041bd7fc1850721e08.diff) = 463 diff --git a/deskutils/kodaskanna/files/patch-src_core_scanimagerunner.cpp b/deskutils/kodaskanna/files/patch-src_core_scanimagerunner.cpp new file mode 100644 index 000000000000..8d3133a58c2d --- /dev/null +++ b/deskutils/kodaskanna/files/patch-src_core_scanimagerunner.cpp @@ -0,0 +1,27 @@ +--- src/core/scanimagerunner.cpp.orig 2022-01-24 22:35:35 UTC ++++ src/core/scanimagerunner.cpp +@@ -10,6 +10,9 @@ + #include "scanresult.hpp" + #include "scanresult_p.hpp" + // ZXing ++#include ++#define ZXING_VERSION \ ++ QT_VERSION_CHECK(ZXING_VERSION_MAJOR, ZXING_VERSION_MINOR, ZXING_VERSION_PATCH) + #include + + namespace Kodaskanna +@@ -63,8 +66,13 @@ void ScanImageRunner::run() + + resultData->isSuccess = result.isValid(); + if (resultData->isSuccess) { +- resultData->text = QString::fromStdWString(result.text()); ++#if ZXING_VERSION < QT_VERSION_CHECK(2, 0, 0) ++ resultData->text = QString::fromStdWString(result.text()); + resultData->bytes = QByteArray(reinterpret_cast(result.rawBytes().data()), result.rawBytes().size()); ++#else ++ resultData->text = QString::fromStdString(result.text()); ++ resultData->bytes = QByteArray(reinterpret_cast(result.bytes().data()), result.bytes().size()); ++#endif + } + + Q_EMIT scanFinished(scanResult);