[pkgsrc/trunk]: pkgsrc/graphics/digikam digikam: update to 6.4.0 qt5/kf5 ver...

[markd <markd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/888fbd36e2ae
branches:  trunk
changeset: 417874:888fbd36e2ae
user:      markd <markd%pkgsrc.org@localhost>
date:      Sun Nov 17 09:11:20 2019 +0000

description:
digikam: update to 6.4.0  qt5/kf5 version

diffstat:

 graphics/digikam/Makefile                                                                |    61 +-
 graphics/digikam/PLIST                                                                   |  1540 ++++-----
 graphics/digikam/distinfo                                                                |    22 +-
 graphics/digikam/options.mk                                                              |    29 -
 graphics/digikam/patches/patch-CMakeLists.txt                                            |    15 -
 graphics/digikam/patches/patch-core_CMakeLists.txt                                       |    30 -
 graphics/digikam/patches/patch-core_README                                               |    16 -
 graphics/digikam/patches/patch-core_app_album_albumwatch.cpp                             |    15 -
 graphics/digikam/patches/patch-core_app_utils_libopencv.h                                |    37 -
 graphics/digikam/patches/patch-core_libs_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp    |    30 -
 graphics/digikam/patches/patch-core_libs_database_imgqsort_imgqsort.cpp                  |    50 -
 graphics/digikam/patches/patch-core_libs_dimg_filters_icc_iccmanager.h                   |    13 -
 graphics/digikam/patches/patch-core_libs_kmemoryinfo_libstatgrab_kmemoryinfo_backend.cpp |    26 +
 graphics/digikam/patches/patch-core_tests_imgqsort_detectblur_detectblur.cpp             |    13 -
 graphics/digikam/patches/patch-core_tests_imgqsort_detectnoise_detectnoise.cpp           |    13 -
 graphics/digikam/patches/patch-doc_CMakeLists.txt                                        |    12 -
 16 files changed, 756 insertions(+), 1166 deletions(-)

diffs (truncated from 2046 to 300 lines):

diff -r 9a6081bdf7b0 -r 888fbd36e2ae graphics/digikam/Makefile
--- a/graphics/digikam/Makefile Sun Nov 17 08:59:53 2019 +0000
+++ b/graphics/digikam/Makefile Sun Nov 17 09:11:20 2019 +0000
@@ -1,54 +1,45 @@
-# $NetBSD: Makefile,v 1.143 2019/11/02 22:37:55 rillig Exp $
+# $NetBSD: Makefile,v 1.144 2019/11/17 09:11:20 markd Exp $
 
-DISTNAME=      digikam-4.13.0
-PKGREVISION=   18
+DISTNAME=      digikam-6.4.0
 CATEGORIES=    graphics
-MASTER_SITES=  ${MASTER_SITE_KDE:=digikam/}
-EXTRACT_SUFX=  .tar.bz2
+MASTER_SITES=  ${MASTER_SITE_KDE:=digikam/6.4.0/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://www.digikam.org/
-COMMENT=       Advanced digital photo management application (KDE4)
+COMMENT=       Advanced digital photo management application
 LICENSE=       gnu-gpl-v2 AND gnu-fdl-v1.2 AND gnu-lgpl-v2.1
 
-BUILD_DEPENDS+=        automoc4>=0.9.83:../../devel/automoc4
-DEPENDS+=      qt4-sqlite3-[0-9]*:../../x11/qt4-sqlite3
-
-USE_PKGLOCALEDIR=      yes
-USE_LANGUAGES=         c c++
+.include "../../meta-pkgs/kde/applications.mk"
 
 REPLACE_PERL=  core/data/scripts/digitaglinktree/digitaglinktree
-CMAKE_ARGS+=   -DMYSQLD_PATH:PATH=${BUILDLINK_PREFIX.mysql-server}/libexec
-CMAKE_ARGS+=   -DENABLE_OPENCV3:BOOL=ON
-USE_TOOLS+=    gawk msgfmt perl:run pkg-config
+CMAKE_ARGS+=   -DBUILD_TESTING=OFF
+USE_TOOLS+=    flex bison msgmerge perl:run pkg-config
 
 CXXFLAGS.NetBSD+=      -D_KERNTYPES
 
-.include "options.mk"
-
-post-patch:
-       rm ${WRKSRC}/po/*/kipiplug* ${WRKSRC}/po/*/libkipi*
-
-# jasper uses SIZE_MAX and friends in its headers.
-CXXFLAGS+=     -D__STDC_LIMIT_MACROS
-
-.include "../../meta-pkgs/kde4/kde4.mk"
-.include "../../databases/mysql55-server/buildlink3.mk"
+.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/lcms/buildlink3.mk"
-.include "../../graphics/libkdcraw/buildlink3.mk"
-.include "../../graphics/libkexiv2/buildlink3.mk"
-.include "../../graphics/libkipi/buildlink3.mk"
-.include "../../graphics/libksane/buildlink3.mk"
-.include "../../graphics/libkface/buildlink3.mk"
-.include "../../graphics/libpgf/buildlink3.mk"
+.include "../../graphics/kiconthemes/buildlink3.mk"
+.include "../../graphics/lcms2/buildlink3.mk"
+.include "../../graphics/lensfun/buildlink3.mk"
+.include "../../wip/libksane/buildlink3.mk"
 .include "../../graphics/liblqr/buildlink3.mk"
+.include "../../graphics/jasper/buildlink3.mk"
+.include "../../graphics/opencv/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../math/eigen3/buildlink3.mk"
-.include "../../misc/libkgeomap/buildlink3.mk"
-.include "../../misc/libkvkontakte/buildlink3.mk"
-.include "../../sysutils/libbaloo4/buildlink3.mk"
+.include "../../wip/libkvkontakte/buildlink3.mk"
+.include "../../multimedia/ffmpeg4/buildlink3.mk"
+.include "../../sysutils/kfilemetadata5/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../www/libmediawiki/buildlink3.mk"
+.include "../../textproc/libxslt/buildlink3.mk"
+.include "../../time/kcalendarcore/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qtwebkit/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 9a6081bdf7b0 -r 888fbd36e2ae graphics/digikam/PLIST
--- a/graphics/digikam/PLIST    Sun Nov 17 08:59:53 2019 +0000
+++ b/graphics/digikam/PLIST    Sun Nov 17 09:11:20 2019 +0000
@@ -1,871 +1,720 @@
-@comment $NetBSD: PLIST,v 1.30 2015/11/03 20:47:48 markd Exp $
+@comment $NetBSD: PLIST,v 1.31 2019/11/17 09:11:20 markd Exp $
 bin/cleanup_digikamdb
 bin/digikam
 bin/digitaglinktree
 bin/showfoto
-lib/kde4/digikamimageplugin_color.so
-lib/kde4/digikamimageplugin_decorate.so
-lib/kde4/digikamimageplugin_enhance.so
-lib/kde4/digikamimageplugin_fxfilters.so
-lib/kde4/digikamimageplugin_transform.so
-lib/kde4/kio_digikamalbums.so
-lib/kde4/kio_digikamdates.so
-lib/kde4/kio_digikammapimages.so
-lib/kde4/kio_digikamsearch.so
-lib/kde4/kio_digikamtags.so
+include/digikam/batchtool.h
+include/digikam/bcgcontainer.h
+include/digikam/coredbaccess.h
+include/digikam/coredbalbuminfo.h
+include/digikam/coredbconstants.h
+include/digikam/coredbfields.h
+include/digikam/coredburl.h
+include/digikam/curvescontainer.h
+include/digikam/dbengineaction.h
+include/digikam/dbengineconfig.h
+include/digikam/dbengineconfigsettings.h
+include/digikam/dbengineerrorhandler.h
+include/digikam/dbengineparameters.h
+include/digikam/dcolor.h
+include/digikam/dcolorblend.h
+include/digikam/dcolorcomposer.h
+include/digikam/dcolorpixelaccess.h
+include/digikam/dhistoryview.h
+include/digikam/digikam_config.h
+include/digikam/digikam_core_export.h
+include/digikam/digikam_database_export.h
+include/digikam/digikam_export.h
+include/digikam/digikam_globals.h
+include/digikam/dimg.h
+include/digikam/dimgbuiltinfilter.h
+include/digikam/dimgloaderobserver.h
+include/digikam/dimgpreviewitem.h
+include/digikam/dimgthreadedanalyser.h
+include/digikam/dimgthreadedfilter.h
+include/digikam/dinfointerface.h
+include/digikam/ditemslist.h
+include/digikam/dmessagebox.h
+include/digikam/dmetainfoiface.h
+include/digikam/dplugin.h
+include/digikam/dpluginaction.h
+include/digikam/dpluginauthor.h
+include/digikam/dpluginbqm.h
+include/digikam/dplugindialog.h
+include/digikam/dplugineditor.h
+include/digikam/dplugingeneric.h
+include/digikam/dpluginloader.h
+include/digikam/dpluginrawimport.h
+include/digikam/dpreviewimage.h
+include/digikam/dpreviewmanager.h
+include/digikam/drawdecoder.h
+include/digikam/drawdecodersettings.h
+include/digikam/drawdecoding.h
+include/digikam/drawinfo.h
+include/digikam/dsavesettingswidget.h
+include/digikam/dshareddata.h
+include/digikam/dwizarddlg.h
+include/digikam/dwizardpage.h
+include/digikam/editortool.h
+include/digikam/filesaveconflictbox.h
+include/digikam/filteraction.h
+include/digikam/geocoordinates.h
+include/digikam/geoifacetypes.h
+include/digikam/gpsdatacontainer.h
+include/digikam/gpsitemcontainer.h
+include/digikam/graphicsdimgitem.h
+include/digikam/graphicsdimgview.h
+include/digikam/historyimageid.h
+include/digikam/iccprofile.h
+include/digikam/icctransform.h
+include/digikam/imageiface.h
+include/digikam/imageregionwidget.h
+include/digikam/imagezoomsettings.h
+include/digikam/iofilesettings.h
+include/digikam/iteminfo.h
+include/digikam/iteminfolist.h
+include/digikam/loadingdescription.h
+include/digikam/metaengine.h
+include/digikam/metaengine_data.h
+include/digikam/photoinfocontainer.h
+include/digikam/previewlayout.h
+include/digikam/previewsettings.h
+include/digikam/previewtoolbar.h
+include/digikam/queuesettings.h
+include/digikam/rginfo.h
+include/digikam/thumbnailinfo.h
+include/digikam/wbcontainer.h
+lib/cmake/DigikamCore/DigikamCoreConfig-noconfig.cmake
+lib/cmake/DigikamCore/DigikamCoreConfig.cmake
+lib/cmake/DigikamCore/DigikamCoreConfigVersion.cmake
+lib/cmake/DigikamDatabase/DigikamDatabaseConfig-noconfig.cmake
+lib/cmake/DigikamDatabase/DigikamDatabaseConfig.cmake
+lib/cmake/DigikamDatabase/DigikamDatabaseConfigVersion.cmake
+lib/cmake/DigikamGui/DigikamGuiConfig-noconfig.cmake
+lib/cmake/DigikamGui/DigikamGuiConfig.cmake
+lib/cmake/DigikamGui/DigikamGuiConfigVersion.cmake
 lib/libdigikamcore.so
 lib/libdigikamcore.so.${PKGVERSION}
 lib/libdigikamdatabase.so
 lib/libdigikamdatabase.so.${PKGVERSION}
+lib/libdigikamgui.so
+lib/libdigikamgui.so.${PKGVERSION}
 man/man1/cleanup_digikamdb.1
 man/man1/digitaglinktree.1
-share/appdata/digiKam-ImagePlugin_Color.metainfo.xml
-share/appdata/digiKam-ImagePlugin_Decorate.metainfo.xml
-share/appdata/digiKam-ImagePlugin_Enhance.metainfo.xml
-share/appdata/digiKam-ImagePlugin_FxFilters.metainfo.xml
-share/appdata/digiKam-ImagePlugin_Transform.metainfo.xml
-share/appdata/digikam.appdata.xml
-share/appdata/showfoto.appdata.xml
-share/applications/kde4/digikam.desktop
-share/applications/kde4/showfoto.desktop
-share/doc/kde/HTML/en/digikam/2Greens.png
-share/doc/kde/HTML/en/digikam/542px-CIExy1931_sRGB_svg.png
-share/doc/kde/HTML/en/digikam/DAM-Metadata.png
-share/doc/kde/HTML/en/digikam/DAM-Workflow.png
-share/doc/kde/HTML/en/digikam/DAM-errors.png
-share/doc/kde/HTML/en/digikam/DAM-pyramid.png
-share/doc/kde/HTML/en/digikam/DAM-story.png
-share/doc/kde/HTML/en/digikam/DAM-transmission.png
-share/doc/kde/HTML/en/digikam/ICCworkflowlogic.png
-share/doc/kde/HTML/en/digikam/addinglibraries.png
-share/doc/kde/HTML/en/digikam/adjustcurvesdialog.png
-share/doc/kde/HTML/en/digikam/adjustcurvespreview.png
-share/doc/kde/HTML/en/digikam/adjustlevelsdialog.png
-share/doc/kde/HTML/en/digikam/adjustlevelspreview.png
-share/doc/kde/HTML/en/digikam/antivignettingdialog.png
-share/doc/kde/HTML/en/digikam/antivignettingpreview.png
-share/doc/kde/HTML/en/digikam/blowupdialog.png
-share/doc/kde/HTML/en/digikam/blowuppreview.png
-share/doc/kde/HTML/en/digikam/blowupsettings1.png
-share/doc/kde/HTML/en/digikam/blowupsettings2.png
-share/doc/kde/HTML/en/digikam/blurfx_farblur.png
-share/doc/kde/HTML/en/digikam/blurfx_focusblur.png
-share/doc/kde/HTML/en/digikam/blurfx_frostglass.png
-share/doc/kde/HTML/en/digikam/blurfx_mosaic.png
-share/doc/kde/HTML/en/digikam/blurfx_motionblur.png
-share/doc/kde/HTML/en/digikam/blurfx_radialblur.png
-share/doc/kde/HTML/en/digikam/blurfx_shakeblur.png
-share/doc/kde/HTML/en/digikam/blurfx_smartblur.png
-share/doc/kde/HTML/en/digikam/blurfx_softenerblur.png
-share/doc/kde/HTML/en/digikam/blurfx_zoomblur.png
-share/doc/kde/HTML/en/digikam/blurfxpreview.png
-share/doc/kde/HTML/en/digikam/borderpreview.png
-share/doc/kde/HTML/en/digikam/cameraclient.png
-share/doc/kde/HTML/en/digikam/cameraclientdownload.png
-share/doc/kde/HTML/en/digikam/cameraclientidentity.png
-share/doc/kde/HTML/en/digikam/cameraclientitemproperties.png
-share/doc/kde/HTML/en/digikam/cameraclientsetting1.png
-share/doc/kde/HTML/en/digikam/cameraclientsetting2.png
-share/doc/kde/HTML/en/digikam/cameraclientsetting3.png
-share/doc/kde/HTML/en/digikam/camerafolderselectiondialog.png
-share/doc/kde/HTML/en/digikam/cameratargetalbumdialog.png
-share/doc/kde/HTML/en/digikam/channelmixerdialog.png
-share/doc/kde/HTML/en/digikam/channelmixerpreview.png
-share/doc/kde/HTML/en/digikam/charcoalpreview.png
-share/doc/kde/HTML/en/digikam/cimg-logo.png
-share/doc/kde/HTML/en/digikam/color-management.docbook
-share/doc/kde/HTML/en/digikam/colormanagement.png
-share/doc/kde/HTML/en/digikam/common
-share/doc/kde/HTML/en/digikam/credits-annex.docbook
-share/doc/kde/HTML/en/digikam/digikamlogo.png
-share/doc/kde/HTML/en/digikam/distortionfx_blockwaves1.png
-share/doc/kde/HTML/en/digikam/distortionfx_blockwaves2.png
-share/doc/kde/HTML/en/digikam/distortionfx_caricature.png
-share/doc/kde/HTML/en/digikam/distortionfx_circularwaves1.png
-share/doc/kde/HTML/en/digikam/distortionfx_circularwaves2.png
-share/doc/kde/HTML/en/digikam/distortionfx_corners.png
-share/doc/kde/HTML/en/digikam/distortionfx_cylinderh.png
-share/doc/kde/HTML/en/digikam/distortionfx_cylinderhv.png
-share/doc/kde/HTML/en/digikam/distortionfx_cylinderv.png
-share/doc/kde/HTML/en/digikam/distortionfx_fisheyes.png
-share/doc/kde/HTML/en/digikam/distortionfx_polarcoord.png
-share/doc/kde/HTML/en/digikam/distortionfx_tiles.png
-share/doc/kde/HTML/en/digikam/distortionfx_twirl.png
-share/doc/kde/HTML/en/digikam/distortionfx_unpolarcoord.png
-share/doc/kde/HTML/en/digikam/distortionfx_wavesh.png
-share/doc/kde/HTML/en/digikam/distortionfx_wavesv.png
-share/doc/kde/HTML/en/digikam/distortionfxpreview.png
-share/doc/kde/HTML/en/digikam/distortions.png
-share/doc/kde/HTML/en/digikam/duplicates_albumsfilter.png
-share/doc/kde/HTML/en/digikam/editor-color.docbook
-share/doc/kde/HTML/en/digikam/editor-decorate.docbook
-share/doc/kde/HTML/en/digikam/editor-enhance.docbook
-share/doc/kde/HTML/en/digikam/editor-filters.docbook
-share/doc/kde/HTML/en/digikam/editor-redeyes-correction.png
-share/doc/kde/HTML/en/digikam/editor-transform.docbook
-share/doc/kde/HTML/en/digikam/editorautolevels.png
-share/doc/kde/HTML/en/digikam/editorautosizebutton.png
-share/doc/kde/HTML/en/digikam/editorbcgadjust.png
-share/doc/kde/HTML/en/digikam/editorblurplugin.png
-share/doc/kde/HTML/en/digikam/editorbwfilter.png
-share/doc/kde/HTML/en/digikam/editorcolorbalance.png
-share/doc/kde/HTML/en/digikam/editorcommondialogtools.png
-share/doc/kde/HTML/en/digikam/editorconvert_brown.png
-share/doc/kde/HTML/en/digikam/editorconvert_bw.png
-share/doc/kde/HTML/en/digikam/editorconvert_bwgreen.png
-share/doc/kde/HTML/en/digikam/editorconvert_bworange.png
-share/doc/kde/HTML/en/digikam/editorconvert_bwred.png
-share/doc/kde/HTML/en/digikam/editorconvert_bwyellow.png
-share/doc/kde/HTML/en/digikam/editorconvert_cold.png