From 3fb8f2aa4e1647de5d7976cd6147f29d42a2fd57 Mon Sep 17 00:00:00 2001
From: Than Ngo <than@fedoraproject.org>
Date: Feb 28 2008 16:49:53 +0000
Subject: apply upstream patch to fix outputview


---

diff --git a/fix_missing_output_kdev3.5.1 b/fix_missing_output_kdev3.5.1
new file mode 100644
index 0000000..e2a7482
--- /dev/null
+++ b/fix_missing_output_kdev3.5.1
@@ -0,0 +1,48 @@
+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"
diff --git a/kdevelop.spec b/kdevelop.spec
index 8eadfd1..299232f 100644
--- a/kdevelop.spec
+++ b/kdevelop.spec
@@ -16,7 +16,7 @@ Name:    kdevelop
 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 @@ Patch2: kdevelop-2.1.5_for_KDE_3.1-doc.patch
 Patch3: kdevelop-3.5.0-svn.patch
 
 #upstream patches
+Patch100: fix_missing_output_kdev3.5.1
 
 Provides: kdevelop3 = %{version}-%{release}
 
@@ -132,6 +133,8 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %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 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Feb 28 2008 Than Ngo <than@redhat.com> 3.5.1-2
+- apply upstream patch to fix outputview
+
 * Fri Feb 15 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 9:3.5.1-1
 - update to 3.5.1 (KDE 3.5.9)
 - drop backported autosave patch (fixed upstream)