rpms/kdebase/devel kdebase-4.4.0-folderview-sorting-kde#227157.patch, NONE, 1.1 kdebase.spec, 1.420, 1.421

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13568/devel

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-4.4.0-folderview-sorting-kde#227157.patch 
Log Message:
* Thu Feb 25 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:4.4.0-4
- backport fix for folderview getting resorted on file creation (kde#227157)

kdebase-4.4.0-folderview-sorting-kde#227157.patch:
 iconview.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdebase-4.4.0-folderview-sorting-kde#227157.patch ---
Index: apps/plasma/applets/folderview/iconview.cpp
===================================================================
--- apps/plasma/applets/folderview/iconview.cpp	(revision 1095736)
+++ apps/plasma/applets/folderview/iconview.cpp	(revision 1095737)
@@ -358,7 +358,7 @@
     Q_UNUSED(parent)
     m_regionCache.clear();
 
-    if (!m_layoutBroken || listingInProgress()) {
+    if (!m_layoutBroken || !m_savedPositions.isEmpty()) {
         if (first < m_validRows) {
             m_validRows = 0;
         }


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.420
retrieving revision 1.421
diff -u -p -r1.420 -r1.421
--- kdebase.spec	10 Feb 2010 18:52:25 -0000	1.420
+++ kdebase.spec	25 Feb 2010 07:48:21 -0000	1.421
@@ -3,7 +3,7 @@ Name:    kdebase
 Summary: KDE Core Files
 Epoch:   6
 Version: 4.4.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 Group: User Interface/Desktops
@@ -18,6 +18,11 @@ Patch2:   kdebase-4.2.1-home-icon.patch
 ## upstream patches
 # remove extra spaces from konsole selections, https://bugzilla.redhat.com/560721
 Patch100: kdebase-4.3.95-konsole-extra-spaces.patch
+# from 4.4.1:
+# http://websvn.kde.org/?view=revision&revision=1095737 (fredrik)
+# Fix the icon view always being resorted when a new file is created.
+# https://bugs.kde.org/show_bug.cgi?id=227157
+Patch101: kdebase-4.4.0-folderview-sorting-kde#227157.patch
 
 %ifnarch s390 s390x
 Requires: eject
@@ -113,6 +118,7 @@ Requires: kdelibs4-devel kdepimlibs4-dev
 %patch2 -p1 -b .home-icon
 
 %patch100 -p1 -b .konsole-extra-spaces
+%patch101 -p0 -b .kde#227157
 
 
 %build
@@ -231,6 +237,9 @@ fi
 
 
 %changelog
+* Thu Feb 25 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:4.4.0-4
+- backport fix for folderview getting resorted on file creation (kde#227157)
+
 * Wed Feb 10 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:4.4.0-3
 - BR webkitpart-devel >= 0.0.5