git: 16a40d117364 - main - deskutils/kodaskanna: Fix build with ZXing-C++ 3.0.x

Max Brazhnikov <[email protected]> Sat, 01 Aug 2026 19:29:14 +0000
Newsgroups gmane.os.freebsd.devel.cvs.ports
Message-ID <[email protected]>
The branch main has been updated by makc:

URL: https://cgit.FreeBSD.org/ports/commit/?id=16a40d117364f5fdeceb82dc77ab53cd23b9bd99

commit 16a40d117364f5fdeceb82dc77ab53cd23b9bd99
Author:     Max Brazhnikov <[email protected]>
AuthorDate: 2026-08-01 19:27:39 +0000
Commit:     Max Brazhnikov <[email protected]>
CommitDate: 2026-08-01 19:27:39 +0000

    deskutils/kodaskanna: Fix build with ZXing-C++ 3.0.x
    
    PR:     293675
---
 deskutils/kodaskanna/files/patch-CMakeLists.txt      | 11 +++++++++++
 .../files/patch-src_core_scanimagerunner.cpp         | 20 ++++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/deskutils/kodaskanna/files/patch-CMakeLists.txt b/deskutils/kodaskanna/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..24b5ed808114
--- /dev/null
+++ b/deskutils/kodaskanna/files/patch-CMakeLists.txt
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig	2025-01-17 13:30:11 UTC
++++ CMakeLists.txt
+@@ -40,7 +40,7 @@ find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS
+     I18n
+ )
+ 
+-find_package(ZXing 2.0)
++find_package(ZXing)
+ 
+ ecm_set_disabled_deprecation_versions(
+     QT 6.5
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..dd107896daab
--- /dev/null
+++ b/deskutils/kodaskanna/files/patch-src_core_scanimagerunner.cpp
@@ -0,0 +1,20 @@
+--- src/core/scanimagerunner.cpp.orig	2025-01-17 13:30:11 UTC
++++ src/core/scanimagerunner.cpp
+@@ -62,7 +62,7 @@ ZXing::ImageFormat zxingImageFormatFromQImage(const QI
+ }
+ 
+ #if ZXING_VERSION >= QT_VERSION_CHECK(2, 2, 0)
+-ZXing::Result readBarcode(const QImage &image, const ZXing::ReaderOptions &readerOptions)
++ZXing::Barcode readBarcode(const QImage &image, const ZXing::ReaderOptions &readerOptions)
+ {
+     return ZXing::ReadBarcode({image.bits(), image.width(), image.height(), zxingImageFormatFromQImage(image), static_cast<int>(image.bytesPerLine())}, readerOptions);
+ }
+@@ -80,7 +80,7 @@ void ScanImageRunner::run()
+     readerOptions.setFormats(ZXing::BarcodeFormat::Any);
+ 
+     const bool isSupportedQImageFormat = (zxingImageFormatFromQImage(m_image) == ZXing::ImageFormat::None);
+-    ZXing::Result result =
++    ZXing::Barcode result =
+         isSupportedQImageFormat ? readBarcode(m_image.convertToFormat(QImage::Format_RGBX8888), readerOptions) : readBarcode(m_image, readerOptions);
+ #else
+     ZXing::DecodeHints decodeHints;