diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-06-04 18:01:13 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-06-04 18:01:13 +0000 |
| commit | 04debfb8c6a52af0c4d9551e9b44f2aeae66b328 (patch) | |
| tree | a50927f6f33935474e840f33be15f1f424538f6f /kde-base/kdelibs | |
| parent | Removed deprecated policies (diff) | |
| download | gentoo-2-04debfb8c6a52af0c4d9551e9b44f2aeae66b328.tar.gz gentoo-2-04debfb8c6a52af0c4d9551e9b44f2aeae66b328.tar.bz2 gentoo-2-04debfb8c6a52af0c4d9551e9b44f2aeae66b328.zip | |
Add upstream fix for super-annoying bug 370039 (double form post)
(Portage version: 2.1.9.50/cvs/Linux x86_64)
Diffstat (limited to 'kde-base/kdelibs')
| -rw-r--r-- | kde-base/kdelibs/ChangeLog | 9 | ||||
| -rw-r--r-- | kde-base/kdelibs/files/kdelibs-4.6.3-doublepost.patch | 27 | ||||
| -rw-r--r-- | kde-base/kdelibs/kdelibs-4.6.3-r2.ebuild (renamed from kde-base/kdelibs/kdelibs-4.6.3-r1.ebuild) | 3 |
3 files changed, 37 insertions, 2 deletions
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog index c9c11933f621..83f0594de2f7 100644 --- a/kde-base/kdelibs/ChangeLog +++ b/kde-base/kdelibs/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for kde-base/kdelibs # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.760 2011/06/02 21:57:38 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.761 2011/06/04 18:01:13 dilfridge Exp $ + +*kdelibs-4.6.3-r2 (04 Jun 2011) + + 04 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org> + -kdelibs-4.6.3-r1.ebuild, +kdelibs-4.6.3-r2.ebuild, + +files/kdelibs-4.6.3-doublepost.patch: + Add upstream fix for super-annoying bug 370039 (double form post) 02 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kdelibs-4.4.5-r4.ebuild, -files/kdelibs-4.4.5-cve20111168.patch, diff --git a/kde-base/kdelibs/files/kdelibs-4.6.3-doublepost.patch b/kde-base/kdelibs/files/kdelibs-4.6.3-doublepost.patch new file mode 100644 index 000000000000..2672d65db138 --- /dev/null +++ b/kde-base/kdelibs/files/kdelibs-4.6.3-doublepost.patch @@ -0,0 +1,27 @@ +commit 92db24adfa941003db1d885df01157056617f30b +Author: Maks Orlovich <maksim@kde.org> +Date: Sun May 8 14:39:03 2011 -0400 + + Fix the job-on-hold reuse logic, which caused the double-POST problem) + + adawit, could you please at least READ what you're backporting if you are + going to be this aggressive? Or better yet, please don't backport anything + that's not fixing a critical bug or is trivial, as per: + http://techbase.kde.org/Policies/Minor_Point_Release_Policy + + CCMAIL: adawit@kde.org + BUG: 272466 + +diff --git a/kio/kio/scheduler.cpp b/kio/kio/scheduler.cpp +index 55da053..9f5607e 100644 +--- a/kio/kio/scheduler.cpp ++++ b/kio/kio/scheduler.cpp +@@ -1151,7 +1151,7 @@ Slave *SchedulerPrivate::heldSlaveForJob(SimpleJob *job) + bool canJobReuse = (cmd == CMD_GET || cmd == CMD_MULTI_GET); + + if (KIO::TransferJob *tJob = qobject_cast<KIO::TransferJob *>(job)) { +- canJobReuse = cmd == (canJobReuse || cmd == CMD_SPECIAL); ++ canJobReuse = (canJobReuse || cmd == CMD_SPECIAL); + if (canJobReuse) { + KIO::MetaData outgoing = tJob->outgoingMetaData(); + const QString resume = outgoing.value("resume"); diff --git a/kde-base/kdelibs/kdelibs-4.6.3-r1.ebuild b/kde-base/kdelibs/kdelibs-4.6.3-r2.ebuild index 7ea4c36084a2..fd3f0527d6f1 100644 --- a/kde-base/kdelibs/kdelibs-4.6.3-r1.ebuild +++ b/kde-base/kdelibs/kdelibs-4.6.3-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.6.3-r1.ebuild,v 1.3 2011/05/10 19:48:48 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.6.3-r2.ebuild,v 1.1 2011/06/04 18:01:13 dilfridge Exp $ EAPI=4 @@ -135,6 +135,7 @@ PATCHES=( "${FILESDIR}/${PN}-4.6.2-nonepomuk.patch" "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch" "${FILESDIR}/${PN}-4.6.3-use_QWeakPointer.patch" + "${FILESDIR}/${PN}-4.6.3-doublepost.patch" ) pkg_pretend() { |