diff --git a/kdelibs-4.3.0-bookmarks.patch b/kdelibs-4.3.0-bookmarks.patch new file mode 100644 index 0000000..65bb650 --- /dev/null +++ b/kdelibs-4.3.0-bookmarks.patch @@ -0,0 +1,16 @@ +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() ) diff --git a/kdelibs.spec b/kdelibs.spec index ed750ed..23f486d 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -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 - 4.3.1-2 +- Patch for kde#160679 + * Fri Aug 28 2009 Than Ngo - 4.3.1-1 - 4.3.1