[arch-commits] Commit in kdelibs/trunk (PKGBUILD fix-double-POST-action.patch)

[Andrea Scarpino]

    Date: Monday, June 6, 2011 @ 02:05:44
  Author: andrea
Revision: 126527

KDE SC 4.6.4

Modified:
  kdelibs/trunk/PKGBUILD
Deleted:
  kdelibs/trunk/fix-double-POST-action.patch

------------------------------+
 PKGBUILD                     |   14 +++++---------
 fix-double-POST-action.patch |   27 ---------------------------
 2 files changed, 5 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-06-06 04:31:59 UTC (rev 126526)
+++ PKGBUILD	2011-06-06 06:05:44 UTC (rev 126527)
@@ -3,8 +3,8 @@
 # Contributor: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=kdelibs
-pkgver=4.6.3
-pkgrel=3
+pkgver=4.6.4
+pkgrel=1
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -20,12 +20,11 @@
 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' 'fix-double-POST-action.patch')
-sha1sums=('c7fb089c9d52a6b1d9188b9e788753373a3288e4'
+        'abs-syntax-highlight.patch')
+sha1sums=('088778bdda8b8c7a7b192abbf0d2a0660a20626d'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
           '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
-          'd994f262356af5b9e4e9619646e471bd98c91efb'
-          'c8ef05943e71a28c4604217d31fc6ca83e48476c')
+          'd994f262356af5b9e4e9619646e471bd98c91efb')
 
 build() {
        cd ${srcdir}/${pkgname}-${pkgver}
@@ -37,9 +36,6 @@
        # 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

Deleted: fix-double-POST-action.patch
===================================================================
--- fix-double-POST-action.patch	2011-06-06 04:31:59 UTC (rev 126526)
+++ fix-double-POST-action.patch	2011-06-06 06:05:44 UTC (rev 126527)
@@ -1,27 +0,0 @@
-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");