CVS commit: pkgsrc/graphics/ksanecore

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Sun Dec 21 12:32:37 UTC 2025

Modified Files:
        pkgsrc/graphics/ksanecore: Makefile PLIST buildlink3.mk distinfo
Added Files:
        pkgsrc/graphics/ksanecore/patches: patch-src_options_baseoption.cpp

Log Message:
ksanecore: update to 25.08.3

Qt6/KF6 version - Two years of development.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/graphics/ksanecore/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/ksanecore/PLIST \
    pkgsrc/graphics/ksanecore/distinfo
cvs rdiff -u -r1.15 -r1.16 pkgsrc/graphics/ksanecore/buildlink3.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/ksanecore/patches/patch-src_options_baseoption.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/ksanecore/Makefile
diff -u pkgsrc/graphics/ksanecore/Makefile:1.22 pkgsrc/graphics/ksanecore/Makefile:1.23
--- pkgsrc/graphics/ksanecore/Makefile:1.22     Thu Oct 23 20:37:37 2025
+++ pkgsrc/graphics/ksanecore/Makefile  Sun Dec 21 12:32:36 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2025/10/23 20:37:37 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2025/12/21 12:32:36 markd Exp $
 
 DISTNAME=      ksanecore-${KAPPSVER}
-PKGREVISION=   9
 CATEGORIES=    graphics
 
 HOMEPAGE=      https://kde.org/applications/graphics/
@@ -13,6 +12,6 @@ LICENSE=      gnu-gpl-v2 AND gnu-fdl-v1.2 AND
 USE_TOOLS+=    msgmerge
 
 .include "../../graphics/sane-backends/buildlink3.mk"
-.include "../../devel/ki18n/buildlink3.mk"
-.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../devel/kf6-ki18n/buildlink3.mk"
+.include "../../x11/qt6-qtbase/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/ksanecore/PLIST
diff -u pkgsrc/graphics/ksanecore/PLIST:1.3 pkgsrc/graphics/ksanecore/PLIST:1.4
--- pkgsrc/graphics/ksanecore/PLIST:1.3 Wed Feb  7 18:36:08 2024
+++ pkgsrc/graphics/ksanecore/PLIST     Sun Dec 21 12:32:36 2025
@@ -1,19 +1,19 @@
-@comment $NetBSD: PLIST,v 1.3 2024/02/07 18:36:08 markd Exp $
-include/KSaneCore/DeviceInformation
-include/KSaneCore/Interface
-include/KSaneCore/Option
-include/KSaneCore/deviceinformation.h
-include/KSaneCore/interface.h
-include/KSaneCore/ksanecore_export.h
-include/KSaneCore/ksanecore_version.h
-include/KSaneCore/option.h
-lib/cmake/KSaneCore/KSaneCoreConfig.cmake
-lib/cmake/KSaneCore/KSaneCoreConfigVersion.cmake
-lib/cmake/KSaneCore/KSaneCoreTargets-noconfig.cmake
-lib/cmake/KSaneCore/KSaneCoreTargets.cmake
-lib/libKSaneCore.so
-lib/libKSaneCore.so.1
-lib/libKSaneCore.so.${PKGVERSION}
+@comment $NetBSD: PLIST,v 1.4 2025/12/21 12:32:36 markd Exp $
+include/KSaneCore6/KSaneCore/DeviceInformation
+include/KSaneCore6/KSaneCore/Interface
+include/KSaneCore6/KSaneCore/Option
+include/KSaneCore6/ksanecore/deviceinformation.h
+include/KSaneCore6/ksanecore/interface.h
+include/KSaneCore6/ksanecore/option.h
+include/KSaneCore6/ksanecore_export.h
+include/KSaneCore6/ksanecore_version.h
+lib/cmake/KSaneCore6/KSaneCore6Config.cmake
+lib/cmake/KSaneCore6/KSaneCore6ConfigVersion.cmake
+lib/cmake/KSaneCore6/KSaneCore6Targets-noconfig.cmake
+lib/cmake/KSaneCore6/KSaneCore6Targets.cmake
+lib/libKSaneCore6.so
+lib/libKSaneCore6.so.1
+lib/libKSaneCore6.so.${PKGVERSION}
 share/locale/ar/LC_MESSAGES/ksanecore.mo
 share/locale/bg/LC_MESSAGES/ksanecore.mo
 share/locale/ca/LC_MESSAGES/ksanecore.mo
@@ -27,12 +27,16 @@ share/locale/eu/LC_MESSAGES/ksanecore.mo
 share/locale/fi/LC_MESSAGES/ksanecore.mo
 share/locale/fr/LC_MESSAGES/ksanecore.mo
 share/locale/gl/LC_MESSAGES/ksanecore.mo
+share/locale/he/LC_MESSAGES/ksanecore.mo
 share/locale/hi/LC_MESSAGES/ksanecore.mo
+share/locale/hu/LC_MESSAGES/ksanecore.mo
+share/locale/ia/LC_MESSAGES/ksanecore.mo
 share/locale/it/LC_MESSAGES/ksanecore.mo
 share/locale/ja/LC_MESSAGES/ksanecore.mo
 share/locale/ka/LC_MESSAGES/ksanecore.mo
 share/locale/ko/LC_MESSAGES/ksanecore.mo
 share/locale/lt/LC_MESSAGES/ksanecore.mo
+share/locale/lv/LC_MESSAGES/ksanecore.mo
 share/locale/nl/LC_MESSAGES/ksanecore.mo
 share/locale/nn/LC_MESSAGES/ksanecore.mo
 share/locale/pl/LC_MESSAGES/ksanecore.mo
@@ -40,6 +44,7 @@ share/locale/pt/LC_MESSAGES/ksanecore.mo
 share/locale/pt_BR/LC_MESSAGES/ksanecore.mo
 share/locale/ro/LC_MESSAGES/ksanecore.mo
 share/locale/ru/LC_MESSAGES/ksanecore.mo
+share/locale/sa/LC_MESSAGES/ksanecore.mo
 share/locale/sk/LC_MESSAGES/ksanecore.mo
 share/locale/sl/LC_MESSAGES/ksanecore.mo
 share/locale/sv/LC_MESSAGES/ksanecore.mo
Index: pkgsrc/graphics/ksanecore/distinfo
diff -u pkgsrc/graphics/ksanecore/distinfo:1.3 pkgsrc/graphics/ksanecore/distinfo:1.4
--- pkgsrc/graphics/ksanecore/distinfo:1.3      Wed Feb  7 18:36:08 2024
+++ pkgsrc/graphics/ksanecore/distinfo  Sun Dec 21 12:32:36 2025
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2024/02/07 18:36:08 markd Exp $
+$NetBSD: distinfo,v 1.4 2025/12/21 12:32:36 markd Exp $
 
-BLAKE2s (ksanecore-23.08.4.tar.xz) = 75d37302a9e1de1bc947781e8cf62a1114b01f1058f217ab9a9aca5d7d69f498
-SHA512 (ksanecore-23.08.4.tar.xz) = 12efe127dc79e660b755f18fceda94c08e689e55125b6454f5eaaf36370afbe508a5c3d61b3635c2df94e0b3b76446ffacd8aaad9e6819b6be87927a8364b276
-Size (ksanecore-23.08.4.tar.xz) = 49608 bytes
+BLAKE2s (ksanecore-25.08.3.tar.xz) = 0a938205cea92094111d7276e0ac83f7af054e38e1b348e928b1069b5d759d77
+SHA512 (ksanecore-25.08.3.tar.xz) = 3101c067f0148e1a261945ec508e347b048ed5dbe1307023447ba5b572d544aca15c5959f78ce7af7cf45934c67938e0aabd0e70aa79858a25ee756d9e3b9b93
+Size (ksanecore-25.08.3.tar.xz) = 56512 bytes
+SHA1 (patch-src_options_baseoption.cpp) = 2402e18faa2bfda9c926416387355a08e2b7b3c3

Index: pkgsrc/graphics/ksanecore/buildlink3.mk
diff -u pkgsrc/graphics/ksanecore/buildlink3.mk:1.15 pkgsrc/graphics/ksanecore/buildlink3.mk:1.16
--- pkgsrc/graphics/ksanecore/buildlink3.mk:1.15        Thu Oct 23 20:37:37 2025
+++ pkgsrc/graphics/ksanecore/buildlink3.mk     Sun Dec 21 12:32:36 2025
@@ -1,16 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.15 2025/10/23 20:37:37 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2025/12/21 12:32:36 markd Exp $
 
 BUILDLINK_TREE+=       ksanecore
 
 .if !defined(KSANECORE_BUILDLINK3_MK)
 KSANECORE_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ksanecore+=      ksanecore>=22.08.0
-BUILDLINK_ABI_DEPENDS.ksanecore?=      ksanecore>=23.08.4nb9
-BUILDLINK_PKGSRCDIR.ksanecore?=        ../../graphics/ksanecore
+BUILDLINK_API_DEPENDS.ksanecore+=      ksanecore>=25.08.2
+BUILDLINK_ABI_DEPENDS.ksanecore?=      ksanecore>=25.08.2
+BUILDLINK_PKGSRCDIR.ksanecore?=                ../../graphics/ksanecore
 
-.include "../../devel/ki18n/buildlink3.mk"
-.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../devel/kf6-ki18n/buildlink3.mk"
+.include "../../x11/qt6-qtbase/buildlink3.mk"
 .endif # KSANECORE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -ksanecore

Added files:

Index: pkgsrc/graphics/ksanecore/patches/patch-src_options_baseoption.cpp
diff -u /dev/null pkgsrc/graphics/ksanecore/patches/patch-src_options_baseoption.cpp:1.1
--- /dev/null   Sun Dec 21 12:32:37 2025
+++ pkgsrc/graphics/ksanecore/patches/patch-src_options_baseoption.cpp  Sun Dec 21 12:32:37 2025
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_options_baseoption.cpp,v 1.1 2025/12/21 12:32:37 markd Exp $
+
+Don't have __BYTE_ORDER
+
+--- src/options/baseoption.cpp.orig    2025-10-04 15:51:38.000000000 +0000
++++ src/options/baseoption.cpp
+@@ -140,6 +140,11 @@ bool BaseOption::writeData(void *data)
+ 
+ void BaseOption::readValue() {}
+ 
++#ifndef __BYTE_ORDER
++#define __BYTE_ORDER _BYTE_ORDER
++#define __LITTLE_ENDIAN _LITTLE_ENDIAN
++#endif
++
+ SANE_Word BaseOption::toSANE_Word(unsigned char *data)
+ {
+     SANE_Word tmp;