rev 4673 - in trunk/packages/kdelibs/debian: . patches

[Christopher Martin]

Author: chrsmrtn
Date: 2006-10-11 23:28:04 +0000 (Wed, 11 Oct 2006)
New Revision: 4673

Added:
   trunk/packages/kdelibs/debian/patches/02_kate_kdeprint_fixes_branch.diff
Modified:
   trunk/packages/kdelibs/debian/changelog
Log:
I think I've got the fix for kdeprint here. Here's to hopin'.

Also pick up yet another kate fix of which kde-packager was notified.

Best, I think, would be to upload only after the current kdelibs enters
Etch.


Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2006-10-11 21:22:36 UTC (rev 4672)
+++ trunk/packages/kdelibs/debian/changelog	2006-10-11 23:28:04 UTC (rev 4673)
@@ -1,3 +1,12 @@
+kdelibs (4:3.5.5a-2) unstable; urgency=high
+
+  * Grab two more fixes from KDE_3_5_BRANCH.
+    + Fix kate's indentation of C/C++ files.
+    + Fix kdeprint's timeout when trying to find cupsd.
+      (Closes: #392052, #392052)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 11 Oct 2006 17:23:00 -0400
+
 kdelibs (4:3.5.5a-1) unstable; urgency=medium
 
   * Nes upstream tarball, fixes a grave bug in katepart (Closes: 391414).

Added: trunk/packages/kdelibs/debian/patches/02_kate_kdeprint_fixes_branch.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/02_kate_kdeprint_fixes_branch.diff	                        (rev 0)
+++ trunk/packages/kdelibs/debian/patches/02_kate_kdeprint_fixes_branch.diff	2006-10-11 23:28:04 UTC (rev 4673)
@@ -0,0 +1,58 @@
+#DPATCHLEVEL=0
+--- kate/part/kateautoindent.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 594640)
++++ kate/part/kateautoindent.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 594640)
+@@ -714,6 +714,7 @@
+   int parenCount = 0;  // Possibly in a multiline for stmt.  Used to skip ';' ...
+   bool found = false;
+   bool isSpecial = false;
++  bool potentialAnchorSeen = false;
+ 
+   //kdDebug(13030) << "calcIndent begin line:" << begin.line() << " col:" << begin.col() << endl;
+ 
+@@ -733,7 +734,7 @@
+       {
+         QChar tc = textLine->getChar (pos);
+         if ((tc == ';' || tc == ':' || tc == ',') && otherAnchor == -1 && parenCount <= 0)
+-          otherAnchor = pos;
++          otherAnchor = pos, potentialAnchorSeen = true;
+         else if (tc == ')')
+           parenCount++;
+         else if (tc == '(')
+@@ -742,7 +743,7 @@
+           openCount--;
+         else if (tc == '{')
+         {
+-          openCount++;
++          openCount++, potentialAnchorSeen = true;
+           if (openCount == 1)
+             break;
+         }
+@@ -826,7 +827,7 @@
+   }
+ 
+   // treat beginning of document as anchor position
+-  if (cur.line() == 0 && cur.col() == 0)
++  if (cur.line() == 0 && cur.col() == 0 && potentialAnchorSeen)
+     found = true;
+ 
+   if (!found)
+--- kdeprint/cups/kmcupsmanager.cpp	(.../tags/KDE/3.5.5/kdelibs)	(revision 594640)
++++ kdeprint/cups/kmcupsmanager.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 594640)
+@@ -920,7 +920,7 @@
+ 	kdDebug(500) << "Checking for update possible" << endl;
+ 	delete m_socket;
+         m_socket = new KNetwork::KBufferedSocket;
+-	m_socket->setTimeout( 1 );
++	m_socket->setTimeout( 1500 );
+ 	connect( m_socket, SIGNAL( connected(const KResolverEntry&) ), 
+                 SLOT( slotConnectionSuccess() ) );
+ 	connect( m_socket, SIGNAL( gotError( int ) ), SLOT( slotConnectionFailed( int ) ) );
+@@ -958,7 +958,7 @@
+ 
+ void KMCupsManager::slotAsyncConnect()
+ {
+-	kdDebug(500) << "Starting async connect" << endl;
++	kdDebug(500) << "Starting async connect to " << CupsInfos::self()->hostaddr() << endl;
+ 	//m_socket->startAsyncConnect();
+         if (CupsInfos::self()->host().startsWith("/"))
+             m_socket->connect( QString(), CupsInfos::self()->host());