Update digikam to 4.4.0

4.4.0:
* Slideshow support multi-monitors computer and use a new OSD widget.
  Users can also change Tags and Labels through keyboard shortcuts.
* New keyboard shortcut to switch on/off color managed view for thumbnails
  and preview.
* New keyboard shortcuts to improve usability while photo review (as to
  switch focus on text edit widget, or to toggle tags view). It's also
  possible to navigate between pictures using PageUp/PageDown while
  editing properties through captions/tags sidebar.

4.3.0:
* New option to display all non geo-located images from collections.
* New notification event when kio-slave cannot be started. OSX event
  notifier is now used to dispatch notifications under Mac.
* New action to exclude items without rating with items filter (see details
  on this blog entry).

4.2.0:
* New view on left sidebar to search quickly items with assigned Labels.
* On tags tree-view a new option to show items with no tag.

4.1.0:
* The face management feature has seen huge improvements and includes fixes
  for some problems introduced in recent releases.
* The detection and recognition of faces is now more robust and suitable
  for production.
* All icon views now have a new overlay to identify photos that have
  geo-location information, making it easier for users to search albums for
  photos with GPS coordinates.
* The maximum thumbnail size is now 512 pixels, up from 256 pixels
  previously, improving their appearance on high-resolution displays.

4.0.0:
* A new tool dedicated to organize whole tag hierarchies.
* A new maintenance tool dedicated to parse image quality and auto-tags
  items automatically using Pick Labels.
* Showfoto thumbbar is now ported to Qt model/view in order to switch later
  full digiKam code to Qt5.
* A lots of work have been done into Import tool to fix several
  dysfunctions reported since a very long time.
* This release is now fully ported to Qt4 model-view and drop last
  Q3-Support classes.
* This release include also the multi-core CPU support for severals tools
  which require a lots of computing, as Sharpen, LocalContrast, Noise
  Reduction, and all visual effects tools.

8 files changed, 95 insertions, 51 deletions

diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile
index 834a4c5c705..b98c5fbd171 100644
--- a/graphics/digikam/Makefile
+++ b/graphics/digikam/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.116 2014/11/07 19:39:34 adam Exp $
+# $NetBSD: Makefile,v 1.117 2014/11/15 21:15:18 markd Exp $
 
-DISTNAME=	digikam-3.5.0
-PKGREVISION=	11
+DISTNAME=	digikam-4.4.0
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_KDE:=digikam/}
 EXTRACT_SUFX=	.tar.bz2
@@ -43,6 +42,7 @@ post-patch:
 .include "../../math/eigen3/buildlink3.mk"
 .include "../../misc/libkgeomap/buildlink3.mk"
 .include "../../misc/libkvkontakte/buildlink3.mk"
+.include "../../sysutils/baloo/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../www/libmediawiki/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/digikam/PLIST b/graphics/digikam/PLIST
index 1d29f452d46..fd25d975439 100644
--- a/graphics/digikam/PLIST
+++ b/graphics/digikam/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.28 2013/11/10 03:19:26 markd Exp $
+@comment $NetBSD: PLIST,v 1.29 2014/11/15 21:15:18 markd Exp $
 bin/cleanup_digikamdb
 bin/digikam
 bin/digitaglinktree
@@ -15,13 +15,18 @@ lib/kde4/kio_digikamsearch.so
 lib/kde4/kio_digikamtags.so
 lib/kde4/libexec/digikamdatabaseserver
 lib/libdigikamcore.so
-lib/libdigikamcore.so.3
-lib/libdigikamcore.so.3.0.0
+lib/libdigikamcore.so.${PKGVERSION}
 lib/libdigikamdatabase.so
-lib/libdigikamdatabase.so.3
-lib/libdigikamdatabase.so.3.0.0
+lib/libdigikamdatabase.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
@@ -401,6 +406,7 @@ share/kde/apps/digikam/icons/hicolor/128x128/actions/restoration.png
 share/kde/apps/digikam/icons/hicolor/128x128/actions/sharpenimage.png
 share/kde/apps/digikam/icons/hicolor/128x128/actions/shear.png
 share/kde/apps/digikam/icons/hicolor/128x128/actions/superimpose.png
+share/kde/apps/digikam/icons/hicolor/128x128/actions/tag.png
 share/kde/apps/digikam/icons/hicolor/128x128/actions/texture.png
 share/kde/apps/digikam/icons/hicolor/128x128/actions/tonemap.png
 share/kde/apps/digikam/icons/hicolor/128x128/actions/viewimage.png
@@ -517,7 +523,6 @@ share/kde/apps/digikam/icons/hicolor/22x22/actions/texture.png
 share/kde/apps/digikam/icons/hicolor/22x22/actions/tonemap.png
 share/kde/apps/digikam/icons/hicolor/22x22/actions/viewimage.png
 share/kde/apps/digikam/icons/hicolor/22x22/actions/whitebalance.png
-share/kde/apps/digikam/icons/hicolor/22x22/mimetypes/raw.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/adjustcurves.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/adjusthsl.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/adjustlevels.png
@@ -584,14 +589,12 @@ share/kde/apps/digikam/icons/hicolor/32x32/actions/tag-places.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/tag-properties.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/tag-recents.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/tag-reset.png
-share/kde/apps/digikam/icons/hicolor/32x32/actions/tag.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/texture.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/tonemap.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/underexposure.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/viewimage.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/whitebalance.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/zoom-select-fit.png
-share/kde/apps/digikam/icons/hicolor/32x32/mimetypes/raw.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/adjustcurves.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/adjusthsl.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/adjustlevels.png
@@ -648,7 +651,6 @@ share/kde/apps/digikam/icons/hicolor/48x48/actions/texture.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/tonemap.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/viewimage.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/whitebalance.png
-share/kde/apps/digikam/icons/hicolor/48x48/mimetypes/raw.png
 share/kde/apps/digikam/icons/hicolor/64x64/actions/adjustcurves.png
 share/kde/apps/digikam/icons/hicolor/64x64/actions/adjusthsl.png
 share/kde/apps/digikam/icons/hicolor/64x64/actions/adjustlevels.png
@@ -705,7 +707,6 @@ share/kde/apps/digikam/icons/hicolor/64x64/actions/texture.png
 share/kde/apps/digikam/icons/hicolor/64x64/actions/tonemap.png
 share/kde/apps/digikam/icons/hicolor/64x64/actions/viewimage.png
 share/kde/apps/digikam/icons/hicolor/64x64/actions/whitebalance.png
-share/kde/apps/digikam/icons/hicolor/64x64/mimetypes/raw.png
 share/kde/apps/digikam/icons/hicolor/scalable/actions/adjustcurves.svgz
 share/kde/apps/digikam/icons/hicolor/scalable/actions/adjustlevels.svgz
 share/kde/apps/digikam/icons/hicolor/scalable/actions/adjustrgb.svgz
diff --git a/graphics/digikam/distinfo b/graphics/digikam/distinfo
index 4ed2c6222bc..54b3f9e7c38 100644
--- a/graphics/digikam/distinfo
+++ b/graphics/digikam/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.44 2013/11/10 03:19:26 markd Exp $
+$NetBSD: distinfo,v 1.45 2014/11/15 21:15:18 markd Exp $
 
-SHA1 (digikam-3.5.0.tar.bz2) = 9e44fcf219312cbcbbaee0cc9a7f460a01769224
-RMD160 (digikam-3.5.0.tar.bz2) = 99afee6f47818653a5011f5a3416a04fb3a6a70f
-Size (digikam-3.5.0.tar.bz2) = 65698806 bytes
+SHA1 (digikam-4.4.0.tar.bz2) = 1feb43120addda314e09761440ec2058e430171c
+RMD160 (digikam-4.4.0.tar.bz2) = 540f243361aba3c95b675c05f84d8d60efab1948
+Size (digikam-4.4.0.tar.bz2) = 68871203 bytes
 SHA1 (patch-CMakeLists.txt) = 83bdf0398c3a4120ce6dc83d205ca32c50229ff2
-SHA1 (patch-bootstrap.local) = e1f0bbdd9508d0c32b7a6fd3e3a0b40ca16092ce
-SHA1 (patch-core_digikam_album_albumwatch.cpp) = cf80a12fef5c998efcad1fd5dcb5df3a0e4e5ae0
-SHA1 (patch-core_libs_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp) = d98ddf66a7d95868e4efa0f03935097f2e8a7795
+SHA1 (patch-core_app_album_albumwatch.cpp) = b43de7db712d3ee59412f350e4dd3cd805600556
+SHA1 (patch-core_libs_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp) = 050904de646281448da1bba7a9fb1b1b0fad51b1
 SHA1 (patch-core_libs_dimg_filters_icc_iccmanager.h) = 999bd32312fbe840913a8d29613b351384061b65
+SHA1 (patch-core_libs_imageproperties_captionedit.cpp) = a0f181ff4af9f71eee5679aef540a78497a113a9
+SHA1 (patch-core_libs_imageproperties_imagedescedittab.cpp) = a09fa20eaac60bf7dc6bcb2b9a1304891029ccb0
 SHA1 (patch-doc_CMakeLists.txt) = 5b4ba1daa49607b8773c3903d953e11bebc4d661
diff --git a/graphics/digikam/patches/patch-bootstrap.local b/graphics/digikam/patches/patch-bootstrap.local
deleted file mode 100644
index adb9462bed6..00000000000
--- a/graphics/digikam/patches/patch-bootstrap.local
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-bootstrap.local,v 1.2 2013/09/10 11:22:30 wiz Exp $
-
-Fix unportable test(1) construct.
-
---- bootstrap.local.orig	2013-03-11 08:25:34.000000000 +0000
-+++ bootstrap.local
-@@ -36,7 +36,7 @@ export PKG_CONFIG_PATH=$DIGIKAM_INSTALL_
- #export CXX=g++4.4
- 
- # Manage local install dir
--if [ $CLEANROOT == 1 ]
-+if [ $CLEANROOT = 1 ]
- then
-     rm -Rf $DIGIKAM_INSTALL_PREFIX
- fi
diff --git a/graphics/digikam/patches/patch-core_digikam_album_albumwatch.cpp b/graphics/digikam/patches/patch-core_app_album_albumwatch.cpp
index e73f5cdaad2..deab5663335 100644
--- a/graphics/digikam/patches/patch-core_digikam_album_albumwatch.cpp
+++ b/graphics/digikam/patches/patch-core_app_album_albumwatch.cpp
@@ -1,9 +1,9 @@
-$NetBSD: patch-core_digikam_album_albumwatch.cpp,v 1.1 2013/05/23 11:18:26 markd Exp $
+$NetBSD: patch-core_app_album_albumwatch.cpp,v 1.1 2014/11/15 21:15:18 markd Exp $
 
 Don't watch individual files on NetBSD - runs out of file descriptors
 
---- core/digikam/album/albumwatch.cpp.orig	2013-05-13 07:51:25.000000000 +0000
-+++ core/digikam/album/albumwatch.cpp
+--- core/app/album/albumwatch.cpp.orig	2013-05-13 07:51:25.000000000 +0000
++++ core/app/album/albumwatch.cpp
 @@ -278,7 +278,7 @@ void AlbumWatch::slotAlbumAdded(Album* a
              // Disable file watch for OS X and Windows and hope for future
              // improvement (possibly with the improvements planned for
diff --git a/graphics/digikam/patches/patch-core_libs_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp b/graphics/digikam/patches/patch-core_libs_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp
index e291f8a393f..76066871553 100644
--- a/graphics/digikam/patches/patch-core_libs_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp
+++ b/graphics/digikam/patches/patch-core_libs_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp
@@ -1,11 +1,11 @@
-$NetBSD: patch-core_libs_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp,v 1.3 2013/05/06 20:40:12 markd Exp $
+$NetBSD: patch-core_libs_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp,v 1.4 2014/11/15 21:15:18 markd Exp $
 
 Make memory info backend compile on NetBSD.  Need to check
 it actually returns the correct results.
 
---- core/libs/3rdparty/kmemoryinfo/kmemoryinfo_backend.cpp.orig	2013-03-11 08:24:30.000000000 +0000
+--- core/libs/3rdparty/kmemoryinfo/kmemoryinfo_backend.cpp.orig	2014-10-08 12:32:44.000000000 +0000
 +++ core/libs/3rdparty/kmemoryinfo/kmemoryinfo_backend.cpp
-@@ -67,7 +67,8 @@ static int fillMemoryInfo(Digikam::KMemo
+@@ -70,7 +70,8 @@ static int fillMemoryInfo(Digikam::KMemo
  #if defined(Q_OS_NETBSD)
  #include <sys/param.h>
  #include <sys/time.h>
@@ -15,16 +15,7 @@ it actually returns the correct results.
  #endif
  #if defined(Q_OS_OPENBSD)
  #include <sys/param.h>
-@@ -152,7 +153,7 @@ struct uvmexp* sg_get_uvmexp()
-     int                  mib[2];
-     size_t               size = sizeof(struct uvmexp);
-     static struct uvmexp uvm;
--    struct uvmexp*       new;
-+    /* struct uvmexp*       new; */
- 
-     mib[0] = CTL_VM;
-     mib[1] = VM_UVMEXP;
-@@ -420,9 +421,9 @@ int get_mem_stats(Digikam::KMemoryInfo::
+@@ -426,9 +427,9 @@ int get_mem_stats(Digikam::KMemoryInfo::
          return 0;
      }
  
diff --git a/graphics/digikam/patches/patch-core_libs_imageproperties_captionedit.cpp b/graphics/digikam/patches/patch-core_libs_imageproperties_captionedit.cpp
new file mode 100644
index 00000000000..7f385dd0d4e
--- /dev/null
+++ b/graphics/digikam/patches/patch-core_libs_imageproperties_captionedit.cpp
@@ -0,0 +1,24 @@
+$NetBSD: patch-core_libs_imageproperties_captionedit.cpp,v 1.1 2014/11/15 21:15:18 markd Exp $
+
+commit f6945f23e0ed1e11f26e2c7e62b02baa8cfa640e
+Author: Pino Toscano <pino@kde.org>
+Date:   Tue Oct 14 22:26:19 2014 +0200
+
+    fix libkexiv2 version for AltLangStrEdit::textEdit()
+    
+    it is part of current libkexiv2/master only (i.e. post 4.14.x, which
+    is 2.3.x)
+
+diff --git a/libs/imageproperties/captionedit.cpp b/libs/imageproperties/captionedit.cpp
+index 88413fc..70bdb6d 100644
+--- core/libs/imageproperties/captionedit.cpp
++++ core/libs/imageproperties/captionedit.cpp
+@@ -202,7 +202,7 @@ void CaptionEdit::slotAuthorChanged(const QString& text)
+ 
+ MsgTextEdit* CaptionEdit::textEdit() const
+ {
+-#if KEXIV2_VERSION >= 0x020302
++#if KEXIV2_VERSION >= 0x020400
+     return d->altLangStrEdit->textEdit();
+ #else
+     return 0;
diff --git a/graphics/digikam/patches/patch-core_libs_imageproperties_imagedescedittab.cpp b/graphics/digikam/patches/patch-core_libs_imageproperties_imagedescedittab.cpp
new file mode 100644
index 00000000000..a35542826d7
--- /dev/null
+++ b/graphics/digikam/patches/patch-core_libs_imageproperties_imagedescedittab.cpp
@@ -0,0 +1,42 @@
+$NetBSD: patch-core_libs_imageproperties_imagedescedittab.cpp,v 1.1 2014/11/15 21:15:18 markd Exp $
+
+commit f6945f23e0ed1e11f26e2c7e62b02baa8cfa640e
+Author: Pino Toscano <pino@kde.org>
+Date:   Tue Oct 14 22:26:19 2014 +0200
+
+    fix libkexiv2 version for AltLangStrEdit::textEdit()
+    
+    it is part of current libkexiv2/master only (i.e. post 4.14.x, which
+    is 2.3.x)
+
+diff --git a/libs/imageproperties/imagedescedittab.cpp b/libs/imageproperties/imagedescedittab.cpp
+index ebfbae1..3d12777 100644
+--- core/libs/imageproperties/imagedescedittab.cpp
++++ core/libs/imageproperties/imagedescedittab.cpp
+@@ -429,7 +429,7 @@ ImageDescEditTab::ImageDescEditTab(QWidget* const parent)
+ 
+     // Initialize ---------------------------------------------
+ 
+-#if KEXIV2_VERSION >= 0x020302
++#if KEXIV2_VERSION >= 0x020400
+     d->titleEdit->textEdit()->installEventFilter(this);
+     d->captionsEdit->textEdit()->installEventFilter(this);
+ #endif
+@@ -532,7 +532,7 @@ void ImageDescEditTab::setFocusToNewTagEdit()
+ void ImageDescEditTab::setFocusToTitlesEdit()
+ {
+     d->tabWidget->setCurrentIndex(Private::DESCRIPTIONS);
+-#if KEXIV2_VERSION >= 0x020302
++#if KEXIV2_VERSION >= 0x020400
+     d->titleEdit->textEdit()->setFocus();
+ #endif
+ }
+@@ -540,7 +540,7 @@ void ImageDescEditTab::setFocusToTitlesEdit()
+ void ImageDescEditTab::setFocusToCommentsEdit()
+ {
+     d->tabWidget->setCurrentIndex(Private::DESCRIPTIONS);
+-#if KEXIV2_VERSION >= 0x020302
++#if KEXIV2_VERSION >= 0x020400
+     d->captionsEdit->textEdit()->setFocus();
+ #endif
+ }