Added a patch to fix small issues on the kate component for kdelibs-3.5.5.

Package-Manager: portage-2.1.1

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 2c0dbb529b9ff0f859049fa5d2d7e14e4b490326..627dbd33b9cd13afd014d31b8035aebd2f93599d 100644 (file)
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.366 2006/10/07 15:06:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.367 2006/10/11 09:59:54 deathwing00 Exp $
+
+  11 Oct 2006; Ioannis Aslanidis <deathwing00@gentoo.org>
+  +files/kdelibs-3.5.5-kate-cstyle-indenter-fix.diff, kdelibs-3.5.5.ebuild:
+  Added a patch that fixes a nasty regression in the cstyle identifier of kate.
 
   07 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
   files/digest-kdelibs-3.5.5, Manifest:

diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 3f03fc5a0dc163a03a38385d19923828d017046c..02c0c1c880d9e642e506d16fc0fdb0e40d2bfd88 100644 (file)
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -37,6 +37,10 @@ AUX kdelibs-3.5.3-konqcrash.patch 510 RMD160 f2d36d41f28bb716660ec721a34f05f1991
 MD5 edb9959440246291035a4fb2c5489402 files/kdelibs-3.5.3-konqcrash.patch 510
 RMD160 f2d36d41f28bb716660ec721a34f05f199177378 files/kdelibs-3.5.3-konqcrash.patch 510
 SHA256 57e9f452df9e022c963419478b4d7082e3e5617d55005c5d9be72144ccef8625 files/kdelibs-3.5.3-konqcrash.patch 510
+AUX kdelibs-3.5.5-kate-cstyle-indenter-fix.diff 1544 RMD160 cb5fea95022dd92b448a8bf2b8e7ea49e9f3225d SHA1 5689ec3ca0c562663bc64b4458dcd1eafade8a38 SHA256 b4364d77149ef699b7724c1102a08a0240df5e19c2b0b1202459b8f97cf8268b
+MD5 1f60e79966e99e68401ce1b0cf3609d9 files/kdelibs-3.5.5-kate-cstyle-indenter-fix.diff 1544
+RMD160 cb5fea95022dd92b448a8bf2b8e7ea49e9f3225d files/kdelibs-3.5.5-kate-cstyle-indenter-fix.diff 1544
+SHA256 b4364d77149ef699b7724c1102a08a0240df5e19c2b0b1202459b8f97cf8268b files/kdelibs-3.5.5-kate-cstyle-indenter-fix.diff 1544
 AUX post-3.4.3-kdelibs-kjs.diff 1570 RMD160 95a341acfe20ac53f528c31be17e50dba2163f8d SHA1 4869c00f7f725a87d0223d684f09fe7e08c0e46d SHA256 2031efa2a5e4a747d5e2630ccd0cae62d7413de025786069931c01b07fc5a724
 MD5 ecc0ec13ce3b06e94e35aa8e937e02bf files/post-3.4.3-kdelibs-kjs.diff 1570
 RMD160 95a341acfe20ac53f528c31be17e50dba2163f8d files/post-3.4.3-kdelibs-kjs.diff 1570
@@ -66,14 +70,14 @@ EBUILD kdelibs-3.5.4-r2.ebuild 5230 RMD160 3fd6f678c273923960cbf26cc59a876591148
 MD5 491a91146391b500614636c9f73b2e35 kdelibs-3.5.4-r2.ebuild 5230
 RMD160 3fd6f678c273923960cbf26cc59a8765911485de kdelibs-3.5.4-r2.ebuild 5230
 SHA256 9bcda2e6109ae6ca39e33dd6886d06d70b843f0806b96ee4bfae54f7d46ae566 kdelibs-3.5.4-r2.ebuild 5230
-EBUILD kdelibs-3.5.5.ebuild 4873 RMD160 36c0e7125ffec63bcab3aae16aa229ba7b226101 SHA1 f821f82314d36a57341f8364e770f5e4490f044e SHA256 394bbaff712236118938242ccf88a670ef8a29074626a4011577eb16f5c9f640
-MD5 ce245d19fd315396d5b295e107826660 kdelibs-3.5.5.ebuild 4873
-RMD160 36c0e7125ffec63bcab3aae16aa229ba7b226101 kdelibs-3.5.5.ebuild 4873
-SHA256 394bbaff712236118938242ccf88a670ef8a29074626a4011577eb16f5c9f640 kdelibs-3.5.5.ebuild 4873
-MISC ChangeLog 59850 RMD160 cd2cfc207541bcfcfb67b7c26f89392296be0ba8 SHA1 c5eabbb0b441cae055407bf7a85da7b61459fcb7 SHA256 b0e30d7166cb9a462ea4ed0304651feeb7dea306c75f13a31ef9ad6d43877f1b
-MD5 ed4ec02ea28620b1ce6ee0050b7a9a2e ChangeLog 59850
-RMD160 cd2cfc207541bcfcfb67b7c26f89392296be0ba8 ChangeLog 59850
-SHA256 b0e30d7166cb9a462ea4ed0304651feeb7dea306c75f13a31ef9ad6d43877f1b ChangeLog 59850
+EBUILD kdelibs-3.5.5.ebuild 5226 RMD160 a94842be41b41fba0769262ba8c40fa2ea3671d5 SHA1 47579463860ce4d0ddfc1bbd996e1a6b827583a3 SHA256 918e138be1d720c36312e22a140abf74a141a0864c1cff97c391cbf46ec69938
+MD5 973be63836556a69d870bcb58d7ca9eb kdelibs-3.5.5.ebuild 5226
+RMD160 a94842be41b41fba0769262ba8c40fa2ea3671d5 kdelibs-3.5.5.ebuild 5226
+SHA256 918e138be1d720c36312e22a140abf74a141a0864c1cff97c391cbf46ec69938 kdelibs-3.5.5.ebuild 5226
+MISC ChangeLog 60067 RMD160 817ba91e965933b885fcb83a98acd22ff41079c7 SHA1 6e217f6593f31678f5dda40f20c6293dfa43a920 SHA256 547de61810d344bec3ca9092f366d86b66a4c0b5197f4ad7f430f85c1615bfdd
+MD5 c6eaf222d1874ff846fb9d5ba9ee4724 ChangeLog 60067
+RMD160 817ba91e965933b885fcb83a98acd22ff41079c7 ChangeLog 60067
+SHA256 547de61810d344bec3ca9092f366d86b66a4c0b5197f4ad7f430f85c1615bfdd ChangeLog 60067
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -96,7 +100,7 @@ SHA256 8c59629509a40001ff71b42db7096bb8c7a4f78bb8e43b60baf2e205cd843c81 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFJ8KCAiZjviIA2XgRAtxyAKCNo7SOdHEzUKmSeUnIT5JFX3YAhQCgzfk/
-UCgPhCP+fVLyN3SdYER3FTo=
-=5n+1
+iD8DBQFFLMCgQVeVlgLp4x8RApgvAJ9U6FE9phP/WC7F3skFpdLmQoR+2gCeIttU
+7LJYIswHFOthl2nzoViKVUw=
+=82Fs
 -----END PGP SIGNATURE-----

diff --git a/kde-base/kdelibs/files/kdelibs-3.5.5-kate-cstyle-indenter-fix.diff b/kde-base/kdelibs/files/kdelibs-3.5.5-kate-cstyle-indenter-fix.diff
new file mode 100644 (file)
index 0000000..c7697a9
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-3.5.5-kate-cstyle-indenter-fix.diff
@@ -0,0 +1,45 @@
+diff -U 4 -H -b -w -B -E -d -i -r kdelibs-3.5.5-orig/kate/part/kateautoindent.cpp kdelibs-3.5.5/kate/part/kateautoindent.cpp
+--- kdelibs-3.5.5-orig/kate/part/kateautoindent.cpp    2006-10-11 11:44:37.000000000 +0200
++++ kdelibs-3.5.5/kate/part/kateautoindent.cpp 2006-10-11 11:47:38.000000000 +0200
+@@ -713,8 +713,9 @@
+   int anchorPos = 0;
+   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;
+ 
+   // Find Indent Anchor Point
+@@ -732,18 +733,18 @@
+       if (textLine->attribute(pos) == symbolAttrib)
+       {
+         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 == '(')
+           parenCount--;
+         else if (tc == '}')
+           openCount--;
+         else if (tc == '{')
+         {
+-          openCount++;
++          openCount++, potentialAnchorSeen = true;
+           if (openCount == 1)
+             break;
+         }
+       }
+@@ -825,9 +826,9 @@
+     }
+   }
+ 
+   // 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)
+     return 0;

diff --git a/kde-base/kdelibs/kdelibs-3.5.5.ebuild b/kde-base/kdelibs/kdelibs-3.5.5.ebuild
index 5a6d05491bcb2fe90a29e7d9cd0022bad46043ce..857a59ae0f7c5ba2aee3d0551829790082c41b3b 100644 (file)
--- a/kde-base/kdelibs/kdelibs-3.5.5.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.5.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.5.ebuild,v 1.2 2006/10/03 23:09:07 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.5.ebuild,v 1.3 2006/10/11 09:59:54 deathwing00 Exp $
 
 inherit kde flag-o-matic eutils multilib
 set-kdedir 3.5
@@ -83,6 +83,12 @@ src_unpack() {
        # TODO - kspell2 Xspell plugins are automagically detected.
        #                As nothing uses kspell2, don't install them.
        sed -i -e "s:plugins::" "${S}/kspell2/Makefile.am" || die "sed failed"
+
+       # Apply the following patch on the next revision of kdelibs-3.5.5 (fixes kde
+       # bug #135409), which corrects a nasty regression in the cstyle indenter.
+       # Revision bump was not forced for this patch. If users want it before the
+       # next revision bump, they should simply reemerge kdelibs.
+       epatch "${FILESDIR}/${P}-kate-cstyle-indenter-fix.diff"
 }
 
 src_compile() {