Update to 3.1.0

digiKam 3.1.0 - Release date: 2013-03-10

NEW FEATURES:

General      : Remove internal lqr-1 library code. Set only an optional
  and external dependency.

BUGFIXES FROM KDE BUGZILLA (alias B.K.O | http://bugs.kde.org):

- OSM maps not refreshing.
- No thumbnails on first start of geolocation module for newly imported
  images.
- digiKam crashed after startup.
- Print image does not work.
- digiKam BQM RAW tool doesn't have options to work in 16 bits and to
  manage color profiles.
- No progress indicator or cancel button.
- Read face tags created by Picasa
- digiKam Crash on Startup with active X11 color profile.
- Cannot preview TIFF files on Mac OS due to "not enough memory" exceptions.
- Error on startup: Failed to update the database schema from version 6
  to version 7.
- SQLITE : convience copy in digiKam core [patch].
- Switch to full screen mode crash under MACOSX.
- digiKam crashes when quitting the program.
- Large .tif files are not loaded.

15 files changed, 56 insertions, 303 deletions

diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile
index 00ef82bacb3..338d76a934f 100644
--- a/graphics/digikam/Makefile
+++ b/graphics/digikam/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.92 2013/02/16 11:21:45 wiz Exp $
+# $NetBSD: Makefile,v 1.93 2013/04/03 12:52:04 markd Exp $
 #
 
-DISTNAME=	digikam-2.5.0
-PKGREVISION=	15
+DISTNAME=	digikam-3.1.0
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=digikam/}
+MASTER_SITES=	${MASTER_SITE_KDE:=digikam/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -20,12 +19,13 @@ USE_LANGUAGES=		c c++
 
 REPLACE_PERL=	core/utilities/scripts/digitaglinktree/digitaglinktree
 CMAKE_ARGS+=    -DMYSQLD_PATH:PATH=${BUILDLINK_PREFIX.mysql-server}/libexec
+CMAKE_ARGS+=	-DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS:BOOL=OFF
 USE_TOOLS+=	gawk msgfmt perl:run pkg-config
 
 .include "options.mk"
 
 post-patch:
-	rm ${WRKSRC}/po/*/libkgeomap.po ${WRKSRC}/po/*/kipiplug*
+	rm ${WRKSRC}/po/*/libkgeomap.po ${WRKSRC}/po/*/kipiplug* ${WRKSRC}/po/*/libkipi*
 
 .include "../../meta-pkgs/kde4/kde4.mk"
 .include "../../databases/mysql51-server/buildlink3.mk"
@@ -41,7 +41,6 @@ post-patch:
 .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 23d8cbd23c1..686d0b9e888 100644
--- a/graphics/digikam/PLIST
+++ b/graphics/digikam/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2012/03/21 21:14:47 markd Exp $
+@comment $NetBSD: PLIST,v 1.27 2013/04/03 12:52:04 markd Exp $
 bin/cleanup_digikamdb
 bin/digikam
 bin/digitaglinktree
@@ -8,7 +8,6 @@ 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
 lib/kde4/kio_digikammapimages.so
@@ -16,11 +15,11 @@ lib/kde4/kio_digikamsearch.so
 lib/kde4/kio_digikamtags.so
 lib/kde4/libexec/digikamdatabaseserver
 lib/libdigikamcore.so
-lib/libdigikamcore.so.2
-lib/libdigikamcore.so.2.0.0
+lib/libdigikamcore.so.3
+lib/libdigikamcore.so.3.0.0
 lib/libdigikamdatabase.so
-lib/libdigikamdatabase.so.2
-lib/libdigikamdatabase.so.2.0.0
+lib/libdigikamdatabase.so.3
+lib/libdigikamdatabase.so.3.0.0
 man/man1/cleanup_digikamdb.1
 man/man1/digitaglinktree.1
 share/applications/kde4/digikam.desktop
@@ -240,15 +239,6 @@ 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
@@ -297,7 +287,6 @@ share/icons/hicolor/scalable/apps/showfoto.svgz
 share/kde/apps/digikam/about/digikam.css
 share/kde/apps/digikam/about/main.html
 share/kde/apps/digikam/about/top-left-digikam.png
-share/kde/apps/digikam/cameraui.rc
 share/kde/apps/digikam/data/assistant-collection.png
 share/kde/apps/digikam/data/assistant-metadata.png
 share/kde/apps/digikam/data/assistant-openfile.png
@@ -334,6 +323,7 @@ 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/leaf-pattern.png
+share/kde/apps/digikam/data/logo-beta.png
 share/kde/apps/digikam/data/logo-cimg.png
 share/kde/apps/digikam/data/logo-digikam.png
 share/kde/apps/digikam/data/logo-exiv2.png
@@ -747,6 +737,7 @@ share/kde/apps/digikam/icons/hicolor/scalable/actions/bqm-update.svgz
 share/kde/apps/digikam/icons/hicolor/scalable/actions/bwtonal.svgz
 share/kde/apps/digikam/icons/hicolor/scalable/actions/channelmixer.svgz
 share/kde/apps/digikam/icons/hicolor/scalable/actions/colormanagement.svgz
+share/kde/apps/digikam/icons/hicolor/scalable/actions/colorneg.svgz
 share/kde/apps/digikam/icons/hicolor/scalable/actions/contrast.svgz
 share/kde/apps/digikam/icons/hicolor/scalable/actions/depth16to8.svgz
 share/kde/apps/digikam/icons/hicolor/scalable/actions/depth8to16.svgz
@@ -770,44 +761,12 @@ share/kde/apps/digikam/icons/hicolor/scalable/actions/superimpose.svgz
 share/kde/apps/digikam/icons/hicolor/scalable/actions/texture.svgz
 share/kde/apps/digikam/icons/hicolor/scalable/actions/tonemap.svgz
 share/kde/apps/digikam/icons/hicolor/scalable/actions/whitebalance.svgz
-share/kde/apps/digikam/lensfun/6x6.xml
-share/kde/apps/digikam/lensfun/compact-canon.xml
-share/kde/apps/digikam/lensfun/compact-casio.xml
-share/kde/apps/digikam/lensfun/compact-fujifilm.xml
-share/kde/apps/digikam/lensfun/compact-kodak.xml
-share/kde/apps/digikam/lensfun/compact-konica-minolta.xml
-share/kde/apps/digikam/lensfun/compact-leica.xml
-share/kde/apps/digikam/lensfun/compact-nikon.xml
-share/kde/apps/digikam/lensfun/compact-olympus.xml
-share/kde/apps/digikam/lensfun/compact-panasonic.xml
-share/kde/apps/digikam/lensfun/compact-pentax.xml
-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
-share/kde/apps/digikam/lensfun/slr-hasselblad.xml
-share/kde/apps/digikam/lensfun/slr-konica-minolta.xml
-share/kde/apps/digikam/lensfun/slr-nikon.xml
-share/kde/apps/digikam/lensfun/slr-olympus.xml
-share/kde/apps/digikam/lensfun/slr-panasonic.xml
-share/kde/apps/digikam/lensfun/slr-pentax.xml
-share/kde/apps/digikam/lensfun/slr-samsung.xml
-share/kde/apps/digikam/lensfun/slr-schneider.xml
-share/kde/apps/digikam/lensfun/slr-sigma.xml
-share/kde/apps/digikam/lensfun/slr-sony.xml
-share/kde/apps/digikam/lensfun/slr-tamron.xml
-share/kde/apps/digikam/lensfun/slr-tokina.xml
-share/kde/apps/digikam/lensfun/slr-ussr.xml
+share/kde/apps/digikam/importui.rc
 share/kde/apps/digikam/lighttablewindowui.rc
 share/kde/apps/digikam/queuemgrwindowui.rc
 share/kde/apps/digikam/tips
 share/kde/apps/digikam/utils/digikam-camera
+share/kde/apps/kconf_update/adjustlevelstool.upd
 share/kde/apps/showfoto/data/banner-showfoto.png
 share/kde/apps/showfoto/data/logo-showfoto.png
 share/kde/apps/showfoto/data/splash-showfoto.png
@@ -821,7 +780,6 @@ 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
diff --git a/graphics/digikam/distinfo b/graphics/digikam/distinfo
index 56ec8e1a3b4..9650b6b3b62 100644
--- a/graphics/digikam/distinfo
+++ b/graphics/digikam/distinfo
@@ -1,17 +1,10 @@
-$NetBSD: distinfo,v 1.38 2013/03/02 18:10:03 joerg Exp $
+$NetBSD: distinfo,v 1.39 2013/04/03 12:52:04 markd Exp $
 
-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_databaseserver_databaseserver.cpp) = 0782796cc4983a520d56951cf4e084f604c837ff
-SHA1 (patch-core_digikam_album_albummanager.h) = 1933ade39e080f1dda996683a6edf47b125a9acf
-SHA1 (patch-core_libs_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp) = 78f2e7a35d7ddae3c8f685414112bd6aebec2855
-SHA1 (patch-core_libs_database_databaseserverstarter.cpp) = 3d58650edf5c6b9877a96202d2d37b8b97893760
-SHA1 (patch-core_libs_database_imagehistory_imagehistorygraph_boost.h) = 18aead6282798bfb20d43ec2a6b8a6a73bc9d065
-SHA1 (patch-core_libs_dimg_filters_icc_iccmanager.h) = 96eb80ae73184d95efb52d01ede8e25b607158a0
-SHA1 (patch-core_libs_template_templateselector.cpp) = 3c172396a9821479453853a607c07735a60e444b
-SHA1 (patch-core_libs_template_templateviewer.cpp) = f98ab6fa4fd81a967a4c2b0a490fef0f64c34c02
-SHA1 (patch-core_libs_widgets_common_dfontselect.cpp) = 64d4df3d82cfba603e26636547696ea0e6f9322b
-SHA1 (patch-core_utilities_setup_setupplugins.cpp) = c15907a93144d33905d1dd33f604362b79e89690
+SHA1 (digikam-3.1.0.tar.bz2) = f4ce304acdf10e859ab8f70ce9d53a05d92d4fbd
+RMD160 (digikam-3.1.0.tar.bz2) = 511550a7ee37aac958a0d2e5afaa0a07aa1eab0e
+Size (digikam-3.1.0.tar.bz2) = 58559707 bytes
+SHA1 (patch-CMakeLists.txt) = 83bdf0398c3a4120ce6dc83d205ca32c50229ff2
+SHA1 (patch-bootstrap.local) = 9164d0d162b4d8333961ee653f4c416dbdd530c9
+SHA1 (patch-core_libs_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp) = 1cce43cd6a1575cfd6c75e9008972e2a521b05e6
+SHA1 (patch-core_libs_dimg_filters_icc_iccmanager.h) = 999bd32312fbe840913a8d29613b351384061b65
 SHA1 (patch-doc_CMakeLists.txt) = 5b4ba1daa49607b8773c3903d953e11bebc4d661
diff --git a/graphics/digikam/patches/patch-CMakeLists.txt b/graphics/digikam/patches/patch-CMakeLists.txt
index 406da86bcf0..d217559945f 100644
--- a/graphics/digikam/patches/patch-CMakeLists.txt
+++ b/graphics/digikam/patches/patch-CMakeLists.txt
@@ -1,10 +1,10 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2012/03/21 21:14:47 markd Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2013/04/03 12:52:04 markd Exp $
 
 Don't do extras -- they are separate packages
 
---- CMakeLists.txt.orig	2012-01-03 00:42:09.000000000 +0000
+--- CMakeLists.txt.orig	2013-03-11 08:25:34.000000000 +0000
 +++ CMakeLists.txt
-@@ -65,15 +65,15 @@ IF(${DIGIKAMSC_USE_PRIVATE_KDEGRAPHICS})
+@@ -127,15 +127,15 @@ IF(ENABLE_PRIVATE_KDEGRAPHICS)
          )
  ENDIF()
  
@@ -27,9 +27,9 @@ Don't do extras -- they are separate packages
 +#        ${CMAKE_MODULE_PATH}
 +#    )
  
- IF(${DIGIKAMSC_USE_PRIVATE_KDEGRAPHICS})
+ IF(ENABLE_PRIVATE_KDEGRAPHICS)
      SET(KIPI_LOCAL_DIR extra/libkipi)
-@@ -82,12 +82,12 @@ IF(${DIGIKAMSC_USE_PRIVATE_KDEGRAPHICS})
+@@ -144,12 +144,12 @@ IF(ENABLE_PRIVATE_KDEGRAPHICS)
      SET(KSANE_LOCAL_DIR extra/libksane)
  ENDIF()
  
@@ -45,5 +45,5 @@ Don't do extras -- they are separate packages
 -ADD_SUBDIRECTORY(extra)
 +#ADD_SUBDIRECTORY(extra)
  ADD_SUBDIRECTORY(core)
- MACRO_OPTIONAL_ADD_SUBDIRECTORY(doc)
  
+ IF(ENABLE_COMPILE_DOC)
diff --git a/graphics/digikam/patches/patch-bootstrap.local b/graphics/digikam/patches/patch-bootstrap.local
new file mode 100644
index 00000000000..e5a4de7c76e
--- /dev/null
+++ b/graphics/digikam/patches/patch-bootstrap.local
@@ -0,0 +1,13 @@
+$NetBSD: patch-bootstrap.local,v 1.1 2013/04/03 12:52:04 markd Exp $
+
+--- bootstrap.local.orig	2013-03-11 08:25:34.000000000 +0000
++++ bootstrap.local
+@@ -36,7 +36,7 @@ export PKG_CONFIG_PATH=$DIGIKAM_INSTALL_
+ #export CXX=g++4.4
+ 
+ # Manage local install dir
+-if [ $CLEANROOT == 1 ]
++if [ $CLEANROOT = 1 ]
+ then
+     rm -Rf $DIGIKAM_INSTALL_PREFIX
+ fi
diff --git a/graphics/digikam/patches/patch-core_databaseserver_databaseserver.cpp b/graphics/digikam/patches/patch-core_databaseserver_databaseserver.cpp
deleted file mode 100644
index fcf9eda7aff..00000000000
--- a/graphics/digikam/patches/patch-core_databaseserver_databaseserver.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-core_databaseserver_databaseserver.cpp,v 1.1 2013/03/02 18:10:03 joerg Exp $
-
---- core/databaseserver/databaseserver.cpp.orig	2013-02-28 09:57:38.000000000 +0000
-+++ core/databaseserver/databaseserver.cpp
-@@ -73,7 +73,7 @@ public:
-     PollThread*       pollThread;
- };
- 
--DatabaseServer::DatabaseServer(QCoreApplication* application=0)
-+DatabaseServer::DatabaseServer(QCoreApplication* application)
-     : QObject(application), d(new DatabaseServerPriv)
- {
-     d->app = application;
diff --git a/graphics/digikam/patches/patch-core_digikam_album_albummanager.h b/graphics/digikam/patches/patch-core_digikam_album_albummanager.h
deleted file mode 100644
index 23ed9304ab2..00000000000
--- a/graphics/digikam/patches/patch-core_digikam_album_albummanager.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-core_digikam_album_albummanager.h,v 1.1 2012/11/16 20:06:08 joerg Exp $
-
---- core/digikam/album/albummanager.h.orig	2012-11-16 17:03:39.000000000 +0000
-+++ core/digikam/album/albummanager.h
-@@ -831,7 +831,7 @@ public:
-     {
-         foreach(T* t, list)
-         {
--            append(AlbumPointer<T>(t));
-+            this->append(AlbumPointer<T>(t));
-         }
-         return *this;
-     }
diff --git a/graphics/digikam/patches/patch-core_libs_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp b/graphics/digikam/patches/patch-core_libs_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp
index c754ec159f6..7820d03f9ab 100644
--- a/graphics/digikam/patches/patch-core_libs_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp
+++ b/graphics/digikam/patches/patch-core_libs_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp
@@ -1,11 +1,11 @@
-$NetBSD: patch-core_libs_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp,v 1.1 2012/03/21 21:14:47 markd Exp $
+$NetBSD: patch-core_libs_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp,v 1.2 2013/04/03 12:52:04 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.orig	2013-03-11 08:24:30.000000000 +0000
 +++ core/libs/3rdparty/kmemoryinfo/kmemoryinfo_backend.cpp
-@@ -57,7 +57,8 @@ static bool fillMemoryInfo(Digikam::KMem
+@@ -67,7 +67,8 @@ static int fillMemoryInfo(Digikam::KMemo
  #if defined(Q_OS_NETBSD)
  #include <sys/param.h>
  #include <sys/time.h>
@@ -15,21 +15,21 @@ it actually returns the correct results.
  #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);
+@@ -152,7 +153,7 @@ struct uvmexp* sg_get_uvmexp()
+     int                  mib[2];
+     size_t               size = sizeof(struct uvmexp);
      static struct uvmexp uvm;
--    struct uvmexp *new;
-+    /* struct uvmexp *new; */
+-    struct uvmexp*       new;
++    /* struct uvmexp*       new; */
  
      mib[0] = CTL_VM;
      mib[1] = VM_UVMEXP;
-@@ -332,7 +333,7 @@ bool get_mem_stats(Digikam::KMemoryInfo:
+@@ -422,7 +423,7 @@ int 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
  
+     return 1;
diff --git a/graphics/digikam/patches/patch-core_libs_database_databaseserverstarter.cpp b/graphics/digikam/patches/patch-core_libs_database_databaseserverstarter.cpp
deleted file mode 100644
index 23260dd9e7c..00000000000
--- a/graphics/digikam/patches/patch-core_libs_database_databaseserverstarter.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-core_libs_database_databaseserverstarter.cpp,v 1.1 2013/03/02 18:10:03 joerg Exp $
-
---- core/libs/database/databaseserverstarter.cpp.orig	2013-02-28 09:52:35.000000000 +0000
-+++ core/libs/database/databaseserverstarter.cpp
-@@ -82,7 +82,7 @@ public:
-     }
- };
- 
--DatabaseServerStarter::DatabaseServerStarter(QObject* parent=0)
-+DatabaseServerStarter::DatabaseServerStarter(QObject* parent)
-     : QObject(parent)
- {
- }
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
deleted file mode 100644
index f748a88f0ee..00000000000
--- a/graphics/digikam/patches/patch-core_libs_database_imagehistory_imagehistorygraph_boost.h
+++ /dev/null
@@ -1,86 +0,0 @@
-$NetBSD: patch-core_libs_database_imagehistory_imagehistorygraph_boost.h,v 1.2 2012/11/16 20:06:08 joerg 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
-@@ -1362,7 +1362,7 @@ protected:
-             template <typename VertexType, typename GraphType>
-             void discover_vertex(VertexType u, const GraphType&) const
-             {
--                record(u);
-+                this->record(u);
-             }
-         };
- 
-@@ -1373,7 +1373,7 @@ protected:
-             template <typename VertexType, typename GraphType>
-             void discover_vertex(VertexType u, const GraphType&) const
-             {
--                record(u);
-+                this->record(u);
-             }
-         };
- 
-@@ -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_libs_dimg_filters_icc_iccmanager.h b/graphics/digikam/patches/patch-core_libs_dimg_filters_icc_iccmanager.h
index 6ec07751ad6..74848dfb330 100644
--- a/graphics/digikam/patches/patch-core_libs_dimg_filters_icc_iccmanager.h
+++ b/graphics/digikam/patches/patch-core_libs_dimg_filters_icc_iccmanager.h
@@ -1,13 +1,13 @@
-$NetBSD: patch-core_libs_dimg_filters_icc_iccmanager.h,v 1.1 2012/11/16 20:06:08 joerg Exp $
+$NetBSD: patch-core_libs_dimg_filters_icc_iccmanager.h,v 1.2 2013/04/03 12:52:04 markd Exp $
 
---- core/libs/dimg/filters/icc/iccmanager.h.orig	2012-11-16 18:20:53.000000000 +0000
+--- core/libs/dimg/filters/icc/iccmanager.h.orig	2013-03-11 08:24:28.000000000 +0000
 +++ core/libs/dimg/filters/icc/iccmanager.h
-@@ -129,7 +129,7 @@ public:
+@@ -128,7 +128,7 @@ public:
      static void transformToSRGB(QImage& qimage, const IccProfile& inputProfile);
  
      /** Transforms the given QImage from sRGB to given display profile. */
--    static void transformForDisplay(QImage& qimage, const IccProfile& displayProfile = displayProfile());
-+    static void transformForDisplay(QImage& qimage, const IccProfile& displayProfile = IccProfile());
+-    static void transformForDisplay(QImage& qimage, const IccProfile& displayProfile1 = displayProfile());
++    static void transformForDisplay(QImage& qimage, const IccProfile& displayProfile1 = IccProfile());
  
  protected:
  
diff --git a/graphics/digikam/patches/patch-core_libs_template_templateselector.cpp b/graphics/digikam/patches/patch-core_libs_template_templateselector.cpp
deleted file mode 100644
index 4e3e8de2f8d..00000000000
--- a/graphics/digikam/patches/patch-core_libs_template_templateselector.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-core_libs_template_templateselector.cpp,v 1.1 2013/03/02 18:10:03 joerg Exp $
-
---- core/libs/template/templateselector.cpp.orig	2013-02-28 10:12:49.000000000 +0000
-+++ core/libs/template/templateselector.cpp
-@@ -72,7 +72,7 @@ public:
-     Template          metadataTemplate;
- };
- 
--TemplateSelector::TemplateSelector(QWidget* parent = 0)
-+TemplateSelector::TemplateSelector(QWidget* parent)
-     : KHBox(parent), d(new TemplateSelectorPriv)
- {
-     d->label         = new QLabel(i18n("Template: "), this);
diff --git a/graphics/digikam/patches/patch-core_libs_template_templateviewer.cpp b/graphics/digikam/patches/patch-core_libs_template_templateviewer.cpp
deleted file mode 100644
index eb3ba7c281b..00000000000
--- a/graphics/digikam/patches/patch-core_libs_template_templateviewer.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-core_libs_template_templateviewer.cpp,v 1.1 2013/03/02 18:10:03 joerg Exp $
-
---- core/libs/template/templateviewer.cpp.orig	2013-02-28 10:07:32.000000000 +0000
-+++ core/libs/template/templateviewer.cpp
-@@ -152,7 +152,7 @@ public:
-     DTextList*      subjectsList;
- };
- 
--TemplateViewer::TemplateViewer(QWidget* parent=0)
-+TemplateViewer::TemplateViewer(QWidget* parent)
-     : RExpanderBox(parent), d(new TemplateViewerPriv)
- {
-     setFrameStyle(QFrame::NoFrame);
diff --git a/graphics/digikam/patches/patch-core_libs_widgets_common_dfontselect.cpp b/graphics/digikam/patches/patch-core_libs_widgets_common_dfontselect.cpp
deleted file mode 100644
index aa0b6d76f30..00000000000
--- a/graphics/digikam/patches/patch-core_libs_widgets_common_dfontselect.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-core_libs_widgets_common_dfontselect.cpp,v 1.1 2013/03/02 18:10:03 joerg Exp $
-
---- core/libs/widgets/common/dfontselect.cpp.orig	2013-02-28 09:42:02.000000000 +0000
-+++ core/libs/widgets/common/dfontselect.cpp
-@@ -64,7 +64,7 @@ public:
-     DFontSelect::FontMode mode;
- };
- 
--DFontSelect::DFontSelect(const QString& text=QString(), QWidget* parent=0)
-+DFontSelect::DFontSelect(const QString& text, QWidget* parent)
-     : KHBox(parent), d(new DFontSelectPriv)
- {
-     d->label     = new QLabel(this);
diff --git a/graphics/digikam/patches/patch-core_utilities_setup_setupplugins.cpp b/graphics/digikam/patches/patch-core_utilities_setup_setupplugins.cpp
deleted file mode 100644
index e925aaa6778..00000000000
--- a/graphics/digikam/patches/patch-core_utilities_setup_setupplugins.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-$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