Thu May 23 11:18:26 2013 UTC ()
Don't watch individual files on NetBSD - runs out of file descriptors.
Bump PKGREVISION.


(markd)
diff -r1.97 -r1.98 pkgsrc/graphics/digikam/Makefile
diff -r1.41 -r1.42 pkgsrc/graphics/digikam/distinfo
diff -r0 -r1.1 pkgsrc/graphics/digikam/patches/patch-core_digikam_album_albumwatch.cpp
cvs diff -r1.97 -r1.98 pkgsrc/graphics/digikam/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/digikam/Makefile 2013/05/21 13:04:09 1.97
+++ pkgsrc/graphics/digikam/Makefile 2013/05/23 11:18:25 1.98
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.97 2013/05/21 13:04:09 markd Exp $ 1# $NetBSD: Makefile,v 1.98 2013/05/23 11:18:25 markd Exp $
2# 2#
3 3
4DISTNAME= digikam-3.2.0 4DISTNAME= digikam-3.2.0
 5PKGREVISION= 1
5CATEGORIES= graphics 6CATEGORIES= graphics
6MASTER_SITES= ${MASTER_SITE_KDE:=digikam/} 7MASTER_SITES= ${MASTER_SITE_KDE:=digikam/}
7EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.digikam.org/ 11HOMEPAGE= http://www.digikam.org/
11COMMENT= Advanced digital photo management application (KDE4) 12COMMENT= Advanced digital photo management application (KDE4)
12LICENSE= gnu-gpl-v2 AND gnu-fdl-v1.2 AND gnu-lgpl-v2.1 13LICENSE= gnu-gpl-v2 AND gnu-fdl-v1.2 AND gnu-lgpl-v2.1
13 14
14BUILD_DEPENDS+= automoc4>=0.9.83:../../devel/automoc4 15BUILD_DEPENDS+= automoc4>=0.9.83:../../devel/automoc4
15DEPENDS+= qt4-sqlite3-[0-9]*:../../x11/qt4-sqlite3 16DEPENDS+= qt4-sqlite3-[0-9]*:../../x11/qt4-sqlite3
16 17
17USE_PKGLOCALEDIR= yes 18USE_PKGLOCALEDIR= yes
cvs diff -r1.41 -r1.42 pkgsrc/graphics/digikam/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/digikam/distinfo 2013/05/21 13:04:09 1.41
+++ pkgsrc/graphics/digikam/distinfo 2013/05/23 11:18:25 1.42
@@ -1,10 +1,11 @@ @@ -1,10 +1,11 @@
1$NetBSD: distinfo,v 1.41 2013/05/21 13:04:09 markd Exp $ 1$NetBSD: distinfo,v 1.42 2013/05/23 11:18:25 markd Exp $
2 2
3SHA1 (digikam-3.2.0.tar.bz2) = 666f1d937dc033ddb880aed8a32e7943113d973f 3SHA1 (digikam-3.2.0.tar.bz2) = 666f1d937dc033ddb880aed8a32e7943113d973f
4RMD160 (digikam-3.2.0.tar.bz2) = 9bec9eff889a9bf90e898ad52dfb1cfd50d1d548 4RMD160 (digikam-3.2.0.tar.bz2) = 9bec9eff889a9bf90e898ad52dfb1cfd50d1d548
5Size (digikam-3.2.0.tar.bz2) = 58449068 bytes 5Size (digikam-3.2.0.tar.bz2) = 58449068 bytes
6SHA1 (patch-CMakeLists.txt) = 83bdf0398c3a4120ce6dc83d205ca32c50229ff2 6SHA1 (patch-CMakeLists.txt) = 83bdf0398c3a4120ce6dc83d205ca32c50229ff2
7SHA1 (patch-bootstrap.local) = 9164d0d162b4d8333961ee653f4c416dbdd530c9 7SHA1 (patch-bootstrap.local) = 9164d0d162b4d8333961ee653f4c416dbdd530c9
 8SHA1 (patch-core_digikam_album_albumwatch.cpp) = cf80a12fef5c998efcad1fd5dcb5df3a0e4e5ae0
8SHA1 (patch-core_libs_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp) = d98ddf66a7d95868e4efa0f03935097f2e8a7795 9SHA1 (patch-core_libs_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp) = d98ddf66a7d95868e4efa0f03935097f2e8a7795
9SHA1 (patch-core_libs_dimg_filters_icc_iccmanager.h) = 999bd32312fbe840913a8d29613b351384061b65 10SHA1 (patch-core_libs_dimg_filters_icc_iccmanager.h) = 999bd32312fbe840913a8d29613b351384061b65
10SHA1 (patch-doc_CMakeLists.txt) = 5b4ba1daa49607b8773c3903d953e11bebc4d661 11SHA1 (patch-doc_CMakeLists.txt) = 5b4ba1daa49607b8773c3903d953e11bebc4d661
File Added: pkgsrc/graphics/digikam/patches/Attic/patch-core_digikam_album_albumwatch.cpp
$NetBSD: patch-core_digikam_album_albumwatch.cpp,v 1.1 2013/05/23 11:18:26 markd Exp $

Don't watch individual files on NetBSD - runs out of file descriptors

--- core/digikam/album/albumwatch.cpp.orig	2013-05-13 07:51:25.000000000 +0000
+++ core/digikam/album/albumwatch.cpp
@@ -278,7 +278,7 @@ void AlbumWatch::slotAlbumAdded(Album* a
             // Disable file watch for OS X and Windows and hope for future
             // improvement (possibly with the improvements planned for
             // QFileSystemWatcher in Qt 5.1)
-#if defined(Q_WS_MAC) || defined(Q_WS_WIN)
+#if defined(Q_WS_MAC) || defined(Q_WS_WIN) || defined(Q_OS_NETBSD)
             d->dirWatch->addDir(dir, KDirWatch::WatchDirOnly);
 #else
             d->dirWatch->addDir(dir, KDirWatch::WatchFiles | KDirWatch::WatchDirOnly);