diff options
| author | root <root@rshg047.dnsready.net> | 2011-05-25 22:48:05 +0000 |
|---|---|---|
| committer | root <root@rshg047.dnsready.net> | 2011-05-25 22:48:05 +0000 |
| commit | 6e35be4b44d90f92ddceb8b067cbbf03fc652a35 (patch) | |
| tree | 5a27309f3fe126e49f5a2f08f08b2526bc8d4dc2 /extra/kdelibs | |
| parent | 363d953113a327863013a9422c8212654a86a209 (diff) | |
Wed May 25 22:48:05 UTC 2011
Diffstat (limited to 'extra/kdelibs')
| -rw-r--r-- | extra/kdelibs/PKGBUILD | 13 | ||||
| -rw-r--r-- | extra/kdelibs/fix-double-POST-action.patch | 27 |
2 files changed, 36 insertions, 4 deletions
diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD index 0f4a867d4..006f488d8 100644 --- a/extra/kdelibs/PKGBUILD +++ b/extra/kdelibs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 122843 2011-05-06 11:48:02Z andrea $ +# $Id: PKGBUILD 124805 2011-05-24 14:15:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> 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 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl' 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 @@ build() { # 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 diff --git a/extra/kdelibs/fix-double-POST-action.patch b/extra/kdelibs/fix-double-POST-action.patch new file mode 100644 index 000000000..2672d65db --- /dev/null +++ b/extra/kdelibs/fix-double-POST-action.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"); |