Added the patch from KDE bug 147195 to prevent kate from crashing when asking to save a session. Fixes our bug 184322.

Package-Manager: portage-2.1.3_rc7

5 files changed, 76 insertions, 5 deletions

diff --git a/kde-base/kate/ChangeLog b/kde-base/kate/ChangeLog
index 433b0c155787..8521a23edb26 100644
--- a/kde-base/kate/ChangeLog
+++ b/kde-base/kate/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kate
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kate/ChangeLog,v 1.77 2007/05/22 21:16:21 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kate/ChangeLog,v 1.78 2007/07/10 18:45:15 philantrop Exp $
+
+*kate-3.5.7-r1 (10 Jul 2007)
+
+  10 Jul 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/kate-3.5.7-session-save.patch, +kate-3.5.7-r1.ebuild:
+  Added the patch from KDE bug 147195 to prevent kate from crashing when
+  asking to save a session. Fixes our bug 184322.
 
 *kate-3.5.7 (22 May 2007)
 
diff --git a/kde-base/kate/Manifest b/kde-base/kate/Manifest
index 75cc9174208f..4cae816a2ad4 100644
--- a/kde-base/kate/Manifest
+++ b/kde-base/kate/Manifest
@@ -1,7 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX kate-3.5.5-visibility.patch 2248 RMD160 58915fcb0f8083e25a2ed85022312b53a6bce816 SHA1 14aa880d8e12e31051df193e162f4a515ed5d45c SHA256 d6546f8f188d6d4f5d75de61ede58f901d2a7d3410d7bb853ad40205aba2d560
 MD5 c0e7ab602ca07d635870a66aa125e636 files/kate-3.5.5-visibility.patch 2248
 RMD160 58915fcb0f8083e25a2ed85022312b53a6bce816 files/kate-3.5.5-visibility.patch 2248
 SHA256 d6546f8f188d6d4f5d75de61ede58f901d2a7d3410d7bb853ad40205aba2d560 files/kate-3.5.5-visibility.patch 2248
+AUX kate-3.5.7-session-save.patch 830 RMD160 b985212c85c11b563bbeb0a8348e2771e8b6e43d SHA1 910d98f125e0d20a54a25069e7df296eb8857657 SHA256 191b6fea38483d631ba87b8fdeff6ad65ace7f9aba8e0aeb2f8ecfb6bf1d336a
+MD5 4e94724dabfaf7a3abf9ad801bd7ec27 files/kate-3.5.7-session-save.patch 830
+RMD160 b985212c85c11b563bbeb0a8348e2771e8b6e43d files/kate-3.5.7-session-save.patch 830
+SHA256 191b6fea38483d631ba87b8fdeff6ad65ace7f9aba8e0aeb2f8ecfb6bf1d336a files/kate-3.5.7-session-save.patch 830
 DIST kdebase-3.5-patchset-04.tar.bz2 8502 RMD160 419e527c8c2b00ca49eb395793374b3459989897 SHA1 f7549db15ffcf29fad372b00ab66f0b257225302 SHA256 e16b356bfa224f7c97b57f3a3bdec9ba0701209459a880bae81556d070b2a961
 DIST kdebase-3.5.5.tar.bz2 23851886 RMD160 6cf804de0487347a3e1d4ea6e5ba5114d23d9806 SHA1 f9f1907ce71fd2f934cf7404f1db1d350c2b9544 SHA256 f77632e44214648e2d0adfe1a79dd61a6a738c21fe5abb0baff16b72432baaa0
 DIST kdebase-3.5.6.tar.bz2 24155599 RMD160 d3cbdcd148ea4c08d254f48faa10fc693517394c SHA1 0b37cae9637692c123a28c405dea8540e6b935c5 SHA256 245b35f8b2e1533f9ae92b3b07bee5339a716dfb8db363d0126d2e7409b7bd7e
@@ -22,14 +29,18 @@ EBUILD kate-3.5.6.ebuild 447 RMD160 195b3bfa9eb1eec0fd577e9fe68574db80f1d396 SHA
 MD5 d0442e2e21961b8269b736804a4af60c kate-3.5.6.ebuild 447
 RMD160 195b3bfa9eb1eec0fd577e9fe68574db80f1d396 kate-3.5.6.ebuild 447
 SHA256 c359758d8c7764ffabf665fa6419882f84dbb87a0b6c568342469f39413ab59e kate-3.5.6.ebuild 447
+EBUILD kate-3.5.7-r1.ebuild 577 RMD160 5de964d4c83a1a1f9e3d59ea8e25bdee6d52b94e SHA1 89cf41cb236f7b7f05441829d2f33c1a21698185 SHA256 44d4f9e35cfe49d49667e142e1b3d197655989ced34a520219ec04e032b1b8e4
+MD5 0680742f771a5b44f6fc13f447a635f4 kate-3.5.7-r1.ebuild 577
+RMD160 5de964d4c83a1a1f9e3d59ea8e25bdee6d52b94e kate-3.5.7-r1.ebuild 577
+SHA256 44d4f9e35cfe49d49667e142e1b3d197655989ced34a520219ec04e032b1b8e4 kate-3.5.7-r1.ebuild 577
 EBUILD kate-3.5.7.ebuild 522 RMD160 cad329b81b2aa5cc7d94817d5b89035d90e5fb38 SHA1 5202dd4124752fecf9426cdbef6884f4103fd793 SHA256 f58d228098ac100db9d57f50fea9e9ca56004cd8aed46271ba7c9431d84493ae
 MD5 39149cacea5aa5761fb8e5677f66e170 kate-3.5.7.ebuild 522
 RMD160 cad329b81b2aa5cc7d94817d5b89035d90e5fb38 kate-3.5.7.ebuild 522
 SHA256 f58d228098ac100db9d57f50fea9e9ca56004cd8aed46271ba7c9431d84493ae kate-3.5.7.ebuild 522
-MISC ChangeLog 8954 RMD160 89d73cc9eb2ebf872a1addf3673509cd2d7cf2a2 SHA1 98cf3c02ac33551d705dc66cdc22fd086baa3e5e SHA256 34470d2d2a54c3d51f075aa582319c941c8d2537c903c491556ec3bd04ca4451
-MD5 8c48cf019f71ad6b139ea8dbda5df14f ChangeLog 8954
-RMD160 89d73cc9eb2ebf872a1addf3673509cd2d7cf2a2 ChangeLog 8954
-SHA256 34470d2d2a54c3d51f075aa582319c941c8d2537c903c491556ec3bd04ca4451 ChangeLog 8954
+MISC ChangeLog 9231 RMD160 e9c8043686872a3dffc23406caa4eaba234bcbed SHA1 e8f417095fa52e29c6ea32df6ae4bd21194ea76d SHA256 89072e159ef3307368ce18eb86b133cbb527fa1caa6349a711fbdd046e8abdd8
+MD5 95a1c7a917bb0443964ead56c66967f3 ChangeLog 9231
+RMD160 e9c8043686872a3dffc23406caa4eaba234bcbed ChangeLog 9231
+SHA256 89072e159ef3307368ce18eb86b133cbb527fa1caa6349a711fbdd046e8abdd8 ChangeLog 9231
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -49,3 +60,13 @@ SHA256 f5d1e7033a5c901ecfdd5db86217faa7c593376a302b1bc2d7862420c014383a files/di
 MD5 4426f920b00d786345c6ce929244f5a3 files/digest-kate-3.5.7 518
 RMD160 3b410df08626da5caee30fef7c7b8ed46cb1535e files/digest-kate-3.5.7 518
 SHA256 3b07ea351c218e033eabd349b829b573e4421a012340943c23b3f2ddc59aa369 files/digest-kate-3.5.7 518
+MD5 4426f920b00d786345c6ce929244f5a3 files/digest-kate-3.5.7-r1 518
+RMD160 3b410df08626da5caee30fef7c7b8ed46cb1535e files/digest-kate-3.5.7-r1 518
+SHA256 3b07ea351c218e033eabd349b829b573e4421a012340943c23b3f2ddc59aa369 files/digest-kate-3.5.7-r1 518
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.5 (GNU/Linux)
+
+iD8DBQFGk9PHCkvF58q80IkRAjkdAJ44rH6v0eoS+F1O8Rhxd0c52A/GrgCeLOjR
+j7bod4BsietT7dD5rNQgBZo=
+=RAC6
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kate/files/digest-kate-3.5.7-r1 b/kde-base/kate/files/digest-kate-3.5.7-r1
new file mode 100644
index 000000000000..bf24efd3a1d8
--- /dev/null
+++ b/kde-base/kate/files/digest-kate-3.5.7-r1
@@ -0,0 +1,6 @@
+MD5 805dd677fdd09a260cac73b39c3171e3 kdebase-3.5-patchset-04.tar.bz2 8502
+RMD160 419e527c8c2b00ca49eb395793374b3459989897 kdebase-3.5-patchset-04.tar.bz2 8502
+SHA256 e16b356bfa224f7c97b57f3a3bdec9ba0701209459a880bae81556d070b2a961 kdebase-3.5-patchset-04.tar.bz2 8502
+MD5 b421e01b3ee712549ee967f58ed24de0 kdebase-3.5.7.tar.bz2 24395088
+RMD160 f43070b5428c3099c0abceed56041e5b4ff3c656 kdebase-3.5.7.tar.bz2 24395088
+SHA256 3c6d739abefc55b6cb64e1cf37b79f5993b666a5b40492471754794416b5c28d kdebase-3.5.7.tar.bz2 24395088
diff --git a/kde-base/kate/files/kate-3.5.7-session-save.patch b/kde-base/kate/files/kate-3.5.7-session-save.patch
new file mode 100644
index 000000000000..fe8029365357
--- /dev/null
+++ b/kde-base/kate/files/kate-3.5.7-session-save.patch
@@ -0,0 +1,18 @@
+--- branches/KDE/3.5/kdebase/kate/app/katesession.cpp	2007/06/16 03:24:38	676114
++++ branches/KDE/3.5/kdebase/kate/app/katesession.cpp	2007/06/16 03:24:56	676115
+@@ -381,13 +381,13 @@
+ 
+     if (sesExit == "ask")
+     {
+-      KDialogBase dlg( i18n ("Save Session?")
++      KDialogBase* dlg = new KDialogBase(i18n ("Save Session?")
+                      , KDialogBase::Yes | KDialogBase::No
+                      , KDialogBase::Yes, KDialogBase::No
+                      );
+ 
+       bool dontAgain = false;
+-      int res = KMessageBox::createKMessageBox(&dlg, QMessageBox::Question,
++      int res = KMessageBox::createKMessageBox(dlg, QMessageBox::Question,
+                               i18n("Save current session?"), QStringList(),
+                               i18n("Do not ask again"), &dontAgain, KMessageBox::Notify);
+ 
diff --git a/kde-base/kate/kate-3.5.7-r1.ebuild b/kde-base/kate/kate-3.5.7-r1.ebuild
new file mode 100644
index 000000000000..ab613fb86cda
--- /dev/null
+++ b/kde-base/kate/kate-3.5.7-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kate/kate-3.5.7-r1.ebuild,v 1.1 2007/07/10 18:45:15 philantrop Exp $
+
+KMNAME=kdebase
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdebase-3.5-patchset-04.tar.bz2"
+
+DESCRIPTION="Kate is an MDI texteditor."
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="kdehiddenvisibility"
+
+KMEXTRA="doc/kwrite"
+
+PATCHES="${FILESDIR}/${P}-session-save.patch"