rev 10672 - in branches/kde4/packages/kdebase/debian: . patches

[Modestas Vainius]

Author: modax-guest
Date: 2008-05-22 09:03:50 +0000 (Thu, 22 May 2008)
New Revision: 10672

Added:
   branches/kde4/packages/kdebase/debian/patches/01_r811027_konqcrash_on_rightclick.diff
Modified:
   branches/kde4/packages/kdebase/debian/changelog
   branches/kde4/packages/kdebase/debian/patches/series
Log:
Konqueror crash fix.

Modified: branches/kde4/packages/kdebase/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase/debian/changelog	2008-05-22 00:26:09 UTC (rev 10671)
+++ branches/kde4/packages/kdebase/debian/changelog	2008-05-22 09:03:50 UTC (rev 10672)
@@ -1,4 +1,4 @@
-kdebase (4:4.0.80-1~pre1) UNRELEASED; urgency=low
+kdebase (4:4.0.80-1~pre2) UNRELEASED; urgency=low
 
   * New upstream development milestone (KDE 4.1 Beta1).
 
@@ -6,8 +6,10 @@
 
   * Resync 97_ patch.
   * Update install files.
+  * Backport 01_r811027_konqcrash_on_rightclick.diff patch from upstream svn
+    which fixes a konqueror crash on each mouse right click.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 22 May 2008 02:58:28 +0300
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 22 May 2008 11:55:10 +0300
 
 kdebase (4:4.0.74-1) experimental; urgency=low
 

Added: branches/kde4/packages/kdebase/debian/patches/01_r811027_konqcrash_on_rightclick.diff
===================================================================
--- branches/kde4/packages/kdebase/debian/patches/01_r811027_konqcrash_on_rightclick.diff	                        (rev 0)
+++ branches/kde4/packages/kdebase/debian/patches/01_r811027_konqcrash_on_rightclick.diff	2008-05-22 09:03:50 UTC (rev 10672)
@@ -0,0 +1,17 @@
+Index: apps/lib/konq/konq_popupmenu.cpp
+===================================================================
+--- a/apps/lib/konq/konq_popupmenu.cpp	(revision 811026)
++++ b/apps/lib/konq/konq_popupmenu.cpp	(revision 811027)
+@@ -196,8 +196,10 @@
+     QFileInfo parentDirInfo;
+ 
+     KUrl url;
+-    KFileItemList::const_iterator it = m_popupMenuInfo.items().begin();
+-    const KFileItemList::const_iterator kend = m_popupMenuInfo.items().end();
++
++    KFileItemList lstItems = m_popupMenuInfo.items();
++    KFileItemList::const_iterator it = lstItems.begin();
++    const KFileItemList::const_iterator kend = lstItems.end();
+     for ( ; it != kend; ++it )
+     {
+         url = (*it).url();

Modified: branches/kde4/packages/kdebase/debian/patches/series
===================================================================
--- branches/kde4/packages/kdebase/debian/patches/series	2008-05-22 00:26:09 UTC (rev 10671)
+++ branches/kde4/packages/kdebase/debian/patches/series	2008-05-22 09:03:50 UTC (rev 10672)
@@ -1 +1,2 @@
+01_r811027_konqcrash_on_rightclick.diff
 97_fix_target_link_libraries.diff