rpms/kdebase-runtime/F-10 kdebase-runtime-4.3.1-fish.patch, NONE, 1.1 kdebase-runtime.spec, 1.93, 1.94

[Lukas Tinkl]

Author: ltinkl

Update of /cvs/extras/rpms/kdebase-runtime/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11815/F-10

Modified Files:
	kdebase-runtime.spec 
Added Files:
	kdebase-runtime-4.3.1-fish.patch 
Log Message:
unbreak fish KIO slave :o)


kdebase-runtime-4.3.1-fish.patch:
 fish.cpp |   22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

--- NEW FILE kdebase-runtime-4.3.1-fish.patch ---
Index: kioslave/fish/fish.cpp
===================================================================
--- kioslave/fish/fish.cpp	(revision 1010372)
+++ kioslave/fish/fish.cpp	(working copy)
@@ -518,8 +518,7 @@
             myDebug( << "select failed, rc: " << rc << ", error: " << strerror(errno) << endl);
             return true;
         }
-        while (FD_ISSET(childFd,&wfds) && outBufPos >= 0) 
-	{
+        if (FD_ISSET(childFd,&wfds) && outBufPos >= 0) {
             if (outBuf) rc = ::write(childFd,outBuf+outBufPos,outBufLen-outBufPos);
             else rc = 0;
             if (rc >= 0) outBufPos += rc;
@@ -536,8 +535,7 @@
                 outBufLen = 0;
             }
         }
-        if (FD_ISSET(childFd,&rfds)) 
-	{
+        else if (FD_ISSET(childFd,&rfds)) {
             rc = ::read(childFd,buf+offset,32768-offset);
             if (rc > 0) {
                 int noff = establishConnection(buf,rc+offset);
@@ -1445,19 +1443,13 @@
                 shutdownConnection();
                 return;
             }
-	    // We first write the complete buffer, including all newlines.
-	    // Do: send command and newlines, expect response then
-	    // Do not: send commands, expect response, send newlines, expect response on newlines
-	    // Newlines do not trigger a response.
-            while (FD_ISSET(childFd,&wfds) && outBufPos >= 0) 
-	    {
+            if (FD_ISSET(childFd,&wfds) && outBufPos >= 0) {
 #else
-            while (outBufPos >= 0) 
-	    {
+            if (outBufPos >= 0) {
 #endif
 #if 0
                 QString debug = QString::fromLatin1(outBuf+outBufPos,outBufLen-outBufPos);
-                myDebug( << "now writing " << (outBufLen-outBufPos) << " " << debug << endl);
+                myDebug( << "now writing " << (outBufLen-outBufPos) << " " << debug.left(40) << "..." << endl);
 #endif
 #ifndef Q_WS_WIN
                 if (outBufLen-outBufPos > 0) rc = ::write(childFd,outBuf+outBufPos,outBufLen-outBufPos);
@@ -1487,10 +1479,10 @@
                 }
             }
 #ifndef Q_WS_WIN
-            if (FD_ISSET(childFd,&rfds)) {
+            else if (FD_ISSET(childFd,&rfds)) {
                 rc = ::read(childFd,buf+offset,32768-offset);
 #else
-            if (childPid->waitForReadyRead(1000)) {
+            else if (childPid->waitForReadyRead(1000)) {
                 rc = childPid->read(buf+offset,32768-offset);
 #endif
                 //myDebug( << "read " << rc << " bytes" << endl);


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-10/kdebase-runtime.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- kdebase-runtime.spec	10 Aug 2009 16:46:16 -0000	1.93
+++ kdebase-runtime.spec	12 Aug 2009 11:41:26 -0000	1.94
@@ -5,7 +5,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.3.0
-Release:       3%{?dist}
+Release:       4%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -27,6 +27,8 @@ Patch4:        kdebase-runtime-4.3.0-nep
 Patch5:        kdebase-runtime-4.3.1-comborender.patch
 # http://websvn.kde.org/?view=rev&revision=1008861
 Patch6:        kdebase-runtime-4.3.1-kcmlocalecrash.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=516416
+Patch7:        kdebase-runtime-4.3.1-fish.patch
 
 # when kdesu was removed, this is/should-be only temporary
 %if 0%{?fedora} < 11
@@ -102,6 +104,7 @@ BuildArch: noarch
 %patch4 -p1 -b .nepomuk-autostart
 %patch5 -p0 -b .comborender
 %patch6 -p0 -b .kcmlocalecrash
+%patch7 -p0 -b .fish
 
 %build
 mkdir -p %{_target_platform}
@@ -221,6 +224,9 @@ fi
 
 
 %changelog
+* Wed Aug 12 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.3.0-4
+- unbreak fish kioslave protocol (#516416)
+
 * Mon Aug 10 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.3.0-3
 - fix Oxygen comboboxes' text being garbled (drawn twice); fixes kdebug:202701
 - fix Locale control module crashing when dragging languages around (kdebug:201578)