rpms/kdelibs/F-9 kdelibs-4.0.4-kdesu.patch, NONE, 1.1 kdelibs.spec, 1.317, 1.318

[Lukas Tinkl (ltinkl)]

Author: ltinkl

Update of /cvs/extras/rpms/kdelibs/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28618

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.0.4-kdesu.patch 
Log Message:
fix #447840: Konquerorsu crash in KDE 4


kdelibs-4.0.4-kdesu.patch:

--- NEW FILE kdelibs-4.0.4-kdesu.patch ---
--- kdelibs/kdesu/client.cpp	2008/01/04 09:09:11	757128
+++ kdelibs/kdesu/client.cpp	2008/05/20 14:24:27	810350
@@ -55,7 +55,7 @@
     :d(new KDEsuClientPrivate)
 {
 #ifdef Q_WS_X11
-    QByteArray display(getenv("DISPLAY"));
+    QString display = QString::fromAscii(qgetenv("DISPLAY"));
     if (display.isEmpty())
     {
         kWarning(900) << k_lineinfo << "$DISPLAY is not set\n";
@@ -63,10 +63,7 @@
     }
 
     // strip the screen number from the display
-    while (QChar::fromLatin1(display.at(display.count() - 1)).isDigit())
-        display.chop(1);
-    if (display.endsWith('.'))
-        display.chop(1);
+    display.replace(QRegExp("\\.[0-9]+$"), "");
 #elif defined(Q_WS_QWS)
     QByteArray display("QWS");
 #else


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/F-9/kdelibs.spec,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -r1.317 -r1.318
--- kdelibs.spec	22 May 2008 18:43:42 -0000	1.317
+++ kdelibs.spec	23 May 2008 00:45:20 -0000	1.318
@@ -1,7 +1,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.0.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -86,6 +86,7 @@
 Patch17: kdelibs-4.0.4-remote-encoding.patch
 # forward port kstandarddirs hack to search /etc/kde
 Patch18: kdelibs-4.0.4-kstandarddirs.patch
+Patch19: kdelibs-4.0.4-kdesu.patch
 
 ## upstream patches
 
@@ -208,6 +209,7 @@
 %patch16 -p1 -b .phonon-hal
 %patch17 -p1 -b .remote-encoding
 %patch18 -p1 -b .kstandarddirs
+%patch19 -p1 -b .kdesu
 
 
 %build
@@ -365,6 +367,9 @@
 
 
 %changelog
+* Fri May 23 2008 Lukáš Tinkl <ltinkl at redhat.com> - 4.0.4-7
+- fix #447840: Konquerorsu crash in KDE 4
+
 * Thu May 22 2008 Rex Dieter <rdieter at fedoraproject.org> - 4.0.4-6
 - kstandarddirs hack to search /etc/kde