7 files changed, 80 insertions, 212 deletions

diff --git a/graphics/digikam-kde4/Makefile b/graphics/digikam-kde4/Makefile
index 05e4f5fa21e9..40e4c86d3b77 100644
--- a/graphics/digikam-kde4/Makefile
+++ b/graphics/digikam-kde4/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	digikam
-DISTVERSION=	1.1.0
-PORTREVISION=	2
+DISTVERSION=	1.2.0
 PORTEPOCH=	1
 CATEGORIES=	graphics kde
 MASTER_SITES=	SF
@@ -20,7 +19,7 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		png.6:${PORTSDIR}/graphics/png \
 		jasper.4:${PORTSDIR}/graphics/jasper \
 		lqr-1.3:${PORTSDIR}/graphics/liblqr-1 \
-		kipi.6:${PORTSDIR}/graphics/kdegraphics4
+		kipi.7:${PORTSDIR}/graphics/kdegraphics4
 
 LATEST_LINK=	${PORTNAME}-kde4
 
@@ -43,7 +42,7 @@ OPTIONS=	GPHOTO2 "Compile with gphoto2 support" on \
 		MARBLE "Geolocation support (requires misc/kdeedu4)" off \
 		PIMLIBS "Address book support" on
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if defined(WITHOUT_GPHOTO2)
 CMAKE_ARGS+=	-DENABLE_GPHOTO2:BOOL=OFF
@@ -75,4 +74,4 @@ post-patch:
 	${GREP} -H -r "#include <q" ${WRKSRC} | ${CUT} -d: -f1 | uniq | \
 		${XARGS} ${REINPLACE_CMD} -f ${FILESDIR}/qt3to4headers.txt
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/digikam-kde4/distinfo b/graphics/digikam-kde4/distinfo
index a350b2d9f093..35e31997dfe0 100644
--- a/graphics/digikam-kde4/distinfo
+++ b/graphics/digikam-kde4/distinfo
@@ -1,3 +1,3 @@
-MD5 (digikam-1.1.0.tar.bz2) = 94a536e7387325c7b73ab2ac7b0a9a62
-SHA256 (digikam-1.1.0.tar.bz2) = 6d26921e83bdb85342a0455df919f33bc2f23533c96e9293e80cd79ff92bfa8f
-SIZE (digikam-1.1.0.tar.bz2) = 15385611
+MD5 (digikam-1.2.0.tar.bz2) = 8f68022008cf1650924cc8688f176572
+SHA256 (digikam-1.2.0.tar.bz2) = 930539b5bb53af345f4bef3d06c7121c22af3dbd7ae7b338fa3d173a6a631206
+SIZE (digikam-1.2.0.tar.bz2) = 13970098
diff --git a/graphics/digikam-kde4/files/patch-CMakeLists.txt b/graphics/digikam-kde4/files/patch-CMakeLists.txt
index f4bbacfa8368..05c7dbec1384 100644
--- a/graphics/digikam-kde4/files/patch-CMakeLists.txt
+++ b/graphics/digikam-kde4/files/patch-CMakeLists.txt
@@ -1,13 +1,19 @@
---- CMakeLists.txt.orig	2009-11-30 11:15:26.000000000 -0600
-+++ CMakeLists.txt	2009-11-30 11:16:54.000000000 -0600
-@@ -64,35 +64,51 @@
+--- CMakeLists.txt.orig	2010-03-29 01:26:06.000000000 +0300
++++ CMakeLists.txt	2010-03-30 09:42:27.978741828 +0300
+@@ -116,9 +116,6 @@
  FIND_PACKAGE(PNG)
  FIND_PACKAGE(TIFF)
  FIND_PACKAGE(Jasper)
 -FIND_PACKAGE(Kdcraw)
 -FIND_PACKAGE(Kexiv2)
 -FIND_PACKAGE(Kipi)
--
+ 
+ # Extract version of libjpeg so that we can use the appropriate dir
+ # See bug #227313, #228483
+@@ -132,31 +129,51 @@
+     SET(DIGIKAM_LIBJPEG_DIR libjpeg-80)
+ ENDIF ("${jpeglib_version}" LESS 80)
+ 
 -# Check KDcraw version installed to compile fine.
 -IF(NOT WIN32)
 -    FIND_PACKAGE(PkgConfig)
diff --git a/graphics/digikam-kde4/files/patch-libs__dimg__loaders__pngloader.cpp b/graphics/digikam-kde4/files/patch-libs__dimg__loaders__pngloader.cpp
deleted file mode 100644
index cc7fe8b9b453..000000000000
--- a/graphics/digikam-kde4/files/patch-libs__dimg__loaders__pngloader.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
---- ./libs/dimg/loaders/pngloader.cpp.orig	2010-01-31 23:21:36.000000000 +1000
-+++ ./libs/dimg/loaders/pngloader.cpp	2010-02-04 11:16:41.771939164 +1000
-@@ -105,7 +105,11 @@
-     unsigned char buf[PNG_BYTES_TO_CHECK];
- 
-     size_t membersRead = fread(buf, 1, PNG_BYTES_TO_CHECK, f);
-+#if PNG_LIBPNG_VER >= 10400
-+    if ((membersRead != PNG_BYTES_TO_CHECK) || png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK))
-+#else
-     if ((membersRead != PNG_BYTES_TO_CHECK) || !png_check_sig(buf, PNG_BYTES_TO_CHECK))
-+#endif
-     {
-         kDebug() << "Not a PNG image file.";
-         fclose(f);
-@@ -165,7 +169,11 @@
-     CleanupData *cleanupData = new CleanupData;
-     cleanupData->setFile(f);
- 
-+#if PNG_LIBPNG_VER >= 10400
-+    if (setjmp(png_jmpbuf(png_ptr)))
-+#else
-     if (setjmp(png_ptr->jmpbuf))
-+#endif
-     {
-         kDebug() << "Internal libPNG error during reading file. Process aborted!";
-         png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-@@ -322,7 +330,11 @@
- #ifdef ENABLE_DEBUG_MESSAGES
-                     kDebug() << "PNG in PNG_COLOR_TYPE_GRAY";
- #endif
-+#if PNG_LIBPNG_VER >= 10400
-+                    png_set_expand_gray_1_2_4_to_8(png_ptr);
-+#else
-                     png_set_gray_1_2_4_to_8(png_ptr);
-+#endif
-                     png_set_gray_to_rgb(png_ptr);
- 
-                     if (QSysInfo::ByteOrder == QSysInfo::LittleEndian)           // Intel
-@@ -627,7 +639,11 @@
-     CleanupData *cleanupData = new CleanupData;
-     cleanupData->setFile(f);
- 
--    if (setjmp(png_ptr->jmpbuf))
-+#if PNG_LIBPNG_VER >= 10400
-+    if (setjmp(png_jmpbuf(png_ptr)))
-+#else
-+     if (setjmp(png_ptr->jmpbuf))
-+#endif
-     {
-         kDebug() << "Internal libPNG error during writing file. Process aborted!";
-         png_destroy_write_struct(&png_ptr, (png_infopp) & info_ptr);
diff --git a/graphics/digikam-kde4/files/patch-libs_threadimageio_thumbnailbasic.cpp b/graphics/digikam-kde4/files/patch-libs_threadimageio_thumbnailbasic.cpp
deleted file mode 100644
index 34ca40d32412..000000000000
--- a/graphics/digikam-kde4/files/patch-libs_threadimageio_thumbnailbasic.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- libs/threadimageio/thumbnailbasic.cpp.orig 2010-01-31 15:21:53.000000000 +0200
-+++ libs/threadimageio/thumbnailbasic.cpp      2010-03-29 10:40:10.024395457 +0300
-@@ -137,7 +137,7 @@
-     unsigned char buf[PNG_BYTES_TO_CHECK];
-
-     size_t itemsRead = fread(buf, 1, PNG_BYTES_TO_CHECK, f);
--    if (itemsRead != 1 || !png_check_sig(buf, PNG_BYTES_TO_CHECK))
-+    if (itemsRead != 1 || png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK))
-     {
-         fclose(f);
-         return qimage;
-@@ -232,7 +232,7 @@
-     {
-         png_set_gray_to_rgb(png_ptr);
-         if (png_get_bit_depth(png_ptr, info_ptr) < 8)
--            png_set_gray_1_2_4_to_8(png_ptr);
-+            png_set_expand_gray_1_2_4_to_8(png_ptr);
-     }
-
-     int sizeOfUint = sizeof(unsigned int);
diff --git a/graphics/digikam-kde4/files/patch-utilities_fuzzysearchview_fuzzysearchview.cpp b/graphics/digikam-kde4/files/patch-utilities_fuzzysearchview_fuzzysearchview.cpp
new file mode 100644
index 000000000000..f449d442b072
--- /dev/null
+++ b/graphics/digikam-kde4/files/patch-utilities_fuzzysearchview_fuzzysearchview.cpp
@@ -0,0 +1,20 @@
+--- 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 3093faf52053..04f4fd8e5afd 100644
--- a/graphics/digikam-kde4/pkg-plist
+++ b/graphics/digikam-kde4/pkg-plist
@@ -3,10 +3,13 @@ bin/digikam
 bin/digitaglinktree
 bin/showfoto
 include/digikam/albumdb.h
-include/digikam/bcgmodifier.h
+include/digikam/bcgfilter.h
+include/digikam/bcgsettings.h
+include/digikam/blurfilter.h
+include/digikam/cbfilter.h
+include/digikam/cbsettings.h
 include/digikam/cietonguewidget.h
 include/digikam/colorgradientwidget.h
-include/digikam/colormodifier.h
 include/digikam/curvesbox.h
 include/digikam/curveswidget.h
 include/digikam/dcolor.h
@@ -16,25 +19,17 @@ include/digikam/dcolorpixelaccess.h
 include/digikam/dcursortracker.h
 include/digikam/dgradientslider.h
 include/digikam/dimg.h
-include/digikam/dimggaussianblur.h
-include/digikam/dimgimagefilters.h
-include/digikam/dimgrefocus.h
-include/digikam/dimgsharpen.h
 include/digikam/dimgthreadedfilter.h
-include/digikam/dimgunsharpmask.h
 include/digikam/dlogoaction.h
 include/digikam/dmetadata.h
 include/digikam/dpopupmenu.h
 include/digikam/dprogressdlg.h
 include/digikam/dzoombar.h
 include/digikam/exifwidget.h
-include/digikam/greycstorationiface.h
-include/digikam/greycstorationsettings.h
-include/digikam/greycstorationwidget.h
 include/digikam/histogrambox.h
 include/digikam/histogrampainter.h
 include/digikam/histogramwidget.h
-include/digikam/hslmodifier.h
+include/digikam/hslfilter.h
 include/digikam/iccpreviewwidget.h
 include/digikam/iccprofileinfodlg.h
 include/digikam/iccprofilewidget.h
@@ -53,48 +48,28 @@ include/digikam/mdkeylistviewitem.h
 include/digikam/metadatalistview.h
 include/digikam/metadatalistviewitem.h
 include/digikam/metadatawidget.h
-include/digikam/noisereductionsettings.h
+include/digikam/nrfilter.h
+include/digikam/nrsettings.h
 include/digikam/paniconwidget.h
 include/digikam/photoinfocontainer.h
 include/digikam/previewwidget.h
 include/digikam/rawcameradlg.h
+include/digikam/refocusfilter.h
 include/digikam/searchtextbar.h
+include/digikam/sharpenfilter.h
 include/digikam/sidebar.h
 include/digikam/statusled.h
 include/digikam/statusnavigatebar.h
 include/digikam/statusprogressbar.h
-include/digikam/statuszoombar.h
 include/digikam/template.h
-include/digikam/waveletsnr.h
+include/digikam/unsharpmaskfilter.h
 include/digikam/xmpwidget.h
 include/digikam_export.h
-lib/kde4/digikamimageplugin_adjustcurves.so
-lib/kde4/digikamimageplugin_adjustlevels.so
-lib/kde4/digikamimageplugin_blurfx.so
-lib/kde4/digikamimageplugin_border.so
-lib/kde4/digikamimageplugin_channelmixer.so
-lib/kde4/digikamimageplugin_charcoal.so
-lib/kde4/digikamimageplugin_colorfx.so
-lib/kde4/digikamimageplugin_contentawareresizing.so
-lib/kde4/digikamimageplugin_core.so
-lib/kde4/digikamimageplugin_distortionfx.so
-lib/kde4/digikamimageplugin_emboss.so
-lib/kde4/digikamimageplugin_filmgrain.so
-lib/kde4/digikamimageplugin_freerotation.so
-lib/kde4/digikamimageplugin_hotpixels.so
-lib/kde4/digikamimageplugin_infrared.so
-lib/kde4/digikamimageplugin_inpainting.so
-lib/kde4/digikamimageplugin_inserttext.so
-lib/kde4/digikamimageplugin_lenscorrection.so
-lib/kde4/digikamimageplugin_localcontrast.so
-lib/kde4/digikamimageplugin_oilpaint.so
-lib/kde4/digikamimageplugin_perspective.so
-lib/kde4/digikamimageplugin_raindrop.so
-lib/kde4/digikamimageplugin_restoration.so
-lib/kde4/digikamimageplugin_sheartool.so
-lib/kde4/digikamimageplugin_superimpose.so
-lib/kde4/digikamimageplugin_texture.so
-lib/kde4/digikamimageplugin_whitebalance.so
+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/digikamnepomukservice.so
 lib/kde4/kio_digikamalbums.so
 lib/kde4/kio_digikamdates.so
@@ -121,24 +96,20 @@ share/apps/digikam/data/assistant-rawimport.png
 share/apps/digikam/data/assistant-scancollection.png
 share/apps/digikam/data/assistant-tooltips.png
 share/apps/digikam/data/banner-digikam.png
-share/apps/digikam/data/bluejean-texture.png
 share/apps/digikam/data/bothhorz.png
 share/apps/digikam/data/bothvert.png
-share/apps/digikam/data/bricks-texture.png
-share/apps/digikam/data/bricks2-texture.png
-share/apps/digikam/data/burlap-texture.png
-share/apps/digikam/data/canvas-texture.png
-share/apps/digikam/data/cellwood-texture.png
 share/apps/digikam/data/centerheight.png
 share/apps/digikam/data/centerwidth.png
 share/apps/digikam/data/chalk-pattern.png
+share/apps/digikam/data/colors-chromablue.png
+share/apps/digikam/data/colors-chromared.png
+share/apps/digikam/data/colors-luma.png
 share/apps/digikam/data/craters-pattern.png
 share/apps/digikam/data/curvefree.png
 share/apps/digikam/data/curvemooth.png
 share/apps/digikam/data/dried-pattern.png
 share/apps/digikam/data/duplicatebothhorz.png
 share/apps/digikam/data/duplicatebothvert.png
-share/apps/digikam/data/fabric-texture.png
 share/apps/digikam/data/granit-pattern.png
 share/apps/digikam/data/histogram-lin.png
 share/apps/digikam/data/histogram-log.png
@@ -155,15 +126,8 @@ share/apps/digikam/data/logo-exiv2.png
 share/apps/digikam/data/logo-gphoto.png
 share/apps/digikam/data/logo-lcms.png
 share/apps/digikam/data/marble-pattern.png
-share/apps/digikam/data/marble-texture.png
-share/apps/digikam/data/marble2-texture.png
-share/apps/digikam/data/metalwire-texture.png
-share/apps/digikam/data/modern-texture.png
-share/apps/digikam/data/moss-texture.png
 share/apps/digikam/data/original.png
 share/apps/digikam/data/paper-pattern.png
-share/apps/digikam/data/paper-texture.png
-share/apps/digikam/data/paper2-texture.png
 share/apps/digikam/data/parque-pattern.png
 share/apps/digikam/data/pine-pattern.png
 share/apps/digikam/data/pink-pattern.png
@@ -171,41 +135,17 @@ share/apps/digikam/data/rain-pattern.png
 share/apps/digikam/data/rock-pattern.png
 share/apps/digikam/data/splash-digikam.png
 share/apps/digikam/data/stone-pattern.png
-share/apps/digikam/data/stone-texture.png
 share/apps/digikam/data/target.png
 share/apps/digikam/data/togglemouseover.png
 share/apps/digikam/data/topicset.iptc-subjectcode.xml
 share/apps/digikam/data/wall-pattern.png
-share/apps/digikam/data/wall-texture.png
 share/apps/digikam/data/wood-pattern.png
 share/apps/digikam/digikam.notifyrc
-share/apps/digikam/digikamimageplugin_adjustcurves_ui.rc
-share/apps/digikam/digikamimageplugin_adjustlevels_ui.rc
-share/apps/digikam/digikamimageplugin_blurfx_ui.rc
-share/apps/digikam/digikamimageplugin_border_ui.rc
-share/apps/digikam/digikamimageplugin_channelmixer_ui.rc
-share/apps/digikam/digikamimageplugin_charcoal_ui.rc
-share/apps/digikam/digikamimageplugin_colorfx_ui.rc
-share/apps/digikam/digikamimageplugin_contentawareresizing_ui.rc
-share/apps/digikam/digikamimageplugin_core_ui.rc
-share/apps/digikam/digikamimageplugin_distortionfx_ui.rc
-share/apps/digikam/digikamimageplugin_emboss_ui.rc
-share/apps/digikam/digikamimageplugin_filmgrain_ui.rc
-share/apps/digikam/digikamimageplugin_freerotation_ui.rc
-share/apps/digikam/digikamimageplugin_hotpixels_ui.rc
-share/apps/digikam/digikamimageplugin_infrared_ui.rc
-share/apps/digikam/digikamimageplugin_inpainting_ui.rc
-share/apps/digikam/digikamimageplugin_inserttext_ui.rc
-share/apps/digikam/digikamimageplugin_lenscorrection_ui.rc
-share/apps/digikam/digikamimageplugin_localcontrast_ui.rc
-share/apps/digikam/digikamimageplugin_oilpaint_ui.rc
-share/apps/digikam/digikamimageplugin_perspective_ui.rc
-share/apps/digikam/digikamimageplugin_raindrop_ui.rc
-share/apps/digikam/digikamimageplugin_restoration_ui.rc
-share/apps/digikam/digikamimageplugin_sheartool_ui.rc
-share/apps/digikam/digikamimageplugin_superimpose_ui.rc
-share/apps/digikam/digikamimageplugin_texture_ui.rc
-share/apps/digikam/digikamimageplugin_whitebalance_ui.rc
+share/apps/digikam/digikamimageplugin_color_ui.rc
+share/apps/digikam/digikamimageplugin_decorate_ui.rc
+share/apps/digikam/digikamimageplugin_enhance_ui.rc
+share/apps/digikam/digikamimageplugin_fxfilters_ui.rc
+share/apps/digikam/digikamimageplugin_transform_ui.rc
 share/apps/digikam/digikamimagewindowui.rc
 share/apps/digikam/digikamui.rc
 share/apps/digikam/icons/hicolor/128x128/actions/adjustcurves.png
@@ -239,9 +179,9 @@ share/apps/digikam/icons/hicolor/128x128/actions/filmgrain.png
 share/apps/digikam/icons/hicolor/128x128/actions/freerotation.png
 share/apps/digikam/icons/hicolor/128x128/actions/hotpixels.png
 share/apps/digikam/icons/hicolor/128x128/actions/imagecomment.png
-share/apps/digikam/icons/hicolor/128x128/actions/infrared.png
 share/apps/digikam/icons/hicolor/128x128/actions/inpainting.png
 share/apps/digikam/icons/hicolor/128x128/actions/invertimage.png
+share/apps/digikam/icons/hicolor/128x128/actions/lensautofix.png
 share/apps/digikam/icons/hicolor/128x128/actions/lensdistortion.png
 share/apps/digikam/icons/hicolor/128x128/actions/noisereduction.png
 share/apps/digikam/icons/hicolor/128x128/actions/oilpaint.png
@@ -254,6 +194,7 @@ share/apps/digikam/icons/hicolor/128x128/actions/sharpenimage.png
 share/apps/digikam/icons/hicolor/128x128/actions/shear.png
 share/apps/digikam/icons/hicolor/128x128/actions/superimpose.png
 share/apps/digikam/icons/hicolor/128x128/actions/texture.png
+share/apps/digikam/icons/hicolor/128x128/actions/tonemap.png
 share/apps/digikam/icons/hicolor/128x128/actions/viewimage.png
 share/apps/digikam/icons/hicolor/128x128/actions/whitebalance.png
 share/apps/digikam/icons/hicolor/16x16/actions/adjustcurves.png
@@ -294,9 +235,9 @@ share/apps/digikam/icons/hicolor/16x16/actions/filmgrain.png
 share/apps/digikam/icons/hicolor/16x16/actions/freerotation.png
 share/apps/digikam/icons/hicolor/16x16/actions/hotpixels.png
 share/apps/digikam/icons/hicolor/16x16/actions/imagecomment.png
-share/apps/digikam/icons/hicolor/16x16/actions/infrared.png
 share/apps/digikam/icons/hicolor/16x16/actions/inpainting.png
 share/apps/digikam/icons/hicolor/16x16/actions/invertimage.png
+share/apps/digikam/icons/hicolor/16x16/actions/lensautofix.png
 share/apps/digikam/icons/hicolor/16x16/actions/lensdistortion.png
 share/apps/digikam/icons/hicolor/16x16/actions/noisereduction.png
 share/apps/digikam/icons/hicolor/16x16/actions/oilpaint.png
@@ -309,6 +250,7 @@ share/apps/digikam/icons/hicolor/16x16/actions/sharpenimage.png
 share/apps/digikam/icons/hicolor/16x16/actions/shear.png
 share/apps/digikam/icons/hicolor/16x16/actions/superimpose.png
 share/apps/digikam/icons/hicolor/16x16/actions/texture.png
+share/apps/digikam/icons/hicolor/16x16/actions/tonemap.png
 share/apps/digikam/icons/hicolor/16x16/actions/viewimage.png
 share/apps/digikam/icons/hicolor/16x16/actions/whitebalance.png
 share/apps/digikam/icons/hicolor/22x22/actions/adjustcurves.png
@@ -349,9 +291,9 @@ share/apps/digikam/icons/hicolor/22x22/actions/filmgrain.png
 share/apps/digikam/icons/hicolor/22x22/actions/freerotation.png
 share/apps/digikam/icons/hicolor/22x22/actions/hotpixels.png
 share/apps/digikam/icons/hicolor/22x22/actions/imagecomment.png
-share/apps/digikam/icons/hicolor/22x22/actions/infrared.png
 share/apps/digikam/icons/hicolor/22x22/actions/inpainting.png
 share/apps/digikam/icons/hicolor/22x22/actions/invertimage.png
+share/apps/digikam/icons/hicolor/22x22/actions/lensautofix.png
 share/apps/digikam/icons/hicolor/22x22/actions/lensdistortion.png
 share/apps/digikam/icons/hicolor/22x22/actions/noisereduction.png
 share/apps/digikam/icons/hicolor/22x22/actions/oilpaint.png
@@ -364,6 +306,7 @@ share/apps/digikam/icons/hicolor/22x22/actions/sharpenimage.png
 share/apps/digikam/icons/hicolor/22x22/actions/shear.png
 share/apps/digikam/icons/hicolor/22x22/actions/superimpose.png
 share/apps/digikam/icons/hicolor/22x22/actions/texture.png
+share/apps/digikam/icons/hicolor/22x22/actions/tonemap.png
 share/apps/digikam/icons/hicolor/22x22/actions/viewimage.png
 share/apps/digikam/icons/hicolor/22x22/actions/whitebalance.png
 share/apps/digikam/icons/hicolor/22x22/mimetypes/raw.png
@@ -405,9 +348,9 @@ share/apps/digikam/icons/hicolor/32x32/actions/filmgrain.png
 share/apps/digikam/icons/hicolor/32x32/actions/freerotation.png
 share/apps/digikam/icons/hicolor/32x32/actions/hotpixels.png
 share/apps/digikam/icons/hicolor/32x32/actions/imagecomment.png
-share/apps/digikam/icons/hicolor/32x32/actions/infrared.png
 share/apps/digikam/icons/hicolor/32x32/actions/inpainting.png
 share/apps/digikam/icons/hicolor/32x32/actions/invertimage.png
+share/apps/digikam/icons/hicolor/32x32/actions/lensautofix.png
 share/apps/digikam/icons/hicolor/32x32/actions/lensdistortion.png
 share/apps/digikam/icons/hicolor/32x32/actions/lighttable.png
 share/apps/digikam/icons/hicolor/32x32/actions/lighttableadd.png
@@ -435,6 +378,7 @@ share/apps/digikam/icons/hicolor/32x32/actions/tag-recents.png
 share/apps/digikam/icons/hicolor/32x32/actions/tag-reset.png
 share/apps/digikam/icons/hicolor/32x32/actions/tag.png
 share/apps/digikam/icons/hicolor/32x32/actions/texture.png
+share/apps/digikam/icons/hicolor/32x32/actions/tonemap.png
 share/apps/digikam/icons/hicolor/32x32/actions/underexposure.png
 share/apps/digikam/icons/hicolor/32x32/actions/viewimage.png
 share/apps/digikam/icons/hicolor/32x32/actions/whitebalance.png
@@ -478,9 +422,9 @@ share/apps/digikam/icons/hicolor/48x48/actions/filmgrain.png
 share/apps/digikam/icons/hicolor/48x48/actions/freerotation.png
 share/apps/digikam/icons/hicolor/48x48/actions/hotpixels.png
 share/apps/digikam/icons/hicolor/48x48/actions/imagecomment.png
-share/apps/digikam/icons/hicolor/48x48/actions/infrared.png
 share/apps/digikam/icons/hicolor/48x48/actions/inpainting.png
 share/apps/digikam/icons/hicolor/48x48/actions/invertimage.png
+share/apps/digikam/icons/hicolor/48x48/actions/lensautofix.png
 share/apps/digikam/icons/hicolor/48x48/actions/lensdistortion.png
 share/apps/digikam/icons/hicolor/48x48/actions/noisereduction.png
 share/apps/digikam/icons/hicolor/48x48/actions/oilpaint.png
@@ -493,6 +437,7 @@ share/apps/digikam/icons/hicolor/48x48/actions/sharpenimage.png
 share/apps/digikam/icons/hicolor/48x48/actions/shear.png
 share/apps/digikam/icons/hicolor/48x48/actions/superimpose.png
 share/apps/digikam/icons/hicolor/48x48/actions/texture.png
+share/apps/digikam/icons/hicolor/48x48/actions/tonemap.png
 share/apps/digikam/icons/hicolor/48x48/actions/viewimage.png
 share/apps/digikam/icons/hicolor/48x48/actions/whitebalance.png
 share/apps/digikam/icons/hicolor/48x48/mimetypes/raw.png
@@ -534,9 +479,9 @@ share/apps/digikam/icons/hicolor/64x64/actions/filmgrain.png
 share/apps/digikam/icons/hicolor/64x64/actions/freerotation.png
 share/apps/digikam/icons/hicolor/64x64/actions/hotpixels.png
 share/apps/digikam/icons/hicolor/64x64/actions/imagecomment.png
-share/apps/digikam/icons/hicolor/64x64/actions/infrared.png
 share/apps/digikam/icons/hicolor/64x64/actions/inpainting.png
 share/apps/digikam/icons/hicolor/64x64/actions/invertimage.png
+share/apps/digikam/icons/hicolor/64x64/actions/lensautofix.png
 share/apps/digikam/icons/hicolor/64x64/actions/lensdistortion.png
 share/apps/digikam/icons/hicolor/64x64/actions/noisereduction.png
 share/apps/digikam/icons/hicolor/64x64/actions/oilpaint.png
@@ -549,6 +494,7 @@ share/apps/digikam/icons/hicolor/64x64/actions/sharpenimage.png
 share/apps/digikam/icons/hicolor/64x64/actions/shear.png
 share/apps/digikam/icons/hicolor/64x64/actions/superimpose.png
 share/apps/digikam/icons/hicolor/64x64/actions/texture.png
+share/apps/digikam/icons/hicolor/64x64/actions/tonemap.png
 share/apps/digikam/icons/hicolor/64x64/actions/viewimage.png
 share/apps/digikam/icons/hicolor/64x64/actions/whitebalance.png
 share/apps/digikam/icons/hicolor/64x64/mimetypes/raw.png
@@ -588,6 +534,7 @@ share/apps/digikam/icons/hicolor/scalable/actions/hotpixels.svgz
 share/apps/digikam/icons/hicolor/scalable/actions/imagecomment.svgz
 share/apps/digikam/icons/hicolor/scalable/actions/inpainting.svgz
 share/apps/digikam/icons/hicolor/scalable/actions/invertimage.svgz
+share/apps/digikam/icons/hicolor/scalable/actions/lensautofix.svgz
 share/apps/digikam/icons/hicolor/scalable/actions/noisereduction.svgz
 share/apps/digikam/icons/hicolor/scalable/actions/perspective.svgz
 share/apps/digikam/icons/hicolor/scalable/actions/ratiocrop.svgz
@@ -596,6 +543,7 @@ share/apps/digikam/icons/hicolor/scalable/actions/sharpenimage.svgz
 share/apps/digikam/icons/hicolor/scalable/actions/shear.svgz
 share/apps/digikam/icons/hicolor/scalable/actions/superimpose.svgz
 share/apps/digikam/icons/hicolor/scalable/actions/texture.svgz
+share/apps/digikam/icons/hicolor/scalable/actions/tonemap.svgz
 share/apps/digikam/icons/hicolor/scalable/actions/whitebalance.svgz
 share/apps/digikam/lighttablewindowui.rc
 share/apps/digikam/queuemgrwindowui.rc
@@ -635,39 +583,16 @@ share/icons/hicolor/scalable/apps/digikam.svgz
 share/icons/hicolor/scalable/apps/showfoto.svgz
 share/kde4/services/digikamalbums.protocol
 share/kde4/services/digikamdates.protocol
-share/kde4/services/digikamimageplugin_adjustcurves.desktop
-share/kde4/services/digikamimageplugin_adjustlevels.desktop
-share/kde4/services/digikamimageplugin_blurfx.desktop
-share/kde4/services/digikamimageplugin_border.desktop
-share/kde4/services/digikamimageplugin_channelmixer.desktop
-share/kde4/services/digikamimageplugin_charcoal.desktop
-share/kde4/services/digikamimageplugin_colorfx.desktop
-share/kde4/services/digikamimageplugin_contentawareresizing.desktop
-share/kde4/services/digikamimageplugin_core.desktop
-share/kde4/services/digikamimageplugin_distortionfx.desktop
-share/kde4/services/digikamimageplugin_emboss.desktop
-share/kde4/services/digikamimageplugin_filmgrain.desktop
-share/kde4/services/digikamimageplugin_freerotation.desktop
-share/kde4/services/digikamimageplugin_hotpixels.desktop
-share/kde4/services/digikamimageplugin_infrared.desktop
-share/kde4/services/digikamimageplugin_inpainting.desktop
-share/kde4/services/digikamimageplugin_inserttext.desktop
-share/kde4/services/digikamimageplugin_lenscorrection.desktop
-share/kde4/services/digikamimageplugin_localcontrast.desktop
-share/kde4/services/digikamimageplugin_oilpaint.desktop
-share/kde4/services/digikamimageplugin_perspective.desktop
-share/kde4/services/digikamimageplugin_raindrop.desktop
-share/kde4/services/digikamimageplugin_restoration.desktop
-share/kde4/services/digikamimageplugin_sheartool.desktop
-share/kde4/services/digikamimageplugin_superimpose.desktop
-share/kde4/services/digikamimageplugin_texture.desktop
-share/kde4/services/digikamimageplugin_whitebalance.desktop
+share/kde4/services/digikamimageplugin_color.desktop
+share/kde4/services/digikamimageplugin_decorate.desktop
+share/kde4/services/digikamimageplugin_enhance.desktop
+share/kde4/services/digikamimageplugin_fxfilters.desktop
+share/kde4/services/digikamimageplugin_transform.desktop
 share/kde4/services/digikamnepomukservice.desktop
 share/kde4/services/digikamsearch.protocol
 share/kde4/services/digikamtags.protocol
 share/kde4/servicetypes/digikamimageplugin.desktop
 share/locale/ar/LC_MESSAGES/digikam.mo
-share/locale/be/LC_MESSAGES/digikam.mo
 share/locale/bg/LC_MESSAGES/digikam.mo
 share/locale/ca/LC_MESSAGES/digikam.mo
 share/locale/ca@valencia/LC_MESSAGES/digikam.mo
@@ -675,28 +600,20 @@ share/locale/cs/LC_MESSAGES/digikam.mo
 share/locale/da/LC_MESSAGES/digikam.mo
 share/locale/de/LC_MESSAGES/digikam.mo
 share/locale/el/LC_MESSAGES/digikam.mo
-share/locale/en_GB/LC_MESSAGES/digikam.mo
 share/locale/eo/LC_MESSAGES/digikam.mo
 share/locale/es/LC_MESSAGES/digikam.mo
 share/locale/et/LC_MESSAGES/digikam.mo
 share/locale/eu/LC_MESSAGES/digikam.mo
-share/locale/fa/LC_MESSAGES/digikam.mo
 share/locale/fi/LC_MESSAGES/digikam.mo
 share/locale/fr/LC_MESSAGES/digikam.mo
-share/locale/ga/LC_MESSAGES/digikam.mo
-share/locale/gl/LC_MESSAGES/digikam.mo
 share/locale/he/LC_MESSAGES/digikam.mo
 share/locale/hi/LC_MESSAGES/digikam.mo
 share/locale/hne/LC_MESSAGES/digikam.mo
-share/locale/hr/LC_MESSAGES/digikam.mo
-share/locale/hu/LC_MESSAGES/digikam.mo
-share/locale/is/LC_MESSAGES/digikam.mo
 share/locale/it/LC_MESSAGES/digikam.mo
 share/locale/ja/LC_MESSAGES/digikam.mo
 share/locale/km/LC_MESSAGES/digikam.mo
 share/locale/ko/LC_MESSAGES/digikam.mo
 share/locale/lt/LC_MESSAGES/digikam.mo
-share/locale/lv/LC_MESSAGES/digikam.mo
 share/locale/nb/LC_MESSAGES/digikam.mo
 share/locale/nds/LC_MESSAGES/digikam.mo
 share/locale/ne/LC_MESSAGES/digikam.mo
@@ -706,7 +623,6 @@ share/locale/pa/LC_MESSAGES/digikam.mo
 share/locale/pl/LC_MESSAGES/digikam.mo
 share/locale/pt/LC_MESSAGES/digikam.mo
 share/locale/pt_BR/LC_MESSAGES/digikam.mo
-share/locale/ro/LC_MESSAGES/digikam.mo
 share/locale/ru/LC_MESSAGES/digikam.mo
 share/locale/se/LC_MESSAGES/digikam.mo
 share/locale/sk/LC_MESSAGES/digikam.mo
@@ -720,8 +636,6 @@ share/locale/zh_CN/LC_MESSAGES/digikam.mo
 share/locale/zh_TW/LC_MESSAGES/digikam.mo
 @dirrmtry share/locale/se/LC_MESSAGES
 @dirrmtry share/locale/se
-@dirrmtry share/locale/hne/LC_MESSAGES
-@dirrmtry share/locale/hne
 @dirrmtry share/locale/ca@valencia/LC_MESSAGES
 @dirrmtry share/locale/ca@valencia
 @dirrm share/apps/showfoto/data