diff options
| author | markd <markd@pkgsrc.org> | 2013-05-06 20:40:12 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2013-05-06 20:40:12 +0000 |
| commit | d10e466907095898efcf8921281e88985408a565 (patch) | |
| tree | 1d76025814f4aa22f5e1992dcf36ddf97e3f63d9 /graphics/digikam | |
| parent | f031d78bc1a760233305b8c2588fa5bc06826d1b (diff) | |
| download | pkgsrc-d10e466907095898efcf8921281e88985408a565.tar.gz | |
Report memory sizes correctly.
Diffstat (limited to 'graphics/digikam')
| -rw-r--r-- | graphics/digikam/Makefile | 4 | ||||
| -rw-r--r-- | graphics/digikam/distinfo | 4 | ||||
| -rw-r--r-- | graphics/digikam/patches/patch-core_libs_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp | 14 |
3 files changed, 13 insertions, 9 deletions
diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile index f14ce0610af..7a864c59bc7 100644 --- a/graphics/digikam/Makefile +++ b/graphics/digikam/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.94 2013/04/28 02:03:37 markd Exp $ +# $NetBSD: Makefile,v 1.95 2013/05/06 20:40:12 markd Exp $ # DISTNAME= digikam-3.1.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_KDE:=digikam/} EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/digikam/distinfo b/graphics/digikam/distinfo index 9650b6b3b62..8a23029c86c 100644 --- a/graphics/digikam/distinfo +++ b/graphics/digikam/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.39 2013/04/03 12:52:04 markd Exp $ +$NetBSD: distinfo,v 1.40 2013/05/06 20:40:12 markd Exp $ 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_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp) = d98ddf66a7d95868e4efa0f03935097f2e8a7795 SHA1 (patch-core_libs_dimg_filters_icc_iccmanager.h) = 999bd32312fbe840913a8d29613b351384061b65 SHA1 (patch-doc_CMakeLists.txt) = 5b4ba1daa49607b8773c3903d953e11bebc4d661 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 7820d03f9ab..e291f8a393f 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,4 +1,4 @@ -$NetBSD: patch-core_libs_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp,v 1.2 2013/04/03 12:52:04 markd Exp $ +$NetBSD: patch-core_libs_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp,v 1.3 2013/05/06 20:40:12 markd Exp $ Make memory info backend compile on NetBSD. Need to check it actually returns the correct results. @@ -24,12 +24,16 @@ it actually returns the correct results. mib[0] = CTL_VM; mib[1] = VM_UVMEXP; -@@ -422,7 +423,7 @@ int get_mem_stats(Digikam::KMemoryInfo:: +@@ -420,9 +421,9 @@ int get_mem_stats(Digikam::KMemoryInfo:: + return 0; + } - data->totalRam = uvm->pagesize * uvm->npages; - data->cacheRam = uvm->pagesize * (uvm->filepages + uvm->execpages); +- 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->totalRam = (qint64) uvm->pagesize * (qint64) uvm->npages; ++ data->cacheRam = (qint64) uvm->pagesize * (qint64) (uvm->filepages + uvm->execpages); ++ data->freeRam = (qint64) uvm->pagesize * (qint64) (uvm->free + uvm->paging); data->usedRam = data->totalRam - data->freeRam; return 1; |