From ad0df4d4aefc596e5140f8547f480d9d831733fe Mon Sep 17 00:00:00 2001
From: Kevin Kofler <kkofler@fedoraproject.org>
Date: May 19 2008 08:46:44 +0000
Subject: - drop backported fix_missing_output_kdev3.5.1 patch


---

diff --git a/fix_missing_output_kdev3.5.1 b/fix_missing_output_kdev3.5.1
deleted file mode 100644
index e2a7482..0000000
--- a/fix_missing_output_kdev3.5.1
+++ /dev/null
@@ -1,48 +0,0 @@
-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 657f0d8..0ea51bf 100644
--- a/kdevelop.spec
+++ b/kdevelop.spec
@@ -34,7 +34,6 @@ 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}
 
@@ -144,8 +143,6 @@ 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/
@@ -258,6 +255,7 @@ rm -rf %{buildroot}
 - update to 3.5.2
 - F9+: BR qt3-devel-docs instead of qt-devel-docs
 - F9+: Require qt3-designer instead of qt-designer
+- drop backported fix_missing_output_kdev3.5.1 patch
 
 * Tue Mar 04 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 9:3.5.1-4
 - BR kdelibs3-apidocs instead of kdelibs-apidocs