digikam: rename to digikam-qt6 for testing, and add conflict

[Thomas Klausner (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Thu Mar 20 00:07:40 2025 +0100
Changeset:	9cb04592ec92acc40ceae439dffc3f33488a6536

Modified Files:
	digikam/Makefile

Log Message:
digikam: rename to digikam-qt6 for testing, and add conflict

Clean up, add upstream bug report link

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9cb04592ec92acc40ceae439dffc3f33488a6536

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

diffstat:
 digikam/Makefile | 36 ++++++++++--------------------------
 1 file changed, 10 insertions(+), 26 deletions(-)

diffs:
diff --git a/digikam/Makefile b/digikam/Makefile
index 0c0a9bd407..a44b291cf1 100644
--- a/digikam/Makefile
+++ b/digikam/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.245 2025/02/12 06:45:07 ryoon Exp $
 
 DISTNAME=	digiKam-8.6.0
-PKGNAME=	${DISTNAME:tl}
+PKGNAME=	${DISTNAME:tl:S/m-/m-qt6-/}
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_KDE:=digikam/${PKGVERSION_NOREV}/}
 
@@ -14,6 +14,11 @@ DEPENDS+=	p5-Image-ExifTool-[0-9]*:../../graphics/p5-Image-ExifTool
 
 WRKSRC=		${WRKDIR}/${DISTNAME:tl}
 
+CONFLICTS+=		digikam-[0-9]*
+# work/.buildlink/include/jasper/jas_config.h:116:6: error: "__STDC_VERSION__" is not defined, evaluates to 0 [-Werror=undef]
+# and more from x265.h
+# Reported upstream at
+# https://bugs.kde.org/show_bug.cgi?id=501769
 BUILDLINK_TRANSFORM+=	rm:-Werror=undef
 
 .include "../../meta-pkgs/kde/applications.mk"
@@ -21,29 +26,20 @@ BUILDLINK_TRANSFORM+=	rm:-Werror=undef
 REPLACE_PERL=	core/data/scripts/digitaglinktree/digitaglinktree
 
 CMAKE_CONFIGURE_ARGS+=	-DBUILD_TESTING=OFF
+CMAKE_CONFIGURE_ARGS+=	-DBUILD_WITH_QT6=TRUE
 CMAKE_CONFIGURE_ARGS+=	-DENABLE_KFILEMETADATASUPPORT=ON
-CMAKE_CONFIGURE_ARGS+=	-DCMAKE_DISABLE_FIND_PACKAGE_KF5AkonadiContact:BOOL=TRUE
 
 USE_TOOLS+=	flex bison msgmerge perl:run pkg-config
 
-CXXFLAGS.NetBSD+=	-D_KERNTYPES
-
-CHECK_PORTABILITY_SKIP+=	*.desktop.cmake.in
-
 .include "../../devel/boost-libs/buildlink3.mk"
-#.include "../../devel/knotifications/buildlink3.mk"
-#.include "../../devel/knotifyconfig/buildlink3.mk"
 .include "../../devel/libgphoto2/buildlink3.mk"
-#.include "../../devel/threadweaver/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/exiv2/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/ImageMagick/buildlink3.mk"
-#.include "../../graphics/kiconthemes/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
 .include "../../graphics/lensfun/buildlink3.mk"
 .include "../../graphics/libheif/buildlink3.mk"
-#.include "../../graphics/libksane/buildlink3.mk"
 .include "../../graphics/libjxl/buildlink3.mk"
 .include "../../graphics/liblqr/buildlink3.mk"
 .include "../../graphics/jasper/buildlink3.mk"
@@ -51,25 +47,13 @@ CHECK_PORTABILITY_SKIP+=	*.desktop.cmake.in
 .include "../../graphics/opencv-contrib-face/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../math/eigen3/buildlink3.mk"
-#.include "../../misc/marble/buildlink3.mk"
 .include "../../multimedia/ffmpeg6/buildlink3.mk"
-# XXX: temporarily disabled since it breaks compilation
-#.include "../../multimedia/x265/buildlink3.mk"
-#.include "../../sysutils/kfilemetadata5/buildlink3.mk"
+.include "../../multimedia/x265/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
-# does not provide the library libakonadicontact that digikam 8.4.0 is looking for
+# does not provide the library libakonadicontact that digikam is looking for
 #.include "../../misc/akonadi-contacts/buildlink3.mk"
-#.include "../../time/kcalendarcore/buildlink3.mk"
-#.include "../../x11/qt5-qtbase/buildlink3.mk"
-#.include "../../x11/qt5-qtwebengine/buildlink3.mk"
-# not recognized by configure step
-#.include "../../x11/qt5-qtmultimedia/buildlink3.mk"
-#.include "../../x11/qt5-qtnetworkauth/buildlink3.mk"
-# unpackaged: qtav - libXv is required by qtav
 .include "../../x11/libXv/buildlink3.mk"
-#
-CMAKE_CONFIGURE_ARGS+=	-DBUILD_WITH_QT6=TRUE
 .include "../../devel/kf6-ki18n/buildlink3.mk"
 .include "../../graphics/qt6-qtsvg/buildlink3.mk"
 .include "../../lang/qt6-qtscxml/buildlink3.mk"
@@ -89,6 +73,6 @@ CMAKE_CONFIGURE_ARGS+=	-DBUILD_WITH_QT6=TRUE
 .include "../../devel/kf6-knotifyconfig/buildlink3.mk"
 .include "../../devel/kf6-knotifications/buildlink3.mk"
 .include "../../sysutils/kf6-kfilemetadata/buildlink3.mk"
-# package missing: KSaneWidgets6Config.cmake
+# TODO: pkgsrc has no package providing KSaneWidgets6Config.cmake
 .include "../../time/kf6-kcalendarcore/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"