rpms/kdevelop/devel fix_missing_output_kdev3.5.1, NONE, 1.1 kdevelop.spec, 1.70, 1.71

[Than Ngo (than)]

Author: than

Update of /cvs/extras/rpms/kdevelop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25519

Modified Files:
	kdevelop.spec 
Added Files:
	fix_missing_output_kdev3.5.1 
Log Message:
apply upstream patch to fix outputview



--- NEW FILE fix_missing_output_kdev3.5.1 ---
Index: parts/outputviews/makewidget.cpp
===================================================================
--- parts/outputviews/makewidget.cpp	(Revision 780035)
+++ parts/outputviews/makewidget.cpp	(Revision 780036)
@@ -532,28 +532,31 @@
 {
     QString sline;
     bool forceCLocale = KConfigGroup( kapp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true );
+    
     if( forceCLocale )
         sline = QString::fromAscii( stdoutbuf+line );
     else
         sline = QString::fromLocal8Bit( stdoutbuf+line );
-    stdoutbuf.truncate(0);
 
     if ( !appendToLastLine( sline ) )
         m_directoryStatusFilter.processLine( sline );
+    stdoutbuf.truncate(0);
 }
 
 void MakeWidget::insertStderrLine( const QCString& line )
 {
     QString sline;
     bool forceCLocale = KConfigGroup( kapp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true );
+    
     if( forceCLocale ) {
         sline = QString( stderrbuf+line );
     }
     else
         sline = QString::fromLocal8Bit( stderrbuf+line );
+    
+    if ( !appendToLastLine( sline ) )
+        m_errorFilter.processLine( sline );
     stderrbuf.truncate(0);
-    if ( !appendToLastLine( line ) )
-        m_errorFilter.processLine( line );
 }
 
 void MakeWidget::slotProcessExited(KProcess *)
@@ -832,7 +835,7 @@
 
 void MakeWidget::storePartialStdoutLine(const QCString & line)
 {
-    stderrbuf += line;
+    stdoutbuf += line;
 }
 
 #include "makewidget.moc"


Index: kdevelop.spec
===================================================================
RCS file: /cvs/extras/rpms/kdevelop/devel/kdevelop.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- kdevelop.spec	15 Feb 2008 10:17:36 -0000	1.70
+++ kdevelop.spec	28 Feb 2008 16:49:53 -0000	1.71
@@ -16,7 +16,7 @@
 Summary: Integrated Development Environment for C++/C
 Epoch:   9
 Version: 3.5.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 URL: http://www.kdevelop.org/
@@ -31,6 +31,7 @@
 Patch3: kdevelop-3.5.0-svn.patch
 
 #upstream patches
+Patch100: fix_missing_output_kdev3.5.1
 
 Provides: kdevelop3 = %{version}-%{release}
 
@@ -132,6 +133,8 @@
 %patch2 -p1 -b .doc
 %patch3 -p1 -b .svn
 
+%patch100 -p0 -b .output
+
 %if %{make_cvs}
   rm -rf c_cpp_reference-2.0.2_for_KDE_3.0/admin
   cp -a admin c_cpp_reference-2.0.2_for_KDE_3.0/
@@ -240,6 +243,9 @@
 
 
 %changelog
+* Thu Feb 28 2008 Than Ngo <than at redhat.com> 3.5.1-2
+- apply upstream patch to fix outputview
+
 * Fri Feb 15 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 9:3.5.1-1
 - update to 3.5.1 (KDE 3.5.9)
 - drop backported autosave patch (fixed upstream)