Add upstream patch to fix crashes; bug 168397

Package-Manager: portage-2.1.2-r13

diff --git a/net-irc/konversation/ChangeLog b/net-irc/konversation/ChangeLog
index f9ceb67ee06c3aed407214c100a1fc9ba77b71d5..7d22d8af0720ded3d2a2d68b37e8978ee3c774a9 100644 (file)
--- a/net-irc/konversation/ChangeLog
+++ b/net-irc/konversation/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/konversation
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/ChangeLog,v 1.47 2006/11/20 21:51:06 cryos Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/ChangeLog,v 1.48 2007/03/06 07:02:13 masterdriverz Exp $
+
+*konversation-1.0.1-r1 (06 Mar 2007)
+
+  06 Mar 2007; Charlie Shepherd <masterdriverz@gentoo.org>
+  +files/konversation-1.0.1-crash.patch, +konversation-1.0.1-r1.ebuild:
+  Add upstream patch to fix crashes; bug 168397
 
   20 Nov 2006; Marcus D. Hanwell <cryos@gentoo.org>
   konversation-1.0.1.ebuild:

diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest
index b8286f46fe9682e99582a6d21c5eef99d7385716..aaed325c8bc41cf78bf606c4868f42844753f029 100644 (file)
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX konversation-0.19-gcc41.patch 494 RMD160 6319955a53ccc6ca3b56547ee17ff81642760209 SHA1 1db17dc890950e760fae6e2a29a187f09423495a SHA256 beed35bc161377ca5f3033ec8d7bec923c947f68e95f4db4cea8bfc5b56aa3cd
 MD5 0689d3b53a7f073faa64a3037f7a063d files/konversation-0.19-gcc41.patch 494
 RMD160 6319955a53ccc6ca3b56547ee17ff81642760209 files/konversation-0.19-gcc41.patch 494
@@ -9,6 +6,10 @@ AUX konversation-0.19-slash-q-tab.patch 506 RMD160 f6f759e3124439a1afa434a50c506
 MD5 9b386c5b691931c6d639276f35951471 files/konversation-0.19-slash-q-tab.patch 506
 RMD160 f6f759e3124439a1afa434a50c506e0a3583d359 files/konversation-0.19-slash-q-tab.patch 506
 SHA256 244eebc95c55207ca2355a468d98271ce49e5ec8efeeb71e791098c3c06df408 files/konversation-0.19-slash-q-tab.patch 506
+AUX konversation-1.0.1-crash.patch 827 RMD160 6c80c566c74ccf72bf8f92d51ddc1b1a25ed3de8 SHA1 4ce634fa9bc57fdd230a4f9dd5c5eab5ff4994bc SHA256 0e9db29683914ae972ba10dc60a25f35f2e2a907ca29aae14282f4a160c5b351
+MD5 774e304ea1bc6c175e4911b794b5fd75 files/konversation-1.0.1-crash.patch 827
+RMD160 6c80c566c74ccf72bf8f92d51ddc1b1a25ed3de8 files/konversation-1.0.1-crash.patch 827
+SHA256 0e9db29683914ae972ba10dc60a25f35f2e2a907ca29aae14282f4a160c5b351 files/konversation-1.0.1-crash.patch 827
 DIST konversation-0.19.tar.bz2 5452000 RMD160 c260ca76b4fee1f7dec460caaea52c17f11e45ef SHA1 d4463fc8413f6a6c35448ab9e600da6464bd6adf SHA256 8655c5d719d53a7b2f0bc5859758b38f656025d6dd3bb9f75a935734c3564355
 DIST konversation-1.0.1.tar.bz2 5848563 RMD160 1cf79a87f451aa2718560f00ddf987b68938310a SHA1 7e4b2356e942848fb83584db1bf2a1b6ef63234d SHA256 8be736289c52c21fe5ada7dd153767abd5155424a510ab9781b9d2f585cc00fd
 DIST konversation-1.0.tar.bz2 5657702 RMD160 960a6bfbec3f7fc30dcb9215b10eded30dfc22e1 SHA1 f592727626845e568696d06b3a086d4b607f4ab3 SHA256 19af696bb4a6f7c74e839bc8fe8e37ff0e44e4ae24834cb7394d3b2ca0e69220
@@ -16,6 +17,10 @@ EBUILD konversation-0.19-r1.ebuild 705 RMD160 0b21f6765644cabb526c1116e6ce9955ff
 MD5 fb279c8d470774b45660845992627c64 konversation-0.19-r1.ebuild 705
 RMD160 0b21f6765644cabb526c1116e6ce9955ffd94381 konversation-0.19-r1.ebuild 705
 SHA256 c15202829754b54d3c2e65aaa742affb9c779c16a8423c2b3c66aa8229b54d09 konversation-0.19-r1.ebuild 705
+EBUILD konversation-1.0.1-r1.ebuild 712 RMD160 06d93bcc1b65e685c821f8c10802cda63bbd8600 SHA1 23c9c99dc14f53df795ef4d8dd6c2c6a2364e4eb SHA256 352b7f6c2ffc5e60809d8ccb28ec5dca39bca4988c9cad6b7c1a3deaad91cc07
+MD5 8f64057e944c203b7ba8efffe6cd44e6 konversation-1.0.1-r1.ebuild 712
+RMD160 06d93bcc1b65e685c821f8c10802cda63bbd8600 konversation-1.0.1-r1.ebuild 712
+SHA256 352b7f6c2ffc5e60809d8ccb28ec5dca39bca4988c9cad6b7c1a3deaad91cc07 konversation-1.0.1-r1.ebuild 712
 EBUILD konversation-1.0.1.ebuild 657 RMD160 ab1ecf9bc9909dc27caab08fa9769b869c5855e5 SHA1 58d27e21dea113d894a43a934072840085514f72 SHA256 bd9d1bfc7640346582158a7f2f9475b8bf2a49964948ca3980e174841d6afac1
 MD5 ffaeb45abfc346c3329ead8b0941b7e0 konversation-1.0.1.ebuild 657
 RMD160 ab1ecf9bc9909dc27caab08fa9769b869c5855e5 konversation-1.0.1.ebuild 657
@@ -24,10 +29,10 @@ EBUILD konversation-1.0.ebuild 618 RMD160 3aa6e60f8559105b69a4fc63886cde855db0f5
 MD5 2e4e4c483bda910da3db225c6fa00abc konversation-1.0.ebuild 618
 RMD160 3aa6e60f8559105b69a4fc63886cde855db0f55c konversation-1.0.ebuild 618
 SHA256 d3890fc7fb0ca6c020d7d3b6e285062b818acf5f857aba98f78fc3189dcfe789 konversation-1.0.ebuild 618
-MISC ChangeLog 5923 RMD160 9a2a320ef4c8f9960483d0935db09c23d7470060 SHA1 84b92593f1ade32c09b1b3a7ca528074ce8ae62c SHA256 9444123ae3281dfe61695b524fae2707c8cecc898a126073b69158dcf97c37cb
-MD5 415fbd061be474cbbe27d3399e8e4168 ChangeLog 5923
-RMD160 9a2a320ef4c8f9960483d0935db09c23d7470060 ChangeLog 5923
-SHA256 9444123ae3281dfe61695b524fae2707c8cecc898a126073b69158dcf97c37cb ChangeLog 5923
+MISC ChangeLog 6149 RMD160 51973de0aee3457fb2518f89e2fc75208884beff SHA1 211d4430120740500874e405ae24b9459fcaedcd SHA256 62e6ae51d7ca709fbacdcd044585c946da0657dde08e7a6882c6d001d0792418
+MD5 d074cc68a4cdfd2e104cb8f099fe3dd0 ChangeLog 6149
+RMD160 51973de0aee3457fb2518f89e2fc75208884beff ChangeLog 6149
+SHA256 62e6ae51d7ca709fbacdcd044585c946da0657dde08e7a6882c6d001d0792418 ChangeLog 6149
 MISC metadata.xml 177 RMD160 8850c5b17b8777a62f670a0ade3bab8144c2b2dc SHA1 500abb13eb9ab623336557bb1246056b39896046 SHA256 0d969af6afa28170dac4b321dd8489b27d322f49f40c39aa3f614953f85292ce
 MD5 71e1e6f08f072eec25aeb364865de8ef metadata.xml 177
 RMD160 8850c5b17b8777a62f670a0ade3bab8144c2b2dc metadata.xml 177
@@ -41,10 +46,6 @@ SHA256 cc1ab45c17897b75757319592773bfbc92d1b4eb03b9750924fbf0cc2d0e7123 files/di
 MD5 7c7e86e03d533fc23d42a755deae605b files/digest-konversation-1.0.1 262
 RMD160 ee7c62af8dabf95b5523d4e37bc502c9743c09f0 files/digest-konversation-1.0.1 262
 SHA256 e905fba1709b730342f4e0cb8b2791f8434aadd38cc90c2804123bfc7e864680 files/digest-konversation-1.0.1 262
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFYiNRntT9W3vfTuoRAog5AJwPCEPNrdTYQjX5CNPUXQWa/hKWSgCfcC12
-X1DzIFIgZUvg92rZ4V2I478=
-=Sc7y
------END PGP SIGNATURE-----
+MD5 7c7e86e03d533fc23d42a755deae605b files/digest-konversation-1.0.1-r1 262
+RMD160 ee7c62af8dabf95b5523d4e37bc502c9743c09f0 files/digest-konversation-1.0.1-r1 262
+SHA256 e905fba1709b730342f4e0cb8b2791f8434aadd38cc90c2804123bfc7e864680 files/digest-konversation-1.0.1-r1 262

diff --git a/net-irc/konversation/files/digest-konversation-1.0.1-r1 b/net-irc/konversation/files/digest-konversation-1.0.1-r1
new file mode 100644 (file)
index 0000000..f530493
--- /dev/null
+++ b/net-irc/konversation/files/digest-konversation-1.0.1-r1
@@ -0,0 +1,3 @@
+MD5 60c2c5f94d4a916055db09728304b19f konversation-1.0.1.tar.bz2 5848563
+RMD160 1cf79a87f451aa2718560f00ddf987b68938310a konversation-1.0.1.tar.bz2 5848563
+SHA256 8be736289c52c21fe5ada7dd153767abd5155424a510ab9781b9d2f585cc00fd konversation-1.0.1.tar.bz2 5848563

diff --git a/net-irc/konversation/files/konversation-1.0.1-crash.patch b/net-irc/konversation/files/konversation-1.0.1-crash.patch
new file mode 100644 (file)
index 0000000..b406e80
--- /dev/null
+++ b/net-irc/konversation/files/konversation-1.0.1-crash.patch
@@ -0,0 +1,17 @@
+--- trunk/extragear/network/konversation/src/viewcontainer.cpp 2006/11/17 17:50:03     605661
++++ trunk/extragear/network/konversation/src/viewcontainer.cpp 2006/11/17 22:04:32     605705
+@@ -2022,11 +2022,13 @@
+     if (m_frontServer)
+     {
+         DccChat* dccChatPanel=new DccChat(m_tabWidget, myNick,nick,arguments,listen);
+-        addView(dccChatPanel, dccChatPanel->getName());
+         connect(dccChatPanel, SIGNAL(updateTabNotification(ChatWindow*,const Konversation::TabNotifyType&)), this, SLOT(setViewNotification(ChatWindow*,const Konversation::TabNotifyType&)));
+         if(listen)
++      {
+             m_frontServer->queue(QString("PRIVMSG %1 :\001DCC CHAT chat %2 %3\001")
+               .arg(nick).arg(numericalIp).arg(dccChatPanel->getPort()));
++      }
++        addView(dccChatPanel, dccChatPanel->getName());
+     }
+ }
+ 

diff --git a/net-irc/konversation/konversation-1.0.1-r1.ebuild b/net-irc/konversation/konversation-1.0.1-r1.ebuild
new file mode 100644 (file)
index 0000000..91f21b1
--- /dev/null
+++ b/net-irc/konversation/konversation-1.0.1-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/konversation-1.0.1-r1.ebuild,v 1.1 2007/03/06 07:02:13 masterdriverz Exp $
+
+LANGS="bg ca da de el en_GB es et fi fr hu it ja ka ko nl pt ru sr sr@Latn sv tr zh_TW
+       ar cs gl he lt pa pt_BR ta"
+LANGS_DOC="da es et it nl pt ru sv"
+
+USE_KEG_PACKAGING=1
+
+inherit kde
+
+DESCRIPTION="A user friendly IRC Client for KDE3.x"
+HOMEPAGE="http://konversation.kde.org/"
+SRC_URI="http://download.berlios.de/${PN}/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+need-kde 3
+
+PATCHES="${FILESDIR}/${P}-crash.patch"