From d1e5da012acc6102e0ccb95271dc7ceb19a9958b Mon Sep 17 00:00:00 2001 From: markd Date: Sun, 11 Dec 2005 11:45:44 +0000 Subject: Update to KDE 3.5 Many new features and refinements. Notable changes include: * Konqueror is the second web browser to pass the Acid2 CSS test, ahead of Firefox and Internet Explorer * Konqueror can also now free web pages from adverts with its ad-block feature * SuperKaramba is included in KDE, providing well-integrated and easy-to-install widgets for the user's desktop * Kopete has support for MSN and Yahoo! webcams * The edutainment module has three new applications (KGeography, Kanagram and blinKen), and has seen huge improvements in Kalzium --- misc/kdeutils3/Makefile | 6 +- misc/kdeutils3/PLIST | 189 ++++++++++++++++++++++++++-------------- misc/kdeutils3/distinfo | 11 +-- misc/kdeutils3/patches/patch-ao | 75 +--------------- misc/kdeutils3/patches/patch-aq | 13 +++ 5 files changed, 150 insertions(+), 144 deletions(-) create mode 100644 misc/kdeutils3/patches/patch-aq diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile index 39676778006..bcef27a7242 100644 --- a/misc/kdeutils3/Makefile +++ b/misc/kdeutils3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2005/12/05 20:50:39 rillig Exp $ +# $NetBSD: Makefile,v 1.46 2005/12/11 11:45:44 markd Exp $ DISTNAME= kdeutils-${_KDE_VERSION} COMMENT= Utilities for the KDE integrated X11 desktop @@ -30,7 +30,11 @@ CPPFLAGS+= -DARK_TAR="\"${PREFIX.gtar}/bin/${GNU_PROGRAM_PREFIX}tar\"" CPPFLAGS+= -D__NetBSD_APM__ .endif +CONFIGURE_ARGS+= --with-pythondir=${LOCALBASE} + .include "../../meta-pkgs/kde3/kde3.mk" +.include "../../devel/gmp/buildlink3.mk" +.include "../../lang/python/application.mk" .include "../../x11/kdebase3/buildlink3.mk" .include "../../x11/kdelibs3/buildlink3.mk" diff --git a/misc/kdeutils3/PLIST b/misc/kdeutils3/PLIST index 890ec712532..61ebc8765d2 100644 --- a/misc/kdeutils3/PLIST +++ b/misc/kdeutils3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.15 2005/03/23 22:02:35 markd Exp $ +@comment $NetBSD: PLIST,v 1.16 2005/12/11 11:45:44 markd Exp $ bin/ark bin/irkick bin/kcalc @@ -16,6 +16,7 @@ bin/kregexpeditor bin/ktimer bin/kwalletmanager bin/kwikdisk +bin/superkaramba include/kmultiformlistbox.h include/kmultiformlistboxentry.h include/kmultiformlistboxfactory.h @@ -116,6 +117,7 @@ share/doc/kde/HTML/en/KRegExpEditor/wordboundary.png share/doc/kde/HTML/en/ark/common share/doc/kde/HTML/en/ark/index.cache.bz2 share/doc/kde/HTML/en/ark/index.docbook +share/doc/kde/HTML/en/ark/man-ark.1.docbook share/doc/kde/HTML/en/irkick/common share/doc/kde/HTML/en/irkick/index.cache.bz2 share/doc/kde/HTML/en/irkick/index.docbook @@ -179,8 +181,20 @@ share/doc/kde/HTML/en/ktimer/common share/doc/kde/HTML/en/ktimer/index.cache.bz2 share/doc/kde/HTML/en/ktimer/index.docbook share/doc/kde/HTML/en/kwallet/common +share/doc/kde/HTML/en/kwallet/cr22-action-wallet_closed.png +share/doc/kde/HTML/en/kwallet/cr22-action-wallet_open.png +share/doc/kde/HTML/en/kwallet/edit1.png +share/doc/kde/HTML/en/kwallet/edit2.png +share/doc/kde/HTML/en/kwallet/edit3.png share/doc/kde/HTML/en/kwallet/index.cache.bz2 share/doc/kde/HTML/en/kwallet/index.docbook +share/doc/kde/HTML/en/kwallet/kwalletmanager.png +share/doc/kde/HTML/en/kwallet/password1.png +share/doc/kde/HTML/en/kwallet/password2.png +share/doc/kde/HTML/en/superkaramba/common +share/doc/kde/HTML/en/superkaramba/index.cache.bz2 +share/doc/kde/HTML/en/superkaramba/index.docbook +share/kde/applnk/Utilities/superkaramba.desktop share/kde/apps/ark/ark_part.rc share/kde/apps/ark/ark_part_readonly.rc share/kde/apps/ark/arkui.rc @@ -188,10 +202,6 @@ share/kde/apps/ark/icons/crystalsvg/22x22/actions/ark_adddir.png share/kde/apps/ark/icons/crystalsvg/22x22/actions/ark_addfile.png share/kde/apps/ark/icons/crystalsvg/22x22/actions/ark_delete.png share/kde/apps/ark/icons/crystalsvg/22x22/actions/ark_extract.png -share/kde/apps/ark/icons/crystalsvg/22x22/actions/ark_help.png -share/kde/apps/ark/icons/crystalsvg/22x22/actions/ark_new.png -share/kde/apps/ark/icons/crystalsvg/22x22/actions/ark_open.png -share/kde/apps/ark/icons/crystalsvg/22x22/actions/ark_options.png share/kde/apps/ark/icons/crystalsvg/22x22/actions/ark_selectall.png share/kde/apps/ark/icons/crystalsvg/22x22/actions/ark_view.png share/kde/apps/ark/icons/crystalsvg/32x32/actions/ark_adddir.png @@ -275,6 +285,7 @@ share/kde/apps/klaptopdaemon/icons/crystalsvg/22x22/actions/laptop_power.png share/kde/apps/klaptopdaemon/icons/crystalsvg/32x32/actions/power.png share/kde/apps/konqueror/servicemenus/encryptfile.desktop share/kde/apps/konqueror/servicemenus/encryptfolder.desktop +share/kde/apps/konqueror/servicemenus/floppy_format.desktop share/kde/apps/kregexpeditor/pics/altn.png share/kde/apps/kregexpeditor/pics/anychar.png share/kde/apps/kregexpeditor/pics/autoverify.png @@ -334,6 +345,7 @@ share/kde/apps/remotes/hauppauge.remote.xml share/kde/apps/remotes/remote.dtd share/kde/apps/remotes/sherwood.remote.xml share/kde/apps/remotes/sonytv.remote.xml +share/kde/apps/superkaramba/superkarambaui.rc share/kde/autostart/irkick.desktop share/kde/autostart/kgpg.desktop share/kde/config.kcfg/ark.kcfg @@ -342,85 +354,109 @@ share/kde/config.kcfg/kedit.kcfg share/kde/config.kcfg/kgpg.kcfg share/kde/config.kcfg/kjots.kcfg share/kde/config/ksim_panelextensionrc -share/kde/icons/crystalsvg/128x128/apps/ark.png -share/kde/icons/crystalsvg/128x128/apps/kdf.png -share/kde/icons/crystalsvg/128x128/apps/kfloppy.png -share/kde/icons/crystalsvg/128x128/apps/kregexpeditor.png -share/kde/icons/crystalsvg/128x128/apps/ktimer.png -share/kde/icons/crystalsvg/128x128/apps/kwalletmanager.png -share/kde/icons/crystalsvg/128x128/apps/kwikdisk.png share/kde/icons/crystalsvg/128x128/apps/laptop_battery.png -share/kde/icons/crystalsvg/16x16/apps/ark.png -share/kde/icons/crystalsvg/16x16/apps/kcalc.png -share/kde/icons/crystalsvg/16x16/apps/kcharselect.png +share/kde/icons/crystalsvg/128x128/apps/superkaramba.png +share/kde/icons/crystalsvg/128x128/mimetypes/superkaramba_theme.png share/kde/icons/crystalsvg/16x16/apps/kcmdf.png -share/kde/icons/crystalsvg/16x16/apps/kdf.png -share/kde/icons/crystalsvg/16x16/apps/kedit.png -share/kde/icons/crystalsvg/16x16/apps/kfloppy.png -share/kde/icons/crystalsvg/16x16/apps/kgpg.png -share/kde/icons/crystalsvg/16x16/apps/khexedit.png -share/kde/icons/crystalsvg/16x16/apps/kjots.png -share/kde/icons/crystalsvg/16x16/apps/kregexpeditor.png share/kde/icons/crystalsvg/16x16/apps/ksim.png -share/kde/icons/crystalsvg/16x16/apps/ktimer.png -share/kde/icons/crystalsvg/16x16/apps/kwalletmanager.png -share/kde/icons/crystalsvg/16x16/apps/kwikdisk.png share/kde/icons/crystalsvg/16x16/apps/laptop_battery.png share/kde/icons/crystalsvg/16x16/apps/laptop_pcmcia.png +share/kde/icons/crystalsvg/16x16/apps/superkaramba.png share/kde/icons/crystalsvg/16x16/devices/ksim_cpu.png -share/kde/icons/crystalsvg/22x22/apps/kgpg.png -share/kde/icons/crystalsvg/22x22/apps/kwalletmanager.png -share/kde/icons/crystalsvg/22x22/apps/kwikdisk.png -share/kde/icons/crystalsvg/32x32/apps/ark.png -share/kde/icons/crystalsvg/32x32/apps/kcalc.png +share/kde/icons/crystalsvg/16x16/mimetypes/superkaramba_theme.png +share/kde/icons/crystalsvg/22x22/apps/kcmdf.png +share/kde/icons/crystalsvg/22x22/apps/superkaramba.png +share/kde/icons/crystalsvg/22x22/mimetypes/superkaramba_theme.png share/kde/icons/crystalsvg/32x32/apps/kcmdf.png -share/kde/icons/crystalsvg/32x32/apps/kdf.png -share/kde/icons/crystalsvg/32x32/apps/kedit.png -share/kde/icons/crystalsvg/32x32/apps/kfloppy.png -share/kde/icons/crystalsvg/32x32/apps/kgpg.png -share/kde/icons/crystalsvg/32x32/apps/khexedit.png -share/kde/icons/crystalsvg/32x32/apps/kjots.png -share/kde/icons/crystalsvg/32x32/apps/kregexpeditor.png share/kde/icons/crystalsvg/32x32/apps/ksim.png -share/kde/icons/crystalsvg/32x32/apps/ktimer.png -share/kde/icons/crystalsvg/32x32/apps/kwalletmanager.png -share/kde/icons/crystalsvg/32x32/apps/kwikdisk.png share/kde/icons/crystalsvg/32x32/apps/laptop_battery.png share/kde/icons/crystalsvg/32x32/apps/laptop_pcmcia.png -share/kde/icons/crystalsvg/48x48/apps/ark.png -share/kde/icons/crystalsvg/48x48/apps/kcalc.png -share/kde/icons/crystalsvg/48x48/apps/kcharselect.png -share/kde/icons/crystalsvg/48x48/apps/kdf.png -share/kde/icons/crystalsvg/48x48/apps/kedit.png -share/kde/icons/crystalsvg/48x48/apps/kfloppy.png -share/kde/icons/crystalsvg/48x48/apps/kgpg.png -share/kde/icons/crystalsvg/48x48/apps/khexedit.png -share/kde/icons/crystalsvg/48x48/apps/kjots.png -share/kde/icons/crystalsvg/48x48/apps/kregexpeditor.png +share/kde/icons/crystalsvg/32x32/apps/superkaramba.png +share/kde/icons/crystalsvg/32x32/mimetypes/superkaramba_theme.png share/kde/icons/crystalsvg/48x48/apps/ksim.png -share/kde/icons/crystalsvg/48x48/apps/ktimer.png -share/kde/icons/crystalsvg/48x48/apps/kwalletmanager.png -share/kde/icons/crystalsvg/48x48/apps/kwikdisk.png share/kde/icons/crystalsvg/48x48/apps/laptop_battery.png share/kde/icons/crystalsvg/48x48/apps/laptop_pcmcia.png -share/kde/icons/crystalsvg/64x64/apps/ark.png -share/kde/icons/crystalsvg/64x64/apps/kcalc.png -share/kde/icons/crystalsvg/64x64/apps/kdf.png -share/kde/icons/crystalsvg/64x64/apps/kedit.png -share/kde/icons/crystalsvg/64x64/apps/kfloppy.png -share/kde/icons/crystalsvg/64x64/apps/kjots.png -share/kde/icons/crystalsvg/64x64/apps/kregexpeditor.png -share/kde/icons/crystalsvg/64x64/apps/kwalletmanager.png -share/kde/icons/crystalsvg/64x64/apps/kwikdisk.png +share/kde/icons/crystalsvg/48x48/apps/superkaramba.png +share/kde/icons/crystalsvg/48x48/mimetypes/superkaramba_theme.png share/kde/icons/crystalsvg/64x64/apps/laptop_battery.png -share/kde/icons/crystalsvg/scalable/apps/ark.svgz -share/kde/icons/crystalsvg/scalable/apps/kcalc.svgz +share/kde/icons/crystalsvg/64x64/apps/superkaramba.png +share/kde/icons/crystalsvg/64x64/mimetypes/superkaramba_theme.png share/kde/icons/crystalsvg/scalable/apps/laptop_battery.svgz +share/kde/icons/crystalsvg/scalable/apps/superkaramba.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/superkaramba_theme.svgz +share/kde/icons/hicolor/128x128/apps/ark.png +share/kde/icons/hicolor/128x128/apps/kdf.png +share/kde/icons/hicolor/128x128/apps/kfloppy.png +share/kde/icons/hicolor/128x128/apps/kregexpeditor.png +share/kde/icons/hicolor/128x128/apps/ktimer.png +share/kde/icons/hicolor/128x128/apps/kwalletmanager.png +share/kde/icons/hicolor/128x128/apps/kwikdisk.png +share/kde/icons/hicolor/16x16/apps/ark.png share/kde/icons/hicolor/16x16/apps/irkick.png +share/kde/icons/hicolor/16x16/apps/kcalc.png +share/kde/icons/hicolor/16x16/apps/kcharselect.png +share/kde/icons/hicolor/16x16/apps/kdf.png +share/kde/icons/hicolor/16x16/apps/kedit.png +share/kde/icons/hicolor/16x16/apps/kfloppy.png +share/kde/icons/hicolor/16x16/apps/kgpg.png +share/kde/icons/hicolor/16x16/apps/khexedit.png +share/kde/icons/hicolor/16x16/apps/kjots.png +share/kde/icons/hicolor/16x16/apps/kregexpeditor.png +share/kde/icons/hicolor/16x16/apps/ktimer.png +share/kde/icons/hicolor/16x16/apps/kwalletmanager.png +share/kde/icons/hicolor/16x16/apps/kwikdisk.png +share/kde/icons/hicolor/22x22/apps/ark.png share/kde/icons/hicolor/22x22/apps/irkick.png +share/kde/icons/hicolor/22x22/apps/kcalc.png +share/kde/icons/hicolor/22x22/apps/kdf.png +share/kde/icons/hicolor/22x22/apps/kedit.png +share/kde/icons/hicolor/22x22/apps/kfloppy.png +share/kde/icons/hicolor/22x22/apps/kgpg.png +share/kde/icons/hicolor/22x22/apps/kjots.png +share/kde/icons/hicolor/22x22/apps/kregexpeditor.png +share/kde/icons/hicolor/22x22/apps/kwalletmanager.png +share/kde/icons/hicolor/22x22/apps/kwikdisk.png +share/kde/icons/hicolor/32x32/apps/ark.png share/kde/icons/hicolor/32x32/apps/irkick.png +share/kde/icons/hicolor/32x32/apps/kcalc.png +share/kde/icons/hicolor/32x32/apps/kcharselect.png +share/kde/icons/hicolor/32x32/apps/kdf.png +share/kde/icons/hicolor/32x32/apps/kedit.png +share/kde/icons/hicolor/32x32/apps/kfloppy.png +share/kde/icons/hicolor/32x32/apps/kgpg.png +share/kde/icons/hicolor/32x32/apps/khexedit.png +share/kde/icons/hicolor/32x32/apps/kjots.png +share/kde/icons/hicolor/32x32/apps/kregexpeditor.png +share/kde/icons/hicolor/32x32/apps/ktimer.png +share/kde/icons/hicolor/32x32/apps/kwalletmanager.png +share/kde/icons/hicolor/32x32/apps/kwikdisk.png +share/kde/icons/hicolor/48x48/apps/ark.png +share/kde/icons/hicolor/48x48/apps/kcalc.png +share/kde/icons/hicolor/48x48/apps/kcharselect.png +share/kde/icons/hicolor/48x48/apps/kdf.png +share/kde/icons/hicolor/48x48/apps/kedit.png +share/kde/icons/hicolor/48x48/apps/kfloppy.png +share/kde/icons/hicolor/48x48/apps/kgpg.png +share/kde/icons/hicolor/48x48/apps/khexedit.png +share/kde/icons/hicolor/48x48/apps/kjots.png +share/kde/icons/hicolor/48x48/apps/kregexpeditor.png +share/kde/icons/hicolor/48x48/apps/ktimer.png +share/kde/icons/hicolor/48x48/apps/kwalletmanager.png +share/kde/icons/hicolor/48x48/apps/kwikdisk.png +share/kde/icons/hicolor/64x64/apps/ark.png +share/kde/icons/hicolor/64x64/apps/kcalc.png +share/kde/icons/hicolor/64x64/apps/kdf.png +share/kde/icons/hicolor/64x64/apps/kedit.png +share/kde/icons/hicolor/64x64/apps/kfloppy.png +share/kde/icons/hicolor/64x64/apps/kjots.png +share/kde/icons/hicolor/64x64/apps/kregexpeditor.png +share/kde/icons/hicolor/64x64/apps/kwalletmanager.png +share/kde/icons/hicolor/64x64/apps/kwikdisk.png +share/kde/icons/hicolor/scalable/apps/ark.svgz +share/kde/icons/hicolor/scalable/apps/kcalc.svgz share/kde/icons/locolor/16x16/apps/irkick.png share/kde/icons/locolor/32x32/apps/irkick.png +share/kde/mimelnk/application/x-superkaramba.desktop share/kde/services/ark_part.desktop share/kde/services/kbyteseditwidget.desktop share/kde/services/kded/klaptopdaemon.desktop @@ -438,22 +474,35 @@ share/kde/servicetypes/kmilo/kmilopluginsvc.desktop @dirrm share/kde/services/kmilo @comment in kde: @dirrm share/kde/services/kded @comment in kde: @dirrm share/kde/services +@comment in kde: @dirrm share/kde/mimelnk/application @comment in kde: @dirrm share/kde/icons/locolor/32x32/apps @comment in kde: @dirrm share/kde/icons/locolor/16x16/apps +@comment in kde: @dirrm share/kde/icons/hicolor/scalable/apps +@comment in kde: @dirrm share/kde/icons/hicolor/64x64/apps +@comment in kde: @dirrm share/kde/icons/hicolor/48x48/apps @comment in kde: @dirrm share/kde/icons/hicolor/32x32/apps @comment in kde: @dirrm share/kde/icons/hicolor/22x22/apps @comment in kde: @dirrm share/kde/icons/hicolor/16x16/apps +@comment in kde: @dirrm share/kde/icons/hicolor/128x128/apps +@comment in kde: @dirrm share/kde/icons/crystalsvg/scalable/mimetypes @comment in kde: @dirrm share/kde/icons/crystalsvg/scalable/apps +@comment in kde: @dirrm share/kde/icons/crystalsvg/64x64/mimetypes @comment in kde: @dirrm share/kde/icons/crystalsvg/64x64/apps +@comment in kde: @dirrm share/kde/icons/crystalsvg/48x48/mimetypes @comment in kde: @dirrm share/kde/icons/crystalsvg/48x48/apps +@comment in kde: @dirrm share/kde/icons/crystalsvg/32x32/mimetypes @comment in kde: @dirrm share/kde/icons/crystalsvg/32x32/apps +@comment in kde: @dirrm share/kde/icons/crystalsvg/22x22/mimetypes @comment in kde: @dirrm share/kde/icons/crystalsvg/22x22/apps +@comment in kde: @dirrm share/kde/icons/crystalsvg/16x16/mimetypes @comment in kde: @dirrm share/kde/icons/crystalsvg/16x16/devices @comment in kde: @dirrm share/kde/icons/crystalsvg/16x16/apps +@comment in kde: @dirrm share/kde/icons/crystalsvg/128x128/mimetypes @comment in kde: @dirrm share/kde/icons/crystalsvg/128x128/apps @comment in kde: @dirrm share/kde/config.kcfg @comment in kde: @dirrm share/kde/config @comment in kde: @dirrm share/kde/autostart +@dirrm share/kde/apps/superkaramba @dirrm share/kde/apps/remotes @comment in kde: @dirrm share/kde/apps/profiles @dirrm share/kde/apps/kwalletmanager/icons/crystalsvg/22x22/actions @@ -519,6 +568,8 @@ share/kde/servicetypes/kmilo/kmilopluginsvc.desktop @dirrm share/kde/apps/ark/icons @dirrm share/kde/apps/ark @comment in kde: @dirrm share/kde/apps +@comment in kde: @dirrm share/kde/applnk/Utilities +@dirrm share/doc/kde/HTML/en/superkaramba @dirrm share/doc/kde/HTML/en/kwallet @dirrm share/doc/kde/HTML/en/ktimer @dirrm share/doc/kde/HTML/en/ksim @@ -530,6 +581,16 @@ share/kde/servicetypes/kmilo/kmilopluginsvc.desktop @dirrm share/doc/kde/HTML/en/kfloppy @dirrm share/doc/kde/HTML/en/kedit @dirrm share/doc/kde/HTML/en/kdf +@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdeutils-apidocs/superkaramba/html +@dirrm share/doc/kde/HTML/en/kdeutils-apidocs/superkaramba/html +@dirrm share/doc/kde/HTML/en/kdeutils-apidocs/superkaramba +@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdeutils-apidocs/kcalc/knumber/html +@dirrm share/doc/kde/HTML/en/kdeutils-apidocs/kcalc/knumber/html +@dirrm share/doc/kde/HTML/en/kdeutils-apidocs/kcalc/knumber +@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdeutils-apidocs/kcalc/html +@dirrm share/doc/kde/HTML/en/kdeutils-apidocs/kcalc/html +@dirrm share/doc/kde/HTML/en/kdeutils-apidocs/kcalc +@dirrm share/doc/kde/HTML/en/kdeutils-apidocs @dirrm share/doc/kde/HTML/en/kcontrol/powerctrl @dirrm share/doc/kde/HTML/en/kcontrol/laptop @dirrm share/doc/kde/HTML/en/kcontrol/kcmlowbatwarn diff --git a/misc/kdeutils3/distinfo b/misc/kdeutils3/distinfo index 33af417d121..9993dd719fa 100644 --- a/misc/kdeutils3/distinfo +++ b/misc/kdeutils3/distinfo @@ -1,10 +1,11 @@ -$NetBSD: distinfo,v 1.34 2005/10/13 13:14:15 markd Exp $ +$NetBSD: distinfo,v 1.35 2005/12/11 11:45:44 markd Exp $ -SHA1 (kdeutils-3.4.3.tar.bz2) = 095a31fd24ebb2f3933f0e321fbda62d0ff8df09 -RMD160 (kdeutils-3.4.3.tar.bz2) = 40573e15b003426cb09963edc212746dfc22c678 -Size (kdeutils-3.4.3.tar.bz2) = 2257060 bytes +SHA1 (kdeutils-3.5.0.tar.bz2) = 194d20c78d61b41dda6c3a6f55f0e10b4718d0a8 +RMD160 (kdeutils-3.5.0.tar.bz2) = 0638cc14a1db465a05eaf915da62d1993a44f461 +Size (kdeutils-3.5.0.tar.bz2) = 2958132 bytes SHA1 (patch-ac) = 9b31039b0e3cc05dc4fb288ee8f66ebf3e440f6e SHA1 (patch-ad) = ad4fcdda6f9fc1b91e1f125421800e412e2ee0aa SHA1 (patch-an) = e13957a9fa0d23aebbe149ecaca7b9dacde5c9fb -SHA1 (patch-ao) = e6998991444af6becbe89b674728080a27e7a0f1 +SHA1 (patch-ao) = b05b590635c258edc4db37851ac1635b5d9c9d39 SHA1 (patch-ap) = 5058d3777d03f0ba18047592849c28bd318019ab +SHA1 (patch-aq) = a76ff5042c3dec821026f512f6e83f5a3eaa3d91 diff --git a/misc/kdeutils3/patches/patch-ao b/misc/kdeutils3/patches/patch-ao index b235ab081e4..194ff7808fa 100644 --- a/misc/kdeutils3/patches/patch-ao +++ b/misc/kdeutils3/patches/patch-ao @@ -1,80 +1,7 @@ -$NetBSD: patch-ao,v 1.10 2004/05/05 23:56:08 markd Exp $ +$NetBSD: patch-ao,v 1.11 2005/12/11 11:45:44 markd Exp $ --- configure.orig 2004-04-06 02:55:31.000000000 +1200 +++ configure -@@ -26498,72 +26498,6 @@ _ACEOF - - - -- echo "$as_me:$LINENO: checking sizeof size_t == sizeof unsigned long" >&5 --echo $ECHO_N "checking sizeof size_t == sizeof unsigned long... $ECHO_C" >&6 -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --int --main () --{ -- -- #if SIZEOF_SIZE_T != SIZEOF_UNSIGNED_LONG -- choke me -- #endif -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -- { { echo "$as_me:$LINENO: error: -- Apparently on your system our assumption sizeof size_t == sizeof unsigned long -- does not apply. Please mail kde-devel@kde.org with a description of your system! -- " >&5 --echo "$as_me: error: -- Apparently on your system our assumption sizeof size_t == sizeof unsigned long -- does not apply. Please mail kde-devel@kde.org with a description of your system! -- " >&2;} -- { (exit 1); exit 1; }; } -- --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -- -- - # darwin needs this to initialize the environment - - for ac_header in crt_externs.h @@ -32333,6 +32267,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ diff --git a/misc/kdeutils3/patches/patch-aq b/misc/kdeutils3/patches/patch-aq new file mode 100644 index 00000000000..e09da77c8bd --- /dev/null +++ b/misc/kdeutils3/patches/patch-aq @@ -0,0 +1,13 @@ +$NetBSD: patch-aq,v 1.1 2005/12/11 11:45:44 markd Exp $ + +--- superkaramba/src/sensorsensor.h.orig 2005-12-09 01:20:39.000000000 +1300 ++++ superkaramba/src/sensorsensor.h +@@ -33,7 +33,7 @@ private: + QString extraParams; + + QMap sensorMap; +-#ifdef __FreeBSD__ ++#if defined __FreeBSD__ || defined(Q_OS_NETBSD) + QMap sensorMapBSD; + #endif + QString sensorResult; -- cgit v1.2.3