CVS commit: pkgsrc/graphics/kf6-prison

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/graphics/kf6-prison
From: "Mark Davies" <markd%netbsd.org@localhost>
Date: Fri, 20 Mar 2026 22:14:28 +0000

Module Name:    pkgsrc
Committed By:   markd
Date:           Fri Mar 20 22:14:28 UTC 2026

Modified Files:
        pkgsrc/graphics/kf6-prison: Makefile PLIST distinfo
Added Files:
        pkgsrc/graphics/kf6-prison/patches: patch-CMakeLists.txt
            patch-src_lib_CMakeLists.txt patch-src_scanner_CMakeLists.txt

Log Message:
/kf6-prison: update to 6.24.0

update ahead of the rest of KDE Frameworks so that works with zxing-cpp 3.x


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/graphics/kf6-prison/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/kf6-prison/PLIST \
    pkgsrc/graphics/kf6-prison/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/kf6-prison/patches/patch-CMakeLists.txt \
    pkgsrc/graphics/kf6-prison/patches/patch-src_lib_CMakeLists.txt \
    pkgsrc/graphics/kf6-prison/patches/patch-src_scanner_CMakeLists.txt

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

Modified files:

Index: pkgsrc/graphics/kf6-prison/Makefile
diff -u pkgsrc/graphics/kf6-prison/Makefile:1.14 pkgsrc/graphics/kf6-prison/Makefile:1.15
--- pkgsrc/graphics/kf6-prison/Makefile:1.14    Thu Mar 19 13:14:06 2026
+++ pkgsrc/graphics/kf6-prison/Makefile Fri Mar 20 22:14:27 2026
@@ -1,23 +1,36 @@
-# $NetBSD: Makefile,v 1.14 2026/03/19 13:14:06 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2026/03/20 22:14:27 markd Exp $
 
 DISTNAME=      prison-${KF6VER}
-PKGREVISION=   4
 CATEGORIES=    graphics
 
 HOMEPAGE=      https://community.kde.org/Frameworks
 COMMENT=       Barcode API to produce QRCode barcodes and DataMatrix barcodes
 LICENSE=       mit
 
-.include "../../meta-pkgs/kde/kf6.mk"
+# Temporarily expand out kde/kf6.mk
+#.include "../../meta-pkgs/kde/kf6.mk"
+KF6VER=6.24.0
+CATEGORIES+=   kde
+MASTER_SITES=  ${MASTER_SITE_KDE:=frameworks/${KF6VER:R}/}
+EXTRACT_SUFX=  .tar.xz
+PKGNAME?=      kf6-${DISTNAME}
 
-TOOL_DEPENDS+= kf6-kdoctools>=${KF6VER}:../../devel/kf6-kdoctools
+.include "../../devel/extra-cmake-modules/buildlink3.mk"
+
+CMAKE_CONFIGURE_ARGS+= -DKF_IGNORE_PLATFORM_CHECK=true
+
+USE_CXX_FEATURES+=     c++20
+
+.include "../../meta-pkgs/kde/Makefile.common"
+
+TOOL_DEPENDS+= kf6-kdoctools>=6.18.0:../../devel/kf6-kdoctools
+#TOOL_DEPENDS+=        kf6-kdoctools>=${KF6VER}:../../devel/kf6-kdoctools
 
 USE_TOOLS+=    pkg-config
 
 .include "../../converters/qrencode/buildlink3.mk"
 .include "../../graphics/libdmtx/buildlink3.mk"
-# TODO: restore when updating to 6.25+
-#.include "../../graphics/zxing-cpp/buildlink3.mk"
+.include "../../graphics/zxing-cpp/buildlink3.mk"
 .include "../../lang/qt6-qtdeclarative/buildlink3.mk"
 .include "../../multimedia/qt6-qtmultimedia/buildlink3.mk"
 .include "../../x11/qt6-qtbase/buildlink3.mk"

Index: pkgsrc/graphics/kf6-prison/PLIST
diff -u pkgsrc/graphics/kf6-prison/PLIST:1.3 pkgsrc/graphics/kf6-prison/PLIST:1.4
--- pkgsrc/graphics/kf6-prison/PLIST:1.3        Thu Mar 19 13:14:06 2026
+++ pkgsrc/graphics/kf6-prison/PLIST    Fri Mar 20 22:14:27 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2026/03/19 13:14:06 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2026/03/20 22:14:27 markd Exp $
 include/KF6/Prison/Prison/Barcode
 include/KF6/Prison/Prison/MeCard
 include/KF6/Prison/Prison/Prison
@@ -7,6 +7,15 @@ include/KF6/Prison/Prison/mecard.h
 include/KF6/Prison/Prison/prison.h
 include/KF6/Prison/Prison/prison_export.h
 include/KF6/Prison/prison_version.h
+include/KF6/PrisonScanner/Prison/Format
+include/KF6/PrisonScanner/Prison/ImageScanner
+include/KF6/PrisonScanner/Prison/ScanResult
+include/KF6/PrisonScanner/Prison/VideoScanner
+include/KF6/PrisonScanner/Prison/format.h
+include/KF6/PrisonScanner/Prison/imagescanner.h
+include/KF6/PrisonScanner/Prison/prisonscanner_export.h
+include/KF6/PrisonScanner/Prison/scanresult.h
+include/KF6/PrisonScanner/Prison/videoscanner.h
 lib/cmake/KF6Prison/KF6PrisonConfig.cmake
 lib/cmake/KF6Prison/KF6PrisonConfigVersion.cmake
 lib/cmake/KF6Prison/KF6PrisonTargets-noconfig.cmake
@@ -14,9 +23,16 @@ lib/cmake/KF6Prison/KF6PrisonTargets.cma
 lib/libKF6Prison.so
 lib/libKF6Prison.so.6
 lib/libKF6Prison.so.${PKGVERSION}
+lib/libKF6PrisonScanner.so
+lib/libKF6PrisonScanner.so.6
+lib/libKF6PrisonScanner.so.${PKGVERSION}
 qt6/qml/org/kde/prison/kde-qmlmodule.version
 qt6/qml/org/kde/prison/libprisonquickplugin.so
 qt6/qml/org/kde/prison/prisonquickplugin.qmltypes
 qt6/qml/org/kde/prison/qmldir
+qt6/qml/org/kde/prison/scanner/kde-qmlmodule.version
+qt6/qml/org/kde/prison/scanner/libprisonscannerquickplugin.so
+qt6/qml/org/kde/prison/scanner/prisonscannerquickplugin.qmltypes
+qt6/qml/org/kde/prison/scanner/qmldir
 share/qlogging-categories6/prison.categories
 share/qlogging-categories6/prison.renamecategories
Index: pkgsrc/graphics/kf6-prison/distinfo
diff -u pkgsrc/graphics/kf6-prison/distinfo:1.3 pkgsrc/graphics/kf6-prison/distinfo:1.4
--- pkgsrc/graphics/kf6-prison/distinfo:1.3     Mon Oct  6 09:56:03 2025
+++ pkgsrc/graphics/kf6-prison/distinfo Fri Mar 20 22:14:27 2026
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.3 2025/10/06 09:56:03 markd Exp $
+$NetBSD: distinfo,v 1.4 2026/03/20 22:14:27 markd Exp $
 
-BLAKE2s (prison-6.18.0.tar.xz) = ea9f3088dcc9b71d4a7a8bb9e3884d1ebe8acee34513ca69d8eae7bd81828a28
-SHA512 (prison-6.18.0.tar.xz) = 158dc3f29263d744526683c6fefd211fdb42f8ee24773ee8fc9d46dc1dc3a1990f227f1e889693699682de9fe5786484bed13f236d275af8112ab9bcbd54cfba
-Size (prison-6.18.0.tar.xz) = 57364 bytes
+BLAKE2s (prison-6.24.0.tar.xz) = 178327d01e1fc96cdfefff55c871fcd60206fd8a5802b4a06f74608c7932ad13
+SHA512 (prison-6.24.0.tar.xz) = a78be4d093303a03e007ae130b123ce8d0dbd7f7f546ca67b334760e6788c0c307e0374c44ed8e195f2c08265f6aabe54e3fcb93b32d35e6a18295d536234a9d
+Size (prison-6.24.0.tar.xz) = 57932 bytes
+SHA1 (patch-CMakeLists.txt) = c72e821ad7ee923556728154c37ded9c99f1f30a
+SHA1 (patch-src_lib_CMakeLists.txt) = 4a7f5b41c0f061b716071fe7d27835993b16f195
+SHA1 (patch-src_scanner_CMakeLists.txt) = aa9350fe5986768a49903b5e2b2b62a82b6d16d1

Added files:

Index: pkgsrc/graphics/kf6-prison/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/graphics/kf6-prison/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Fri Mar 20 22:14:28 2026
+++ pkgsrc/graphics/kf6-prison/patches/patch-CMakeLists.txt     Fri Mar 20 22:14:27 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2026/03/20 22:14:27 markd Exp $
+
+allow extra-cmake-modules-6.18.0 temporarily
+
+--- CMakeLists.txt.orig        2026-03-07 20:33:44.000000000 +0000
++++ CMakeLists.txt
+@@ -5,7 +5,7 @@ project(prison VERSION ${KF_VERSION})
+ 
+ # ECM setup
+ include(FeatureSummary)
+-find_package(ECM 6.24.0 NO_MODULE)
++find_package(ECM 6.18.0 NO_MODULE)
+ set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";)
+ feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES)
+ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" "${ECM_MODULE_PATH}")
Index: pkgsrc/graphics/kf6-prison/patches/patch-src_lib_CMakeLists.txt
diff -u /dev/null pkgsrc/graphics/kf6-prison/patches/patch-src_lib_CMakeLists.txt:1.1
--- /dev/null   Fri Mar 20 22:14:28 2026
+++ pkgsrc/graphics/kf6-prison/patches/patch-src_lib_CMakeLists.txt     Fri Mar 20 22:14:27 2026
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_lib_CMakeLists.txt,v 1.1 2026/03/20 22:14:27 markd Exp $
+
+Reverse https://invent.kde.org/frameworks/prison/-/commit/abc05e05bfe7244317cb635186233d656
+a4b7cea
+so that builds with extra-cmake-modules-6.18
+
+--- src/lib/CMakeLists.txt.orig        2026-03-07 20:33:44.000000000 +0000
++++ src/lib/CMakeLists.txt
+@@ -104,8 +104,8 @@ ecm_generate_headers(Prison_CamelCase_HE
+     Barcode
+     Prison
+     MeCard
+-    SHARED_PREFIX Prison
+     REQUIRED_HEADERS Prison_HEADERS
++    OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/Prison
+ )
+ 
+ ecm_generate_qdoc(KF6Prison prison.qdocconf)
Index: pkgsrc/graphics/kf6-prison/patches/patch-src_scanner_CMakeLists.txt
diff -u /dev/null pkgsrc/graphics/kf6-prison/patches/patch-src_scanner_CMakeLists.txt:1.1
--- /dev/null   Fri Mar 20 22:14:28 2026
+++ pkgsrc/graphics/kf6-prison/patches/patch-src_scanner_CMakeLists.txt Fri Mar 20 22:14:27 2026
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_scanner_CMakeLists.txt,v 1.1 2026/03/20 22:14:27 markd Exp $
+
+Reverse https://invent.kde.org/frameworks/prison/-/commit/abc05e05bfe7244317cb635186233d656a4b7cea
+so that builds with extra-cmake-modules-6.18
+
+--- src/scanner/CMakeLists.txt.orig    2026-03-07 20:33:44.000000000 +0000
++++ src/scanner/CMakeLists.txt
+@@ -60,7 +60,7 @@ ecm_generate_headers(PrisonScanner_Camel
+         ImageScanner
+         ScanResult
+         VideoScanner
+-    SHARED_PREFIX Prison
++    OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/Prison
+     REQUIRED_HEADERS PrisonScanner_HEADERS
+ )
+

Prev by Date: CVS commit: pkgsrc/net/nbtscan
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/net/nbtscan
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index