diff options
author | Tobias Heinlein <keytoaster@gentoo.org> | 2007-08-10 20:05:19 +0000 |
---|---|---|
committer | Tobias Heinlein <keytoaster@gentoo.org> | 2007-08-10 20:05:19 +0000 |
commit | 36d50beaaa08da4a89d0db80ea174a74a4b3c8aa (patch) | |
tree | 7726268244b0ce5cf9971deab5009af714dfceaf | |
parent | fix bug #188109. remove old version (diff) | |
download | gentoo-2-36d50beaaa08da4a89d0db80ea174a74a4b3c8aa.tar.gz gentoo-2-36d50beaaa08da4a89d0db80ea174a74a4b3c8aa.tar.bz2 gentoo-2-36d50beaaa08da4a89d0db80ea174a74a4b3c8aa.zip |
Adding a patch to fix a crash, see bug 187977
-rw-r--r-- | net-p2p/ktorrent/ChangeLog | 8 | ||||
-rw-r--r-- | net-p2p/ktorrent/Manifest | 11 | ||||
-rw-r--r-- | net-p2p/ktorrent/files/ktorrent-2.2.1-fix-wait-job-crash.patch | 56 | ||||
-rw-r--r-- | net-p2p/ktorrent/ktorrent-2.2.1-r1.ebuild | 50 |
4 files changed, 124 insertions, 1 deletions
diff --git a/net-p2p/ktorrent/ChangeLog b/net-p2p/ktorrent/ChangeLog index a95ad940fd81..9b206015f430 100644 --- a/net-p2p/ktorrent/ChangeLog +++ b/net-p2p/ktorrent/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-p2p/ktorrent # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ChangeLog,v 1.54 2007/07/25 19:07:47 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ChangeLog,v 1.55 2007/08/10 20:05:19 keytoaster Exp $ + +*ktorrent-2.2.1-r1 (10 Aug 2007) + + 10 Aug 2007; Tobias Heinlein <keytoaster@gentoo.org> + +files/ktorrent-2.2.1-fix-wait-job-crash.patch, +ktorrent-2.2.1-r1.ebuild: + Adding a patch to fix a crash, see bug 187977 25 Jul 2007; Carsten Lohrke <carlo@gentoo.org> -files/ktorrent-2.0.3-znow.patch, diff --git a/net-p2p/ktorrent/Manifest b/net-p2p/ktorrent/Manifest index 352a30773681..257889c01898 100644 --- a/net-p2p/ktorrent/Manifest +++ b/net-p2p/ktorrent/Manifest @@ -1,3 +1,7 @@ +AUX ktorrent-2.2.1-fix-wait-job-crash.patch 1896 RMD160 ee15d8f0b141b12b958e13c22c8f121d33fe3a0e SHA1 8503274db402198889ae343ac6e2a671d8ca6305 SHA256 cd0e212b9849bcf10399530b722d5e53b9e0c37277f4f1e03d801e62372f3aa1 +MD5 15d92119adf7ff5809242923ba46a6c5 files/ktorrent-2.2.1-fix-wait-job-crash.patch 1896 +RMD160 ee15d8f0b141b12b958e13c22c8f121d33fe3a0e files/ktorrent-2.2.1-fix-wait-job-crash.patch 1896 +SHA256 cd0e212b9849bcf10399530b722d5e53b9e0c37277f4f1e03d801e62372f3aa1 files/ktorrent-2.2.1-fix-wait-job-crash.patch 1896 DIST ktorrent-2.1.3.tar.gz 3622588 RMD160 6c85512c9a69f2f1743febed356a6d9964a79850 SHA1 119ad7b0b41f9061988aeba76191b96311b493d3 SHA256 ee73a3cf28cf39e521ddffd8a4cdeda69bf8408086afc1eb9d2605aac1574f2e DIST ktorrent-2.1.4.tar.gz 3631999 RMD160 8286012e5fbc0bd827d5cb70c7895e5460f21a0b SHA1 454992ec5f0b4f67e62474cf863a2d66dbd77f28 SHA256 d492f75801c180202e99ca9c9cdff0b54e2f5d8e4ae2dddccbf1aac218276c48 DIST ktorrent-2.2.1.tar.gz 3763678 RMD160 329b6e0556a11875d7ce36d669c5c25370552936 SHA1 53dd36430fd47b396b16d30d466c45bd87ae40b2 SHA256 cd5f7ca8d9a06a317c4adf6336328dc79bdf6c7f7d31588af691ba202ef267f3 @@ -9,6 +13,10 @@ EBUILD ktorrent-2.1.4.ebuild 1091 RMD160 1fe216074fea16f670debf14312b3a9d34add0e MD5 1eab36deddf5835fb87d7b74c16072e1 ktorrent-2.1.4.ebuild 1091 RMD160 1fe216074fea16f670debf14312b3a9d34add0e3 ktorrent-2.1.4.ebuild 1091 SHA256 97b4d671c986473db7ce38780efee578018e914ebdf1405a5309dbd2563a1341 ktorrent-2.1.4.ebuild 1091 +EBUILD ktorrent-2.2.1-r1.ebuild 1214 RMD160 ef6c7390dca8c98e41fec6bfc251ba7ee119cf31 SHA1 29f5f2aec657d138e58d710eb776fd2ced237dca SHA256 e76f94a1b4a58e5ae9bf4d09b8868cd0f3b4cad063d76d5f3346e199ed07327a +MD5 cdd21b04416dd6a186ca5e0b75a8db11 ktorrent-2.2.1-r1.ebuild 1214 +RMD160 ef6c7390dca8c98e41fec6bfc251ba7ee119cf31 ktorrent-2.2.1-r1.ebuild 1214 +SHA256 e76f94a1b4a58e5ae9bf4d09b8868cd0f3b4cad063d76d5f3346e199ed07327a ktorrent-2.2.1-r1.ebuild 1214 EBUILD ktorrent-2.2.1.ebuild 1089 RMD160 644df5201dae422ad15869a78129485d13880004 SHA1 7b8bc68d3ec58a96ff7da144a0dde7f1dd960316 SHA256 a2c5d9c6faac60afede4e3762938728d8b57327a765974060f35a6ab9273d01d MD5 75076b87813d18329d1dfb44830df6c8 ktorrent-2.2.1.ebuild 1089 RMD160 644df5201dae422ad15869a78129485d13880004 ktorrent-2.2.1.ebuild 1089 @@ -30,3 +38,6 @@ SHA256 110f7df9c1d47a3ab2b6216ea4f962e1e4d11b4925087ee6e4106f36458e6855 files/di MD5 a2d21be654e0eeb70b70fc812ffe05b9 files/digest-ktorrent-2.2.1 247 RMD160 7026a970640e1e6862f67c977ce4076cdafb72df files/digest-ktorrent-2.2.1 247 SHA256 b0ff92094488199b1179e1a9a518ca611e4c3e99224c82c88be49c453b2f416e files/digest-ktorrent-2.2.1 247 +MD5 a2d21be654e0eeb70b70fc812ffe05b9 files/digest-ktorrent-2.2.1-r1 247 +RMD160 7026a970640e1e6862f67c977ce4076cdafb72df files/digest-ktorrent-2.2.1-r1 247 +SHA256 b0ff92094488199b1179e1a9a518ca611e4c3e99224c82c88be49c453b2f416e files/digest-ktorrent-2.2.1-r1 247 diff --git a/net-p2p/ktorrent/files/ktorrent-2.2.1-fix-wait-job-crash.patch b/net-p2p/ktorrent/files/ktorrent-2.2.1-fix-wait-job-crash.patch new file mode 100644 index 000000000000..155337f059ed --- /dev/null +++ b/net-p2p/ktorrent/files/ktorrent-2.2.1-fix-wait-job-crash.patch @@ -0,0 +1,56 @@ +diff -Naru ktorrent_old/apps/ktorrent/ktorrentcore.cpp ktorrent_new/apps/ktorrent/ktorrentcore.cpp +--- ktorrent_old/apps/ktorrent/ktorrentcore.cpp 2007-07-23 12:43:11.000000000 -0400 ++++ ktorrent_new/apps/ktorrent/ktorrentcore.cpp 2007-08-07 00:44:13.000000000 -0400 +@@ -1,5 +1,5 @@ + /*************************************************************************** +- * Copyright (C) 2005 by * ++ * copyright (C) 2005 by * + * Joris Guisson <joris.guisson@gmail.com> * + * Ivan Vasic <ivasic@gmail.com> * + * * +@@ -593,9 +593,7 @@ + qman->onExit(job); + // wait for completion of stopped events + if (job->needToWait()) +- { + WaitJob::execute(job); +- } + else + delete job; + +diff -Naru ktorrent_old/libktorrent/pluginmanager.cpp ktorrent_new/libktorrent/pluginmanager.cpp +--- ktorrent_old/libktorrent/pluginmanager.cpp 2007-07-23 12:43:10.000000000 -0400 ++++ ktorrent_new/libktorrent/pluginmanager.cpp 2007-08-07 00:46:55.000000000 -0400 +@@ -125,12 +125,13 @@ + p->shutdown(wjob); + if (wjob->needToWait()) + bt::WaitJob::execute(wjob); ++ else ++ delete wjob; + } + catch (Error & err) + { + Out(SYS_GEN|LOG_NOTICE) << "Error when unloading plugin: " << err.toString() << endl; + } +- delete wjob; + + gui->removePluginGui(p); + p->unload(); +@@ -174,14 +175,16 @@ + p->shutdown(wjob); + i++; + } ++ + if (wjob->needToWait()) + bt::WaitJob::execute(wjob); ++ else ++ delete wjob; + } + catch (Error & err) + { + Out(SYS_GEN|LOG_NOTICE) << "Error when unloading all plugins: " << err.toString() << endl; + } +- delete wjob; + + // then unload them + bt::PtrMap<QString,Plugin>::iterator i = plugins.begin(); diff --git a/net-p2p/ktorrent/ktorrent-2.2.1-r1.ebuild b/net-p2p/ktorrent/ktorrent-2.2.1-r1.ebuild new file mode 100644 index 000000000000..a82e01467992 --- /dev/null +++ b/net-p2p/ktorrent/ktorrent-2.2.1-r1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ktorrent-2.2.1-r1.ebuild,v 1.1 2007/08/10 20:05:19 keytoaster Exp $ + +inherit kde + +MY_P="${P/_/}" +MY_PV="${PV/_/}" +S="${WORKDIR}/${MY_P}" + +DESCRIPTION="A BitTorrent program for KDE." +HOMEPAGE="http://ktorrent.org/" +SRC_URI="http://ktorrent.org/downloads/${MY_PV}/${MY_P}.tar.gz" +LICENSE="GPL-2" + +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="kdeenablefinal" + +DEPEND="dev-libs/gmp" + +need-kde 3.4 + +LANGS="ar bg br ca cs cy da de el en_GB es et fa fr gl hu it ja ka lt +ms nds nl pa pl pt pt_BR ru rw sk sr sr@Latn sv tr uk zh_CN zh_TW" + +for X in ${LANGS} ; do + IUSE="${IUSE} linguas_${X}" +done + +src_unpack() { + kde_src_unpack + + local MAKE_LANGS + cd "${WORKDIR}/${MY_P}/translations" + for X in ${LANGS} ; do + use linguas_${X} && MAKE_LANGS="${MAKE_LANGS} ${X}" + done + rm -f ${S}/configure + sed -i -e "s:SUBDIRS=.*:SUBDIRS=${MAKE_LANGS}:" Makefile.am + + # Prevent a crash, fixes bug 187977 + cd "${S}" + epatch "${FILESDIR}/${P}-fix-wait-job-crash.patch" +} + +src_compile(){ + local myconf="--enable-knetwork" + kde_src_compile +} |