summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authormarkd <markd@pkgsrc.org>2012-03-21 21:14:47 +0000
committermarkd <markd@pkgsrc.org>2012-03-21 21:14:47 +0000
commit4505025378eccc59d5e92159684d0ce598368595 (patch)
treee70120c557d8a330296e2fa93b4936d140753be8 /graphics
parent5a0816c5d38eedb7bc09b020e1bca19f1be669d7 (diff)
downloadpkgsrc-4505025378eccc59d5e92159684d0ce598368595.tar.gz
Update to 2.5.0
Changes unknown
Diffstat (limited to 'graphics')
-rw-r--r--graphics/digikam/Makefile25
-rw-r--r--graphics/digikam/PLIST365
-rw-r--r--graphics/digikam/distinfo14
-rw-r--r--graphics/digikam/options.mk4
-rw-r--r--graphics/digikam/patches/patch-CMakeLists.txt49
-rw-r--r--graphics/digikam/patches/patch-aa26
-rw-r--r--graphics/digikam/patches/patch-core_libs_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp35
-rw-r--r--graphics/digikam/patches/patch-core_libs_database_imagehistory_imagehistorygraph_boost.h68
-rw-r--r--graphics/digikam/patches/patch-core_utilities_setup_setupplugins.cpp46
-rw-r--r--graphics/digikam/patches/patch-doc_CMakeLists.txt12
10 files changed, 520 insertions, 124 deletions
diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile
index cc52d5b4fb5..0007f0ac90d 100644
--- a/graphics/digikam/Makefile
+++ b/graphics/digikam/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.74 2012/03/03 00:13:11 wiz Exp $
+# $NetBSD: Makefile,v 1.75 2012/03/21 21:14:47 markd Exp $
#
-DISTNAME= digikam-1.6.0
-PKGREVISION= 10
+DISTNAME= digikam-2.5.0
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=digikam/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= wiz@NetBSD.org
-HOMEPAGE= http://digikam.sourceforge.net/
+HOMEPAGE= http://www.digikam.org/
COMMENT= Advanced digital photo management application (KDE4)
LICENSE= gnu-gpl-v2 AND gnu-fdl-v1.2 AND gnu-lgpl-v2.1
@@ -19,22 +18,30 @@ PKG_DESTDIR_SUPPORT= user-destdir
USE_PKGLOCALEDIR= yes
USE_LANGUAGES= c c++
-REPLACE_PERL= utilities/scripts/digitaglinktree/digitaglinktree
-USE_CMAKE= yes
+REPLACE_PERL= core/utilities/scripts/digitaglinktree/digitaglinktree
CMAKE_ARGS+= -DMYSQLD_PATH:PATH=${BUILDLINK_PREFIX.mysql-server}/libexec
USE_TOOLS+= gawk msgfmt perl:run pkg-config
.include "options.mk"
+post-patch:
+ rm ${WRKSRC}/po/*/libkgeomap.po ${WRKSRC}/po/*/kipiplug*
+
.include "../../meta-pkgs/kde4/kde4.mk"
.include "../../databases/mysql51-server/buildlink3.mk"
.include "../../devel/libgphoto2/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-# for libkdcraw>=0.4.0
-BUILDLINK_API_DEPENDS.kdegraphics4+= kdegraphics4>=4.5
-.include "../../graphics/kdegraphics4/buildlink3.mk"
+.include "../../graphics/libkdcraw/buildlink3.mk"
+.include "../../graphics/libkexiv2/buildlink3.mk"
+.include "../../graphics/libkipi/buildlink3.mk"
+.include "../../graphics/libksane/buildlink3.mk"
+.include "../../graphics/libkface/buildlink3.mk"
.include "../../graphics/lcms/buildlink3.mk"
.include "../../graphics/liblqr/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../misc/libkgeomap/buildlink3.mk"
+.include "../../misc/libkvkontakte/buildlink3.mk"
.include "../../multimedia/kdemultimedia4/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 fb007a824f4..23d8cbd23c1 100644
--- a/graphics/digikam/PLIST
+++ b/graphics/digikam/PLIST
@@ -1,66 +1,8 @@
-@comment $NetBSD: PLIST,v 1.25 2011/01/10 15:19:43 wiz Exp $
+@comment $NetBSD: PLIST,v 1.26 2012/03/21 21:14:47 markd Exp $
bin/cleanup_digikamdb
bin/digikam
bin/digitaglinktree
bin/showfoto
-include/digikam/albumdb.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/dcolor.h
-include/digikam/dcolorblend.h
-include/digikam/dcolorcomposer.h
-include/digikam/dcolorpixelaccess.h
-include/digikam/dcursortracker.h
-include/digikam/dgradientslider.h
-include/digikam/dimg.h
-include/digikam/dimgthreadedfilter.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/hslfilter.h
-include/digikam/iccpreviewwidget.h
-include/digikam/iccprofileinfodlg.h
-include/digikam/iccprofilewidget.h
-include/digikam/icctransform.h
-include/digikam/imagecurves.h
-include/digikam/imagedialog.h
-include/digikam/imageiface.h
-include/digikam/imagelevels.h
-include/digikam/imageplugin.h
-include/digikam/iptcwidget.h
-include/digikam/knotificationwrapper.h
-include/digikam/libsinfodlg.h
-include/digikam/makernotewidget.h
-include/digikam/mdkeylistviewitem.h
-include/digikam/metadatalistview.h
-include/digikam/metadatalistviewitem.h
-include/digikam/metadatawidget.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/rexpanderboxexclusive.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/template.h
-include/digikam/unsharpmaskfilter.h
-include/digikam/xmpwidget.h
-include/digikam_export.h
lib/kde4/digikamimageplugin_color.so
lib/kde4/digikamimageplugin_decorate.so
lib/kde4/digikamimageplugin_enhance.so
@@ -69,26 +11,281 @@ lib/kde4/digikamimageplugin_transform.so
lib/kde4/digikamnepomukservice.so
lib/kde4/kio_digikamalbums.so
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/kde4/plugins/marble/ExternalDraw.so
lib/libdigikamcore.so
-lib/libdigikamcore.so.1
-lib/libdigikamcore.so.1.0.0
+lib/libdigikamcore.so.2
+lib/libdigikamcore.so.2.0.0
lib/libdigikamdatabase.so
-lib/libdigikamdatabase.so.1
-lib/libdigikamdatabase.so.1.0.0
+lib/libdigikamdatabase.so.2
+lib/libdigikamdatabase.so.2.0.0
man/man1/cleanup_digikamdb.1
man/man1/digitaglinktree.1
share/applications/kde4/digikam.desktop
share/applications/kde4/showfoto.desktop
+share/doc/kde/HTML/en/digikam/2Greens.png
+share/doc/kde/HTML/en/digikam/542px-CIExy1931_sRGB_svg.png
+share/doc/kde/HTML/en/digikam/DAM-Metadata.png
+share/doc/kde/HTML/en/digikam/DAM-Workflow.png
+share/doc/kde/HTML/en/digikam/DAM-errors.png
+share/doc/kde/HTML/en/digikam/DAM-pyramid.png
+share/doc/kde/HTML/en/digikam/DAM-story.png
+share/doc/kde/HTML/en/digikam/DAM-transmission.png
+share/doc/kde/HTML/en/digikam/ICCworkflowlogic.png
+share/doc/kde/HTML/en/digikam/addinglibraries.png
+share/doc/kde/HTML/en/digikam/adjustcurvesdialog.png
+share/doc/kde/HTML/en/digikam/adjustcurvespreview.png
+share/doc/kde/HTML/en/digikam/adjustlevelsdialog.png
+share/doc/kde/HTML/en/digikam/adjustlevelspreview.png
+share/doc/kde/HTML/en/digikam/antivignettingdialog.png
+share/doc/kde/HTML/en/digikam/antivignettingpreview.png
+share/doc/kde/HTML/en/digikam/blowupdialog.png
+share/doc/kde/HTML/en/digikam/blowuppreview.png
+share/doc/kde/HTML/en/digikam/blowupsettings1.png
+share/doc/kde/HTML/en/digikam/blowupsettings2.png
+share/doc/kde/HTML/en/digikam/blurfx_farblur.png
+share/doc/kde/HTML/en/digikam/blurfx_focusblur.png
+share/doc/kde/HTML/en/digikam/blurfx_frostglass.png
+share/doc/kde/HTML/en/digikam/blurfx_mosaic.png
+share/doc/kde/HTML/en/digikam/blurfx_motionblur.png
+share/doc/kde/HTML/en/digikam/blurfx_radialblur.png
+share/doc/kde/HTML/en/digikam/blurfx_shakeblur.png
+share/doc/kde/HTML/en/digikam/blurfx_smartblur.png
+share/doc/kde/HTML/en/digikam/blurfx_softenerblur.png
+share/doc/kde/HTML/en/digikam/blurfx_zoomblur.png
+share/doc/kde/HTML/en/digikam/blurfxpreview.png
+share/doc/kde/HTML/en/digikam/borderpreview.png
+share/doc/kde/HTML/en/digikam/cameraclient.png
+share/doc/kde/HTML/en/digikam/cameraclientdownload.png
+share/doc/kde/HTML/en/digikam/cameraclientidentity.png
+share/doc/kde/HTML/en/digikam/cameraclientitemproperties.png
+share/doc/kde/HTML/en/digikam/cameraclientsetting1.png
+share/doc/kde/HTML/en/digikam/cameraclientsetting2.png
+share/doc/kde/HTML/en/digikam/cameraclientsetting3.png
+share/doc/kde/HTML/en/digikam/camerafolderselectiondialog.png
+share/doc/kde/HTML/en/digikam/cameratargetalbumdialog.png
+share/doc/kde/HTML/en/digikam/channelmixerdialog.png
+share/doc/kde/HTML/en/digikam/channelmixerpreview.png
+share/doc/kde/HTML/en/digikam/charcoalpreview.png
+share/doc/kde/HTML/en/digikam/cimg-logo.png
+share/doc/kde/HTML/en/digikam/color-management.docbook
+share/doc/kde/HTML/en/digikam/colormanagement.png
+share/doc/kde/HTML/en/digikam/common
+share/doc/kde/HTML/en/digikam/credits-annex.docbook
+share/doc/kde/HTML/en/digikam/digikamlogo.png
+share/doc/kde/HTML/en/digikam/distortionfx_blockwaves1.png
+share/doc/kde/HTML/en/digikam/distortionfx_blockwaves2.png
+share/doc/kde/HTML/en/digikam/distortionfx_caricature.png
+share/doc/kde/HTML/en/digikam/distortionfx_circularwaves1.png
+share/doc/kde/HTML/en/digikam/distortionfx_circularwaves2.png
+share/doc/kde/HTML/en/digikam/distortionfx_corners.png
+share/doc/kde/HTML/en/digikam/distortionfx_cylinderh.png
+share/doc/kde/HTML/en/digikam/distortionfx_cylinderhv.png
+share/doc/kde/HTML/en/digikam/distortionfx_cylinderv.png
+share/doc/kde/HTML/en/digikam/distortionfx_fisheyes.png
+share/doc/kde/HTML/en/digikam/distortionfx_polarcoord.png
+share/doc/kde/HTML/en/digikam/distortionfx_tiles.png
+share/doc/kde/HTML/en/digikam/distortionfx_twirl.png
+share/doc/kde/HTML/en/digikam/distortionfx_unpolarcoord.png
+share/doc/kde/HTML/en/digikam/distortionfx_wavesh.png
+share/doc/kde/HTML/en/digikam/distortionfx_wavesv.png
+share/doc/kde/HTML/en/digikam/distortionfxpreview.png
+share/doc/kde/HTML/en/digikam/distortions.png
+share/doc/kde/HTML/en/digikam/duplicates_albumsfilter.png
+share/doc/kde/HTML/en/digikam/editor-color.docbook
+share/doc/kde/HTML/en/digikam/editor-decorate.docbook
+share/doc/kde/HTML/en/digikam/editor-enhance.docbook
+share/doc/kde/HTML/en/digikam/editor-filters.docbook
+share/doc/kde/HTML/en/digikam/editor-redeyes-correction.png
+share/doc/kde/HTML/en/digikam/editor-transform.docbook
+share/doc/kde/HTML/en/digikam/editorautolevels.png
+share/doc/kde/HTML/en/digikam/editorautosizebutton.png
+share/doc/kde/HTML/en/digikam/editorbcgadjust.png
+share/doc/kde/HTML/en/digikam/editorblurplugin.png
+share/doc/kde/HTML/en/digikam/editorbwfilter.png
+share/doc/kde/HTML/en/digikam/editorcolorbalance.png
+share/doc/kde/HTML/en/digikam/editorcommondialogtools.png
+share/doc/kde/HTML/en/digikam/editorconvert_brown.png
+share/doc/kde/HTML/en/digikam/editorconvert_bw.png
+share/doc/kde/HTML/en/digikam/editorconvert_bwgreen.png
+share/doc/kde/HTML/en/digikam/editorconvert_bworange.png
+share/doc/kde/HTML/en/digikam/editorconvert_bwred.png
+share/doc/kde/HTML/en/digikam/editorconvert_bwyellow.png
+share/doc/kde/HTML/en/digikam/editorconvert_cold.png
+share/doc/kde/HTML/en/digikam/editorconvert_original.png
+share/doc/kde/HTML/en/digikam/editorconvert_platinium.png
+share/doc/kde/HTML/en/digikam/editorconvert_selenium.png
+share/doc/kde/HTML/en/digikam/editorconvert_sepia.png
+share/doc/kde/HTML/en/digikam/editorcropbutton.png
+share/doc/kde/HTML/en/digikam/editorequalize.png
+share/doc/kde/HTML/en/digikam/editorgoldensectionsexample.png
+share/doc/kde/HTML/en/digikam/editorgoldenspiralexample.png
+share/doc/kde/HTML/en/digikam/editorgoldenspiralsectionsexample.png
+share/doc/kde/HTML/en/digikam/editorgoldentrianglesexample.png
+share/doc/kde/HTML/en/digikam/editorharmonioustrianglesexample.png
+share/doc/kde/HTML/en/digikam/editorhistogramdescription.png
+share/doc/kde/HTML/en/digikam/editorhistogramsample1.png
+share/doc/kde/HTML/en/digikam/editorhistogramsample2.png
+share/doc/kde/HTML/en/digikam/editorhistogramsample3.png
+share/doc/kde/HTML/en/digikam/editorhsladjust.png
+share/doc/kde/HTML/en/digikam/editoriccprofile.png
+share/doc/kde/HTML/en/digikam/editorimageselection.png
+share/doc/kde/HTML/en/digikam/editorneon.png
+share/doc/kde/HTML/en/digikam/editornoisereductionplugin.png
+share/doc/kde/HTML/en/digikam/editornormalize.png
+share/doc/kde/HTML/en/digikam/editorpreview.png
+share/doc/kde/HTML/en/digikam/editorraindropsplugin.png
+share/doc/kde/HTML/en/digikam/editorratiocroptool.png
+share/doc/kde/HTML/en/digikam/editorresizetool.png
+share/doc/kde/HTML/en/digikam/editorrevertbutton.png
+share/doc/kde/HTML/en/digikam/editorrulethirdlinesexample.png
+share/doc/kde/HTML/en/digikam/editorsharpenplugin.png
+share/doc/kde/HTML/en/digikam/editorstretchcontrast.png
+share/doc/kde/HTML/en/digikam/editortoolbar.png
+share/doc/kde/HTML/en/digikam/editorunsharpedmaskplugin.png
+share/doc/kde/HTML/en/digikam/editorvivid.png
+share/doc/kde/HTML/en/digikam/editorzoombuttons.png
+share/doc/kde/HTML/en/digikam/embosspreview.png
+share/doc/kde/HTML/en/digikam/file-formats.docbook
+share/doc/kde/HTML/en/digikam/filmgrainpreview.png
+share/doc/kde/HTML/en/digikam/firstrunassistant_step1.png
+share/doc/kde/HTML/en/digikam/firstrunassistant_step2.png
+share/doc/kde/HTML/en/digikam/firstrunassistant_step3.png
+share/doc/kde/HTML/en/digikam/firstrunassistant_step4.png
+share/doc/kde/HTML/en/digikam/firstrunassistant_step5.png
+share/doc/kde/HTML/en/digikam/firstrunassistant_step6.png
+share/doc/kde/HTML/en/digikam/firstrunassistant_step7.png
+share/doc/kde/HTML/en/digikam/firstrunassistant_step8.png
+share/doc/kde/HTML/en/digikam/freerotationpreview.png
+share/doc/kde/HTML/en/digikam/fuzzysearchsimilar.png
+share/doc/kde/HTML/en/digikam/handheld_gps.png
+share/doc/kde/HTML/en/digikam/hotpixelsdialog.png
+share/doc/kde/HTML/en/digikam/hotpixelspreview.png
+share/doc/kde/HTML/en/digikam/ie-menu.docbook
+share/doc/kde/HTML/en/digikam/index.cache.bz2
+share/doc/kde/HTML/en/digikam/index.docbook
+share/doc/kde/HTML/en/digikam/infraredpreview.png
+share/doc/kde/HTML/en/digikam/inpaintingdialog.png
+share/doc/kde/HTML/en/digikam/inpaintingpreview.png
+share/doc/kde/HTML/en/digikam/inpaintingsettings1.png
+share/doc/kde/HTML/en/digikam/inpaintingsettings2.png
+share/doc/kde/HTML/en/digikam/inserttextpreview.png
+share/doc/kde/HTML/en/digikam/introductionfirewireconnector.png
+share/doc/kde/HTML/en/digikam/introductionfirstrundialog.png
+share/doc/kde/HTML/en/digikam/introductionfoldericon.png
+share/doc/kde/HTML/en/digikam/introductionplugininterfaces.png
+share/doc/kde/HTML/en/digikam/introductionscandialog.png
+share/doc/kde/HTML/en/digikam/introductionserialconnector.png
+share/doc/kde/HTML/en/digikam/introductionusbconnector.png
+share/doc/kde/HTML/en/digikam/lensdistortiondialog.png
+share/doc/kde/HTML/en/digikam/lensdistortionpreview.png
+share/doc/kde/HTML/en/digikam/lighttable.png
+share/doc/kde/HTML/en/digikam/logo.png
+share/doc/kde/HTML/en/digikam/maininterfacealbumproperties.png
+share/doc/kde/HTML/en/digikam/maininterfaceassigntags.png
+share/doc/kde/HTML/en/digikam/maininterfacedateview.png
+share/doc/kde/HTML/en/digikam/maininterfacepreview.png
+share/doc/kde/HTML/en/digikam/maininterfacequicksearch.png
+share/doc/kde/HTML/en/digikam/maininterfacesearchview.png
+share/doc/kde/HTML/en/digikam/maininterfacetagsview.png
+share/doc/kde/HTML/en/digikam/maininterfacetoolbar.png
+share/doc/kde/HTML/en/digikam/maininterfaceview.png
+share/doc/kde/HTML/en/digikam/menu-descriptions.docbook
+share/doc/kde/HTML/en/digikam/menualbum.png
+share/doc/kde/HTML/en/digikam/menucamera.png
+share/doc/kde/HTML/en/digikam/menuexport.png
+share/doc/kde/HTML/en/digikam/menuhelp.png
+share/doc/kde/HTML/en/digikam/menuimage.png
+share/doc/kde/HTML/en/digikam/menuimagemetadata.png
+share/doc/kde/HTML/en/digikam/menuimport.png
+share/doc/kde/HTML/en/digikam/menuselect.png
+share/doc/kde/HTML/en/digikam/menusettings.png
+share/doc/kde/HTML/en/digikam/menutag.png
+share/doc/kde/HTML/en/digikam/menutools.png
+share/doc/kde/HTML/en/digikam/menutoolsbatch.png
+share/doc/kde/HTML/en/digikam/menuview.png
+share/doc/kde/HTML/en/digikam/noisereductiondialog.png
+share/doc/kde/HTML/en/digikam/noisereductionpreview.png
+share/doc/kde/HTML/en/digikam/noiseremovaltool.png
+share/doc/kde/HTML/en/digikam/oilpaintpreview.png
+share/doc/kde/HTML/en/digikam/perspectivepreview.png
+share/doc/kde/HTML/en/digikam/photo-editing.docbook
+share/doc/kde/HTML/en/digikam/raindropspreview.png
+share/doc/kde/HTML/en/digikam/rawcamerasupport.png
+share/doc/kde/HTML/en/digikam/refocus-notsharpened.png
+share/doc/kde/HTML/en/digikam/refocus-refocus.png
+share/doc/kde/HTML/en/digikam/refocus-sharped.png
+share/doc/kde/HTML/en/digikam/refocus-unsharpmask.png
+share/doc/kde/HTML/en/digikam/refocusdialog.png
+share/doc/kde/HTML/en/digikam/restorationdialog.png
+share/doc/kde/HTML/en/digikam/restorationpreview.png
+share/doc/kde/HTML/en/digikam/restorationpreview2.png
+share/doc/kde/HTML/en/digikam/restorationsettings1.png
+share/doc/kde/HTML/en/digikam/restorationsettings2.png
+share/doc/kde/HTML/en/digikam/searchinterface.png
+share/doc/kde/HTML/en/digikam/setupaddcamera.png
+share/doc/kde/HTML/en/digikam/setupalbum.png
+share/doc/kde/HTML/en/digikam/setupcamera.png
+share/doc/kde/HTML/en/digikam/setupcollections.png
+share/doc/kde/HTML/en/digikam/setupembeddedinfo.png
+share/doc/kde/HTML/en/digikam/setupiccprofiles.png
+share/doc/kde/HTML/en/digikam/setupimageeditor.png
+share/doc/kde/HTML/en/digikam/setupimageplugins.png
+share/doc/kde/HTML/en/digikam/setupkipiplugins.png
+share/doc/kde/HTML/en/digikam/setuplighttable.png
+share/doc/kde/HTML/en/digikam/setupmimetypes.png
+share/doc/kde/HTML/en/digikam/setupmisc.png
+share/doc/kde/HTML/en/digikam/setuprawfiledecoding.png
+share/doc/kde/HTML/en/digikam/setupsaveimages.png
+share/doc/kde/HTML/en/digikam/setupslideshow.png
+share/doc/kde/HTML/en/digikam/setupthemeclean.png
+share/doc/kde/HTML/en/digikam/setupthemedark.png
+share/doc/kde/HTML/en/digikam/setupthemedefault.png
+share/doc/kde/HTML/en/digikam/setupthemedessert.png
+share/doc/kde/HTML/en/digikam/setupthemedigicasa.png
+share/doc/kde/HTML/en/digikam/setupthemedreary.png
+share/doc/kde/HTML/en/digikam/setupthememarine.png
+share/doc/kde/HTML/en/digikam/setupthemeorangecrush.png
+share/doc/kde/HTML/en/digikam/setupthemesandy.png
+share/doc/kde/HTML/en/digikam/setuptooltip.png
+share/doc/kde/HTML/en/digikam/sheartoolpreview.png
+share/doc/kde/HTML/en/digikam/sidebar.docbook
+share/doc/kde/HTML/en/digikam/sidebarcolorshistogramviewer.png
+share/doc/kde/HTML/en/digikam/sidebarcommentstags.png
+share/doc/kde/HTML/en/digikam/sidebarfileproperties.png
+share/doc/kde/HTML/en/digikam/sidebargeolocation.png
+share/doc/kde/HTML/en/digikam/sidebarmetadata.png
+share/doc/kde/HTML/en/digikam/sidebarmetadataexif.png
+share/doc/kde/HTML/en/digikam/sidebarmetadatagps.png
+share/doc/kde/HTML/en/digikam/sidebarmetadataiptc.png
+share/doc/kde/HTML/en/digikam/sidebarmetadatamakernote.png
+share/doc/kde/HTML/en/digikam/sidebartagfilters.png
+share/doc/kde/HTML/en/digikam/solarizepreview.png
+share/doc/kde/HTML/en/digikam/superimposepreview.png
+share/doc/kde/HTML/en/digikam/texturedialog.png
+share/doc/kde/HTML/en/digikam/texturepreview.png
+share/doc/kde/HTML/en/digikam/timeline.png
+share/doc/kde/HTML/en/digikam/unsharpdialog.png
+share/doc/kde/HTML/en/digikam/unsharppreview.png
+share/doc/kde/HTML/en/digikam/vignettingcorrectiondialog.png
+share/doc/kde/HTML/en/digikam/whitebalancedialog.png
+share/doc/kde/HTML/en/showfoto/common
+share/doc/kde/HTML/en/showfoto/index.cache.bz2
+share/doc/kde/HTML/en/showfoto/index.docbook
+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/icons/hicolor/128x128/apps/digikam.png
share/icons/hicolor/128x128/apps/showfoto.png
share/icons/hicolor/16x16/apps/digikam.png
share/icons/hicolor/16x16/apps/showfoto.png
share/icons/hicolor/22x22/apps/digikam.png
share/icons/hicolor/22x22/apps/showfoto.png
+share/icons/hicolor/256x256/apps/digikam.png
+share/icons/hicolor/256x256/apps/showfoto.png
share/icons/hicolor/32x32/apps/digikam.png
share/icons/hicolor/32x32/apps/showfoto.png
share/icons/hicolor/48x48/apps/digikam.png
@@ -136,9 +333,6 @@ share/kde/apps/digikam/data/histogram-log.png
share/kde/apps/digikam/data/ice-pattern.png
share/kde/apps/digikam/data/image-full.png
share/kde/apps/digikam/data/image-selection.png
-share/kde/apps/digikam/data/indicator-gray.png
-share/kde/apps/digikam/data/indicator-green.png
-share/kde/apps/digikam/data/indicator-red.png
share/kde/apps/digikam/data/leaf-pattern.png
share/kde/apps/digikam/data/logo-cimg.png
share/kde/apps/digikam/data/logo-digikam.png
@@ -591,6 +785,9 @@ share/kde/apps/digikam/lensfun/compact-ricoh.xml
share/kde/apps/digikam/lensfun/compact-sigma.xml
share/kde/apps/digikam/lensfun/compact-sony.xml
share/kde/apps/digikam/lensfun/generic.xml
+share/kde/apps/digikam/lensfun/mil-olympus.xml
+share/kde/apps/digikam/lensfun/mil-panasonic.xml
+share/kde/apps/digikam/lensfun/mil-samsung.xml
share/kde/apps/digikam/lensfun/rf-leica.xml
share/kde/apps/digikam/lensfun/slr-canon.xml
share/kde/apps/digikam/lensfun/slr-contax.xml
@@ -609,19 +806,6 @@ share/kde/apps/digikam/lensfun/slr-tokina.xml
share/kde/apps/digikam/lensfun/slr-ussr.xml
share/kde/apps/digikam/lighttablewindowui.rc
share/kde/apps/digikam/queuemgrwindowui.rc
-share/kde/apps/digikam/themes/Blue
-share/kde/apps/digikam/themes/Clean
-share/kde/apps/digikam/themes/DLR
-share/kde/apps/digikam/themes/Dark
-share/kde/apps/digikam/themes/DarkRoom
-share/kde/apps/digikam/themes/Dessert
-share/kde/apps/digikam/themes/Digikasa
-share/kde/apps/digikam/themes/Dreary
-share/kde/apps/digikam/themes/Gray
-share/kde/apps/digikam/themes/Marine
-share/kde/apps/digikam/themes/OrangeCrush
-share/kde/apps/digikam/themes/Rose
-share/kde/apps/digikam/themes/Sandy
share/kde/apps/digikam/tips
share/kde/apps/digikam/utils/digikam-camera
share/kde/apps/showfoto/data/banner-showfoto.png
@@ -636,13 +820,18 @@ 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/digikammapimages.protocol
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/bs/LC_MESSAGES/digikam.mo
share/locale/ca/LC_MESSAGES/digikam.mo
-share/locale/ca@valencia/LC_MESSAGES/digikam.mo
+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
@@ -650,30 +839,42 @@ 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/ms/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
+share/locale/nl/LC_MESSAGES/digikam.mo
share/locale/nn/LC_MESSAGES/digikam.mo
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
share/locale/sl/LC_MESSAGES/digikam.mo
+share/locale/sq/LC_MESSAGES/digikam.mo
share/locale/sv/LC_MESSAGES/digikam.mo
share/locale/th/LC_MESSAGES/digikam.mo
share/locale/tr/LC_MESSAGES/digikam.mo
+share/locale/uk/LC_MESSAGES/digikam.mo
share/locale/vi/LC_MESSAGES/digikam.mo
share/locale/zh_CN/LC_MESSAGES/digikam.mo
share/locale/zh_TW/LC_MESSAGES/digikam.mo
diff --git a/graphics/digikam/distinfo b/graphics/digikam/distinfo
index 55b8486d0d8..ecba20ca620 100644
--- a/graphics/digikam/distinfo
+++ b/graphics/digikam/distinfo
@@ -1,6 +1,10 @@
-$NetBSD: distinfo,v 1.35 2011/01/24 15:55:03 wiz Exp $
+$NetBSD: distinfo,v 1.36 2012/03/21 21:14:47 markd Exp $
-SHA1 (digikam-1.6.0.tar.bz2) = 7daf9606468e5a9ada55fac3a68820703adac48e
-RMD160 (digikam-1.6.0.tar.bz2) = b277e96a95aca2b85e42bfd614542c389c394c52
-Size (digikam-1.6.0.tar.bz2) = 13243516 bytes
-SHA1 (patch-aa) = 207e1455ebb60623ae6ce8786b9ed32e3ceeda8f
+SHA1 (digikam-2.5.0.tar.bz2) = 6cadb838669d1bdcbd6abb677889f7d68d696383
+RMD160 (digikam-2.5.0.tar.bz2) = 4ff1b5fbc2cc4a8cb9994f7c7796086418dd43fb
+Size (digikam-2.5.0.tar.bz2) = 54976375 bytes
+SHA1 (patch-CMakeLists.txt) = be9b2c8df31e20b4d051c2bdaf92d0a0dff573b8
+SHA1 (patch-core_libs_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp) = 78f2e7a35d7ddae3c8f685414112bd6aebec2855
+SHA1 (patch-core_libs_database_imagehistory_imagehistorygraph_boost.h) = 4a7eb391a392ad2dbbf42a0fb06c157ce79d5177
+SHA1 (patch-core_utilities_setup_setupplugins.cpp) = c15907a93144d33905d1dd33f604362b79e89690
+SHA1 (patch-doc_CMakeLists.txt) = 5b4ba1daa49607b8773c3903d953e11bebc4d661
diff --git a/graphics/digikam/options.mk b/graphics/digikam/options.mk
index 031f6fe53c2..7cc95b897da 100644
--- a/graphics/digikam/options.mk
+++ b/graphics/digikam/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2010/02/15 14:19:45 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2012/03/21 21:14:47 markd Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.digikam
PKG_SUPPORTED_OPTIONS= lensfun liblqr marble pim
@@ -15,7 +15,7 @@ PKG_SUGGESTED_OPTIONS= lensfun liblqr marble pim
.endif
.if !empty(PKG_OPTIONS:Mmarble)
-.include "../../misc/kdeedu4/buildlink3.mk"
+.include "../../misc/marble/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mpim)
diff --git a/graphics/digikam/patches/patch-CMakeLists.txt b/graphics/digikam/patches/patch-CMakeLists.txt
new file mode 100644
index 00000000000..406da86bcf0
--- /dev/null
+++ b/graphics/digikam/patches/patch-CMakeLists.txt
@@ -0,0 +1,49 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2012/03/21 21:14:47 markd Exp $
+
+Don't do extras -- they are separate packages
+
+--- CMakeLists.txt.orig 2012-01-03 00:42:09.000000000 +0000
++++ CMakeLists.txt
+@@ -65,15 +65,15 @@ IF(${DIGIKAMSC_USE_PRIVATE_KDEGRAPHICS})
+ )
+ 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(${DIGIKAMSC_USE_PRIVATE_KDEGRAPHICS})
+ SET(KIPI_LOCAL_DIR extra/libkipi)
+@@ -82,12 +82,12 @@ IF(${DIGIKAMSC_USE_PRIVATE_KDEGRAPHICS})
+ SET(KSANE_LOCAL_DIR extra/libksane)
+ ENDIF()
+
+-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)
+ MACRO_OPTIONAL_ADD_SUBDIRECTORY(doc)
+
diff --git a/graphics/digikam/patches/patch-aa b/graphics/digikam/patches/patch-aa
deleted file mode 100644
index 21635f61c43..00000000000
--- a/graphics/digikam/patches/patch-aa
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-aa,v 1.12 2011/01/24 15:55:04 wiz Exp $
-
-Fix build with png-1.5.
-https://bugs.kde.org/show_bug.cgi?id=264181
-
---- libs/dimg/loaders/pngloader.cpp.orig 2010-11-22 17:47:36.000000000 +0000
-+++ libs/dimg/loaders/pngloader.cpp
-@@ -494,7 +494,8 @@ bool PNGLoader::load(const QString& file
-
- if (m_loadFlags & LoadICCData)
- {
-- png_charp profile_name, profile_data=NULL;
-+ png_charp profile_name;
-+ png_bytep profile_data=NULL;
- png_uint_32 profile_size;
- int compression_type;
-
-@@ -730,7 +731,7 @@ bool PNGLoader::save(const QString& file
-
- if (!profile_rawdata.isEmpty())
- {
-- png_set_iCCP(png_ptr, info_ptr, (png_charp)("icc"), PNG_COMPRESSION_TYPE_BASE, profile_rawdata.data(), profile_rawdata.size());
-+ png_set_iCCP(png_ptr, info_ptr, (png_charp)("icc"), PNG_COMPRESSION_TYPE_BASE, (png_bytep)profile_rawdata.data(), profile_rawdata.size());
- }
-
- // -------------------------------------------------------------------
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
new file mode 100644
index 00000000000..c754ec159f6
--- /dev/null
+++ b/graphics/digikam/patches/patch-core_libs_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp
@@ -0,0 +1,35 @@
+$NetBSD: patch-core_libs_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp,v 1.1 2012/03/21 21:14:47 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 2012-01-03 00:32:23.000000000 +0000
++++ core/libs/3rdparty/kmemoryinfo/kmemoryinfo_backend.cpp
+@@ -57,7 +57,8 @@ static bool fillMemoryInfo(Digikam::KMem
+ #if defined(Q_OS_NETBSD)
+ #include <sys/param.h>
+ #include <sys/time.h>
+-#include <uvm/uvm.h>
++#include <sys/sysctl.h>
++#include <uvm/uvm_extern.h>
+ #endif
+ #if defined(Q_OS_OPENBSD)
+ #include <sys/param.h>
+@@ -128,7 +129,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;
+@@ -332,7 +333,7 @@ bool get_mem_stats(Digikam::KMemoryInfo:
+
+ data->totalRam = uvm->pagesize * uvm->npages;
+ data->cacheRam = uvm->pagesize * (uvm->filepages + uvm->execpages);
+- data->freeRam = uvm->pagesize * (uvm->free + uvm->inactive);
++ data->freeRam = uvm->pagesize * (uvm->free + uvm->paging);
+ data->usedRam = data->totalRam - data->freeRam;
+ #endif
+
diff --git a/graphics/digikam/patches/patch-core_libs_database_imagehistory_imagehistorygraph_boost.h b/graphics/digikam/patches/patch-core_libs_database_imagehistory_imagehistorygraph_boost.h
new file mode 100644
index 00000000000..05a7e8e91d3
--- /dev/null
+++ b/graphics/digikam/patches/patch-core_libs_database_imagehistory_imagehistorygraph_boost.h
@@ -0,0 +1,68 @@
+$NetBSD: patch-core_libs_database_imagehistory_imagehistorygraph_boost.h,v 1.1 2012/03/21 21:14:47 markd Exp $
+
+boost148.patch from ArchLinux - build with recent boost.
+
+--- core/libs/database/imagehistory/imagehistorygraph_boost.h.orig 2012-01-03 00:32:26.000000000 +0000
++++ core/libs/database/imagehistory/imagehistorygraph_boost.h
+@@ -1198,7 +1198,7 @@ protected:
+ {
+ boost::dag_shortest_paths(graph, v,
+ // we provide a constant weight of 1
+- weight_map(boost::ref_property_map<edge_t,int>(weight)).
++ weight_map(boost::ref_property_map<typename boost::graph_traits<GraphType>::edge_descriptor,int>(weight)).
+ // Store distance and predecessors in QMaps, wrapped to serve as property maps
+ distance_map(VertexIntMapAdaptor(distances)).
+ predecessor_map(VertexVertexMapAdaptor(predecessors))
+@@ -1218,7 +1218,7 @@ protected:
+ {
+ boost::dag_shortest_paths(graph, v,
+ // we provide a constant weight of 1
+- weight_map(boost::ref_property_map<edge_t,int>(weight)).
++ weight_map(boost::ref_property_map<typename boost::graph_traits<GraphType>::edge_descriptor,int>(weight)).
+ // Invert the default compare method: With greater, we get the longest path
+ distance_compare(std::greater<int>()).
+ // will be returned if a node is unreachable
+@@ -1384,14 +1384,15 @@ protected:
+ template <class GraphType, typename VertexLessThan>
+ class lessThanMapEdgeToTarget
+ {
++ typedef typename boost::graph_traits<GraphType>::edge_descriptor edge_descriptor;
+ public:
+ lessThanMapEdgeToTarget(const GraphType& g, VertexLessThan vertexLessThan)
+ : g(g), vertexLessThan(vertexLessThan) {}
+ const GraphType& g;
+ VertexLessThan vertexLessThan;
+- bool operator()(const Edge& a, const Edge& b)
++ bool operator()(const edge_descriptor& a, const edge_descriptor& b)
+ {
+- return vertexLessThan(boost::target(a.toEdge(), g), boost::target(b.toEdge(), g));
++ return vertexLessThan(boost::target(a, g), boost::target(b, g));
+ }
+ };
+
+@@ -1402,20 +1403,21 @@ protected:
+ {
+ typedef std::pair<Vertex, QList<Edge> > VertexInfo;
+
+- QList<Edge> outEdges;
++ typedef typename boost::graph_traits<IncidenceGraph>::edge_descriptor edge_descriptor;
++ QList<edge_descriptor> outEdges;
+ std::vector<VertexInfo> stack;
+
+ boost::put(color, u, boost::gray_color);
+ vis.discover_vertex(u, g);
+
+- outEdges = toEdgeList(boost::out_edges(u, g));
++ outEdges = toList<edge_descriptor>(boost::out_edges(u, g));
+ // Sort edges. The lessThan we have takes vertices, so we use a lessThan which
+ // maps the given edges to their targets, and calls our vertex lessThan.
+ qSort(outEdges.begin(), outEdges.end(), lessThanMapEdgeToTarget<IncidenceGraph, LessThan>(g, lessThan));
+
+- foreach(const Edge& e, outEdges)
++ foreach(const edge_descriptor& e, outEdges)
+ {
+- Vertex v = boost::target(e.toEdge(), g);
++ Vertex v = boost::target(e, g);
+ vis.examine_edge(e, g);
+ boost::default_color_type v_color = boost::get(color, v);
+ if (v_color == boost::white_color)
diff --git a/graphics/digikam/patches/patch-core_utilities_setup_setupplugins.cpp b/graphics/digikam/patches/patch-core_utilities_setup_setupplugins.cpp
new file mode 100644
index 00000000000..e925aaa6778
--- /dev/null
+++ b/graphics/digikam/patches/patch-core_utilities_setup_setupplugins.cpp
@@ -0,0 +1,46 @@
+$NetBSD: patch-core_utilities_setup_setupplugins.cpp,v 1.1 2012/03/21 21:14:47 markd Exp $
+
+--- core/utilities/setup/setupplugins.cpp.orig 2012-01-03 00:32:01.000000000 +0000
++++ core/utilities/setup/setupplugins.cpp
+@@ -6,8 +6,8 @@
+ * Date : 2004-01-02
+ * Description : setup Kipi plugins tab.
+ *
+- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
+- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com>
++ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
++ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com>
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General
+@@ -100,6 +100,11 @@ SetupPlugins::SetupPlugins(QWidget* pare
+
+ panel->setLayout(mainLayout);
+
++#if KIPI_VERSION < 0x010400
++ d->checkAllBtn->setVisible(false);
++ d->clearBtn->setVisible(false);
++#endif
++
+ initPlugins();
+
+ // --------------------------------------------------------
+@@ -158,14 +163,18 @@ void SetupPlugins::applyPlugins()
+ void SetupPlugins::slotCheckAll()
+ {
+ QApplication::setOverrideCursor(Qt::WaitCursor);
++#if KIPI_VERSION >= 0x010400
+ d->kipiConfig->slotCheckAll();
++#endif
+ QApplication::restoreOverrideCursor();
+ }
+
+ void SetupPlugins::slotClear()
+ {
+ QApplication::setOverrideCursor(Qt::WaitCursor);
++#if KIPI_VERSION >= 0x010400
+ d->kipiConfig->slotClear();
++#endif
+ QApplication::restoreOverrideCursor();
+ }
+ } // namespace Digikam
diff --git a/graphics/digikam/patches/patch-doc_CMakeLists.txt b/graphics/digikam/patches/patch-doc_CMakeLists.txt
new file mode 100644
index 00000000000..3e3f7a467ff
--- /dev/null
+++ b/graphics/digikam/patches/patch-doc_CMakeLists.txt
@@ -0,0 +1,12 @@
+$NetBSD: patch-doc_CMakeLists.txt,v 1.1 2012/03/21 21:14:47 markd Exp $
+
+Don't do kipi-plugins.
+
+--- doc/CMakeLists.txt.orig 2012-01-03 00:33:14.000000000 +0000
++++ doc/CMakeLists.txt
+@@ -24,4 +24,4 @@
+
+ MACRO_OPTIONAL_ADD_SUBDIRECTORY(digikam/digikam)
+ MACRO_OPTIONAL_ADD_SUBDIRECTORY(digikam/showfoto)
+-MACRO_OPTIONAL_ADD_SUBDIRECTORY(kipi-plugins)
++#MACRO_OPTIONAL_ADD_SUBDIRECTORY(kipi-plugins)