rpms/kdelibs/F-10 kdelibs-4.3.0-bookmarks.patch, NONE, 1.1 kdelibs.spec, 1.439, 1.440

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29386/F-10

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.3.0-bookmarks.patch 
Log Message:
Sync from F-11:

* Wed Sep 02 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.1-2
- Patch for kde#160679

kdelibs-4.3.0-bookmarks.patch:
 kbookmark.cc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdelibs-4.3.0-bookmarks.patch ---
diff -rU5 kdelibs-4.3.0/kio/bookmarks/kbookmark.cc kdelibs-4.3.0.bookmarks/kio/bookmarks/kbookmark.cc
--- kdelibs-4.3.0/kio/bookmarks/kbookmark.cc	2008-07-08 05:54:18.000000000 -0400
+++ kdelibs-4.3.0.bookmarks/kio/bookmarks/kbookmark.cc	2009-08-28 15:09:07.000000000 -0400
@@ -681,11 +681,11 @@
         doc.setContent( payload );
         QDomElement elem = doc.documentElement();
         QDomNodeList children = elem.childNodes();
         for ( int childno = 0; childno < children.count(); childno++)
         {
-            bookmarks.append( KBookmark( children.item(childno).cloneNode(true).toElement() ));
+            bookmarks.append( KBookmark( children.item(childno).toElement() ));
         }
         return bookmarks;
     }
     const KUrl::List urls = KUrl::List::fromMimeData( mimeData );
     if ( !urls.isEmpty() )


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.439
retrieving revision 1.440
diff -u -p -r1.439 -r1.440
--- kdelibs.spec	1 Sep 2009 17:41:47 -0000	1.439
+++ kdelibs.spec	2 Sep 2009 18:57:49 -0000	1.440
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -80,6 +80,8 @@ Patch14: kdelibs-4.2.85-libexecdir.patch
 # kstandarddirs changes: search /etc/kde, find /usr/libexec/kde4
 Patch18: kdelibs-4.1.72-kstandarddirs.patch
 Patch20: kdelibs-4.1.70-cmake.patch
+# patch to fix keditbookmarks crash (kde#160679)
+Patch22: kdelibs-4.3.0-bookmarks.patch
 
 # upstream
 # 4.3 branch
@@ -209,6 +211,7 @@ format for easy browsing.
 %patch14 -p1 -b .libexecdir
 %patch18 -p1 -b .kstandarddirs
 %patch20 -p1 -b .xxcmake
+%patch22 -p1 -b .bookmarks
 
 # upstream patches
 # 4.3
@@ -397,6 +400,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Sep 02 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.1-2
+- Patch for kde#160679
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1