From nobody Tue Jan 10 16:42:40 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 4NrxSJ2br0z2r8wj; Tue, 10 Jan 2023 16:42:40 +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 4NrxSJ1vnxz42RN; Tue, 10 Jan 2023 16:42:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673368960; 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=Hz2UA1+rDUphlBsr39xbXWbjfqCXQVfcwM4krHRV55s=; b=kG4c3N02jK06/gDVEAuobh2SubG027PbrIOtR8ZkLCVS1L+MzeaRjVRDX0sDnvjjbNE4Eb BDWCUC9UBLMGoPBnEQNUGy/WpCyymibG2ug6IyU8u+ZpqTdgr1lxISYssuochmD0xzU/7L DmlDFCkfTBkb7oqhmrr24FE/yJ/IaxDNCYHNLWwNqAv6mSy2L83rc2ddJYPtpSz4PFRo4I z+ALNgf/6CQbBXq7H04IzLyK/6Y0HEMVmFFux/XQAvb3dekIbjmk56YSi3lDA1Uv1fn76d pcz7v4tVtHexyFrSakpsa7J30+Q6REhXvBc614HByqg0avYFCHuNXO0IfYrkWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673368960; 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=Hz2UA1+rDUphlBsr39xbXWbjfqCXQVfcwM4krHRV55s=; b=kBtLpMfZ1zmBQgpV1uegUfPmdLJf5woRkFhUf1BzXwlQUk1qjTsdZKh06maxVyQK5bufY9 MFnmsUwnpHVCTGnLAdCYG6HMhfaMCRwSRyXYeMTh/NZGE4o1WKwJ4dXMCC/WW8NSUnycXh E9IFcq21cThCSPK2OJyBtQXyKD7RpihGQCQ3Kl55RgiY/NaoMwxIYiIen7hOwyLUyCgINC vbOx6J7mjw6DDD9VykX2t0CmYptKGKBVWH5Xx1KuHMCXk8arwP0fpRqpt/VKTwl+vwwL61 UFk59tYAkEALBk50T3djSBn0sg04S3mv951IM8cyZX9CO1WbvWSTOfumcpk2rw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673368960; a=rsa-sha256; cv=none; b=e2BjuGOxvtKSv576xNHLJ11Omw96cIXHYFAuG6LSYUMLOPXeC1qSjJO4X26a1NMwxtZ7xD WTVFc8hHl46mUWMe3k6aI97iqIc95uRFJiwaF/3IS+THQvvrIkhJ2SsfFPbwvv+FMnTZ/2 JJTemhGbnlBRKx5zMEnKXt/0U645d86iUcmH7T/26fjS9UL2h4mvibI6czRb7NuNBccKJX gorf6L48A3l/C5tisUcRR8dR7k9jmBw6FMoTJf8dNj4UsPmMSjOBgZxy2zgJhUuBQag5LH u5BhBGCGA0UZffkXwJY4ZfmAA26BpPF6IaSn11a2XyIi0qS15xnUSURzMT8eGQ== 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 4NrxSJ0y6fzFVm; Tue, 10 Jan 2023 16:42:40 +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 30AGgebB038204; Tue, 10 Jan 2023 16:42:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30AGgeax038203; Tue, 10 Jan 2023 16:42:40 GMT (envelope-from git) Date: Tue, 10 Jan 2023 16:42:40 GMT Message-Id: <202301101642.30AGgeax038203@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: cd55d84b6a6f - main - net-im/kaidan: 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: cd55d84b6a6fa671682a8f2cf8caedb5e785e916 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=cd55d84b6a6fa671682a8f2cf8caedb5e785e916 commit cd55d84b6a6fa671682a8f2cf8caedb5e785e916 Author: Tobias C. Berner AuthorDate: 2023-01-10 10:37:52 +0000 Commit: Tobias C. Berner CommitDate: 2023-01-10 16:41:14 +0000 net-im/kaidan: prepare for textproc/zxing-cpp 2.0.0 Backported from upstream. --- net-im/kaidan/files/patch-src_QrCodeDecoder.cpp | 26 +++++++++++++++++++++++ net-im/kaidan/files/patch-src_QrCodeGenerator.cpp | 25 ++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/net-im/kaidan/files/patch-src_QrCodeDecoder.cpp b/net-im/kaidan/files/patch-src_QrCodeDecoder.cpp new file mode 100644 index 000000000000..5223f26e47c6 --- /dev/null +++ b/net-im/kaidan/files/patch-src_QrCodeDecoder.cpp @@ -0,0 +1,26 @@ +--- src/QrCodeDecoder.cpp.orig 2023-01-10 10:30:39 UTC ++++ src/QrCodeDecoder.cpp +@@ -60,7 +60,11 @@ void QrCodeDecoder::decodeImage(const QImage &image) + { + // Advise the decoder to check for QR codes and to try decoding rotated versions of the image. + #if ZXING_VERSION >= QT_VERSION_CHECK(1, 1, 0) ++# if ZXING_VERSION >= QT_VERSION_CHECK(1, 1, 1) ++ const auto decodeHints = DecodeHints().setFormats(BarcodeFormat::QRCode); ++# else + const auto decodeHints = DecodeHints().setFormats(BarcodeFormat::QR_CODE); ++# endif + const auto result = ReadBarcode({image.bits(), image.width(), image.height(), ZXing::ImageFormat::Lum, image.bytesPerLine()}, decodeHints); + #else + const auto decodeHints = +@@ -77,7 +81,11 @@ void QrCodeDecoder::decodeImage(const QImage &image) + // If a QR code could be found and decoded, emit a signal with the decoded string. + // Otherwise, emit a signal for failed decoding. + if (result.isValid()) ++#if ZXING_VERSION < QT_VERSION_CHECK(2, 0, 0) + emit decodingSucceeded(QString::fromStdString(TextUtfEncoding::ToUtf8(result.text()))); ++#else ++ emit decodingSucceeded(QString::fromStdString(result.text())); ++#endif + else + emit decodingFailed(); + } diff --git a/net-im/kaidan/files/patch-src_QrCodeGenerator.cpp b/net-im/kaidan/files/patch-src_QrCodeGenerator.cpp new file mode 100644 index 000000000000..f72eba0b2bdb --- /dev/null +++ b/net-im/kaidan/files/patch-src_QrCodeGenerator.cpp @@ -0,0 +1,25 @@ +--- src/QrCodeGenerator.cpp.orig 2023-01-10 10:34:19 UTC ++++ src/QrCodeGenerator.cpp +@@ -33,6 +33,10 @@ + #include + #include + ++#include ++#define ZXING_VERSION \ ++ QT_VERSION_CHECK(ZXING_VERSION_MAJOR, ZXING_VERSION_MINOR, ZXING_VERSION_PATCH) ++ + #include + #include + +@@ -74,7 +78,11 @@ QImage QrCodeGenerator::generateQrCode(int edgePixelCo + QImage QrCodeGenerator::generateQrCode(int edgePixelCount, const QString &text) + { + try { ++#if ZXING_VERSION >= QT_VERSION_CHECK(1, 1, 1) ++ ZXing::MultiFormatWriter writer(ZXing::BarcodeFormat::QRCode); ++#else + ZXing::MultiFormatWriter writer(ZXing::BarcodeFormat::QR_CODE); ++#endif + const ZXing::BitMatrix &bitMatrix = writer.encode(text.toStdWString(), edgePixelCount, edgePixelCount); + return toImage(bitMatrix); + } catch (const std::invalid_argument &e) {