14 files changed, 51 insertions, 627 deletions

diff --git a/graphics/digikam-kde4/Makefile b/graphics/digikam-kde4/Makefile
index 3b3fc5cbcf97..5af4d82820e4 100644
--- a/graphics/digikam-kde4/Makefile
+++ b/graphics/digikam-kde4/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	digikam
 PORTVERSION=	${DIGIKAM_VER}
-PORTREVISION=	3
 PORTEPOCH=	2
 CATEGORIES=	graphics kde
 
@@ -25,13 +24,13 @@ LIB_DEPENDS=	libtiff.so:graphics/tiff \
 		libboost_graph.so:devel/boost-libs
 
 USES+=		pkgconfig shebangfix
-USE_KDE4+=	libkdcraw libkexiv2 libkipi
+USE_KDE4+=	libkdcraw libkexiv2 libkipi runtime_run
 USE_QT4+=	sql-sqlite3_run
 USE_LDCONFIG=	yes
 CMAKE_ARGS+=	-DWITH_Sqlite2:BOOL=OFF
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/core
-SHEBANG_FILES=	utilities/scripts/digitaglinktree/digitaglinktree
+SHEBANG_FILES=	data/scripts/digitaglinktree/digitaglinktree
 
 OPTIONS_DEFINE=		DOCS NLS GPHOTO2 PIMLIBS MYSQL
 OPTIONS_DEFAULT=	GPHOTO2 PIMLIBS
@@ -44,17 +43,21 @@ NLS_RUN_DEPENDS=	digikam-l10n>=${DIGIKAM_VER}:graphics/digikam-kde4-l10n
 
 GPHOTO2_DESC=		Gphoto2 camera support
 GPHOTO2_LIB_DEPENDS=	libgphoto2.so:graphics/libgphoto2
+GPHOTO2_CMAKE_ON=	-DWITH_Gphoto2:BOOL=ON
 GPHOTO2_CMAKE_OFF=	-DWITH_Gphoto2:BOOL=OFF
 
 PIMLIBS_DESC=		Address book support
-PIMLIBS_USE=		KDE4=pimlibs
+PIMLIBS_USE=		KDE4=pimlibs baloo
 PIMLIBS_CMAKE_ON=	-DENABLE_KDEPIMLIBSSUPPORT:BOOL=ON
 PIMLIBS_CMAKE_OFF=	-DENABLE_KDEPIMLIBSSUPPORT:BOOL=OFF
 
 MYSQL_USE=		MYSQL=server QT4=sql-mysql_run
 MYSQL_BUILD_DEPENDS=	${LOCALBASE}/lib/mysql/libmysqld.a:${_MYSQL_SERVER}
 MYSQL_CMAKE_ON= 	-DMYSQLD_PATH:PATH=${LOCALBASE}/libexec \
-			-DMYSQL_TOOLS_PATH:PATH=${LOCALBASE}/bin
-MYSQL_CMAKE_OFF=	-DENABLE_INTERNALMYSQL:BOOL=OFF
+			-DMYSQL_TOOLS_PATH:PATH=${LOCALBASE}/bin \
+			-DENABLE_INTERNALMYSQL:BOOL=ON \
+			-DENABLE_MYSQLSUPPORT:BOOL=ON
+MYSQL_CMAKE_OFF=	-DENABLE_INTERNALMYSQL:BOOL=OFF \
+			-DENABLE_MYSQLSUPPORT:BOOL=OFF
 
 .include <bsd.port.mk>
diff --git a/graphics/digikam-kde4/Makefile.common b/graphics/digikam-kde4/Makefile.common
index 50db7bbddd5b..3958f83291e2 100644
--- a/graphics/digikam-kde4/Makefile.common
+++ b/graphics/digikam-kde4/Makefile.common
@@ -1,7 +1,6 @@
 # $FreeBSD$
 #
 # Make sure when DIGIKAM_VER is updated that the following ports are updated:
-#	astro/libkgeomap
 #	graphics/digikam-kde4
 #	graphics/digikam-kde4-doc
 #	graphics/digikam-kde4-l10n
@@ -9,11 +8,13 @@
 #	graphics/kipi-plugins-kde4
 #	graphics/libkface
 #	graphics/libkipiplugins
-#	net/libkvkontakte
-#	net/libmediawiki
+# These ports now lead independent lives:
+#	astro/libkgeomap (part of KDE Applications)
+#	net/libkvkontakte (part of KDE Applications)
+#	net/libmediawiki (part of digiKam 4.12)
 
-DIGIKAM_VER=	4.2.0
-MASTER_SITES=	KDE/Attic/digikam
+DIGIKAM_VER=	4.14.0
+MASTER_SITES=	KDE/stable/digikam
 
 KIPI_PLUGINS_ALL=	acquireimages \
 			advancedslideshow \
@@ -27,7 +28,7 @@ KIPI_PLUGINS_ALL=	acquireimages \
 			flashexport \
 			flickrexport \
 			galleryexport \
-			googledrive \
+			googleservices \
 			gpssync \
 			htmlexport \
 			imageshackexport \
@@ -43,7 +44,6 @@ KIPI_PLUGINS_ALL=	acquireimages \
 			metadataedit \
 			panorama \
 			photolayoutseditor \
-			picasawebexport \
 			piwigoexport \
 			printimages \
 			rajceexport \
@@ -70,8 +70,6 @@ advancedslideshow_DESC=	Slide images with 2D and 3D effects using OpenGL
 batchprocess_DESC=	Batch process images (convert, resize, rename, etc.)
 calendar_DESC=		Create calendars
 debianscreenshots_DESC=	Export images to Debian Screenshots web service
-# builds and media server shows up, but files are not accessible
-# dlnaexport_DESC=	Export collection on DLNA network service
 dngconverter_DESC=	Convert Raw Image to Digital NeGative
 dropbox_DESC=		Export images to Dropbox cloud service
 expoblending_DESC=	Create pseudo HDR image with a stack of bracketed images
@@ -79,7 +77,7 @@ facebook_DESC=		Import/export images to/from a remote Facebook web service
 flashexport_DESC=	Export images to Flash using SimpleViewer
 flickrexport_DESC=	Export images to a remote Flickr based web service
 galleryexport_DESC=	Export images to a remote Gallery
-googledrive_DESC=	Export images to Google Drive cloud service
+googleservices_DESC=	Export images to Google Services (drive/picasa)
 gpssync_DESC=		Geolocalize images
 htmlexport_DESC=	Export images collections into a static XHTML page
 imageshackexport_DESC=	Export images to ImageShack web service
@@ -97,7 +95,6 @@ panorama_DESC=		Assemble panoramic photo automatically
 # not ready for production yet
 # photivointegration_DESC=	Integration of the Photivo RAW-Processor
 photolayoutseditor_DESC=Assemble images together
-picasawebexport_DESC=	Export images to a remote Picasa web service
 piwigoexport_DESC=	Export images to a remote Piwigo (PHPWebGallery) server
 printimages_DESC=	Print images in various format
 rajceexport_DESC=	Export images to Rajce web service
@@ -139,6 +136,7 @@ USES+=		pkgconfig
 EXTRA_PATCHES=	${.CURDIR}/../../graphics/kipi-plugins-kde4/files/extrapatch-CMakeLists.txt
 LIB_DEPENDS+=	libkipiplugins.so:graphics/libkipiplugins
 .endif
+EXTRA_PATCHES+=	${.CURDIR}/../../graphics/kipi-plugins-kde4/files/extrapatch-extra_kipi_plugins_cmakelists.patch
 
 EXTRACT_AFTER_ARGS=	--no-same-owner --no-same-permissions ${DISTNAME}/extra/kipi-plugins
 WRKSRC=		${WRKDIR}/${DISTNAME}/extra/kipi-plugins
@@ -146,14 +144,5 @@ BUILD_WRKSRC=	${WRKSRC}/${${KIPI_PLUGIN}_DIR}
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
 ${KIPI_PLUGIN}_DIR?=		${KIPI_PLUGIN}
-
-post-configure: post-kipi-configure
-
-post-kipi-configure:
-	${ECHO_CMD} '#define GITVERSION "unknown"' > ${WRKSRC}/common/libkipiplugins/gitversion.h
-.if ${KIPI_PLUGIN} != "libkipiplugins"
-	${LN} -s ${KDE4_PREFIX}/lib/libkipiplugins.so ${WRKSRC}/lib/libkipiplugins.so
-.endif
-
 . endif # defined(KIPI_PLUGIN)
 .endif # !defined(NO_BUILD)
diff --git a/graphics/digikam-kde4/distinfo b/graphics/digikam-kde4/distinfo
index 12640b701c8b..061deca8e354 100644
--- a/graphics/digikam-kde4/distinfo
+++ b/graphics/digikam-kde4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (digikam-4.2.0.tar.bz2) = e86575b76672dfd0a7ed5f1d7b8b74425171804d7f16b0d743a5d2375c1c1b08
-SIZE (digikam-4.2.0.tar.bz2) = 68849613
+SHA256 (digikam-4.14.0.tar.bz2) = 9d7bcb689d8c29be2e81976f0a043220f442a24f2071284044e7f1a799a7fdad
+SIZE (digikam-4.14.0.tar.bz2) = 59805228
diff --git a/graphics/digikam-kde4/files/patch-CMakeLists.txt b/graphics/digikam-kde4/files/patch-CMakeLists.txt
deleted file mode 100644
index 5d85151a9c23..000000000000
--- a/graphics/digikam-kde4/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,27 +0,0 @@
---- ./CMakeLists.txt.orig	2012-06-04 16:38:57.000000000 -0400
-+++ ./CMakeLists.txt	2012-06-24 12:52:32.000000000 -0400
-@@ -203,9 +203,10 @@
-     FIND_LIBRARY(MATH_LIBRARY m)
- ENDIF(NOT WIN32)
- 
--IF(Boost_FOUND)
--    INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
--ENDIF(Boost_FOUND)
-+STRING(TOLOWER ${CMAKE_SYSTEM_NAME} node_platform)
-+IF(${node_platform} MATCHES freebsd)
-+    FIND_LIBRARY(KVM_LIBRARY NAMES kvm)
-+ENDIF(${node_platform} MATCHES freebsd)
- 
- #-------------------------------------------------------------------------------------
- 
-@@ -595,6 +596,10 @@
-                         ${CMAKE_CURRENT_BINARY_DIR}/digikam
-     )
- 
-+    IF(Boost_FOUND)
-+        INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
-+    ENDIF(Boost_FOUND)
-+
-     IF(USE_SCRIPT_IFACE)
-         INCLUDE_DIRECTORIES(${QT_QTSCRIPT_INCLUDE_DIR})
-     ENDIF(USE_SCRIPT_IFACE)
diff --git a/graphics/digikam-kde4/files/patch-cmake__modules__FindPGF.cmake b/graphics/digikam-kde4/files/patch-cmake__modules__FindPGF.cmake
deleted file mode 100644
index b030ad48f34f..000000000000
--- a/graphics/digikam-kde4/files/patch-cmake__modules__FindPGF.cmake
+++ /dev/null
@@ -1,46 +0,0 @@
---- ./cmake/modules/FindPGF.cmake.orig	2013-10-01 06:23:25.000000000 +0000
-+++ ./cmake/modules/FindPGF.cmake	2014-01-20 22:29:10.782525688 +0000
-@@ -4,24 +4,28 @@
- #  PGF_FOUND            - system has libgf
- #  PGF_INCLUDE_DIRS     - the libpgf include directory
- #  PGF_LIBRARIES        - Link these to use libpgf
--#  PGF_CODEC_VERSION_ID - PGF codec version ID.
- 
--FIND_PACKAGE(PkgConfig)
-+find_package(PkgConfig)
- 
--IF(PKG_CONFIG_FOUND)
-+if(PKG_CONFIG_FOUND)
-+    pkg_check_modules(PC_PGF QUIET libpgf)
-+endif(PKG_CONFIG_FOUND)
- 
--    PKG_CHECK_MODULES(PGF libpgf)
-+find_path(PGF_INCLUDE_DIRS NAMES PGFimage.h
-+  PATHS
-+  ${PC_PGF_INCLUDEDIR}
-+  ${PC_PGF_INCLUDE_DIRS}
-+)
- 
--    IF(PGF_FOUND)
--        MESSAGE(STATUS "PGF_INCLUDE_DIRS     = ${PGF_INCLUDE_DIRS}")
--        MESSAGE(STATUS "PGF_INCLUDEDIR       = ${PGF_INCLUDEDIR}")
--        MESSAGE(STATUS "PGF_LIBRARIES        = ${PGF_LIBRARIES}")
--        MESSAGE(STATUS "PGF_LDFLAGS          = ${PGF_LDFLAGS}")
--        MESSAGE(STATUS "PGF_CFLAGS           = ${PGF_CFLAGS}")
--        MESSAGE(STATUS "PGF_VERSION          = ${PGF_VERSION}")
-+find_library(PGF_LIBRARIES NAMES pgf
-+  PATHS
-+  ${PC_PGF_LIBDIR}
-+  ${PC_PGF_LIBRARY_DIRS}
-+)
- 
--        STRING(REPLACE "." "" PGF_CODEC_VERSION_ID "${PGF_VERSION}")
--        MESSAGE(STATUS "PGF_CODEC_VERSION_ID = ${PGF_CODEC_VERSION_ID}")
--    ENDIF(PGF_FOUND)
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(pgf
-+  REQUIRED_VARS PGF_LIBRARIES PGF_INCLUDE_DIRS
-+)
- 
--ENDIF(PKG_CONFIG_FOUND)
-+mark_as_advanced(PGF_INCLUDE_DIRS PGF_LIBRARIES)
diff --git a/graphics/digikam-kde4/files/patch-cmake__modules__MacroUtils.cmake b/graphics/digikam-kde4/files/patch-cmake__modules__MacroUtils.cmake
deleted file mode 100644
index 90125bab5c00..000000000000
--- a/graphics/digikam-kde4/files/patch-cmake__modules__MacroUtils.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake/modules/MacroUtils.cmake.orig	2014-09-18 04:17:31 UTC
-+++ cmake/modules/MacroUtils.cmake
-@@ -112,7 +112,7 @@
-     
-     ENDIF()
- 
--ENDMACRO(PRINT_PLUGIN_COMPILE_STATUS)
-+ENDMACRO(PRINT_COMPONENT_COMPILE_STATUS)
- 
- # -------------------------------------------------------------------------
- 
diff --git a/graphics/digikam-kde4/files/patch-digikam__CMakeLists.txt b/graphics/digikam-kde4/files/patch-digikam__CMakeLists.txt
deleted file mode 100644
index 7e36dc4a69d5..000000000000
--- a/graphics/digikam-kde4/files/patch-digikam__CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./digikam/CMakeLists.txt.orig	2012-01-02 19:32:42.000000000 -0500
-+++ ./digikam/CMakeLists.txt	2012-05-14 20:28:25.000000000 -0400
-@@ -118,6 +118,10 @@
-     TARGET_LINK_LIBRARIES(digikamcore ${X11_LIBRARIES})
- ENDIF(Q_WS_X11)
- 
-+IF(${node_platform} MATCHES freebsd)
-+    TARGET_LINK_LIBRARIES(digikamcore ${KVM_LIBRARY})
-+ENDIF(${node_platform} MATCHES freebsd)
-+
- # For Contents Aware Resizer and Lens auto-correction tools.
- IF(GLIB2_FOUND)
-     TARGET_LINK_LIBRARIES(digikamcore ${GLIB2_LIBRARIES} ${liblqr_LIBS} ${liblensfun_LIBS})
diff --git a/graphics/digikam-kde4/files/patch-digikam__album__albumwatch.cpp b/graphics/digikam-kde4/files/patch-digikam__album__albumwatch.cpp
deleted file mode 100644
index d742f6dc1639..000000000000
--- a/graphics/digikam-kde4/files/patch-digikam__album__albumwatch.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./digikam/album/albumwatch.cpp.orig	2013-04-04 16:03:45.920385000 +0000
-+++ ./digikam/album/albumwatch.cpp	2013-04-04 16:04:05.410385977 +0000
-@@ -278,7 +278,7 @@
-             // Disable file watch for OS X and Windows and hope for future
-             // improvement (possibly with the improvements planned for
-             // QFileSystemWatcher in Qt 5.1)
--#if defined(Q_WS_MAC) || defined(Q_WS_WIN)
-+#if defined(Q_WS_MAC) || defined(Q_WS_WIN) || defined(Q_OS_FREEBSD)
-             d->dirWatch->addDir(dir, KDirWatch::WatchDirOnly);
- #else
-             d->dirWatch->addDir(dir, KDirWatch::WatchFiles | KDirWatch::WatchDirOnly);
diff --git a/graphics/digikam-kde4/files/patch-git-r2ad23d-lensfun-fix b/graphics/digikam-kde4/files/patch-git-r2ad23d-lensfun-fix
deleted file mode 100644
index f8490da1adbb..000000000000
--- a/graphics/digikam-kde4/files/patch-git-r2ad23d-lensfun-fix
+++ /dev/null
@@ -1,448 +0,0 @@
-commit 2ad23dae290c64c293d9c3d3ae2c8734c99f902b
-Author: Gilles Caulier <caulier.gilles@gmail.com>
-Date:   Tue Sep 2 17:06:33 2014 +0200
-
-    Make digiKam ready to use next Lensfun API where CII correction have been removed.
-    BUGS: 331523
-    CCBUGS: 319383
-    CCBUGS: 333540
-    FIXED-IN: 4.3.0
-
-diff --git a/imageplugins/enhance/lensautofixtool.cpp b/imageplugins/enhance/lensautofixtool.cpp
-index 55bbc3a..b1e6510 100644
---- imageplugins/enhance/lensautofixtool.cpp.orig
-+++ imageplugins/enhance/lensautofixtool.cpp
-@@ -4,7 +4,7 @@
-  * Description : a plugin to fix automatically camera lens aberrations
-  *
-  * Copyright (C) 2008      by Adrian Schroeter <adrian at suse dot de>
-- * Copyright (C) 2008-2013 by Gilles Caulier <caulier dot gilles at gmail dot com>
-+ * Copyright (C) 2008-2014 by Gilles Caulier <caulier dot gilles at gmail dot com>
-  *
-  * This program is free software; you can redistribute it
-  * and/or modify it under the terms of the GNU General
-@@ -153,7 +153,6 @@ void LensAutoFixTool::slotLensChanged()
- {
-     d->settingsView->setEnabledCCA(d->cameraSelector->iface()->supportsCCA());
-     d->settingsView->setEnabledVig(d->cameraSelector->iface()->supportsVig());
--    d->settingsView->setEnabledCCI(d->cameraSelector->iface()->supportsVig());
-     d->settingsView->setEnabledDist(d->cameraSelector->iface()->supportsDistortion());
-     d->settingsView->setEnabledGeom(d->cameraSelector->iface()->supportsDistortion());
-     slotTimer();
-diff --git a/imageplugins/enhance/lensautofixtool.h b/imageplugins/enhance/lensautofixtool.h
-index 994d45a..7225101 100644
---- imageplugins/enhance/lensautofixtool.h.orig
-+++ imageplugins/enhance/lensautofixtool.h
-@@ -4,7 +4,7 @@
-  * Description : a plugin to fix automatically camera lens aberrations
-  *
-  * Copyright (C) 2008      by Adrian Schroeter <adrian at suse dot de>
-- * Copyright (C) 2008-2013 by Gilles Caulier <caulier dot gilles at gmail dot com>
-+ * Copyright (C) 2008-2014 by Gilles Caulier <caulier dot gilles at gmail dot com>
-  *
-  * This program is free software; you can redistribute it
-  * and/or modify it under the terms of the GNU General
-diff --git a/libs/dimg/filters/lens/lensfunfilter.cpp b/libs/dimg/filters/lens/lensfunfilter.cpp
-index 21bfd2d..4f3eb68 100644
---- libs/dimg/filters/lens/lensfunfilter.cpp.orig
-+++ libs/dimg/filters/lens/lensfunfilter.cpp
-@@ -4,7 +4,7 @@
-  * Description : a tool to fix automatically camera lens aberrations
-  *
-  * Copyright (C) 2008      by Adrian Schroeter <adrian at suse dot de>
-- * Copyright (C) 2008-2013 by Gilles Caulier <caulier dot gilles at gmail dot com>
-+ * Copyright (C) 2008-2014 by Gilles Caulier <caulier dot gilles at gmail dot com>
-  *
-  * This program is free software; you can redistribute it
-  * and/or modify it under the terms of the GNU General
-@@ -123,11 +123,6 @@ void LensFunFilter::filterImage()
-         modifyFlags |= LF_MODIFY_VIGNETTING;
-     }
- 
--    if (d->iface->settings().filterCCI)
--    {
--        modifyFlags |= LF_MODIFY_CCI;
--    }
--
-     // Init lensfun lib, we are working on the full image.
- 
-     lfPixelFormat colorDepth = m_orgImage.bytesDepth() == 4 ? LF_PF_U8 : LF_PF_U16;
-@@ -156,7 +151,7 @@ void LensFunFilter::filterImage()
-     // Calc necessary steps for progress bar
- 
-     int steps = ((d->iface->settings().filterCCA)                                   ? 1 : 0) +
--                ((d->iface->settings().filterVIG || d->iface->settings().filterCCI) ? 1 : 0) +
-+                ((d->iface->settings().filterVIG)                                   ? 1 : 0) +
-                 ((d->iface->settings().filterDST || d->iface->settings().filterGEO) ? 1 : 0);
- 
-     kDebug() << "LensFun Modifier Flags: " << modflags << "  Steps:" << steps;
-@@ -216,7 +211,7 @@ void LensFunFilter::filterImage()
- 
-     // Stage 2: Color Corrections: Vignetting and Color Contribution Index
- 
--    if (d->iface->settings().filterVIG || d->iface->settings().filterCCI)
-+    if (d->iface->settings().filterVIG)
-     {
-         uchar* data   = m_destImage.bits();
-         loop          = 0;
-@@ -318,8 +313,6 @@ bool LensFunFilter::registerSettingsToXmp(KExiv2Data& data) const
-     str.append("\n");
-     str.append(i18n("VIG Correction: %1",   prm.filterVIG  && d->iface->supportsVig()       ? i18n("enabled") : i18n("disabled")));
-     str.append("\n");
--    str.append(i18n("CCI Correction: %1",   prm.filterCCI  && d->iface->supportsCCI()       ? i18n("enabled") : i18n("disabled")));
--    str.append("\n");
-     str.append(i18n("DST Correction: %1",   prm.filterDST && d->iface->supportsDistortion() ? i18n("enabled") : i18n("disabled")));
-     str.append("\n");
-     str.append(i18n("GEO Correction: %1",   prm.filterGEO && d->iface->supportsGeometry()   ? i18n("enabled") : i18n("disabled")));
-@@ -340,7 +333,6 @@ FilterAction LensFunFilter::filterAction()
-     LensFunContainer prm = d->iface->settings();
-     action.addParameter("ccaCorrection",   prm.filterCCA);
-     action.addParameter("vigCorrection",   prm.filterVIG);
--    action.addParameter("cciCorrection",   prm.filterCCI);
-     action.addParameter("dstCorrection",   prm.filterDST);
-     action.addParameter("geoCorrection",   prm.filterGEO);
-     action.addParameter("cropFactor",      prm.cropFactor);
-@@ -359,7 +351,6 @@ void LensFunFilter::readParameters(const Digikam::FilterAction& action)
-     LensFunContainer prm = d->iface->settings();
-     prm.filterCCA        = action.parameter("ccaCorrection").toBool();
-     prm.filterVIG        = action.parameter("vigCorrection").toBool();
--    prm.filterCCI        = action.parameter("cciCorrection").toBool();
-     prm.filterDST        = action.parameter("dstCorrection").toBool();
-     prm.filterGEO        = action.parameter("geoCorrection").toBool();
-     prm.cropFactor       = action.parameter("cropFactor").toDouble();
-diff --git a/libs/dimg/filters/lens/lensfunfilter.h b/libs/dimg/filters/lens/lensfunfilter.h
-index 665046d..65819c0 100644
---- libs/dimg/filters/lens/lensfunfilter.h.orig
-+++ libs/dimg/filters/lens/lensfunfilter.h
-@@ -4,7 +4,7 @@
-  * Description : a tool to fix automatically camera lens aberrations
-  *
-  * Copyright (C) 2008      by Adrian Schroeter <adrian at suse dot de>
-- * Copyright (C) 2008-2013 by Gilles Caulier <caulier dot gilles at gmail dot com>
-+ * Copyright (C) 2008-2014 by Gilles Caulier <caulier dot gilles at gmail dot com>
-  *
-  * This program is free software; you can redistribute it
-  * and/or modify it under the terms of the GNU General
-@@ -44,7 +44,6 @@ public:
-     {
-         filterCCA       = true;
-         filterVIG       = true;
--        filterCCI       = true;
-         filterDST       = true;
-         filterGEO       = true;
-         focalLength     = -1.0;
-@@ -64,7 +63,6 @@ public:
- 
-     bool      filterCCA;       /// Chromatic Aberation Corrections
-     bool      filterVIG;       /// Vigneting Corrections
--    bool      filterCCI;       /// Color Contribution Index Corrections
-     bool      filterDST;       /// Distortion Corrections
-     bool      filterGEO;       /// Geometry Corrections
- 
-@@ -102,12 +100,12 @@ public:
- 
-     static QList<int>       SupportedVersions()
-     {
--        return QList<int>() << 1;
-+        return QList<int>() << 1 << 2;
-     }
- 
-     static int              CurrentVersion()
-     {
--        return 1;
-+        return 2;
-     }
- 
-     virtual QString         filterIdentifier() const
-diff --git a/libs/dimg/filters/lens/lensfuniface.cpp b/libs/dimg/filters/lens/lensfuniface.cpp
-index 78badc6..36ad91d 100644
---- libs/dimg/filters/lens/lensfuniface.cpp.orig
-+++ libs/dimg/filters/lens/lensfuniface.cpp
-@@ -133,7 +133,6 @@ void LensFunIface::setFilterSettings(const LensFunContainer& other)
- {
-     d->settings.filterCCA = other.filterCCA;
-     d->settings.filterVIG = other.filterVIG;
--    d->settings.filterCCI = other.filterCCI;
-     d->settings.filterDST = other.filterDST;
-     d->settings.filterGEO = other.filterGEO;
- }
-@@ -478,6 +477,7 @@ bool LensFunIface::supportsDistortion() const
-     }
- 
-     lfLensCalibDistortion res;
-+
-     return d->usedLens->InterpolateDistortion(d->settings.focalLength, res);
- }
- 
-@@ -489,6 +489,7 @@ bool LensFunIface::supportsCCA() const
-     }
- 
-     lfLensCalibTCA res;
-+
-     return d->usedLens->InterpolateTCA(d->settings.focalLength, res);
- }
- 
-@@ -500,6 +501,7 @@ bool LensFunIface::supportsVig() const
-     }
- 
-     lfLensCalibVignetting res;
-+
-     return d->usedLens->InterpolateVignetting(d->settings.focalLength,
-                                               d->settings.aperture,
-                                               d->settings.subjectDistance, res);
-@@ -510,11 +512,6 @@ bool LensFunIface::supportsGeometry() const
-     return supportsDistortion();
- }
- 
--bool LensFunIface::supportsCCI() const
--{
--    return supportsVig();
--}
--
- QString LensFunIface::lensFunVersion()
- {
-     return QString("%1.%2.%3-%4").arg(LF_VERSION_MAJOR).arg(LF_VERSION_MINOR).arg(LF_VERSION_MICRO).arg(LF_VERSION_BUGFIX);
-diff --git a/libs/dimg/filters/lens/lensfuniface.h b/libs/dimg/filters/lens/lensfuniface.h
-index 612af38..ad137ff 100644
---- libs/dimg/filters/lens/lensfuniface.h.orig
-+++ libs/dimg/filters/lens/lensfuniface.h
-@@ -82,7 +82,6 @@ public:
-     bool supportsCCA()        const;
-     bool supportsVig()        const;
-     bool supportsGeometry()   const;
--    bool supportsCCI()        const;
- 
-     /** Return Camera maker string description found in metadata
-     */
-diff --git a/libs/dimg/filters/lens/lensfunsettings.cpp b/libs/dimg/filters/lens/lensfunsettings.cpp
-index c892f0d..9aada79 100644
---- libs/dimg/filters/lens/lensfunsettings.cpp.orig
-+++ libs/dimg/filters/lens/lensfunsettings.cpp
-@@ -4,7 +4,7 @@
-  * Description : a tool to fix automatically camera lens aberrations
-  *
-  * Copyright (C) 2008      by Adrian Schroeter <adrian at suse dot de>
-- * Copyright (C) 2008-2013 by Gilles Caulier <caulier dot gilles at gmail dot com>
-+ * Copyright (C) 2008-2014 by Gilles Caulier <caulier dot gilles at gmail dot com>
-  *
-  * This program is free software; you can redistribute it
-  * and/or modify it under the terms of the GNU General
-@@ -45,27 +45,23 @@ public:
-     Private() :
-         filterCCA(0),
-         filterVIG(0),
--        filterCCI(0),
-         filterDST(0),
-         filterGEO(0)
-     {}
- 
-     static const QString configCCAEntry;
-     static const QString configVignettingEntry;
--    static const QString configCCIEntry;
-     static const QString configDistortionEntry;
-     static const QString configGeometryEntry;
- 
-     QCheckBox*           filterCCA;
-     QCheckBox*           filterVIG;
--    QCheckBox*           filterCCI;
-     QCheckBox*           filterDST;
-     QCheckBox*           filterGEO;
- };
- 
- const QString LensFunSettings::Private::configCCAEntry("CCA");
- const QString LensFunSettings::Private::configVignettingEntry("Vignetting");
--const QString LensFunSettings::Private::configCCIEntry("CCI");
- const QString LensFunSettings::Private::configDistortionEntry("Distortion");
- const QString LensFunSettings::Private::configGeometryEntry("Geometry");
- 
-@@ -86,10 +82,6 @@ LensFunSettings::LensFunSettings(QWidget* const parent)
-     d->filterVIG->setWhatsThis(i18n("Vignetting refers to an image darkening, mostly in the corners. "
-                                     "Optical and natural vignetting can be canceled out with this option, "
-                                     "whereas mechanical vignetting will not be cured."));
--    d->filterCCI  = new QCheckBox(i18n("Color"));
--    d->filterCCI->setWhatsThis(i18n("All lenses have a slight color tinge to them, "
--                                    "mostly due to the anti-reflective coating. "
--                                    "The tinge can be canceled when the respective data is known for the lens."));
-     d->filterDST = new QCheckBox(i18n("Distortion"));
-     d->filterDST->setWhatsThis(i18n("Distortion refers to an image deformation, which is most pronounced "
-                                     "towards the corners. These Seidel aberrations are known as pincushion "
-@@ -107,7 +99,6 @@ LensFunSettings::LensFunSettings(QWidget* const parent)
-     grid->addWidget(title,        0, 0, 1, 2);
-     grid->addWidget(d->filterCCA, 1, 0, 1, 2);
-     grid->addWidget(d->filterVIG, 2, 0, 1, 2);
--    grid->addWidget(d->filterCCI, 3, 0, 1, 2);
-     grid->addWidget(d->filterDST, 4, 0, 1, 2);
-     grid->addWidget(d->filterGEO, 5, 0, 1, 2);
-     grid->addWidget(note,         6, 0, 1, 2);
-@@ -121,9 +112,6 @@ LensFunSettings::LensFunSettings(QWidget* const parent)
-     connect(d->filterVIG, SIGNAL(toggled(bool)),
-             this, SIGNAL(signalSettingsChanged()));
- 
--    connect(d->filterCCI, SIGNAL(toggled(bool)),
--            this, SIGNAL(signalSettingsChanged()));
--
-     connect(d->filterDST, SIGNAL(toggled(bool)),
-             this, SIGNAL(signalSettingsChanged()));
- 
-@@ -146,11 +134,6 @@ void LensFunSettings::setEnabledVig(bool b)
-     d->filterVIG->setEnabled(b);
- }
- 
--void LensFunSettings::setEnabledCCI(bool b)
--{
--    d->filterCCI->setEnabled(b);
--}
--
- void LensFunSettings::setEnabledDist(bool b)
- {
-     d->filterDST->setEnabled(b);
-@@ -165,7 +148,6 @@ void LensFunSettings::assignFilterSettings(LensFunContainer& prm)
- {
-     prm.filterCCA = (d->filterCCA->isChecked() && d->filterCCA->isEnabled());
-     prm.filterVIG = (d->filterVIG->isChecked() && d->filterVIG->isEnabled());
--    prm.filterCCI = (d->filterCCI->isChecked() && d->filterCCI->isEnabled());
-     prm.filterDST = (d->filterDST->isChecked() && d->filterDST->isEnabled());
-     prm.filterGEO = (d->filterGEO->isChecked() && d->filterGEO->isEnabled());
- }
-@@ -175,7 +157,6 @@ void LensFunSettings::setFilterSettings(const LensFunContainer& settings)
-     blockSignals(true);
-     d->filterCCA->setChecked(settings.filterCCA);
-     d->filterVIG->setChecked(settings.filterVIG);
--    d->filterCCI->setChecked(settings.filterCCI);
-     d->filterDST->setChecked(settings.filterDST);
-     d->filterGEO->setChecked(settings.filterGEO);
-     blockSignals(false);
-@@ -198,7 +179,6 @@ void LensFunSettings::readSettings(KConfigGroup& group)
-     LensFunContainer defaultPrm = defaultSettings();
-     prm.filterCCA = group.readEntry(d->configCCAEntry,        defaultPrm.filterCCA);
-     prm.filterVIG = group.readEntry(d->configVignettingEntry, defaultPrm.filterVIG);
--    prm.filterCCI = group.readEntry(d->configCCIEntry,        defaultPrm.filterCCI);
-     prm.filterDST = group.readEntry(d->configDistortionEntry, defaultPrm.filterDST);
-     prm.filterGEO = group.readEntry(d->configGeometryEntry,   defaultPrm.filterGEO);
-     setFilterSettings(prm);
-@@ -219,11 +199,6 @@ void LensFunSettings::writeSettings(KConfigGroup& group)
-         group.writeEntry(d->configVignettingEntry, (prm.filterVIG));
-     }
- 
--    if (d->filterCCI->isEnabled())
--    {
--        group.writeEntry(d->configCCIEntry, (prm.filterCCI));
--    }
--
-     if (d->filterDST->isEnabled())
-     {
-         group.writeEntry(d->configDistortionEntry, (prm.filterDST));
-diff --git a/libs/dimg/filters/lens/lensfunsettings.h b/libs/dimg/filters/lens/lensfunsettings.h
-index 9f79684..193bce9 100644
---- libs/dimg/filters/lens/lensfunsettings.h.orig
-+++ libs/dimg/filters/lens/lensfunsettings.h
-@@ -4,7 +4,7 @@
-  * Description : a tool to fix automatically camera lens aberrations
-  *
-  * Copyright (C) 2008      by Adrian Schroeter <adrian at suse dot de>
-- * Copyright (C) 2008-2013 by Gilles Caulier <caulier dot gilles at gmail dot com>
-+ * Copyright (C) 2008-2014 by Gilles Caulier <caulier dot gilles at gmail dot com>
-  *
-  * This program is free software; you can redistribute it
-  * and/or modify it under the terms of the GNU General
-@@ -47,7 +47,6 @@ public:
- 
-     void setEnabledCCA(bool b);
-     void setEnabledVig(bool b);
--    void setEnabledCCI(bool b);
-     void setEnabledDist(bool b);
-     void setEnabledGeom(bool b);
- 
-diff --git a/utilities/queuemanager/basetools/enhance/lensautofix.cpp b/utilities/queuemanager/basetools/enhance/lensautofix.cpp
-index 21c4822..3fc60cf 100644
---- utilities/queuemanager/basetools/enhance/lensautofix.cpp.orig
-+++ utilities/queuemanager/basetools/enhance/lensautofix.cpp
-@@ -6,7 +6,7 @@
-  * Date        : 2010-09-18
-  * Description : lens auto-fix batch tool.
-  *
-- * Copyright (C) 2010-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
-+ * Copyright (C) 2010-2014 by Gilles Caulier <caulier dot gilles at gmail dot com>
-  *
-  * This program is free software; you can redistribute it
-  * and/or modify it under the terms of the GNU General
-@@ -75,19 +75,19 @@ LensAutoFix::~LensAutoFix()
- 
- void LensAutoFix::registerSettingsWidget()
- {
--    m_settingsWidget  = new QWidget;
--    QLabel* note      = new QLabel(i18n("<b>Use Metadata</b> option will parse images' information at "
--                                        "queue run-time to find relevant lens features."));
-+    m_settingsWidget   = new QWidget;
-+    QLabel* const note = new QLabel(i18n("<b>Use Metadata</b> option will parse images' information at "
-+                                         "queue run-time to find relevant lens features."));
-     note->setWordWrap(true);
-     note->setFrameStyle(QFrame::StyledPanel | QFrame::Raised);
- 
--    d->cameraSelector = new LensFunCameraSelector();
--    KSeparator* line  = new KSeparator(Qt::Horizontal);
--    d->settingsView   = new LensFunSettings();
-+    d->cameraSelector      = new LensFunCameraSelector();
-+    KSeparator* const line = new KSeparator(Qt::Horizontal);
-+    d->settingsView        = new LensFunSettings();
-     d->cameraSelector->setPassiveMetadataUsage(true);
-     d->cameraSelector->setEnabledUseMetadata(true);
- 
--    QGridLayout* grid = new QGridLayout(m_settingsWidget);
-+    QGridLayout* const grid = new QGridLayout(m_settingsWidget);
-     grid->addWidget(note,              0, 0, 1, 2);
-     grid->addWidget(d->cameraSelector, 1, 0, 1, 2);
-     grid->addWidget(line,              2, 0, 1, 2);
-@@ -112,7 +112,6 @@ BatchToolSettings LensAutoFix::defaultSettings()
-     prm.insert("UseMetadata",     true);
-     prm.insert("filterCCA",       true);
-     prm.insert("filterVIG",       true);
--    prm.insert("filterCCI",       true);
-     prm.insert("filterDST",       true);
-     prm.insert("filterGEO",       true);
- 
-@@ -134,7 +133,6 @@ void LensAutoFix::slotAssignSettings2Widget()
-     LensFunContainer lfPrm;
-     lfPrm.filterCCA       = settings()["filterCCA"].toBool();
-     lfPrm.filterVIG       = settings()["filterVIG"].toBool();
--    lfPrm.filterCCI       = settings()["filterCCI"].toBool();
-     lfPrm.filterDST       = settings()["filterDST"].toBool();
-     lfPrm.filterGEO       = settings()["filterGEO"].toBool();
- 
-@@ -155,7 +153,6 @@ void LensAutoFix::slotSettingsChanged()
-     // Update checkbox options about Lens corrections available.
-     d->settingsView->setEnabledCCA(d->cameraSelector->useMetadata()  ? true : d->cameraSelector->iface()->supportsCCA());
-     d->settingsView->setEnabledVig(d->cameraSelector->useMetadata()  ? true : d->cameraSelector->iface()->supportsVig());
--    d->settingsView->setEnabledCCI(d->cameraSelector->useMetadata()  ? true : d->cameraSelector->iface()->supportsVig());
-     d->settingsView->setEnabledDist(d->cameraSelector->useMetadata() ? true : d->cameraSelector->iface()->supportsDistortion());
-     d->settingsView->setEnabledGeom(d->cameraSelector->useMetadata() ? true : d->cameraSelector->iface()->supportsDistortion());
- 
-@@ -166,7 +163,6 @@ void LensAutoFix::slotSettingsChanged()
- 
-     prm.insert("filterCCA", (bool)settings.filterCCA);
-     prm.insert("filterVIG", (bool)settings.filterVIG);
--    prm.insert("filterCCI", (bool)settings.filterCCI);
-     prm.insert("filterDST", (bool)settings.filterDST);
-     prm.insert("filterGEO", (bool)settings.filterGEO);
- 
-@@ -210,7 +206,6 @@ bool LensAutoFix::toolOperations()
-     {
-         prm.filterCCA       = settings()["filterCCA"].toBool();
-         prm.filterVIG       = settings()["filterVIG"].toBool();
--        prm.filterCCI       = settings()["filterCCI"].toBool();
-         prm.filterDST       = settings()["filterDST"].toBool();
-         prm.filterGEO       = settings()["filterGEO"].toBool();
- 
-diff --git a/utilities/queuemanager/basetools/enhance/lensautofix.h b/utilities/queuemanager/basetools/enhance/lensautofix.h
-index d6ab8b4..6d4bf19 100644
---- utilities/queuemanager/basetools/enhance/lensautofix.h.orig
-+++ utilities/queuemanager/basetools/enhance/lensautofix.h
-@@ -6,7 +6,7 @@
-  * Date        : 2010-09-18
-  * Description : lens auto-fix batch tool.
-  *
-- * Copyright (C) 2010-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
-+ * Copyright (C) 2010-2014 by Gilles Caulier <caulier dot gilles at gmail dot com>
-  *
-  * This program is free software; you can redistribute it
-  * and/or modify it under the terms of the GNU General
diff --git a/graphics/digikam-kde4/files/patch-libs_3rdparty_cimg_CImg.h b/graphics/digikam-kde4/files/patch-libs_3rdparty_cimg_CImg.h
deleted file mode 100644
index 9cf1f616c055..000000000000
--- a/graphics/digikam-kde4/files/patch-libs_3rdparty_cimg_CImg.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- libs/3rdparty/cimg/CImg.h.orig     2010-01-31 15:22:15.000000000 +0200
-+++ libs/3rdparty/cimg/CImg.h  2010-03-29 10:42:42.741492686 +0300
-@@ -29449,7 +29449,7 @@
-         new_bit_depth = 8;
-       }
-       if (new_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8){
--        png_set_gray_1_2_4_to_8(png_ptr);
-+        png_set_expand_gray_1_2_4_to_8(png_ptr);
-         new_bit_depth = 8;
-       }
-       if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
diff --git a/graphics/digikam-kde4/files/patch-libs_3rdparty_kmemoryinfo_kmemoryinfo__backend.cpp b/graphics/digikam-kde4/files/patch-libs_3rdparty_kmemoryinfo_kmemoryinfo__backend.cpp
new file mode 100644
index 000000000000..66064e3c21ab
--- /dev/null
+++ b/graphics/digikam-kde4/files/patch-libs_3rdparty_kmemoryinfo_kmemoryinfo__backend.cpp
@@ -0,0 +1,24 @@
+--- libs/3rdparty/kmemoryinfo/kmemoryinfo_backend.cpp.orig	2015-02-26 18:08:01 UTC
++++ libs/3rdparty/kmemoryinfo/kmemoryinfo_backend.cpp
+@@ -118,7 +118,7 @@ kvm_t* sg_get_kvm()
+         return kvmd;
+     }
+ 
+-    kvmd = kvm_openfiles(NULL, NULL, NULL, O_RDONLY, NULL);
++    kvmd = kvm_openfiles(NULL, "/dev/null", NULL, O_RDONLY, NULL);
+ 
+     if (kvmd == NULL)
+     {
+@@ -220,9 +220,9 @@ int get_mem_stats(Digikam::KMemoryInfo::
+     int    mib[2];
+     u_long physmem;
+     size_t size;
+-    u_long free_count;
+-    u_long cache_count;
+-    u_long inactive_count;
++    u_int free_count;
++    u_int cache_count;
++    u_int inactive_count;
+     int    pagesize;
+ #endif // defined(Q_OS_FREEBSD) || defined(Q_OS_DFBSD)
+ 
diff --git a/graphics/digikam-kde4/files/patch-libs__3rdparty__kmemoryinfo__kmemoryinfo_backend.cpp b/graphics/digikam-kde4/files/patch-libs__3rdparty__kmemoryinfo__kmemoryinfo_backend.cpp
deleted file mode 100644
index 8d9b5342703b..000000000000
--- a/graphics/digikam-kde4/files/patch-libs__3rdparty__kmemoryinfo__kmemoryinfo_backend.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./libs/3rdparty/kmemoryinfo/kmemoryinfo_backend.cpp.orig	2012-01-02 19:32:23.000000000 -0500
-+++ ./libs/3rdparty/kmemoryinfo/kmemoryinfo_backend.cpp	2012-05-14 20:28:25.000000000 -0400
-@@ -53,6 +53,9 @@
- #include <sys/types.h>
- #include <sys/sysctl.h>
- #include <unistd.h>
-+#include <paths.h>
-+#include <fcntl.h>
-+#include <kvm.h>
- #endif
- #if defined(Q_OS_NETBSD)
- #include <sys/param.h>
diff --git a/graphics/digikam-kde4/files/patch-utilities_fuzzysearchview_fuzzysearchview.cpp b/graphics/digikam-kde4/files/patch-utilities_fuzzysearchview_fuzzysearchview.cpp
deleted file mode 100644
index f449d442b072..000000000000
--- a/graphics/digikam-kde4/files/patch-utilities_fuzzysearchview_fuzzysearchview.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- utilities/fuzzysearch/fuzzysearchview.cpp.orig	2010-03-29 01:20:16.000000000 +0300
-+++ utilities/fuzzysearch/fuzzysearchview.cpp	2010-03-30 10:02:03.000000000 +0300
-@@ -26,7 +26,7 @@
- 
- // Qt includes
- 
--#include <qevent.h>
-+#include <QEvent>
- #include <QFrame>
- #include <QImage>
- #include <QLabel>
-@@ -36,6 +36,8 @@
- #include <QTime>
- #include <QTimer>
- #include <QToolButton>
-+#include <QDragEnterEvent>
-+#include <QDropEvent>
- 
- // KDE includes
- 
diff --git a/graphics/digikam-kde4/pkg-plist b/graphics/digikam-kde4/pkg-plist
index d62fd43e98b7..6a24c4217468 100644
--- a/graphics/digikam-kde4/pkg-plist
+++ b/graphics/digikam-kde4/pkg-plist
@@ -19,6 +19,13 @@ lib/libdigikamdatabase.so
 lib/libdigikamdatabase.so.%%SHLIB_VER%%
 man/man1/cleanup_digikamdb.1.gz
 man/man1/digitaglinktree.1.gz
+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/apps/digikam/about/digikam.css