diff options
| author | wiz <wiz@pkgsrc.org> | 2006-09-19 17:50:46 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2006-09-19 17:50:46 +0000 |
| commit | 0444de6b6c4bd5b0862a90c8b1b1ca310042145c (patch) | |
| tree | 533b70cae1a6558eedeefe6e01197dac4c51e936 /x11/kdebase3 | |
| parent | 462adfe965e4fe37b03aa06ca523d882aa42a3e8 (diff) | |
| download | pkgsrc-0444de6b6c4bd5b0862a90c8b1b1ca310042145c.tar.gz | |
Fix build on NetBSD-4.99.2. Tips for fix from yamt@
ok markd@ "if it fixes the build"
Diffstat (limited to 'x11/kdebase3')
| -rw-r--r-- | x11/kdebase3/distinfo | 3 | ||||
| -rw-r--r-- | x11/kdebase3/patches/patch-ab | 30 |
2 files changed, 32 insertions, 1 deletions
diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo index 35955968896..24fcddb3cfb 100644 --- a/x11/kdebase3/distinfo +++ b/x11/kdebase3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.87 2006/08/02 13:45:51 markd Exp $ +$NetBSD: distinfo,v 1.88 2006/09/19 17:50:46 wiz Exp $ SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4 @@ -13,6 +13,7 @@ SHA1 (kdebase-3.5.4.tar.bz2) = 18f2bb3643a40f937bf260d5969d6919aa52abf4 RMD160 (kdebase-3.5.4.tar.bz2) = 29f763ec9de2cf3437b94567b317642e7df5e295 Size (kdebase-3.5.4.tar.bz2) = 23636847 bytes SHA1 (patch-aa) = 28647cdec95367504e582ceb871e67dd3c321e29 +SHA1 (patch-ab) = 6565b0ea0566446cdf823726b0b9d65118f41632 SHA1 (patch-ac) = 8be0f15be839f4f01d3e079501b83e27f1fab2eb SHA1 (patch-ad) = 031e5622acb376ce1867d08b35c55bce101e8855 SHA1 (patch-ae) = e281920c63ab6cea8ed41c406275e63120d27490 diff --git a/x11/kdebase3/patches/patch-ab b/x11/kdebase3/patches/patch-ab new file mode 100644 index 00000000000..2a4a98b3318 --- /dev/null +++ b/x11/kdebase3/patches/patch-ab @@ -0,0 +1,30 @@ +$NetBSD: patch-ab,v 1.7 2006/09/19 17:50:46 wiz Exp $ + +--- kcontrol/info/memory_netbsd.cpp.orig 2005-09-10 08:25:05.000000000 +0000 ++++ kcontrol/info/memory_netbsd.cpp +@@ -22,8 +22,12 @@ void KMemoryWidget::update() + int mib[2]; + size_t len; + #ifdef UVM +- struct uvmexp uvmexp; ++#if __NetBSD_Version__ > 499000100 /* 4.99.2+ */ ++ struct uvmexp_sysctl uvmexp; + #else ++ struct uvmexp uvmexp; ++#endif ++#else /* !UVM */ + struct swapent *swaplist; + int64_t nswap, rnswap, totalswap, freeswap, usedswap; + #endif +@@ -49,7 +53,11 @@ void KMemoryWidget::update() + + #ifdef UVM + mib[0] = CTL_VM; ++#if __NetBSD_Version__ > 499000100 /* 4.99.2+ */ ++ mib[1] = VM_UVMEXP2; ++#else + mib[1] = VM_UVMEXP; ++#endif + len = sizeof(uvmexp); + if ( sysctl(mib, 2, &uvmexp, &len, NULL, 0) < 0 ) { + Memory_Info[FREE_MEM] = NO_MEMORY_INFO; |