Date: Sun, 04 Jan 2026 21:03:10 +0000 From: Adriaan de Groot <adridg@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 55ec7c0cc7a1 - main - deskutils/kodaskanna: update to 0.2.2, latest upstream, and Qt6 Message-ID: <695ad58e.472f3.124c338d@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=55ec7c0cc7a12ac6e2152e7f9849bfbd1679cb7d commit 55ec7c0cc7a12ac6e2152e7f9849bfbd1679cb7d Author: Adriaan de Groot <adridg@FreeBSD.org> AuthorDate: 2026-01-04 19:34:39 +0000 Commit: Adriaan de Groot <adridg@FreeBSD.org> CommitDate: 2026-01-04 21:01:37 +0000 deskutils/kodaskanna: update to 0.2.2, latest upstream, and Qt6 Kodaskanna is a utility for reading data from 1D/2D codes (e.g. QR codes or bar codes) and making the data available for further processing. This port- update catches 3 years of upstream activity and switches the toolkit to the current Qt version. PR: 289561 Reported-by: diizzy@ --- deskutils/kodaskanna/Makefile | 20 +++++--------- deskutils/kodaskanna/distinfo | 8 +++--- .../files/patch-src_core_scanimagerunner.cpp | 27 ------------------- deskutils/kodaskanna/pkg-plist | 31 ++++++++++++++++++++-- 4 files changed, 39 insertions(+), 47 deletions(-) diff --git a/deskutils/kodaskanna/Makefile b/deskutils/kodaskanna/Makefile index abc1a78e58f8..56ce787a1ac2 100644 --- a/deskutils/kodaskanna/Makefile +++ b/deskutils/kodaskanna/Makefile @@ -1,30 +1,24 @@ PORTNAME= kodaskanna -DISTVERSION= 0.1.0 -PORTREVISION= 3 +DISTVERSION= 0.2.2 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 +WWW= https://apps.kde.org/kodaskanna/ LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/LICENSES/LGPL-2.1-or-later.txt 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 -USE_XORG= x11 -USE_QT= concurrent core dbus declarative gui \ - multimedia network quickcontrols quickcontrols2 \ - widgets xml \ - buildtools:build qmake:build -USE_KDE= auth codecs config configwidgets coreaddons i18n \ - kio purpose service widgetsaddons windowsystem \ +USES= cmake compiler:c++17-lang gettext gl kde:6 pkgconfig qt:6 tar:xz +USE_GL= opengl +USE_QT= base tools:build +USE_KDE= config configwidgets coreaddons i18n \ + kio purpose service widgetsaddons \ ecm:build .include <bsd.port.mk> diff --git a/deskutils/kodaskanna/distinfo b/deskutils/kodaskanna/distinfo index 67b6e541e78d..c118de25fe77 100644 --- a/deskutils/kodaskanna/distinfo +++ b/deskutils/kodaskanna/distinfo @@ -1,5 +1,3 @@ -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 +TIMESTAMP = 1767550898 +SHA256 (kodaskanna-0.2.2.tar.xz) = d32e42297ab1a81a96b68683d1d5ff9034036e29d590c482dce2619eea687a80 +SIZE (kodaskanna-0.2.2.tar.xz) = 59160 diff --git a/deskutils/kodaskanna/files/patch-src_core_scanimagerunner.cpp b/deskutils/kodaskanna/files/patch-src_core_scanimagerunner.cpp deleted file mode 100644 index 8d3133a58c2d..000000000000 --- a/deskutils/kodaskanna/files/patch-src_core_scanimagerunner.cpp +++ /dev/null @@ -1,27 +0,0 @@ ---- 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 <ZXing/ZXVersion.h> -+#define ZXING_VERSION \ -+ QT_VERSION_CHECK(ZXING_VERSION_MAJOR, ZXING_VERSION_MINOR, ZXING_VERSION_PATCH) - #include <ZXing/ReadBarcode.h> - - 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<const char *>(result.rawBytes().data()), result.rawBytes().size()); -+#else -+ resultData->text = QString::fromStdString(result.text()); -+ resultData->bytes = QByteArray(reinterpret_cast<const char *>(result.bytes().data()), result.bytes().size()); -+#endif - } - - Q_EMIT scanFinished(scanResult); diff --git a/deskutils/kodaskanna/pkg-plist b/deskutils/kodaskanna/pkg-plist index 0bc312495291..483af52649b0 100644 --- a/deskutils/kodaskanna/pkg-plist +++ b/deskutils/kodaskanna/pkg-plist @@ -1,13 +1,40 @@ bin/kodaskanna -%%QT_PLUGINDIR%%/kf5/purpose/kodaskannaplugin.so +%%QT_PLUGINDIR%%/kf6/purpose/kodaskannaplugin.so share/applications/org.kde.kodaskanna.desktop +share/kio/servicemenus/kodaskanna_scan_image.desktop share/icons/hicolor/48x48/apps/kodaskanna.svg -share/kservices5/ServiceMenus/kodaskanna_scan_image.desktop +share/locale/ar/LC_MESSAGES/kodaskanna.mo share/locale/ca/LC_MESSAGES/kodaskanna.mo +share/locale/ca@valencia/LC_MESSAGES/kodaskanna.mo +share/locale/cs/LC_MESSAGES/kodaskanna.mo +share/locale/de/LC_MESSAGES/kodaskanna.mo +share/locale/en_GB/LC_MESSAGES/kodaskanna.mo +share/locale/eo/LC_MESSAGES/kodaskanna.mo share/locale/es/LC_MESSAGES/kodaskanna.mo +share/locale/eu/LC_MESSAGES/kodaskanna.mo +share/locale/fi/LC_MESSAGES/kodaskanna.mo +share/locale/fr/LC_MESSAGES/kodaskanna.mo +share/locale/gl/LC_MESSAGES/kodaskanna.mo +share/locale/he/LC_MESSAGES/kodaskanna.mo +share/locale/hi/LC_MESSAGES/kodaskanna.mo +share/locale/ia/LC_MESSAGES/kodaskanna.mo +share/locale/is/LC_MESSAGES/kodaskanna.mo +share/locale/it/LC_MESSAGES/kodaskanna.mo +share/locale/ja/LC_MESSAGES/kodaskanna.mo +share/locale/ka/LC_MESSAGES/kodaskanna.mo +share/locale/ko/LC_MESSAGES/kodaskanna.mo +share/locale/lt/LC_MESSAGES/kodaskanna.mo share/locale/nl/LC_MESSAGES/kodaskanna.mo +share/locale/nn/LC_MESSAGES/kodaskanna.mo +share/locale/pl/LC_MESSAGES/kodaskanna.mo +share/locale/pt/LC_MESSAGES/kodaskanna.mo +share/locale/sa/LC_MESSAGES/kodaskanna.mo share/locale/sk/LC_MESSAGES/kodaskanna.mo share/locale/sl/LC_MESSAGES/kodaskanna.mo share/locale/sv/LC_MESSAGES/kodaskanna.mo +share/locale/tr/LC_MESSAGES/kodaskanna.mo share/locale/uk/LC_MESSAGES/kodaskanna.mo +share/locale/zh_CN/LC_MESSAGES/kodaskanna.mo +share/locale/zh_TW/LC_MESSAGES/kodaskanna.mo share/metainfo/org.kde.kodaskanna.appdata.xml +share/qlogging-categories6/kodaskanna.categorieshome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?695ad58e.472f3.124c338d>