From 4c401a88dfbbadda4c57eb912e622aa926730ac8 Mon Sep 17 00:00:00 2001 From: markd Date: Thu, 10 Jun 2004 11:39:50 +0000 Subject: Update to kde 3.2.3 Changes: * general: More and better usage of icons in different widgets * kiosk: Support for user profiles * kfile: directory chooser dialog now hides hidden directories, added context option to show * uiserver: Fix KIO: Progress Dialog - 'Keep open' + 'Open File' - Problems * kwallet: Keep KWallet's password dialog above other windows --- x11/kdelibs3/Makefile | 3 +-- x11/kdelibs3/distinfo | 9 +++------ x11/kdelibs3/patches/patch-ab | 21 --------------------- x11/kdelibs3/patches/patch-ah | 18 ------------------ x11/kdelibs3/patches/patch-ai | 31 ------------------------------- 5 files changed, 4 insertions(+), 78 deletions(-) delete mode 100644 x11/kdelibs3/patches/patch-ab delete mode 100644 x11/kdelibs3/patches/patch-ah delete mode 100644 x11/kdelibs3/patches/patch-ai (limited to 'x11') diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index 676e5505783..1310748f855 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.60 2004/05/17 00:03:39 markd Exp $ +# $NetBSD: Makefile,v 1.61 2004/06/10 11:39:50 markd Exp $ DISTNAME= kdelibs-${_KDE_VERSION} -PKGREVISION= 2 CATEGORIES= x11 COMMENT= Support libraries for the KDE integrated X11 desktop diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo index bb7caa73c80..63e28448661 100644 --- a/x11/kdelibs3/distinfo +++ b/x11/kdelibs3/distinfo @@ -1,15 +1,12 @@ -$NetBSD: distinfo,v 1.37 2004/05/17 00:03:40 markd Exp $ +$NetBSD: distinfo,v 1.38 2004/06/10 11:39:50 markd Exp $ -SHA1 (kdelibs-3.2.2.tar.bz2) = 74899bccba17b1d6475cc1b154a03d462ef02e1f -Size (kdelibs-3.2.2.tar.bz2) = 12716460 bytes +SHA1 (kdelibs-3.2.3.tar.bz2) = 33df00cb44694db306c29504f6ee5f3bd4a71c7d +Size (kdelibs-3.2.3.tar.bz2) = 12737024 bytes SHA1 (patch-aa) = be278f29b743c573b71c7804eff26324e78ed779 -SHA1 (patch-ab) = 1ebea4ea8b38f26e90f217ca7c3c209148b9e282 SHA1 (patch-ad) = fc3a7b173dc93bad196fff3ddd9aef65c92dda64 SHA1 (patch-ae) = 238f16203cd101a5944ff01aa965956392c5b16d SHA1 (patch-af) = 7fbb3abcbf56020e3827ddf9d056beab9d1f3cd7 SHA1 (patch-ag) = e471fdf5428e0f515ef3fe5427622854886ef952 -SHA1 (patch-ah) = d267babaefa3492ff8959d0018c2e0168a873226 -SHA1 (patch-ai) = 06e04841d3198537482a268cb87c613e18cf0f8f SHA1 (patch-an) = 41d2721bd55d060cde630771dad0377dbe770d73 SHA1 (patch-bc) = 434a48d290aa9716b8c6e372419460ebd33cf8ea SHA1 (patch-bd) = f233a73d0a8148e1ae7f4e777c3f5d50b56d768f diff --git a/x11/kdelibs3/patches/patch-ab b/x11/kdelibs3/patches/patch-ab deleted file mode 100644 index 7781d37094b..00000000000 --- a/x11/kdelibs3/patches/patch-ab +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ab,v 1.9 2004/04/21 13:23:57 markd Exp $ - -Use of tainted arguments in exec is deprecated at /var/www/cgi-bin/cvsweb.cgi line 2043. -=================================================================== -RCS file: /home2/webcvs/mirror/kdelibs/kdesu/su.cpp,v -retrieving revision 1.32.2.2 -retrieving revision 1.32.2.3 -diff -u -p -r1.32.2.2 -r1.32.2.3 ---- kdesu/su.cpp 2004/03/26 23:26:45 1.32.2.2 -+++ kdesu/su.cpp 2004/04/13 13:32:27 1.32.2.3 -@@ -78,9 +78,9 @@ int SuProcess::exec(const char *password - args += "root"; - else - args += m_User; -- args += "-"; - args += "-c"; - args += QCString(__KDE_BINDIR) + "/kdesu_stub"; -+ args += "-"; - - QCString command = __PATH_SU; - if (::access(__PATH_SU, X_OK) != 0) diff --git a/x11/kdelibs3/patches/patch-ah b/x11/kdelibs3/patches/patch-ah deleted file mode 100644 index 916767b392e..00000000000 --- a/x11/kdelibs3/patches/patch-ah +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ah,v 1.4 2004/05/17 00:03:39 markd Exp $ - -Index: kapplication.cpp -=================================================================== -RCS file: /home/kde/kdelibs/kdecore/kapplication.cpp,v -retrieving revision 1.637.2.8 -diff -u -p -r1.637.2.8 kapplication.cpp ---- kdecore/kapplication.cpp 8 Apr 2004 09:56:28 -0000 1.637.2.8 -+++ kdecore/kapplication.cpp 14 May 2004 12:24:53 -0000 -@@ -2172,7 +2172,7 @@ void KApplication::invokeMailer(const QS - - if (command.isEmpty() || command == QString::fromLatin1("kmail") - || command.endsWith("/kmail")) -- command = QString::fromLatin1("kmail --composer -s %s -c %c -b %b --body %B --attach %A %t"); -+ command = QString::fromLatin1("kmail --composer -s %s -c %c -b %b --body %B --attach %A -- %t"); - - // TODO: Take care of the preferred terminal app (instead of hardcoding - // Konsole), this will probably require a rewrite of the configurable diff --git a/x11/kdelibs3/patches/patch-ai b/x11/kdelibs3/patches/patch-ai deleted file mode 100644 index c8c575e4519..00000000000 --- a/x11/kdelibs3/patches/patch-ai +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ai,v 1.4 2004/05/17 00:03:39 markd Exp $ - -Index: ktelnetservice.cpp -=================================================================== -RCS file: /home/kde/kdelibs/kio/misc/ktelnetservice.cpp,v -retrieving revision 1.7.2.1 -diff -u -p -r1.7.2.1 ktelnetservice.cpp ---- kio/misc/ktelnetservice.cpp 18 Feb 2004 11:42:12 -0000 1.7.2.1 -+++ kio/misc/ktelnetservice.cpp 13 May 2004 15:12:14 -0000 -@@ -77,10 +77,19 @@ int main(int argc, char **argv) - cmd << url.user(); - } - -+ QString host; - if (!url.host().isEmpty()) -- cmd << url.host(); // telnet://host -+ host = url.host(); // telnet://host - else if (!url.path().isEmpty()) -- cmd << url.path(); // telnet:host -+ host = url.path(); // telnet:host -+ -+ if (host.isEmpty() || host.startsWith("-")) -+ { -+ kdError() << "Invalid hostname " << host << endl; -+ return 2; -+ } -+ -+ cmd << host; - - if (url.port()){ - if ( url.protocol() == "ssh" ) -- cgit v1.2.3