[Pkg-kde-commits] rev 793 - in trunk/packages/kdelibs/debian: . patches

[Adeodato Simó]

Author: dato-guest
Date: 2005-03-12 18:09:10 +0100 (Sat, 12 Mar 2005)
New Revision: 793

Added:
   trunk/packages/kdelibs/debian/patches/19_kate_noassert.diff
Modified:
   trunk/packages/kdelibs/debian/changelog
Log:
19_kate_noassert.diff: Backport small patch from KDE 3.4 to prevent kate
from printing lots of assertion failures to stderr when editing a long
line. (Closes: #298308)


Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2005-03-12 16:13:15 UTC (rev 792)
+++ trunk/packages/kdelibs/debian/changelog	2005-03-12 17:09:10 UTC (rev 793)
@@ -12,6 +12,9 @@
       The KDE_USE_IDN environment variable can be set to a colon-separated
       list of TLDs to override this default, so if empty IDN will be disabled.
 
+  * Backport small patch from KDE 3.4 to prevent kate from printing lots of
+    assertion failures to stderr when editing a long line. (Closes: #298308)
+
   * As OpenOffice.org 1.1.3 will enter testing together with this version of
     kdelibs, re-add to kdelibs-data the template .desktop files removed in
     3.3.2-1. Replace openoffice.org-mimelnk (<< 1.1.3), but don't conflict.
@@ -19,7 +22,7 @@
   * This upload will get built with a non-broken gcc version in mipsel,
     and thus closes: #298615.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 12 Mar 2005 14:25:42 +0100
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 12 Mar 2005 18:02:54 +0100
 
 kdelibs (4:3.3.2-3) unstable; urgency=high
 

Added: trunk/packages/kdelibs/debian/patches/19_kate_noassert.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/19_kate_noassert.diff	2005-03-12 16:13:15 UTC (rev 792)
+++ trunk/packages/kdelibs/debian/patches/19_kate_noassert.diff	2005-03-12 17:09:10 UTC (rev 793)
@@ -0,0 +1,18 @@
+Index: katerenderer.cpp
+===================================================================
+RCS file: /home/kde/kdelibs/kate/part/katerenderer.cpp,v
+retrieving revision 1.82
+retrieving revision 1.83
+diff -u -p -r1.82 -r1.83
+--- a/kate/part/katerenderer.cpp    14 Nov 2004 14:17:59 -0000      1.82
++++ b/kate/part/katerenderer.cpp    2 Dec 2004 12:55:32 -0000       1.83
+@@ -636,7 +636,8 @@ uint KateRenderer::textWidth(const KateT
+     if (z < len) {
+       width = a->width(*fs, textLine->string(), z, m_tabWidth);
+     } else {
+-      Q_ASSERT(!m_doc->wrapCursor());
++      // DF: commented out. It happens all the time.
++      //Q_ASSERT(!m_doc->wrapCursor());
+       width = a->width(*fs, spaceChar, m_tabWidth);
+     }
+