From a2380ac3f9614c1125a38f481be321ffd8a692ca Mon Sep 17 00:00:00 2001 From: markd Date: Tue, 20 Apr 2004 12:33:56 +0000 Subject: bl3ify and update to kde3.2.2. Changes: * kappfinder: Fixed button order * kdesktop: Fix switching desktops incurrs (seemingly) unrequired cpu load * konqueror: Fix textposition of bookmark toolbar not saved * konqueror: Fix [testcase] HTTP-EQUIV="refresh" not working with weird formating. * konqueror (khtml): Fix When dragging a URL link with an image, the image is pasted and not the link URL * konqueror (khtml): Basic support for the HTML ACCESSKEY attribute. * konqueror (khtml): Ctrl only suspends Shift+arrows scrolling. * konqueror (khtml event): Fix dragging an attachment icon to desktop copies icon! * konqueror: No "Actions" submenu with only one entry * konqueror: Shift inverses "open tabs in background" setting for Ctrl+left mouse button and "Open in New Tab" in context menu * kicker: Fix tooltips sometimes not disappearing. * konsole: Added support for Scroll Up (SU) and Scroll Down (SD) * konsole: Better compatibility with xterm/XF86 4.4.0 * konsole: Fixed sending of large blocks * konsole: Show session menu when you move the mouse. * Make various scripts install with the executable bit set * Fix various libraries' install locations and versioning --- x11/kdebase3/patches/patch-bb | 8 +++---- x11/kdebase3/patches/patch-fh | 49 ------------------------------------------- 2 files changed, 4 insertions(+), 53 deletions(-) delete mode 100644 x11/kdebase3/patches/patch-fh (limited to 'x11/kdebase3/patches') diff --git a/x11/kdebase3/patches/patch-bb b/x11/kdebase3/patches/patch-bb index 4aaa547619b..8a3aafe244d 100644 --- a/x11/kdebase3/patches/patch-bb +++ b/x11/kdebase3/patches/patch-bb @@ -1,6 +1,6 @@ -$NetBSD: patch-bb,v 1.3 2004/02/04 14:25:59 markd Exp $ +$NetBSD: patch-bb,v 1.4 2004/04/20 12:33:56 markd Exp $ ---- kdesktop/init.cc.orig 2003-02-20 21:51:34.000000000 +1300 +--- kdesktop/init.cc.orig 2004-04-04 19:42:34.000000000 +1200 +++ kdesktop/init.cc @@ -81,6 +81,9 @@ static void copyDirectoryFile(const QStr cmd += " "; @@ -12,9 +12,9 @@ $NetBSD: patch-bb,v 1.3 2004/02/04 14:25:59 markd Exp $ } } -@@ -107,6 +110,9 @@ void copyDesktopLinks() +@@ -114,6 +117,9 @@ void copyDesktopLinks() cmd += " "; - cmd += QFile::encodeName(KProcess::quote(desktopPath + desk.readName())); + cmd += QFile::encodeName(KProcess::quote(desktopPath)); system( cmd ); + cmd = "chmod u+w "; + cmd += QFile::encodeName(KProcess::quote(desktopPath + desk.readName())); diff --git a/x11/kdebase3/patches/patch-fh b/x11/kdebase3/patches/patch-fh deleted file mode 100644 index b215441c2f9..00000000000 --- a/x11/kdebase3/patches/patch-fh +++ /dev/null @@ -1,49 +0,0 @@ -$NetBSD: patch-fh,v 1.1 2004/03/14 18:30:31 jdolecek Exp $ - ---- kcontrol/info/memory_netbsd.cpp.orig 2004-03-14 19:16:08.000000000 +0100 -+++ kcontrol/info/memory_netbsd.cpp 2004-03-14 19:16:39.000000000 +0100 -@@ -26,7 +26,7 @@ - struct uvmexp uvmexp; - #else - struct swapent *swaplist; -- int nswap, rnswap, totalswap, freeswap, usedswap; -+ int64_t nswap, rnswap, totalswap, freeswap, usedswap; - #endif - - /* memory */ -@@ -38,9 +38,6 @@ - else - Memory_Info[TOTAL_MEM] = memory; - --#warning "FIXME: Memory_Info[CACHED_MEM]" -- Memory_Info[CACHED_MEM] = NO_MEMORY_INFO; // cached memory in ram -- - #ifdef UVM - mib[0] = CTL_VM; - mib[1] = VM_UVMEXP; -@@ -51,13 +48,19 @@ - Memory_Info[INACTIVE_MEM] = NO_MEMORY_INFO; - Memory_Info[SWAP_MEM] = NO_MEMORY_INFO; - Memory_Info[FREESWAP_MEM] = NO_MEMORY_INFO; -+ Memory_Info[CACHED_MEM] = NO_MEMORY_INFO; - } else { -- Memory_Info[FREE_MEM] = MEMORY(uvmexp.free * uvmexp.pagesize); -- Memory_Info[ACTIVE_MEM] = MEMORY(uvmexp.active * uvmexp.pagesize); -- Memory_Info[INACTIVE_MEM] = MEMORY(uvmexp.inactive * uvmexp.pagesize); -- Memory_Info[SWAP_MEM] = MEMORY(uvmexp.swpages * uvmexp.pagesize); -- Memory_Info[FREESWAP_MEM] = MEMORY((uvmexp.swpages - uvmexp.swpginuse) * -- uvmexp.pagesize); -+ t_memsize pgsz = uvmexp.pagesize; -+ Memory_Info[FREE_MEM] = MEMORY(pgsz * uvmexp.free); -+ Memory_Info[ACTIVE_MEM] = MEMORY(pgsz * uvmexp.active); -+ Memory_Info[INACTIVE_MEM] = MEMORY(pgsz * uvmexp.inactive); -+ Memory_Info[SWAP_MEM] = MEMORY(pgsz * uvmexp.swpages); -+ Memory_Info[FREESWAP_MEM] = MEMORY(pgsz * (uvmexp.swpages - uvmexp.swpginuse)); -+#if __NetBSD_Version__ > 106000000 -+ Memory_Info[CACHED_MEM] = MEMORY(pgsz * (uvmexp.filepages + uvmexp.execpages)); -+#else -+ Memory_Info[CACHED_MEM] = NO_MEMORY_INFO; -+#endif - } - #else - Memory_Info[FREE_MEM] = NO_MEMORY_INFO; -- cgit v1.2.3