rev 9953 - in trunk/packages/kdevelop/debian: . patches
Jeremy Lainé
sharky at alioth.debian.org
Thu Apr 3 07:10:17 UTC 2008
Author: sharky
Date: 2008-04-03 07:10:17 +0000 (Thu, 03 Apr 2008)
New Revision: 9953
Added:
trunk/packages/kdevelop/debian/patches/02_fix_build_output_view.diff
Removed:
trunk/packages/kdevelop/debian/patches/02_fix_desktop_entries.diff
trunk/packages/kdevelop/debian/patches/03_fix_user_interface_lag.diff
trunk/packages/kdevelop/debian/patches/04_fix_click_on_error.diff
Modified:
trunk/packages/kdevelop/debian/changelog
Log:
refresh patches for kdevelop 3.5.1
Modified: trunk/packages/kdevelop/debian/changelog
===================================================================
--- trunk/packages/kdevelop/debian/changelog 2008-04-03 06:59:11 UTC (rev 9952)
+++ trunk/packages/kdevelop/debian/changelog 2008-04-03 07:10:17 UTC (rev 9953)
@@ -1,6 +1,11 @@
kdevelop (4:3.5.1-1) UNRELEASED; urgency=low
* New upstream release.
+ * Remove patches included upstream:
+ + 02_fix_desktop_entries.diff
+ + 03_fix_user_interface_lag.diff
+ + 04_fix_click_on_error.diff
+ * Add patch for lines disappearing from build output view.
-- Jeremy Lainé <jeremy.laine at m4x.org> Tue, 01 Apr 2008 09:14:11 +0200
Added: trunk/packages/kdevelop/debian/patches/02_fix_build_output_view.diff
===================================================================
--- trunk/packages/kdevelop/debian/patches/02_fix_build_output_view.diff (rev 0)
+++ trunk/packages/kdevelop/debian/patches/02_fix_build_output_view.diff 2008-04-03 07:10:17 UTC (rev 9953)
@@ -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"
Deleted: trunk/packages/kdevelop/debian/patches/02_fix_desktop_entries.diff
Deleted: trunk/packages/kdevelop/debian/patches/03_fix_user_interface_lag.diff
Deleted: trunk/packages/kdevelop/debian/patches/04_fix_click_on_error.diff
More information about the pkg-kde-commits
mailing list