[arch-commits] Commit in kdelibs/trunk (PKGBUILD fix-double-POST-action.patch)
Andrea Scarpino
andrea at archlinux.org
Tue May 24 14:15:20 UTC 2011
Date: Tuesday, May 24, 2011 @ 10:15:20
Author: andrea
Revision: 124805
Fix a bug when using POST in KHTML browsers
Added:
kdelibs/trunk/fix-double-POST-action.patch
Modified:
kdelibs/trunk/PKGBUILD
------------------------------+
PKGBUILD | 11 ++++++++---
fix-double-POST-action.patch | 27 +++++++++++++++++++++++++++
2 files changed, 35 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-05-24 13:57:04 UTC (rev 124804)
+++ PKGBUILD 2011-05-24 14:15:20 UTC (rev 124805)
@@ -4,7 +4,7 @@
pkgname=kdelibs
pkgver=4.6.3
-pkgrel=2
+pkgrel=3
pkgdesc="KDE Core Libraries"
arch=('i686' 'x86_64')
url='http://www.kde.org'
@@ -19,11 +19,13 @@
replaces=('arts' 'kdelibs-experimental')
install='kdelibs.install'
source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
- 'kde-applications-menu.patch' 'archlinux-menu.patch' 'abs-syntax-highlight.patch')
+ 'kde-applications-menu.patch' 'archlinux-menu.patch'
+ 'abs-syntax-highlight.patch' 'fix-double-POST-action.patch')
sha1sums=('c7fb089c9d52a6b1d9188b9e788753373a3288e4'
'86ee8c8660f19de8141ac99cd6943964d97a1ed7'
'63a850ab4196b9d06934f2b4a13acd9f7739bc67'
- 'd994f262356af5b9e4e9619646e471bd98c91efb')
+ 'd994f262356af5b9e4e9619646e471bd98c91efb'
+ 'c8ef05943e71a28c4604217d31fc6ca83e48476c')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -35,6 +37,9 @@
# add syntax highlightning for PKGBUILD and .install files
patch -p1 -i $srcdir/abs-syntax-highlight.patch
+ # Already fixed upstream
+ patch -p1 -i $srcdir/fix-double-POST-action.patch
+
cd ${srcdir}
mkdir build
cd build
Added: fix-double-POST-action.patch
===================================================================
--- fix-double-POST-action.patch (rev 0)
+++ fix-double-POST-action.patch 2011-05-24 14:15:20 UTC (rev 124805)
@@ -0,0 +1,27 @@
+commit 92db24adfa941003db1d885df01157056617f30b
+Author: Maks Orlovich <maksim at 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 at 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");
More information about the arch-commits
mailing list