Update to 4.13.0

Lots of bug fixes.

12 files changed, 256 insertions, 132 deletions

diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile
index 36f75bb60bc..896618327a2 100644
--- a/graphics/digikam/Makefile
+++ b/graphics/digikam/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.120 2015/06/12 10:50:09 wiz Exp $
+# $NetBSD: Makefile,v 1.121 2015/11/03 20:47:48 markd Exp $
 
-DISTNAME=	digikam-4.4.0
-PKGREVISION=	3
+DISTNAME=	digikam-4.13.0
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_KDE:=digikam/}
 EXTRACT_SUFX=	.tar.bz2
@@ -17,15 +16,15 @@ DEPENDS+=	qt4-sqlite3-[0-9]*:../../x11/qt4-sqlite3
 USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		c c++
 
-REPLACE_PERL=	core/utilities/scripts/digitaglinktree/digitaglinktree
+REPLACE_PERL=	core/data/scripts/digitaglinktree/digitaglinktree
 CMAKE_ARGS+=    -DMYSQLD_PATH:PATH=${BUILDLINK_PREFIX.mysql-server}/libexec
-CMAKE_ARGS+=	-DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS:BOOL=OFF
+CMAKE_ARGS+=	-DENABLE_OPENCV3:BOOL=ON
 USE_TOOLS+=	gawk msgfmt perl:run pkg-config
 
 .include "options.mk"
 
 post-patch:
-	rm ${WRKSRC}/po/*/libkgeomap.po ${WRKSRC}/po/*/kipiplug* ${WRKSRC}/po/*/libkipi*
+	rm ${WRKSRC}/po/*/kipiplug* ${WRKSRC}/po/*/libkipi*
 
 .include "../../meta-pkgs/kde4/kde4.mk"
 .include "../../databases/mysql55-server/buildlink3.mk"
diff --git a/graphics/digikam/PLIST b/graphics/digikam/PLIST
index fd25d975439..99c7b1dd671 100644
--- a/graphics/digikam/PLIST
+++ b/graphics/digikam/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.29 2014/11/15 21:15:18 markd Exp $
+@comment $NetBSD: PLIST,v 1.30 2015/11/03 20:47:48 markd Exp $
 bin/cleanup_digikamdb
 bin/digikam
 bin/digitaglinktree
@@ -13,7 +13,6 @@ lib/kde4/kio_digikamdates.so
 lib/kde4/kio_digikammapimages.so
 lib/kde4/kio_digikamsearch.so
 lib/kde4/kio_digikamtags.so
-lib/kde4/libexec/digikamdatabaseserver
 lib/libdigikamcore.so
 lib/libdigikamcore.so.${PKGVERSION}
 lib/libdigikamdatabase.so
@@ -273,6 +272,96 @@ share/doc/kde/HTML/en/showfoto/introductionplugininterfaces.png
 share/doc/kde/HTML/en/showfoto/setupgeneral.png
 share/doc/kde/HTML/en/showfoto/setupplugins.png
 share/doc/kde/HTML/en/showfoto/setupslideshow.png
+share/doc/kde/HTML/it/digikam/color-management.docbook
+share/doc/kde/HTML/it/digikam/common
+share/doc/kde/HTML/it/digikam/credits-annex.docbook
+share/doc/kde/HTML/it/digikam/editor-color.docbook
+share/doc/kde/HTML/it/digikam/editor-decorate.docbook
+share/doc/kde/HTML/it/digikam/editor-enhance.docbook
+share/doc/kde/HTML/it/digikam/editor-filters.docbook
+share/doc/kde/HTML/it/digikam/editor-transform.docbook
+share/doc/kde/HTML/it/digikam/file-formats.docbook
+share/doc/kde/HTML/it/digikam/ie-menu.docbook
+share/doc/kde/HTML/it/digikam/index.cache.bz2
+share/doc/kde/HTML/it/digikam/index.docbook
+share/doc/kde/HTML/it/digikam/menu-descriptions.docbook
+share/doc/kde/HTML/it/digikam/photo-editing.docbook
+share/doc/kde/HTML/it/digikam/sidebar.docbook
+share/doc/kde/HTML/nl/digikam/color-management.docbook
+share/doc/kde/HTML/nl/digikam/common
+share/doc/kde/HTML/nl/digikam/credits-annex.docbook
+share/doc/kde/HTML/nl/digikam/editor-color.docbook
+share/doc/kde/HTML/nl/digikam/editor-decorate.docbook
+share/doc/kde/HTML/nl/digikam/editor-enhance.docbook
+share/doc/kde/HTML/nl/digikam/editor-filters.docbook
+share/doc/kde/HTML/nl/digikam/editor-transform.docbook
+share/doc/kde/HTML/nl/digikam/file-formats.docbook
+share/doc/kde/HTML/nl/digikam/ie-menu.docbook
+share/doc/kde/HTML/nl/digikam/index.cache.bz2
+share/doc/kde/HTML/nl/digikam/index.docbook
+share/doc/kde/HTML/nl/digikam/menu-descriptions.docbook
+share/doc/kde/HTML/nl/digikam/photo-editing.docbook
+share/doc/kde/HTML/nl/digikam/sidebar.docbook
+share/doc/kde/HTML/pt/digikam/color-management.docbook
+share/doc/kde/HTML/pt/digikam/common
+share/doc/kde/HTML/pt/digikam/credits-annex.docbook
+share/doc/kde/HTML/pt/digikam/editor-color.docbook
+share/doc/kde/HTML/pt/digikam/editor-decorate.docbook
+share/doc/kde/HTML/pt/digikam/editor-enhance.docbook
+share/doc/kde/HTML/pt/digikam/editor-filters.docbook
+share/doc/kde/HTML/pt/digikam/editor-transform.docbook
+share/doc/kde/HTML/pt/digikam/file-formats.docbook
+share/doc/kde/HTML/pt/digikam/ie-menu.docbook
+share/doc/kde/HTML/pt/digikam/index.cache.bz2
+share/doc/kde/HTML/pt/digikam/index.docbook
+share/doc/kde/HTML/pt/digikam/menu-descriptions.docbook
+share/doc/kde/HTML/pt/digikam/photo-editing.docbook
+share/doc/kde/HTML/pt/digikam/sidebar.docbook
+share/doc/kde/HTML/pt_BR/digikam/color-management.docbook
+share/doc/kde/HTML/pt_BR/digikam/common
+share/doc/kde/HTML/pt_BR/digikam/credits-annex.docbook
+share/doc/kde/HTML/pt_BR/digikam/editor-color.docbook
+share/doc/kde/HTML/pt_BR/digikam/editor-decorate.docbook
+share/doc/kde/HTML/pt_BR/digikam/editor-enhance.docbook
+share/doc/kde/HTML/pt_BR/digikam/editor-filters.docbook
+share/doc/kde/HTML/pt_BR/digikam/editor-transform.docbook
+share/doc/kde/HTML/pt_BR/digikam/file-formats.docbook
+share/doc/kde/HTML/pt_BR/digikam/ie-menu.docbook
+share/doc/kde/HTML/pt_BR/digikam/index.cache.bz2
+share/doc/kde/HTML/pt_BR/digikam/index.docbook
+share/doc/kde/HTML/pt_BR/digikam/menu-descriptions.docbook
+share/doc/kde/HTML/pt_BR/digikam/photo-editing.docbook
+share/doc/kde/HTML/pt_BR/digikam/sidebar.docbook
+share/doc/kde/HTML/sv/digikam/color-management.docbook
+share/doc/kde/HTML/sv/digikam/common
+share/doc/kde/HTML/sv/digikam/credits-annex.docbook
+share/doc/kde/HTML/sv/digikam/editor-color.docbook
+share/doc/kde/HTML/sv/digikam/editor-decorate.docbook
+share/doc/kde/HTML/sv/digikam/editor-enhance.docbook
+share/doc/kde/HTML/sv/digikam/editor-filters.docbook
+share/doc/kde/HTML/sv/digikam/editor-transform.docbook
+share/doc/kde/HTML/sv/digikam/file-formats.docbook
+share/doc/kde/HTML/sv/digikam/ie-menu.docbook
+share/doc/kde/HTML/sv/digikam/index.cache.bz2
+share/doc/kde/HTML/sv/digikam/index.docbook
+share/doc/kde/HTML/sv/digikam/menu-descriptions.docbook
+share/doc/kde/HTML/sv/digikam/photo-editing.docbook
+share/doc/kde/HTML/sv/digikam/sidebar.docbook
+share/doc/kde/HTML/uk/digikam/color-management.docbook
+share/doc/kde/HTML/uk/digikam/common
+share/doc/kde/HTML/uk/digikam/credits-annex.docbook
+share/doc/kde/HTML/uk/digikam/editor-color.docbook
+share/doc/kde/HTML/uk/digikam/editor-decorate.docbook
+share/doc/kde/HTML/uk/digikam/editor-enhance.docbook
+share/doc/kde/HTML/uk/digikam/editor-filters.docbook
+share/doc/kde/HTML/uk/digikam/editor-transform.docbook
+share/doc/kde/HTML/uk/digikam/file-formats.docbook
+share/doc/kde/HTML/uk/digikam/ie-menu.docbook
+share/doc/kde/HTML/uk/digikam/index.cache.bz2
+share/doc/kde/HTML/uk/digikam/index.docbook
+share/doc/kde/HTML/uk/digikam/menu-descriptions.docbook
+share/doc/kde/HTML/uk/digikam/photo-editing.docbook
+share/doc/kde/HTML/uk/digikam/sidebar.docbook
 share/icons/hicolor/128x128/apps/digikam.png
 share/icons/hicolor/128x128/apps/showfoto.png
 share/icons/hicolor/16x16/apps/digikam.png
diff --git a/graphics/digikam/distinfo b/graphics/digikam/distinfo
index a8f0d685f4e..d16dc8a025c 100644
--- a/graphics/digikam/distinfo
+++ b/graphics/digikam/distinfo
@@ -1,14 +1,17 @@
-$NetBSD: distinfo,v 1.46 2014/11/17 19:02:30 joerg Exp $
+$NetBSD: distinfo,v 1.47 2015/11/03 20:47:48 markd Exp $
 
-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 (digikam-4.13.0.tar.bz2) = d696ac88dcb3bcbd3a5da83b0fbe5e7315a43f92
+RMD160 (digikam-4.13.0.tar.bz2) = 11d6aa15a94cd38acca79f2a31f65393a01a2b0b
+SHA512 (digikam-4.13.0.tar.bz2) = 0cadb55f568a34d07f008791ca351428f4cd9e7060ba79aa8acc25e5e38f0bbcd586df764dacbcb9d1dadb56d2fb9160760cc89aeab4d7cef9bdbd26f691752b
+Size (digikam-4.13.0.tar.bz2) = 69554099 bytes
+SHA1 (patch-CMakeLists.txt) = ee3eba86700bc98c27fa43b53a295b20d9f6be2e
+SHA1 (patch-core_CMakeLists.txt) = 672b7327a66a67eaddc4f74121a1039c4ef318e5
+SHA1 (patch-core_README) = 66feff98fe74f9bb0478fb183f5292d48474bce9
 SHA1 (patch-core_app_album_albumwatch.cpp) = b43de7db712d3ee59412f350e4dd3cd805600556
+SHA1 (patch-core_app_utils_libopencv.h) = bba134463fc923afa5d54d2fbfe8cbd7569aef7b
 SHA1 (patch-core_libs_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp) = 050904de646281448da1bba7a9fb1b1b0fad51b1
+SHA1 (patch-core_libs_database_imgqsort_imgqsort.cpp) = db8750b66dc6e2c08958795e747a564f0506d7b1
 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-core_tests_imgqsort_detectblur_detectblur.cpp) = a2d49329ff9c4d7d05c23d5f0a2a152e9d02d790
-SHA1 (patch-core_tests_imgqsort_detectnoise_detectnoise.cpp) = 62b4f08733475c7eaf95c64747bc8c18a3dbfae3
+SHA1 (patch-core_tests_imgqsort_detectblur_detectblur.cpp) = 6d1e05be8887e2473051761f0919edec0ced03ef
+SHA1 (patch-core_tests_imgqsort_detectnoise_detectnoise.cpp) = db708620ed31325429b61a1074eea25c64cd72ad
 SHA1 (patch-doc_CMakeLists.txt) = 5b4ba1daa49607b8773c3903d953e11bebc4d661
diff --git a/graphics/digikam/patches/patch-CMakeLists.txt b/graphics/digikam/patches/patch-CMakeLists.txt
index d217559945f..ba32bea2d83 100644
--- a/graphics/digikam/patches/patch-CMakeLists.txt
+++ b/graphics/digikam/patches/patch-CMakeLists.txt
@@ -1,49 +1,15 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2013/04/03 12:52:04 markd Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.3 2015/11/03 20:47:48 markd Exp $
 
-Don't do extras -- they are separate packages
+Don't do kipi-plugins -- separate package
 
---- CMakeLists.txt.orig	2013-03-11 08:25:34.000000000 +0000
+--- CMakeLists.txt.orig	2015-09-03 21:22:44.000000000 +0000
 +++ CMakeLists.txt
-@@ -127,15 +127,15 @@ IF(ENABLE_PRIVATE_KDEGRAPHICS)
-         )
- ENDIF()
+@@ -215,7 +215,7 @@ endif()
  
--# prepend our own FindXXX modules to CMAKE_MODULE_PATH
--SET(CMAKE_MODULE_PATH
--        ${CMAKE_SOURCE_DIR}/extra/libkgeomap/cmake/modules
--        ${CMAKE_SOURCE_DIR}/extra/libmediawiki/cmake/modules
--        ${CMAKE_SOURCE_DIR}/extra/libkface/cmake/modules
--        ${CMAKE_SOURCE_DIR}/extra/libkvkontakte/cmake/modules
--        ${CMAKE_SOURCE_DIR}/cmake/modules
--        ${CMAKE_MODULE_PATH}
--    )
-+## prepend our own FindXXX modules to CMAKE_MODULE_PATH
-+#SET(CMAKE_MODULE_PATH
-+#        ${CMAKE_SOURCE_DIR}/extra/libkgeomap/cmake/modules
-+#        ${CMAKE_SOURCE_DIR}/extra/libmediawiki/cmake/modules
-+#        ${CMAKE_SOURCE_DIR}/extra/libkface/cmake/modules
-+#        ${CMAKE_SOURCE_DIR}/extra/libkvkontakte/cmake/modules
-+#        ${CMAKE_SOURCE_DIR}/cmake/modules
-+#        ${CMAKE_MODULE_PATH}
-+#    )
+ ############################################################################################################################################
  
- IF(ENABLE_PRIVATE_KDEGRAPHICS)
-     SET(KIPI_LOCAL_DIR extra/libkipi)
-@@ -144,12 +144,12 @@ IF(ENABLE_PRIVATE_KDEGRAPHICS)
-     SET(KSANE_LOCAL_DIR extra/libksane)
- ENDIF()
+-add_subdirectory(extra)
++#add_subdirectory(extra)
+ add_subdirectory(core)
  
--SET(KFACE_LOCAL_DIR extra/libkface)
--SET(KGEOMAP_LOCAL_DIR extra/libkgeomap)
--SET(MEDIAWIKI_LOCAL_DIR extra/libmediawiki)
--SET(LIBKVKONTAKTE_LOCAL_DIR extra/libkvkontakte)
-+#SET(KFACE_LOCAL_DIR extra/libkface)
-+#SET(KGEOMAP_LOCAL_DIR extra/libkgeomap)
-+#SET(MEDIAWIKI_LOCAL_DIR extra/libmediawiki)
-+#SET(LIBKVKONTAKTE_LOCAL_DIR extra/libkvkontakte)
- 
--ADD_SUBDIRECTORY(extra)
-+#ADD_SUBDIRECTORY(extra)
- ADD_SUBDIRECTORY(core)
- 
- IF(ENABLE_COMPILE_DOC)
+ if(ENABLE_COMPILE_DOC)
diff --git a/graphics/digikam/patches/patch-core_CMakeLists.txt b/graphics/digikam/patches/patch-core_CMakeLists.txt
new file mode 100644
index 00000000000..69ba4ca063f
--- /dev/null
+++ b/graphics/digikam/patches/patch-core_CMakeLists.txt
@@ -0,0 +1,30 @@
+$NetBSD: patch-core_CMakeLists.txt,v 1.1 2015/11/03 20:47:48 markd Exp $
+
+opencv3 support. https://bugs.kde.org/show_bug.cgi?id=349601
+
+--- core/CMakeLists.txt.orig	2015-09-03 21:22:45.000000000 +0000
++++ core/CMakeLists.txt
+@@ -12,6 +12,7 @@ message(STATUS "Starting CMake configura
+ 
+ option(ENABLE_INTERNALMYSQL     "Build digiKam with internal MySQL server executable (default=OFF)"              OFF)
+ option(ENABLE_LCMS2             "Build digiKam with LCMS2 instead LCMS1 (default=OFF)"                           OFF)
++option(ENABLE_OPENCV3           "Build digiKam with OpenCV3 instead OpenCV2 (default=OFF)"                       OFF)
+ option(ENABLE_BALOOSUPPORT      "Build digiKam with Baloo support (default=ON)"                                  ON)
+ option(ENABLE_KDEPIMLIBSSUPPORT "Build digiKam with Kdepimlibs support (default=OFF)"                            OFF)
+ 
+@@ -122,8 +123,13 @@ find_package(Boost)
+ 
+ # -- check OpenCV --------------------------------------------------------------------------------
+ 
+-set(OPENCV_MIN_VERSION "2.4.9")
+-DETECT_OPENCV(${OPENCV_MIN_VERSION}  core highgui objdetect contrib legacy imgproc)
++if (ENABLE_OPENCV3)
++    set(OPENCV_MIN_VERSION "3.0.0")
++    DETECT_OPENCV(${OPENCV_MIN_VERSION} core face highgui objdetect imgproc)
++else()
++    set(OPENCV_MIN_VERSION "2.4.9")
++    DETECT_OPENCV(${OPENCV_MIN_VERSION} core highgui objdetect contrib legacy imgproc)
++endif()
+ 
+ # -- check the libkdcraw version -----------------------------------------------------------------
+ 
diff --git a/graphics/digikam/patches/patch-core_README b/graphics/digikam/patches/patch-core_README
new file mode 100644
index 00000000000..c48b5651b87
--- /dev/null
+++ b/graphics/digikam/patches/patch-core_README
@@ -0,0 +1,16 @@
+$NetBSD: patch-core_README,v 1.1 2015/11/03 20:47:48 markd Exp $
+
+opencv3 support. https://bugs.kde.org/show_bug.cgi?id=349601
+
+--- core/README.orig	2015-09-03 21:22:45.000000000 +0000
++++ core/README
+@@ -122,6 +122,9 @@ CMake compilation options to custom digi
+ Use CMake "-DENABLE_LCMS2=on"             flag to compile digiKam source code using lcms2 instead lcms1                          (disabled by default).
+ Use CMake "-DENABLE_BALOOSUPPORT=on"      flag to compile digiKam with Baloo support                                             (disabled by default).
+ Use CMake "-DENABLE_KDEPIMLIBSSUPPORT=on" flag to compile digiKam with KdePimLibs support                                        (disabled by default).
++Use CMake "-DENABLE_OPENCV3=on"           flag to compile libkface source code using OpenCV3 instead OpenCV2                     (disabled by default).
++                                          OpenCV3 support needs extra contrib modules package, especially 'face'
++                                          and 'legacy' components.
+ 
+ Mysql support options (experimental):
+ 
diff --git a/graphics/digikam/patches/patch-core_app_utils_libopencv.h b/graphics/digikam/patches/patch-core_app_utils_libopencv.h
new file mode 100644
index 00000000000..760b9796666
--- /dev/null
+++ b/graphics/digikam/patches/patch-core_app_utils_libopencv.h
@@ -0,0 +1,37 @@
+$NetBSD: patch-core_app_utils_libopencv.h,v 1.1 2015/11/03 20:47:48 markd Exp $
+
+opencv3 support. https://bugs.kde.org/show_bug.cgi?id=349601
+
+--- core/app/utils/libopencv.h.orig	2015-09-03 21:22:45.000000000 +0000
++++ core/app/utils/libopencv.h
+@@ -7,7 +7,7 @@
+  * @date   2010-06-16
+  * @brief  Wrapper for OpenCV header files
+  *
+- * @author Copyright (C) 2012-2014 by Gilles Caulier
++ * @author Copyright (C) 2012-2015 by Gilles Caulier
+  *         <a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a>
+  *
+  * This program is free software; you can redistribute it
+@@ -46,17 +46,19 @@
+ 
+ #define OPENCV_MAKE_VERSION(major,minor,patch) (((major) << 16) | ((minor) << 8) | (patch))
+ #define OPENCV_VERSION                         OPENCV_MAKE_VERSION(CV_MAJOR_VERSION,CV_MINOR_VERSION,CV_SUBMINOR_VERSION)
+-#define OPENCV_TEST_VERSION(major,minor,patch) ( OPENCV_VERSION >= OPENCV_MAKE_VERSION(major,minor,patch) )
++#define OPENCV_TEST_VERSION(major,minor,patch) ( OPENCV_VERSION < OPENCV_MAKE_VERSION(major,minor,patch) )
+ 
+-#if OPENCV_TEST_VERSION(2,3,0)
++#if OPENCV_TEST_VERSION(2,5,0)
+ #   include <opencv2/opencv.hpp>
+ #   include <opencv2/legacy/compat.hpp>
+ #   include <opencv/cvaux.h>
++#   include <opencv2/imgproc/imgproc.hpp>
+ #else
+ #   include <opencv/cv.h>
+ #   include <opencv/cvaux.h>
+ #   include <opencv/cxcore.h>
+ #   include <opencv/highgui.h>
++#   include <opencv2/imgproc.hpp>
+ #endif
+ 
+ // Restore warnings
diff --git a/graphics/digikam/patches/patch-core_libs_database_imgqsort_imgqsort.cpp b/graphics/digikam/patches/patch-core_libs_database_imgqsort_imgqsort.cpp
new file mode 100644
index 00000000000..52c3095cee2
--- /dev/null
+++ b/graphics/digikam/patches/patch-core_libs_database_imgqsort_imgqsort.cpp
@@ -0,0 +1,50 @@
+$NetBSD: patch-core_libs_database_imgqsort_imgqsort.cpp,v 1.1 2015/11/03 20:47:48 markd Exp $
+
+opencv3 support. https://bugs.kde.org/show_bug.cgi?id=349601
+
+--- core/libs/database/imgqsort/imgqsort.cpp.orig	2015-09-03 21:22:45.000000000 +0000
++++ core/libs/database/imgqsort/imgqsort.cpp
+@@ -282,10 +282,15 @@ void ImgQSort::readImage() const
+ 
+     MixerFilter mixer(&d->image, 0L, settings);
+     mixer.startFilterDirectly();
+-
+     d->image.putImageData(mixer.getTargetImage().bits());
++
++#if OPENCV_TEST_VERSION(3,0,0)
+     d->src      = cvCreateMat(d->image.numPixels(), 3, CV_8UC3); // Create a matrix containing the pixel values of original image
+     d->src_gray = cvCreateMat(d->image.numPixels(), 1, CV_8UC1); // Create a matrix containing the pixel values of grayscaled image
++#else
++    d->src      = Mat(d->image.numPixels(), 3, CV_8UC3); // Create a matrix containing the pixel values of original image
++    d->src_gray = Mat(d->image.numPixels(), 1, CV_8UC1); // Create a matrix containing the pixel values of grayscaled image
++#endif
+ 
+     if (d->imq.detectNoise)
+     {
+@@ -655,7 +660,12 @@ int ImgQSort::compressiondetector() cons
+     int countblocks      = 0;
+     int number_of_blocks = 0;
+     int sum              = 0;
++
++#if OPENCV_TEST_VERSION(3,0,0)
+     vector<int> average_bottom, average_middle, average_top;
++#else
++    std::vector<int> average_bottom, average_middle, average_top;
++#endif
+ 
+     // Go through 8 blocks at a time horizontally
+     // iterating through columns.
+@@ -792,7 +802,13 @@ int ImgQSort::compressiondetector() cons
+ int ImgQSort::exposureamount() const
+ {
+     /// Separate the image in 3 places ( B, G and R )
++
++#if OPENCV_TEST_VERSION(3,0,0)
+     vector<Mat> bgr_planes;
++#else
++    std::vector<Mat> bgr_planes;
++#endif
++
+     split(d->src, bgr_planes);
+ 
+     /// Establish the number of bins
diff --git a/graphics/digikam/patches/patch-core_libs_imageproperties_captionedit.cpp b/graphics/digikam/patches/patch-core_libs_imageproperties_captionedit.cpp
deleted file mode 100644
index 7f385dd0d4e..00000000000
--- a/graphics/digikam/patches/patch-core_libs_imageproperties_captionedit.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-$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
deleted file mode 100644
index a35542826d7..00000000000
--- a/graphics/digikam/patches/patch-core_libs_imageproperties_imagedescedittab.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-$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
- }
diff --git a/graphics/digikam/patches/patch-core_tests_imgqsort_detectblur_detectblur.cpp b/graphics/digikam/patches/patch-core_tests_imgqsort_detectblur_detectblur.cpp
index f41f1800477..65b159984d6 100644
--- a/graphics/digikam/patches/patch-core_tests_imgqsort_detectblur_detectblur.cpp
+++ b/graphics/digikam/patches/patch-core_tests_imgqsort_detectblur_detectblur.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-core_tests_imgqsort_detectblur_detectblur.cpp,v 1.1 2014/11/17 19:02:30 joerg Exp $
+$NetBSD: patch-core_tests_imgqsort_detectblur_detectblur.cpp,v 1.2 2015/11/03 20:47:48 markd Exp $
 
 --- core/tests/imgqsort/detectblur/detectblur.cpp.orig	2014-11-17 15:36:48.000000000 +0000
 +++ core/tests/imgqsort/detectblur/detectblur.cpp
@@ -6,8 +6,8 @@ $NetBSD: patch-core_tests_imgqsort_detectblur_detectblur.cpp,v 1.1 2014/11/17 19
      blur( src_gray, detected_edges, Size(3,3) );
  
      // Canny detector
--    Canny( detected_edges, detected_edges, lowThreshold, lowThreshold*ratio, kernel_size );
-+    Canny( detected_edges, detected_edges, lowThreshold, lowThreshold*::ratio, kernel_size );
+-    Canny( detected_edges, detected_edges, lowThreshold, lowThreshold*ratio_value, kernel_size );
++    Canny( detected_edges, detected_edges, lowThreshold, lowThreshold*::ratio_value, kernel_size );
  
      // Using Canny's output as a mask, we display our result
      dst = Scalar::all(0);
diff --git a/graphics/digikam/patches/patch-core_tests_imgqsort_detectnoise_detectnoise.cpp b/graphics/digikam/patches/patch-core_tests_imgqsort_detectnoise_detectnoise.cpp
index 2c2f8abbac0..54ac5950d93 100644
--- a/graphics/digikam/patches/patch-core_tests_imgqsort_detectnoise_detectnoise.cpp
+++ b/graphics/digikam/patches/patch-core_tests_imgqsort_detectnoise_detectnoise.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-core_tests_imgqsort_detectnoise_detectnoise.cpp,v 1.1 2014/11/17 19:02:30 joerg Exp $
+$NetBSD: patch-core_tests_imgqsort_detectnoise_detectnoise.cpp,v 1.2 2015/11/03 20:47:48 markd Exp $
 
 --- core/tests/imgqsort/detectnoise/detectnoise.cpp.orig	2014-11-17 15:37:46.000000000 +0000
 +++ core/tests/imgqsort/detectnoise/detectnoise.cpp
@@ -6,8 +6,8 @@ $NetBSD: patch-core_tests_imgqsort_detectnoise_detectnoise.cpp,v 1.1 2014/11/17
      blur( src_gray, detected_edges, Size(3,3) );
  
      // Canny detector
--    Canny( detected_edges, detected_edges, lowThreshold, lowThreshold*ratio, kernel_size );
-+    Canny( detected_edges, detected_edges, lowThreshold, lowThreshold*::ratio, kernel_size );
+-    Canny( detected_edges, detected_edges, lowThreshold, lowThreshold*ratio_value, kernel_size );
++    Canny( detected_edges, detected_edges, lowThreshold, lowThreshold*::ratio_value, kernel_size );
  
      // Using Canny's output as a mask, we display our result
      dst = Scalar::all(0);