Mon May 6 20:40:12 2013 UTC ()
Report memory sizes correctly.


(markd)
diff -r1.94 -r1.95 pkgsrc/graphics/digikam/Makefile
diff -r1.39 -r1.40 pkgsrc/graphics/digikam/distinfo
diff -r1.2 -r1.3 pkgsrc/graphics/digikam/patches/patch-core_libs_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp
cvs diff -r1.94 -r1.95 pkgsrc/graphics/digikam/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/digikam/Makefile 2013/04/28 02:03:37 1.94
+++ pkgsrc/graphics/digikam/Makefile 2013/05/06 20:40:12 1.95
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.94 2013/04/28 02:03:37 markd Exp $ 1# $NetBSD: Makefile,v 1.95 2013/05/06 20:40:12 markd Exp $
2# 2#
3 3
4DISTNAME= digikam-3.1.0 4DISTNAME= digikam-3.1.0
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= graphics 6CATEGORIES= graphics
7MASTER_SITES= ${MASTER_SITE_KDE:=digikam/} 7MASTER_SITES= ${MASTER_SITE_KDE:=digikam/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.digikam.org/ 11HOMEPAGE= http://www.digikam.org/
12COMMENT= Advanced digital photo management application (KDE4) 12COMMENT= Advanced digital photo management application (KDE4)
13LICENSE= 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
14 14
15BUILD_DEPENDS+= automoc4>=0.9.83:../../devel/automoc4 15BUILD_DEPENDS+= automoc4>=0.9.83:../../devel/automoc4
16DEPENDS+= qt4-sqlite3-[0-9]*:../../x11/qt4-sqlite3 16DEPENDS+= qt4-sqlite3-[0-9]*:../../x11/qt4-sqlite3
17 17
18USE_PKGLOCALEDIR= yes 18USE_PKGLOCALEDIR= yes
cvs diff -r1.39 -r1.40 pkgsrc/graphics/digikam/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/digikam/distinfo 2013/04/03 12:52:04 1.39
+++ pkgsrc/graphics/digikam/distinfo 2013/05/06 20:40:12 1.40
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.39 2013/04/03 12:52:04 markd Exp $ 1$NetBSD: distinfo,v 1.40 2013/05/06 20:40:12 markd Exp $
2 2
3SHA1 (digikam-3.1.0.tar.bz2) = f4ce304acdf10e859ab8f70ce9d53a05d92d4fbd 3SHA1 (digikam-3.1.0.tar.bz2) = f4ce304acdf10e859ab8f70ce9d53a05d92d4fbd
4RMD160 (digikam-3.1.0.tar.bz2) = 511550a7ee37aac958a0d2e5afaa0a07aa1eab0e 4RMD160 (digikam-3.1.0.tar.bz2) = 511550a7ee37aac958a0d2e5afaa0a07aa1eab0e
5Size (digikam-3.1.0.tar.bz2) = 58559707 bytes 5Size (digikam-3.1.0.tar.bz2) = 58559707 bytes
6SHA1 (patch-CMakeLists.txt) = 83bdf0398c3a4120ce6dc83d205ca32c50229ff2 6SHA1 (patch-CMakeLists.txt) = 83bdf0398c3a4120ce6dc83d205ca32c50229ff2
7SHA1 (patch-bootstrap.local) = 9164d0d162b4d8333961ee653f4c416dbdd530c9 7SHA1 (patch-bootstrap.local) = 9164d0d162b4d8333961ee653f4c416dbdd530c9
8SHA1 (patch-core_libs_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp) = 1cce43cd6a1575cfd6c75e9008972e2a521b05e6 8SHA1 (patch-core_libs_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp) = d98ddf66a7d95868e4efa0f03935097f2e8a7795
9SHA1 (patch-core_libs_dimg_filters_icc_iccmanager.h) = 999bd32312fbe840913a8d29613b351384061b65 9SHA1 (patch-core_libs_dimg_filters_icc_iccmanager.h) = 999bd32312fbe840913a8d29613b351384061b65
10SHA1 (patch-doc_CMakeLists.txt) = 5b4ba1daa49607b8773c3903d953e11bebc4d661 10SHA1 (patch-doc_CMakeLists.txt) = 5b4ba1daa49607b8773c3903d953e11bebc4d661
cvs diff -r1.2 -r1.3 pkgsrc/graphics/digikam/patches/Attic/patch-core_libs_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp (expand / switch to unified diff)

--- pkgsrc/graphics/digikam/patches/Attic/patch-core_libs_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp 2013/04/03 12:52:04 1.2
+++ pkgsrc/graphics/digikam/patches/Attic/patch-core_libs_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp 2013/05/06 20:40:12 1.3
@@ -1,35 +1,39 @@ @@ -1,35 +1,39 @@
1$NetBSD: patch-core_libs_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp,v 1.2 2013/04/03 12:52:04 markd Exp $ 1$NetBSD: patch-core_libs_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp,v 1.3 2013/05/06 20:40:12 markd Exp $
2 2
3Make memory info backend compile on NetBSD. Need to check 3Make memory info backend compile on NetBSD. Need to check
4it actually returns the correct results. 4it actually returns the correct results.
5 5
6--- core/libs/3rdparty/kmemoryinfo/kmemoryinfo_backend.cpp.orig 2013-03-11 08:24:30.000000000 +0000 6--- core/libs/3rdparty/kmemoryinfo/kmemoryinfo_backend.cpp.orig 2013-03-11 08:24:30.000000000 +0000
7+++ core/libs/3rdparty/kmemoryinfo/kmemoryinfo_backend.cpp 7+++ core/libs/3rdparty/kmemoryinfo/kmemoryinfo_backend.cpp
8@@ -67,7 +67,8 @@ static int fillMemoryInfo(Digikam::KMemo 8@@ -67,7 +67,8 @@ static int fillMemoryInfo(Digikam::KMemo
9 #if defined(Q_OS_NETBSD) 9 #if defined(Q_OS_NETBSD)
10 #include <sys/param.h> 10 #include <sys/param.h>
11 #include <sys/time.h> 11 #include <sys/time.h>
12-#include <uvm/uvm.h> 12-#include <uvm/uvm.h>
13+#include <sys/sysctl.h> 13+#include <sys/sysctl.h>
14+#include <uvm/uvm_extern.h> 14+#include <uvm/uvm_extern.h>
15 #endif 15 #endif
16 #if defined(Q_OS_OPENBSD) 16 #if defined(Q_OS_OPENBSD)
17 #include <sys/param.h> 17 #include <sys/param.h>
18@@ -152,7 +153,7 @@ struct uvmexp* sg_get_uvmexp() 18@@ -152,7 +153,7 @@ struct uvmexp* sg_get_uvmexp()
19 int mib[2]; 19 int mib[2];
20 size_t size = sizeof(struct uvmexp); 20 size_t size = sizeof(struct uvmexp);
21 static struct uvmexp uvm; 21 static struct uvmexp uvm;
22- struct uvmexp* new; 22- struct uvmexp* new;
23+ /* struct uvmexp* new; */ 23+ /* struct uvmexp* new; */
24  24
25 mib[0] = CTL_VM; 25 mib[0] = CTL_VM;
26 mib[1] = VM_UVMEXP; 26 mib[1] = VM_UVMEXP;
27@@ -422,7 +423,7 @@ int get_mem_stats(Digikam::KMemoryInfo:: 27@@ -420,9 +421,9 @@ int get_mem_stats(Digikam::KMemoryInfo::
 28 return 0;
 29 }
28  30
29 data->totalRam = uvm->pagesize * uvm->npages; 31- data->totalRam = uvm->pagesize * uvm->npages;
30 data->cacheRam = uvm->pagesize * (uvm->filepages + uvm->execpages); 32- data->cacheRam = uvm->pagesize * (uvm->filepages + uvm->execpages);
31- data->freeRam = uvm->pagesize * (uvm->free + uvm->inactive); 33- data->freeRam = uvm->pagesize * (uvm->free + uvm->inactive);
32+ data->freeRam = uvm->pagesize * (uvm->free + uvm->paging); 34+ data->totalRam = (qint64) uvm->pagesize * (qint64) uvm->npages;
 35+ data->cacheRam = (qint64) uvm->pagesize * (qint64) (uvm->filepages + uvm->execpages);
 36+ data->freeRam = (qint64) uvm->pagesize * (qint64) (uvm->free + uvm->paging);
33 data->usedRam = data->totalRam - data->freeRam; 37 data->usedRam = data->totalRam - data->freeRam;
34  38
35 return 1; 39 return 1;