4 files changed, 25 insertions, 43 deletions

diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile
index 6d0593b73280..257ed80b021d 100644
--- a/graphics/digikam/Makefile
+++ b/graphics/digikam/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	digikam
-DISTVERSION=	7.1.0
-PORTREVISION=	5
+DISTVERSION=	7.3.0
 CATEGORIES=	graphics kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}
 DIST_SUBDIR=	KDE/digikam/${PORTVERSION}
diff --git a/graphics/digikam/distinfo b/graphics/digikam/distinfo
index ef268a80d055..4a0c0144116b 100644
--- a/graphics/digikam/distinfo
+++ b/graphics/digikam/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1599295900
-SHA256 (KDE/digikam/7.1.0/digikam-7.1.0.tar.xz) = b103c8463adf04939583199e13f8e83015d8a4a9ad79ebfd502d2a50b5a5abbe
-SIZE (KDE/digikam/7.1.0/digikam-7.1.0.tar.xz) = 593501044
+TIMESTAMP = 1626164066
+SHA256 (KDE/digikam/7.3.0/digikam-7.3.0.tar.xz) = 95aea93be1cfd39bb52333b82b3e57bf68080c7d1319d754d167a20f6dbe4551
+SIZE (KDE/digikam/7.3.0/digikam-7.3.0.tar.xz) = 256985340
diff --git a/graphics/digikam/files/patch-core_app_utils_digikam__version.cpp b/graphics/digikam/files/patch-core_app_utils_digikam__version.cpp
deleted file mode 100644
index 13adac682ee2..000000000000
--- a/graphics/digikam/files/patch-core_app_utils_digikam__version.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- core/app/utils/digikam_version.cpp.orig	2019-11-03 09:03:59 UTC
-+++ core/app/utils/digikam_version.cpp
-@@ -29,7 +29,7 @@
- 
- // Local includes.
- 
--#include "gitversion.h"
-+#define GITVERSION ""
- #include "daboutdata.h"
- 
- #if defined(Q_CC_GNU)
diff --git a/graphics/digikam/pkg-plist b/graphics/digikam/pkg-plist
index 6e97f6bd481b..839bf74fdc6e 100644
--- a/graphics/digikam/pkg-plist
+++ b/graphics/digikam/pkg-plist
@@ -10,6 +10,7 @@ include/digikam/coredbconstants.h
 include/digikam/coredbfields.h
 include/digikam/coredburl.h
 include/digikam/curvescontainer.h
+include/digikam/dactivelabel.h
 include/digikam/dbengineaction.h
 include/digikam/dbengineconfig.h
 include/digikam/dbengineconfigsettings.h
@@ -49,6 +50,7 @@ include/digikam/dpluginloader.h
 include/digikam/dpluginrawimport.h
 include/digikam/dpreviewimage.h
 include/digikam/dpreviewmanager.h
+include/digikam/dprogresswdg.h
 include/digikam/drawdecoder.h
 include/digikam/drawdecodersettings.h
 include/digikam/drawdecoding.h
@@ -90,6 +92,8 @@ include/digikam/rginfo.h
 include/digikam/thumbnailinfo.h
 include/digikam/thumbnailloadthread.h
 include/digikam/wbcontainer.h
+include/digikam/wstooldialog.h
+include/digikam/wstoolutils.h
 lib/cmake/DigikamCore/DigikamCoreConfig-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/DigikamCore/DigikamCoreConfig.cmake
 lib/cmake/DigikamCore/DigikamCoreConfigVersion.cmake
@@ -202,10 +206,10 @@ lib/libdigikamgui.so.%%SHLIB_VER%%
 %%QT_PLUGINDIR%%/digikam/editor/Editor_WhiteBalanceTool_Plugin.so
 %%QT_PLUGINDIR%%/digikam/generic/Generic_Box_Plugin.so
 %%QT_PLUGINDIR%%/digikam/generic/Generic_Calendar_Plugin.so
+%%QT_PLUGINDIR%%/digikam/generic/Generic_DNGConverter_Plugin.so
 %%QT_PLUGINDIR%%/digikam/generic/Generic_DigitalScanner_Plugin.so
 %%QT_PLUGINDIR%%/digikam/generic/Generic_DropBox_Plugin.so
 %%QT_PLUGINDIR%%/digikam/generic/Generic_ExpoBlending_Plugin.so
-%%QT_PLUGINDIR%%/digikam/generic/Generic_FaceBook_Plugin.so
 %%QT_PLUGINDIR%%/digikam/generic/Generic_FileCopy_Plugin.so
 %%QT_PLUGINDIR%%/digikam/generic/Generic_FileTransfer_Plugin.so
 %%QT_PLUGINDIR%%/digikam/generic/Generic_Flickr_Plugin.so
@@ -215,7 +219,6 @@ lib/libdigikamgui.so.%%SHLIB_VER%%
 %%QT_PLUGINDIR%%/digikam/generic/Generic_HtmlGallery_Plugin.so
 %%QT_PLUGINDIR%%/digikam/generic/Generic_ImageShack_Plugin.so
 %%QT_PLUGINDIR%%/digikam/generic/Generic_ImgUr_Plugin.so
-%%QT_PLUGINDIR%%/digikam/generic/Generic_IpFs_Plugin.so
 %%QT_PLUGINDIR%%/digikam/generic/Generic_JAlbum_Plugin.so
 %%QT_PLUGINDIR%%/digikam/generic/Generic_MediaServer_Plugin.so
 %%QT_PLUGINDIR%%/digikam/generic/Generic_MediaWiki_Plugin.so
@@ -236,6 +239,7 @@ lib/libdigikamgui.so.%%SHLIB_VER%%
 %%MEDIAPLAYER%%%%QT_PLUGINDIR%%/digikam/generic/Generic_VideoSlideShow_Plugin.so
 %%QT_PLUGINDIR%%/digikam/generic/Generic_Wallpaper_Plugin.so
 %%QT_PLUGINDIR%%/digikam/generic/Generic_YandexFotki_Plugin.so
+%%QT_PLUGINDIR%%/digikam/generic/Generic_iNaturalist_Plugin.so
 %%QT_PLUGINDIR%%/digikam/rawimport/RawImport_DarkTable_Plugin.so
 %%QT_PLUGINDIR%%/digikam/rawimport/RawImport_Native_Plugin.so
 %%QT_PLUGINDIR%%/digikam/rawimport/RawImport_RawTherapee_Plugin.so
@@ -286,6 +290,7 @@ share/applications/org.kde.showfoto.desktop
 %%DATADIR%%/data/craters-pattern.png
 %%DATADIR%%/data/curvefree.png
 %%DATADIR%%/data/curvemooth.png
+%%DATADIR%%/data/detectFacesImg.png
 %%DATADIR%%/data/dried-pattern.png
 %%DATADIR%%/data/duplicatebothhorz.png
 %%DATADIR%%/data/duplicatebothvert.png
@@ -297,6 +302,7 @@ share/applications/org.kde.showfoto.desktop
 %%DATADIR%%/data/histogram-log.png
 %%DATADIR%%/data/histogram.png
 %%DATADIR%%/data/ice-pattern.png
+%%DATADIR%%/data/ignoreImg.png
 %%DATADIR%%/data/image-full.png
 %%DATADIR%%/data/image-selection.png
 %%DATADIR%%/data/leaf-pattern.png
@@ -326,6 +332,7 @@ share/applications/org.kde.showfoto.desktop
 %%DATADIR%%/data/modern-texture.png
 %%DATADIR%%/data/moss-texture.png
 %%DATADIR%%/data/original.png
+%%DATADIR%%/data/overlayImg.png
 %%DATADIR%%/data/paper-pattern.png
 %%DATADIR%%/data/paper-texture.png
 %%DATADIR%%/data/paper2-texture.png
@@ -339,17 +346,15 @@ share/applications/org.kde.showfoto.desktop
 %%DATADIR%%/data/splash-digikam.png
 %%DATADIR%%/data/stone-pattern.png
 %%DATADIR%%/data/stone-texture.png
+%%DATADIR%%/data/tagFacesImg.gif
 %%DATADIR%%/data/target.png
 %%DATADIR%%/data/togglemouseover.png
 %%DATADIR%%/data/wall-pattern.png
 %%DATADIR%%/data/wall-texture.png
 %%DATADIR%%/data/wood-pattern.png
+%%DATADIR%%/data/workOnAllCoresImg.png
 %%DATADIR%%/database/dbconfig.xml
 %%DATADIR%%/database/mysql-global.conf
-%%DATADIR%%/facesengine/deploy.prototxt
-%%DATADIR%%/facesengine/openface_nn4.small2.v1.t7
-%%DATADIR%%/facesengine/res10_300x300_ssd_iter_140000_fp16.caffemodel
-%%DATADIR%%/facesengine/shapepredictor.dat
 %%DATADIR%%/geoiface/backend-googlemaps-js.js
 %%DATADIR%%/geoiface/backend-googlemaps.html
 %%DATADIR%%/geoiface/cluster-circle-00ff00-selected.png
@@ -633,14 +638,12 @@ share/icons/hicolor/128x128/apps/showfoto.png
 share/icons/hicolor/16x16/apps/digikam.png
 share/icons/hicolor/16x16/apps/dk-box.png
 share/icons/hicolor/16x16/apps/dk-dropbox.png
-share/icons/hicolor/16x16/apps/dk-facebook-white.png
-share/icons/hicolor/16x16/apps/dk-facebook.png
 share/icons/hicolor/16x16/apps/dk-flickr.png
 share/icons/hicolor/16x16/apps/dk-googledrive.png
 share/icons/hicolor/16x16/apps/dk-googlephoto.png
 share/icons/hicolor/16x16/apps/dk-imageshack.png
 share/icons/hicolor/16x16/apps/dk-imgur.png
-share/icons/hicolor/16x16/apps/dk-ipfs.png
+share/icons/hicolor/16x16/apps/dk-inat.png
 share/icons/hicolor/16x16/apps/dk-mediawiki.png
 share/icons/hicolor/16x16/apps/dk-onedrive.png
 share/icons/hicolor/16x16/apps/dk-pinterest.png
@@ -653,14 +656,12 @@ share/icons/hicolor/16x16/apps/showfoto.png
 share/icons/hicolor/22x22/apps/digikam.png
 share/icons/hicolor/22x22/apps/dk-box.png
 share/icons/hicolor/22x22/apps/dk-dropbox.png
-share/icons/hicolor/22x22/apps/dk-facebook-white.png
-share/icons/hicolor/22x22/apps/dk-facebook.png
 share/icons/hicolor/22x22/apps/dk-flickr.png
 share/icons/hicolor/22x22/apps/dk-googledrive.png
 share/icons/hicolor/22x22/apps/dk-googlephoto.png
 share/icons/hicolor/22x22/apps/dk-imageshack.png
 share/icons/hicolor/22x22/apps/dk-imgur.png
-share/icons/hicolor/22x22/apps/dk-ipfs.png
+share/icons/hicolor/22x22/apps/dk-inat.png
 share/icons/hicolor/22x22/apps/dk-mediawiki.png
 share/icons/hicolor/22x22/apps/dk-onedrive.png
 share/icons/hicolor/22x22/apps/dk-pinterest.png
@@ -693,14 +694,12 @@ share/icons/hicolor/32x32/actions/underexposure.png
 share/icons/hicolor/32x32/apps/digikam.png
 share/icons/hicolor/32x32/apps/dk-box.png
 share/icons/hicolor/32x32/apps/dk-dropbox.png
-share/icons/hicolor/32x32/apps/dk-facebook-white.png
-share/icons/hicolor/32x32/apps/dk-facebook.png
 share/icons/hicolor/32x32/apps/dk-flickr.png
 share/icons/hicolor/32x32/apps/dk-googledrive.png
 share/icons/hicolor/32x32/apps/dk-googlephoto.png
 share/icons/hicolor/32x32/apps/dk-imageshack.png
 share/icons/hicolor/32x32/apps/dk-imgur.png
-share/icons/hicolor/32x32/apps/dk-ipfs.png
+share/icons/hicolor/32x32/apps/dk-inat.png
 share/icons/hicolor/32x32/apps/dk-mediawiki.png
 share/icons/hicolor/32x32/apps/dk-onedrive.png
 share/icons/hicolor/32x32/apps/dk-pinterest.png
@@ -713,14 +712,12 @@ share/icons/hicolor/32x32/apps/showfoto.png
 share/icons/hicolor/48x48/apps/digikam.png
 share/icons/hicolor/48x48/apps/dk-box.png
 share/icons/hicolor/48x48/apps/dk-dropbox.png
-share/icons/hicolor/48x48/apps/dk-facebook-white.png
-share/icons/hicolor/48x48/apps/dk-facebook.png
 share/icons/hicolor/48x48/apps/dk-flickr.png
 share/icons/hicolor/48x48/apps/dk-googledrive.png
 share/icons/hicolor/48x48/apps/dk-googlephoto.png
 share/icons/hicolor/48x48/apps/dk-imageshack.png
 share/icons/hicolor/48x48/apps/dk-imgur.png
-share/icons/hicolor/48x48/apps/dk-ipfs.png
+share/icons/hicolor/48x48/apps/dk-inat.png
 share/icons/hicolor/48x48/apps/dk-mediawiki.png
 share/icons/hicolor/48x48/apps/dk-onedrive.png
 share/icons/hicolor/48x48/apps/dk-pinterest.png
@@ -735,12 +732,9 @@ share/icons/hicolor/64x64/apps/showfoto.png
 share/icons/hicolor/96x96/apps/expoblending.png
 share/icons/hicolor/96x96/apps/panorama.png
 share/icons/hicolor/scalable/apps/digikam.svgz
-share/icons/hicolor/scalable/apps/dk-facebook-white.svgz
-share/icons/hicolor/scalable/apps/dk-facebook.svgz
 share/icons/hicolor/scalable/apps/dk-flickr.svgz
 share/icons/hicolor/scalable/apps/dk-googlephoto.svgz
 share/icons/hicolor/scalable/apps/dk-imgur.svgz
-share/icons/hicolor/scalable/apps/dk-ipfs.svgz
 share/icons/hicolor/scalable/apps/dk-mediawiki.svgz
 share/icons/hicolor/scalable/apps/dk-piwigo.svgz
 share/icons/hicolor/scalable/apps/dk-smugmug.svgz
@@ -753,12 +747,6 @@ share/kxmlgui5/digikam/importui5.rc
 share/kxmlgui5/digikam/lighttablewindowui5.rc
 share/kxmlgui5/digikam/queuemgrwindowui5.rc
 share/kxmlgui5/showfoto/showfotoui5.rc
-share/metainfo/org.kde.digikam.appdata.xml
-share/metainfo/org.kde.showfoto.appdata.xml
-share/showfoto/data/banner-showfoto.png
-share/showfoto/data/logo-showfoto.png
-share/showfoto/data/splash-showfoto.png
-share/solid/actions/digikam-opencamera.desktop
 %%NLS%%share/locale/ar/LC_MESSAGES/digikam.mo
 %%NLS%%share/locale/be/LC_MESSAGES/digikam.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/digikam.mo
@@ -814,3 +802,9 @@ share/solid/actions/digikam-opencamera.desktop
 %%NLS%%share/locale/vi/LC_MESSAGES/digikam.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/digikam.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/digikam.mo
+share/metainfo/org.kde.digikam.appdata.xml
+share/metainfo/org.kde.showfoto.appdata.xml
+share/showfoto/data/banner-showfoto.png
+share/showfoto/data/logo-showfoto.png
+share/showfoto/data/splash-showfoto.png
+share/solid/actions/digikam-opencamera.desktop