Hello community,

here is the log from the commit of package kdelibs4 for openSUSE:Factory
checked in at Thu May 19 10:31:03 CEST 2011.



--------
--- KDE/kdelibs4/kdelibs4-apidocs.changes       2011-04-28 18:06:22.000000000 
+0200
+++ /mounts/work_src_done/STABLE/kdelibs4/kdelibs4-apidocs.changes      
2011-05-18 22:12:55.000000000 +0200
@@ -1,0 +2,5 @@
+Wed May 18 20:08:01 UTC 2011 - [email protected]
+
+- fix double post problem with konqueror (kde#272466)
+
+-------------------------------------------------------------------
kdelibs4.changes: same change

calling whatdependson for head-i586


New:
----
  bugzilla-mid-air-collission-bko272466.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdelibs4-apidocs.spec ++++++
--- /var/tmp/diff_new_pack.TSk97l/_old  2011-05-19 10:30:36.000000000 +0200
+++ /var/tmp/diff_new_pack.TSk97l/_new  2011-05-19 10:30:36.000000000 +0200
@@ -26,7 +26,7 @@
 Summary:        KDE 4 API documentation
 Url:            http://www.kde.org
 Version:        4.6.3
-Release:        1
+Release:        2
 Requires:       kde4-filesystem
 Source0:        kdelibs-%version.tar.bz2
 Source1:        baselibs.conf

++++++ kdelibs4.spec ++++++
--- /var/tmp/diff_new_pack.TSk97l/_old  2011-05-19 10:30:36.000000000 +0200
+++ /var/tmp/diff_new_pack.TSk97l/_new  2011-05-19 10:30:36.000000000 +0200
@@ -44,7 +44,7 @@
 Summary:        KDE Base Libraries
 Url:            http://www.kde.org
 Version:        4.6.3
-Release:        1
+Release:        3
 Requires:       soprano >= %( echo `rpm -q --queryformat '%{VERSION}' 
libsoprano-devel`)
 Recommends:     strigi >= %( echo `rpm -q --queryformat '%{VERSION}' 
strigi-devel`)
 Requires:       kdelibs4-core = %version
@@ -74,6 +74,7 @@
 Patch24:        ksuseinstall.diff
 Patch25:        ksuseinstall_11.2.diff
 Patch28:        no_kbookmark_write_error.diff
+Patch29:        bugzilla-mid-air-collission-bko272466.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %requires_ge        libqt4-x11
 %if 0%{?opensuse_bs}
@@ -161,6 +162,8 @@
 %patch25
 %endif
 %patch28 -p1
+#Can be removed with KDE 4.6.4
+%patch29
 #
 # define KDE version exactly
 #

++++++ bugzilla-mid-air-collission-bko272466.diff ++++++
commit 92db24adfa941003db1d885df01157056617f30b
Author: Maks Orlovich <[email protected]>
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: [email protected]
    BUG: 272466

diff --git a/kio/kio/scheduler.cpp b/kio/kio/scheduler.cpp
index 55da053..9f5607e 100644
--- kio/kio/scheduler.cpp
+++ 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");


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to