From cad9bbaac60e0c2a0cce1fbcb0d9ceea44dd9bd1 Mon Sep 17 00:00:00 2001 From: markd Date: Thu, 10 Jun 2004 11:51:51 +0000 Subject: update to kde 3.2.3 changes: * general: More and better usage of icons in different applications * general: Fix link order for IRIX * kappfinder: Fixed menu structure and added icons of several applications * kicker: Don't show unimplemented "About" and "Preferences" for universal sidebar * kicker: Fix two panels on different xinerama screens affecting their placement. * konqueror/kdesktop: Fix konqueror is ignoring umask when creating new files * konqueror/kdesktop: Fix filename suggestion when moving files applies to all subsequent files * konqueror: Made all items in the "Go" menu open in the current Konqueror window * konqueror: Now Ctrl+Enter opens a tab with default background setting * konqueror: Holding Shift while opening a tab inverses the "open tabs ini background" setting * konqueror: "[FMSettings] TabPosition=Bottom" in konquerorrc lets the tabbar appear at bottom * konqueror: Fix konqueror listview rightclick always selects file * konsole: Added the ability to fetch the shell PID per session via DCOP * konsole: Fix terminal size display is covered by kwin size display * konsole: Fix Default rendition should be used when clearing screen areas * konsole: Fix can't change/save Keytabs in the Session Editor * konsole: Fix for crashes on exit. * konsole: Fix transparant background updates * kio_fish: Fixes for copying into a symlink to a folder, and for copying over a directory that already exists * kwin: Keep properly splashscreens above their mainwindows. * kwin: Restore focus when a broken application sets it to nowhere. * kwin: Fix dialog placement problems with Konqueror with Qt-3.2.x . * kwin: Fix problem with minimizing xmms. * kwin: Fix active desktop borders while moving improper initialization. * kwin: Fix Shift+middle mouse button action in Konqueror. * klipper: Fix Klipper reacting to its own clipboard changes. * khotkeys: Mouse gestures are globally disabled by default. * drkonqi: Fix valid backtraces sometimes being reported as useless. * kcontrol: Fix colorsheme file name conflict --- x11/kdebase3/Makefile | 3 +- x11/kdebase3/PLIST | 58 ++++++- x11/kdebase3/distinfo | 10 +- x11/kdebase3/patches/patch-ae | 13 +- x11/kdebase3/patches/patch-ah | 346 ------------------------------------------ x11/kdebase3/patches/patch-ai | 80 ---------- 6 files changed, 63 insertions(+), 447 deletions(-) delete mode 100644 x11/kdebase3/patches/patch-ah delete mode 100644 x11/kdebase3/patches/patch-ai diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index f3b6202ce44..8a445c3a0a5 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.53 2004/05/31 12:21:06 markd Exp $ +# $NetBSD: Makefile,v 1.54 2004/06/10 11:51:51 markd Exp $ DISTNAME= kdebase-${_KDE_VERSION} -PKGREVISION= 3 CATEGORIES= x11 COMMENT= Base modules for the KDE 3 integrated X11 desktop diff --git a/x11/kdebase3/PLIST b/x11/kdebase3/PLIST index 236d99a5a79..dd4c7e320f9 100644 --- a/x11/kdebase3/PLIST +++ b/x11/kdebase3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.20 2004/05/26 13:20:53 markd Exp $ +@comment $NetBSD: PLIST,v 1.21 2004/06/10 11:51:51 markd Exp $ bin/appletproxy bin/drkonqi bin/extensionproxy @@ -2191,15 +2191,18 @@ share/kde/icons/crystalsvg/128x128/apps/xclock.png share/kde/icons/crystalsvg/128x128/apps/xfmail.png share/kde/icons/crystalsvg/128x128/apps/xmag.png share/kde/icons/crystalsvg/16x16/actions/newfont.png +share/kde/icons/crystalsvg/16x16/apps/abiword.png share/kde/icons/crystalsvg/16x16/apps/access.png share/kde/icons/crystalsvg/16x16/apps/acroread.png share/kde/icons/crystalsvg/16x16/apps/agent.png share/kde/icons/crystalsvg/16x16/apps/alevt.png share/kde/icons/crystalsvg/16x16/apps/applixware.png share/kde/icons/crystalsvg/16x16/apps/arts.png +share/kde/icons/crystalsvg/16x16/apps/assistant.png share/kde/icons/crystalsvg/16x16/apps/background.png share/kde/icons/crystalsvg/16x16/apps/bell.png share/kde/icons/crystalsvg/16x16/apps/blender.png +share/kde/icons/crystalsvg/16x16/apps/bluefish.png share/kde/icons/crystalsvg/16x16/apps/cache.png share/kde/icons/crystalsvg/16x16/apps/clanbomber.png share/kde/icons/crystalsvg/16x16/apps/clock.png @@ -2207,16 +2210,25 @@ share/kde/icons/crystalsvg/16x16/apps/colors.png share/kde/icons/crystalsvg/16x16/apps/cookie.png share/kde/icons/crystalsvg/16x16/apps/date.png share/kde/icons/crystalsvg/16x16/apps/designer.png +share/kde/icons/crystalsvg/16x16/apps/dia.png share/kde/icons/crystalsvg/16x16/apps/dlgedit.png +share/kde/icons/crystalsvg/16x16/apps/eclipse.png share/kde/icons/crystalsvg/16x16/apps/emacs.png share/kde/icons/crystalsvg/16x16/apps/email.png share/kde/icons/crystalsvg/16x16/apps/energy.png share/kde/icons/crystalsvg/16x16/apps/energy_star.png share/kde/icons/crystalsvg/16x16/apps/enhanced_browsing.png +share/kde/icons/crystalsvg/16x16/apps/evolution.png share/kde/icons/crystalsvg/16x16/apps/filetypes.png +share/kde/icons/crystalsvg/16x16/apps/firefox.png share/kde/icons/crystalsvg/16x16/apps/fonts.png +share/kde/icons/crystalsvg/16x16/apps/gabber.png +share/kde/icons/crystalsvg/16x16/apps/gaim.png share/kde/icons/crystalsvg/16x16/apps/gimp.png share/kde/icons/crystalsvg/16x16/apps/gnome_apps.png +share/kde/icons/crystalsvg/16x16/apps/gnomemeeting.png +share/kde/icons/crystalsvg/16x16/apps/gnucash.png +share/kde/icons/crystalsvg/16x16/apps/gnumeric.png share/kde/icons/crystalsvg/16x16/apps/go.png share/kde/icons/crystalsvg/16x16/apps/gv.png share/kde/icons/crystalsvg/16x16/apps/gvim.png @@ -2271,6 +2283,7 @@ share/kde/icons/crystalsvg/16x16/apps/kwin.png share/kde/icons/crystalsvg/16x16/apps/kwrite.png share/kde/icons/crystalsvg/16x16/apps/kxkb.png share/kde/icons/crystalsvg/16x16/apps/licq.png +share/kde/icons/crystalsvg/16x16/apps/linguist.png share/kde/icons/crystalsvg/16x16/apps/linuxconf.png share/kde/icons/crystalsvg/16x16/apps/locale.png share/kde/icons/crystalsvg/16x16/apps/looknfeel.png @@ -2304,6 +2317,7 @@ share/kde/icons/crystalsvg/16x16/apps/package_system.png share/kde/icons/crystalsvg/16x16/apps/package_toys.png share/kde/icons/crystalsvg/16x16/apps/package_utilities.png share/kde/icons/crystalsvg/16x16/apps/package_wordprocessing.png +share/kde/icons/crystalsvg/16x16/apps/pan.png share/kde/icons/crystalsvg/16x16/apps/panel.png share/kde/icons/crystalsvg/16x16/apps/panel_settings.png share/kde/icons/crystalsvg/16x16/apps/password.png @@ -2311,6 +2325,7 @@ share/kde/icons/crystalsvg/16x16/apps/penguin.png share/kde/icons/crystalsvg/16x16/apps/personal.png share/kde/icons/crystalsvg/16x16/apps/phppg.png share/kde/icons/crystalsvg/16x16/apps/plan.png +share/kde/icons/crystalsvg/16x16/apps/planner.png share/kde/icons/crystalsvg/16x16/apps/printmgr.png share/kde/icons/crystalsvg/16x16/apps/proxy.png share/kde/icons/crystalsvg/16x16/apps/pybliographic.png @@ -2318,15 +2333,19 @@ share/kde/icons/crystalsvg/16x16/apps/randr.png share/kde/icons/crystalsvg/16x16/apps/realplayer.png share/kde/icons/crystalsvg/16x16/apps/remote.png share/kde/icons/crystalsvg/16x16/apps/samba.png +share/kde/icons/crystalsvg/16x16/apps/scribus.png +share/kde/icons/crystalsvg/16x16/apps/sodipodi.png share/kde/icons/crystalsvg/16x16/apps/soffice.png share/kde/icons/crystalsvg/16x16/apps/style.png share/kde/icons/crystalsvg/16x16/apps/stylesheet.png share/kde/icons/crystalsvg/16x16/apps/terminal.png +share/kde/icons/crystalsvg/16x16/apps/thunderbird.png share/kde/icons/crystalsvg/16x16/apps/tux.png share/kde/icons/crystalsvg/16x16/apps/usb.png share/kde/icons/crystalsvg/16x16/apps/vnc.png share/kde/icons/crystalsvg/16x16/apps/wabi.png share/kde/icons/crystalsvg/16x16/apps/window_list.png +share/kde/icons/crystalsvg/16x16/apps/wine.png share/kde/icons/crystalsvg/16x16/apps/winprops.png share/kde/icons/crystalsvg/16x16/apps/wp.png share/kde/icons/crystalsvg/16x16/apps/xcalc.png @@ -2355,15 +2374,18 @@ share/kde/icons/crystalsvg/22x22/apps/kvirc.png share/kde/icons/crystalsvg/22x22/apps/nedit.png share/kde/icons/crystalsvg/22x22/apps/randr.png share/kde/icons/crystalsvg/32x32/actions/newfont.png +share/kde/icons/crystalsvg/32x32/apps/abiword.png share/kde/icons/crystalsvg/32x32/apps/access.png share/kde/icons/crystalsvg/32x32/apps/acroread.png share/kde/icons/crystalsvg/32x32/apps/agent.png share/kde/icons/crystalsvg/32x32/apps/alevt.png share/kde/icons/crystalsvg/32x32/apps/applixware.png share/kde/icons/crystalsvg/32x32/apps/arts.png +share/kde/icons/crystalsvg/32x32/apps/assistant.png share/kde/icons/crystalsvg/32x32/apps/background.png share/kde/icons/crystalsvg/32x32/apps/bell.png share/kde/icons/crystalsvg/32x32/apps/blender.png +share/kde/icons/crystalsvg/32x32/apps/bluefish.png share/kde/icons/crystalsvg/32x32/apps/cache.png share/kde/icons/crystalsvg/32x32/apps/clanbomber.png share/kde/icons/crystalsvg/32x32/apps/clock.png @@ -2371,18 +2393,27 @@ share/kde/icons/crystalsvg/32x32/apps/colors.png share/kde/icons/crystalsvg/32x32/apps/cookie.png share/kde/icons/crystalsvg/32x32/apps/date.png share/kde/icons/crystalsvg/32x32/apps/designer.png +share/kde/icons/crystalsvg/32x32/apps/dia.png share/kde/icons/crystalsvg/32x32/apps/dlgedit.png +share/kde/icons/crystalsvg/32x32/apps/eclipse.png share/kde/icons/crystalsvg/32x32/apps/emacs.png share/kde/icons/crystalsvg/32x32/apps/email.png share/kde/icons/crystalsvg/32x32/apps/energy.png share/kde/icons/crystalsvg/32x32/apps/energy_star.png share/kde/icons/crystalsvg/32x32/apps/enhanced_browsing.png share/kde/icons/crystalsvg/32x32/apps/error.png +share/kde/icons/crystalsvg/32x32/apps/evolution.png share/kde/icons/crystalsvg/32x32/apps/filetypes.png +share/kde/icons/crystalsvg/32x32/apps/firefox.png share/kde/icons/crystalsvg/32x32/apps/fonts.png +share/kde/icons/crystalsvg/32x32/apps/gabber.png +share/kde/icons/crystalsvg/32x32/apps/gaim.png share/kde/icons/crystalsvg/32x32/apps/galeon.png share/kde/icons/crystalsvg/32x32/apps/gimp.png share/kde/icons/crystalsvg/32x32/apps/gnome_apps.png +share/kde/icons/crystalsvg/32x32/apps/gnomemeeting.png +share/kde/icons/crystalsvg/32x32/apps/gnucash.png +share/kde/icons/crystalsvg/32x32/apps/gnumeric.png share/kde/icons/crystalsvg/32x32/apps/go.png share/kde/icons/crystalsvg/32x32/apps/gv.png share/kde/icons/crystalsvg/32x32/apps/gvim.png @@ -2438,6 +2469,7 @@ share/kde/icons/crystalsvg/32x32/apps/kwin.png share/kde/icons/crystalsvg/32x32/apps/kwrite.png share/kde/icons/crystalsvg/32x32/apps/kxkb.png share/kde/icons/crystalsvg/32x32/apps/licq.png +share/kde/icons/crystalsvg/32x32/apps/linguist.png share/kde/icons/crystalsvg/32x32/apps/linuxconf.png share/kde/icons/crystalsvg/32x32/apps/locale.png share/kde/icons/crystalsvg/32x32/apps/looknfeel.png @@ -2469,11 +2501,13 @@ share/kde/icons/crystalsvg/32x32/apps/package_system.png share/kde/icons/crystalsvg/32x32/apps/package_toys.png share/kde/icons/crystalsvg/32x32/apps/package_utilities.png share/kde/icons/crystalsvg/32x32/apps/package_wordprocessing.png +share/kde/icons/crystalsvg/32x32/apps/pan.png share/kde/icons/crystalsvg/32x32/apps/password.png share/kde/icons/crystalsvg/32x32/apps/penguin.png share/kde/icons/crystalsvg/32x32/apps/personal.png share/kde/icons/crystalsvg/32x32/apps/phppg.png share/kde/icons/crystalsvg/32x32/apps/plan.png +share/kde/icons/crystalsvg/32x32/apps/planner.png share/kde/icons/crystalsvg/32x32/apps/printmgr.png share/kde/icons/crystalsvg/32x32/apps/proxy.png share/kde/icons/crystalsvg/32x32/apps/pybliographic.png @@ -2481,21 +2515,26 @@ share/kde/icons/crystalsvg/32x32/apps/pysol.png share/kde/icons/crystalsvg/32x32/apps/randr.png share/kde/icons/crystalsvg/32x32/apps/realplayer.png share/kde/icons/crystalsvg/32x32/apps/samba.png +share/kde/icons/crystalsvg/32x32/apps/scribus.png +share/kde/icons/crystalsvg/32x32/apps/sodipodi.png share/kde/icons/crystalsvg/32x32/apps/soffice.png share/kde/icons/crystalsvg/32x32/apps/style.png share/kde/icons/crystalsvg/32x32/apps/stylesheet.png share/kde/icons/crystalsvg/32x32/apps/terminal.png +share/kde/icons/crystalsvg/32x32/apps/thunderbird.png share/kde/icons/crystalsvg/32x32/apps/tux.png share/kde/icons/crystalsvg/32x32/apps/usb.png share/kde/icons/crystalsvg/32x32/apps/vnc.png share/kde/icons/crystalsvg/32x32/apps/wabi.png share/kde/icons/crystalsvg/32x32/apps/window_list.png share/kde/icons/crystalsvg/32x32/apps/winprops.png +share/kde/icons/crystalsvg/32x32/apps/wine.png share/kde/icons/crystalsvg/32x32/apps/wp.png share/kde/icons/crystalsvg/32x32/apps/x.png share/kde/icons/crystalsvg/32x32/apps/xapp.png share/kde/icons/crystalsvg/32x32/apps/xawtv.png share/kde/icons/crystalsvg/32x32/apps/xcalc.png +share/kde/icons/crystalsvg/32x32/apps/xchat.png share/kde/icons/crystalsvg/32x32/apps/xclipboard.png share/kde/icons/crystalsvg/32x32/apps/xclock.png share/kde/icons/crystalsvg/32x32/apps/xconsole.png @@ -2512,6 +2551,7 @@ share/kde/icons/crystalsvg/32x32/apps/xpaint.png share/kde/icons/crystalsvg/32x32/apps/xv.png share/kde/icons/crystalsvg/32x32/devices/print_printer.png share/kde/icons/crystalsvg/32x32/filesystems/folder_print2.png +share/kde/icons/crystalsvg/48x48/apps/abiword.png share/kde/icons/crystalsvg/48x48/apps/access.png share/kde/icons/crystalsvg/48x48/apps/acroread.png share/kde/icons/crystalsvg/48x48/apps/agent.png @@ -2520,6 +2560,7 @@ share/kde/icons/crystalsvg/48x48/apps/arts.png share/kde/icons/crystalsvg/48x48/apps/background.png share/kde/icons/crystalsvg/48x48/apps/bell.png share/kde/icons/crystalsvg/48x48/apps/blender.png +share/kde/icons/crystalsvg/48x48/apps/bluefish.png share/kde/icons/crystalsvg/48x48/apps/cache.png share/kde/icons/crystalsvg/48x48/apps/clanbomber.png share/kde/icons/crystalsvg/48x48/apps/clock.png @@ -2527,16 +2568,25 @@ share/kde/icons/crystalsvg/48x48/apps/colors.png share/kde/icons/crystalsvg/48x48/apps/cookie.png share/kde/icons/crystalsvg/48x48/apps/date.png share/kde/icons/crystalsvg/48x48/apps/designer.png +share/kde/icons/crystalsvg/48x48/apps/dia.png +share/kde/icons/crystalsvg/48x48/apps/eclipse.png share/kde/icons/crystalsvg/48x48/apps/emacs.png share/kde/icons/crystalsvg/48x48/apps/email.png share/kde/icons/crystalsvg/48x48/apps/energy.png share/kde/icons/crystalsvg/48x48/apps/energy_star.png share/kde/icons/crystalsvg/48x48/apps/enhanced_browsing.png +share/kde/icons/crystalsvg/48x48/apps/evolution.png share/kde/icons/crystalsvg/48x48/apps/filetypes.png +share/kde/icons/crystalsvg/48x48/apps/firefox.png share/kde/icons/crystalsvg/48x48/apps/fonts.png +share/kde/icons/crystalsvg/48x48/apps/gabber.png +share/kde/icons/crystalsvg/48x48/apps/gaim.png share/kde/icons/crystalsvg/48x48/apps/galeon.png share/kde/icons/crystalsvg/48x48/apps/gimp.png share/kde/icons/crystalsvg/48x48/apps/gnome_apps.png +share/kde/icons/crystalsvg/48x48/apps/gnomemeeting.png +share/kde/icons/crystalsvg/48x48/apps/gnucash.png +share/kde/icons/crystalsvg/48x48/apps/gnumeric.png share/kde/icons/crystalsvg/48x48/apps/go.png share/kde/icons/crystalsvg/48x48/apps/gvim.png share/kde/icons/crystalsvg/48x48/apps/help_index.png @@ -2617,16 +2667,20 @@ share/kde/icons/crystalsvg/48x48/apps/package_system.png share/kde/icons/crystalsvg/48x48/apps/package_toys.png share/kde/icons/crystalsvg/48x48/apps/package_utilities.png share/kde/icons/crystalsvg/48x48/apps/package_wordprocessing.png +share/kde/icons/crystalsvg/48x48/apps/pan.png share/kde/icons/crystalsvg/48x48/apps/password.png share/kde/icons/crystalsvg/48x48/apps/penguin.png share/kde/icons/crystalsvg/48x48/apps/personal.png share/kde/icons/crystalsvg/48x48/apps/phppg.png +share/kde/icons/crystalsvg/48x48/apps/planner.png share/kde/icons/crystalsvg/48x48/apps/printmgr.png share/kde/icons/crystalsvg/48x48/apps/proxy.png share/kde/icons/crystalsvg/48x48/apps/pysol.png share/kde/icons/crystalsvg/48x48/apps/randr.png share/kde/icons/crystalsvg/48x48/apps/remote.png share/kde/icons/crystalsvg/48x48/apps/samba.png +share/kde/icons/crystalsvg/48x48/apps/scribus.png +share/kde/icons/crystalsvg/48x48/apps/sodipodi.png share/kde/icons/crystalsvg/48x48/apps/soffice.png share/kde/icons/crystalsvg/48x48/apps/staroffice.png share/kde/icons/crystalsvg/48x48/apps/style.png @@ -2636,9 +2690,11 @@ share/kde/icons/crystalsvg/48x48/apps/tux.png share/kde/icons/crystalsvg/48x48/apps/usb.png share/kde/icons/crystalsvg/48x48/apps/vnc.png share/kde/icons/crystalsvg/48x48/apps/window_list.png +share/kde/icons/crystalsvg/48x48/apps/wine.png share/kde/icons/crystalsvg/48x48/apps/winprops.png share/kde/icons/crystalsvg/48x48/apps/wmaker_apps.png share/kde/icons/crystalsvg/48x48/apps/wp.png +share/kde/icons/crystalsvg/48x48/apps/xchat.png share/kde/icons/crystalsvg/48x48/apps/xclock.png share/kde/icons/crystalsvg/48x48/apps/xedit.png share/kde/icons/crystalsvg/48x48/apps/xemacs.png diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo index c7a59952e40..210f1d8aa38 100644 --- a/x11/kdebase3/distinfo +++ b/x11/kdebase3/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.52 2004/05/31 12:21:06 markd Exp $ +$NetBSD: distinfo,v 1.53 2004/06/10 11:51:51 markd Exp $ -SHA1 (kdebase-3.2.2.tar.bz2) = bc941b3faa4440ca2048d9332371c974d0e17f5b -Size (kdebase-3.2.2.tar.bz2) = 17216476 bytes +SHA1 (kdebase-3.2.3.tar.bz2) = bb3543a7ffa95e55a5eb87c4e476d3a800c0113c +Size (kdebase-3.2.3.tar.bz2) = 17330422 bytes SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d Size (Daemon.png) = 15725 bytes SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b @@ -10,11 +10,9 @@ SHA1 (patch-aa) = fcb678ef0112e2d39f2d7ced126c88f2862b3351 SHA1 (patch-ab) = 5ddff11c04fb004a8ddaedbec2655fdd3cf3d466 SHA1 (patch-ac) = 8be0f15be839f4f01d3e079501b83e27f1fab2eb SHA1 (patch-ad) = 031e5622acb376ce1867d08b35c55bce101e8855 -SHA1 (patch-ae) = 5d9902de9990efc1883f11563f49ac8639fe743d +SHA1 (patch-ae) = bea53dcd5c8e7d1670de293e131befb5d6db78b5 SHA1 (patch-af) = ad9b3a97151c964d4adea2d8fecd780c6198b205 SHA1 (patch-ag) = 89f50ee8b328cd654aebf1da5424e87eb6b42628 -SHA1 (patch-ah) = dad5cd23522073d088329b4da2c2978d807005bc -SHA1 (patch-ai) = 5638690e617dd27b88aa00928828d3ef585bd6ff SHA1 (patch-aj) = 3ed17b109394ce3d24accbbd6afcad40013d6b48 SHA1 (patch-ak) = 234c9a4d01b15ab803a182c51c14a7c0cf249576 SHA1 (patch-bb) = 1b6c717a1bedafbeae0037ee382795d8aa59f081 diff --git a/x11/kdebase3/patches/patch-ae b/x11/kdebase3/patches/patch-ae index 0fdc7a763d1..83169f2994a 100644 --- a/x11/kdebase3/patches/patch-ae +++ b/x11/kdebase3/patches/patch-ae @@ -1,18 +1,7 @@ -$NetBSD: patch-ae,v 1.5 2004/04/20 12:37:34 markd Exp $ +$NetBSD: patch-ae,v 1.6 2004/06/10 11:51:52 markd Exp $ --- kcontrol/krdb/krdb.cpp.orig 2004-04-04 19:42:18.000000000 +1200 +++ kcontrol/krdb/krdb.cpp -@@ -343,8 +343,8 @@ static void createGtkrc( bool exportColo - t << " base[NORMAL] = " << color( cg.base() ) << endl; - t << " base[SELECTED] = " << color( cg.highlight() ) << endl; - t << " base[INSENSITIVE] = " << color( cg.background() ) << endl; -- t << " base[ACTIVE] = " << color( cg.base() ) << endl; -- t << " base[PRELIGHT] = " << color( cg.base() ) << endl; -+ t << " base[ACTIVE] = " << color( cg.highlight() ) << endl; -+ t << " base[PRELIGHT] = " << color( cg.highlight() ) << endl; - t << endl; - t << " text[NORMAL] = " << color( cg.text() ) << endl; - t << " text[SELECTED] = " << color( cg.highlightedText() ) << endl; @@ -384,7 +384,14 @@ static void createGtkrc( bool exportColo // not every button, checkbox, etc. t << "style \"MenuItem\"" << endl; diff --git a/x11/kdebase3/patches/patch-ah b/x11/kdebase3/patches/patch-ah deleted file mode 100644 index cb739147f83..00000000000 --- a/x11/kdebase3/patches/patch-ah +++ /dev/null @@ -1,346 +0,0 @@ -$NetBSD: patch-ah,v 1.5 2004/05/01 07:32:15 tron Exp $ - -Fixes build with Freetype-2.1.8, see: -http://webcvs.kde.org/cgi-bin/cvsweb.cgi/kdebase/kcontrol/kfontinst/lib/FontEngine.cpp - ---- kcontrol/kfontinst/lib/FontEngine.cpp 2004/03/30 21:17:35 1.12.2.2 -+++ kcontrol/kfontinst/lib/FontEngine.cpp 2004/04/27 20:30:25 1.12.2.3 -@@ -522,14 +522,33 @@ void CFontEngine::createPreview(int widt - - FT_Face face; - FT_Size size; -- FTC_Image_Desc font; - -+#if KFI_FT_IS_GE(2, 1, 8) -+ FTC_ScalerRec scaler; -+ FTC_ImageTypeRec font; -+#else -+ FTC_Image_Desc font; -+#endif -+ -+#if KFI_FT_IS_GE(2, 1, 8) -+ font.face_id=getId(itsPath, faceNo); -+ font.width=font.height=point2Pixel(sizes[s].font); -+ font.flags=FT_LOAD_DEFAULT; -+ scaler.face_id=font.face_id; -+ scaler.width=scaler.height=font.width; -+ scaler.pixel=1; -+#else - font.font.face_id=getId(itsPath, faceNo); - font.font.pix_width=font.font.pix_height=point2Pixel(sizes[s].font); - font.image_type=ftc_image_grays; -+#endif - - FT_F26Dot6 startX=sizes[s].offset, -+#if KFI_FT_IS_GE(2, 1, 8) -+ startY=sizes[s].offset+font.height, -+#else - startY=sizes[s].offset+font.font.pix_height, -+#endif - x=startX, - y=startY; - -@@ -570,7 +589,12 @@ void CFontEngine::createPreview(int widt - y+=startY; - } - -+#if KFI_FT_IS_GE(2, 1, 8) -+ if(!FTC_Manager_LookupFace(itsFt.cacheManager, scaler.face_id, &face) && -+ !FTC_Manager_LookupSize(itsFt.cacheManager, &scaler, &size)) -+#else - if(!FTC_Manager_Lookup_Size(itsFt.cacheManager, &(font.font), &face, &size)) -+#endif - { - int i; - FT_F26Dot6 stepY=size->metrics.y_ppem /*(size->metrics.height>>6)*/ + sizes[s].offset; -@@ -585,14 +609,24 @@ void CFontEngine::createPreview(int widt - unsigned int ch; - - for(ch=0; chmetrics.y_ppem /*(size->metrics.height>>6)*/ + sizes[s].offset; - -@@ -603,12 +637,15 @@ void CFontEngine::createPreview(int widt - y+=stepY; - x=startX; - } -- -+#if KFI_FT_IS_GE(2, 1, 8) -+ y+=font.height; -+#else - y+=font.font.pix_height; -+#endif - } - - for(i=1; inum_glyphs; ++i) // Glyph 0 is the NULL glyph -- if(drawGlyph(pix, font, size, i, x, y, width, height, startX, stepY)) -+ if(drawGlyph(pix, font, i, x, y, width, height, startX, stepY)) - break; - } - } -@@ -621,14 +658,14 @@ void CFontEngine::createPreview(int widt - unsigned int ch; - - for(ch=0; chnum_glyphs; ++i) // Glyph 0 is the NULL glyph -- if(drawGlyph(pix, font, size, i, x, y, width, height, startX, stepY)) -+ if(drawGlyph(pix, font, i, x, y, width, height, startX, stepY)) - break; - } - -@@ -2858,8 +2895,13 @@ FTC_FaceID CFontEngine::getId(const QStr - return (FTC_FaceID)p; - } - -+#if KFI_FT_IS_GE(2, 1, 8) -+bool CFontEngine::getGlyphBitmap(FTC_ImageTypeRec &font, FT_ULong index, Bitmap &target, int &left, int &top, -+ int &xAdvance, FT_Pointer *ptr) -+#else - bool CFontEngine::getGlyphBitmap(FTC_Image_Desc &font, FT_ULong index, Bitmap &target, int &left, int &top, - int &xAdvance, FT_Pointer *ptr) -+#endif - { - bool ok=false; - -@@ -2867,13 +2909,23 @@ bool CFontEngine::getGlyphBitmap(FTC_Ima - - // - // Cache small glyphs, else render on demand... -+#if KFI_FT_IS_GE(2, 1, 8) -+ if(font.width<48 && font.height<48) -+#else - if(font.font.pix_width<48 && font.font.pix_height<48) -+#endif - { - FTC_SBit sbit; - -- if(!FTC_SBit_Cache_Lookup(itsFt.sBitCache, &font, index, &sbit)) -+#if KFI_FT_IS_GE(2, 1, 8) -+ if(!FTC_SBitCache_Lookup(itsFt.sBitCache, &font, index, &sbit, NULL) && sbit->buffer) -+#else -+ if(!FTC_SBit_Cache_Lookup(itsFt.sBitCache, &font, index, &sbit) && sbit->buffer) -+#endif - { -- target.greys=ft_pixel_mode_mono==sbit->format ? 2 : 256; -+ target.greys=sbit->max_grays+1; // ft_pixel_mode_mono==sbit->format ? 2 : 256; -+ target.mono=ft_pixel_mode_mono==sbit->format ? true : false; -+ target.pitch=sbit->pitch; - target.height=sbit->height; - target.width=sbit->width; - target.buffer=sbit->buffer; -@@ -2883,11 +2935,15 @@ bool CFontEngine::getGlyphBitmap(FTC_Ima - ok=true; - } - } -- else -+ if(!ok) - { - FT_Glyph glyph; - -+#if KFI_FT_IS_GE(2, 1, 8) -+ if(!FTC_ImageCache_Lookup(itsFt.imageCache, &font, index, &glyph, NULL)) -+#else - if(!FTC_Image_Cache_Lookup(itsFt.imageCache, &font, index, &glyph)) -+#endif - { - ok=true; - -@@ -2896,12 +2952,14 @@ bool CFontEngine::getGlyphBitmap(FTC_Ima - *ptr=glyph; - - if(ok) -- if(ft_glyph_format_bitmap==glyph->format) -+ if(ft_glyph_format_bitmap==glyph->format && ((FT_BitmapGlyph)glyph)->bitmap.buffer) - { - FT_BitmapGlyph bitmap=(FT_BitmapGlyph)glyph; - FT_Bitmap *source=&(bitmap->bitmap); - -- target.greys= (ft_pixel_mode_mono==(FT_Pixel_Mode_) source->pixel_mode) ? 1 : source->num_grays; -+ target.greys=ft_pixel_mode_mono==(FT_Pixel_Mode_) source->pixel_mode ? 2 : source->num_grays; -+ target.mono=ft_pixel_mode_mono==(FT_Pixel_Mode_) source->pixel_mode ? true : false; -+ target.pitch=source->pitch; - target.height=source->rows; - target.width=source->width; - target.buffer=source->buffer; -@@ -2919,14 +2977,12 @@ bool CFontEngine::getGlyphBitmap(FTC_Ima - - void CFontEngine::align32(Bitmap &bmp) - { -- int mod=bmp.width%4; -+ // Pitch = number of bytes per row of the bitmap. This needs to fall on a 32bit (4byte) boundary. -+ int padBytes=4-(bmp.pitch%4); - -- if(mod) -+ if(padBytes<4) - { -- bmp.mod=4-mod; -- -- int width=bmp.width+bmp.mod, -- size=(bmp.width+bmp.mod)*bmp.height, -+ int size=(bmp.pitch+padBytes)*bmp.height, - row; - - if(size>itsFt.bufferSize) -@@ -2939,20 +2995,23 @@ void CFontEngine::align32(Bitmap &bmp) - itsFt.buffer=new unsigned char [itsFt.bufferSize]; - } - -- memset(itsFt.buffer, 0, itsFt.bufferSize); -+ //memset(itsFt.buffer, 0, itsFt.bufferSize); - for(row=0; row0 && bmp.height>0) - { -- if(2==bmp.greys) -+ if(x+xAdvance+1>width) - { -- QPixmap glyphPix(QBitmap(bmp.width, bmp.height, bmp.buffer)); -+ x=startX; -+ y+=stepY; - -- bitBlt(&pix, x+left, y-top, &glyphPix, 0, 0, bmp.width, bmp.height, Qt::AndROP); -+ if(y>height) -+ return true; - } -- else -- { -- static QRgb clut[256]; -- static bool clutSetup=false; - -- if(!clutSetup) -- { -- int j; -- for(j=0; j<256; j++) -- clut[j]=qRgb(255-j, 255-j, 255-j); -- clutSetup=true; -- } -+ static QRgb clut8[256]; -+ static QRgb clut1[2]={ qRgb(255, 255, 255), qRgb(0, 0, 0) }; -+ static bool clut8Setup=false; - -- align32(bmp); -+ if(!bmp.mono && !clut8Setup) -+ { -+ int j; -+ for(j=0; j<256; j++) -+ clut8[j]=qRgb(255-j, 255-j, 255-j); -+ clut8Setup=true; -+ } - -- QPixmap glyphPix(QImage(bmp.buffer, bmp.width, bmp.height, 8, clut , bmp.greys, QImage::IgnoreEndian)); -+ align32(bmp); - -- bitBlt(&pix, x+left, y-top, &glyphPix, 0, 0, bmp.width, bmp.height, Qt::AndROP); -- } -+ QPixmap glyphPix(QImage(bmp.buffer, bmp.width, bmp.height, bmp.mono ? 1 : 8, bmp.mono ? clut1 : clut8, bmp.mono ? 2 : bmp.greys, -+ QImage::BigEndian)); -+ -+ bitBlt(&pix, x+left, y-top, &glyphPix, 0, 0, glyphPix.width(), glyphPix.height(), Qt::AndROP); - - if(glyph) - FT_Done_Glyph((FT_Glyph)glyph); - - x+=xAdvance+1; -- -- if(x+size->metrics.x_ppem>width) -- { -- x=startX; -- y+=stepY; -- -- if(y>height) -- return true; -- } - } - else if(x!=startX) - x+=space; -@@ -3015,7 +3067,6 @@ CFontEngine::TFtData::TFtData() - , buffer(NULL), - bufferSize(0) - #endif -- - { - if(FT_Init_FreeType(&library)) - { -@@ -3024,9 +3075,29 @@ CFontEngine::TFtData::TFtData() - } - #ifdef HAVE_FT_CACHE - ids.setAutoDelete(true); -- FTC_Manager_New(library, 0, 0, 0, face_requester, 0, &cacheManager); -- FTC_SBit_Cache_New(cacheManager, &sBitCache); -- FTC_Image_Cache_New(cacheManager, &imageCache); -+ if(FTC_Manager_New(library, 0, 0, 0, face_requester, 0, &cacheManager)) -+ { -+ std::cerr << "ERROR: Could not initliaze FreeType2 cache manager\n"; -+ exit(0); -+ } -+#if KFI_FT_IS_GE(2, 1, 8) -+ if(FTC_SBitCache_New(cacheManager, &sBitCache)) -+#else -+ if(FTC_SBit_Cache_New(cacheManager, &sBitCache)) -+#endif -+ { -+ std::cerr << "ERROR: Could not initliaze FreeType2 small bitmaps cache\n"; -+ exit(0); -+ } -+#if KFI_FT_IS_GE(2, 1, 8) -+ if(FTC_ImageCache_New(cacheManager, &imageCache)) -+#else -+ if(FTC_Image_Cache_New(cacheManager, &imageCache)) -+#endif -+ { -+ std::cerr << "ERROR: Could not initliaze FreeType2 glyph image cache\n"; -+ exit(0); -+ } - #endif - } diff --git a/x11/kdebase3/patches/patch-ai b/x11/kdebase3/patches/patch-ai deleted file mode 100644 index cf4e62b7ddb..00000000000 --- a/x11/kdebase3/patches/patch-ai +++ /dev/null @@ -1,80 +0,0 @@ -$NetBSD: patch-ai,v 1.11 2004/05/01 07:32:15 tron Exp $ - -Fixes build with Freetype-2.1.8, see: -http://webcvs.kde.org/cgi-bin/cvsweb.cgi/kdebase/kcontrol/kfontinst/lib/FontEngine.h - ---- kcontrol/kfontinst/lib/FontEngine.h 2003/11/29 01:41:14 1.5 -+++ kcontrol/kfontinst/lib/FontEngine.h 2004/04/27 20:30:25 1.5.2.1 -@@ -34,6 +34,7 @@ - #endif - - #include "Encodings.h" -+#include - #include - #include FT_FREETYPE_H - #include -@@ -50,6 +51,10 @@ - #include - #endif - -+// OK - some macros to make determining the FreeType version easier... -+#define KFI_FREETYPE_VERSION KDE_MAKE_VERSION(FREETYPE_MAJOR, FREETYPE_MINOR, FREETYPE_PATCH) -+#define KFI_FT_IS_GE(a,b,c) (KFI_FREETYPE_VERSION >= KDE_MAKE_VERSION(a,b,c)) -+ - class CFontEngine - { - public: -@@ -178,8 +183,15 @@ class CFontEngine - bool open; - #ifdef HAVE_FT_CACHE - FTC_Manager cacheManager; -+ -+#if KFI_FT_IS_GE(2, 1, 8) -+ FTC_ImageCache imageCache; -+ FTC_SBitCache sBitCache; -+#else - FTC_Image_Cache imageCache; - FTC_SBit_Cache sBitCache; -+#endif -+ - QPtrList ids; - unsigned char *buffer; - int bufferSize; -@@ -191,7 +203,8 @@ class CFontEngine - int width, - height, - greys, -- mod; -+ pitch; -+ bool mono; - unsigned char *buffer; - }; - -@@ -348,11 +361,25 @@ class CFontEngine - private: - - FTC_FaceID getId(const QString &f, int faceNo); -+ -+#if KFI_FT_IS_GE(2, 1, 8) -+ bool getGlyphBitmap(FTC_ImageTypeRec &font, FT_ULong index, Bitmap &target, int &left, int &top, -+ int &xAdvance, FT_Pointer *ptr); -+#else - bool getGlyphBitmap(FTC_Image_Desc &font, FT_ULong index, Bitmap &target, int &left, int &top, - int &xAdvance, FT_Pointer *ptr); -+#endif -+ - void align32(Bitmap &bmp); -- bool drawGlyph(QPixmap &pix, FTC_Image_Desc &font, FT_Size &size, int glyphNum, FT_F26Dot6 &x, FT_F26Dot6 &y, -+ -+#if KFI_FT_IS_GE(2, 1, 8) -+ bool drawGlyph(QPixmap &pix, FTC_ImageTypeRec &font, int glyphNum, FT_F26Dot6 &x, FT_F26Dot6 &y, - FT_F26Dot6 width, FT_F26Dot6 height, FT_F26Dot6 startX, FT_F26Dot6 stepY, int space=0); -+#else -+ bool drawGlyph(QPixmap &pix, FTC_Image_Desc &font, int glyphNum, FT_F26Dot6 &x, FT_F26Dot6 &y, -+ FT_F26Dot6 width, FT_F26Dot6 height, FT_F26Dot6 startX, FT_F26Dot6 stepY, int space=0); -+#endif -+ - #endif - - private: - -- cgit v1.2.3