Add patch solving serious crashes when browsing images. Per bug #259984. Thanks to punraz for the patch.

(Portage version: 2.2_rc23/cvs/Linux x86_64)

3 files changed, 36 insertions, 2 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 7dddceaff9fa..84fe3e340a0a 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.127 2009/02/16 14:46:00 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.128 2009/03/04 20:14:04 scarabeus Exp $
+
+*digikam-0.10.0_rc2-r1 (04 Mar 2009)
+
+  04 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  +files/0.10.0_rc2-browseImages.patch, -digikam-0.10.0_rc2.ebuild,
+  +digikam-0.10.0_rc2-r1.ebuild:
+  Add patch solving serious crashes when browsing images. Per bug #259984.
+  Thanks to punraz for the patch.
 
 *digikam-0.10.0_rc2 (16 Feb 2009)
 
diff --git a/media-gfx/digikam/digikam-0.10.0_rc2.ebuild b/media-gfx/digikam/digikam-0.10.0_rc2-r1.ebuild
index 75bbce041b69..c6042de64626 100644
--- a/media-gfx/digikam/digikam-0.10.0_rc2.ebuild
+++ b/media-gfx/digikam/digikam-0.10.0_rc2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.10.0_rc2.ebuild,v 1.1 2009/02/16 14:46:00 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.10.0_rc2-r1.ebuild,v 1.1 2009/03/04 20:14:04 scarabeus Exp $
 
 EAPI="2"
 
@@ -40,6 +40,8 @@ DEPEND="
 #liblensfun when added should be also optional dep.
 RDEPEND="${DEPEND}"
 
+PATCHES=( "$FILESDIR/${PV}-browseImages.patch" )
+
 S="${WORKDIR}/${P/_/-}"
 
 src_prepare() {
diff --git a/media-gfx/digikam/files/0.10.0_rc2-browseImages.patch b/media-gfx/digikam/files/0.10.0_rc2-browseImages.patch
new file mode 100644
index 000000000000..47aac4d7848c
--- /dev/null
+++ b/media-gfx/digikam/files/0.10.0_rc2-browseImages.patch
@@ -0,0 +1,24 @@
+--- digikam/imagepreviewbar.cpp
++++ ../imagepreviewbar.cpp
+@@ -682,16 +682,17 @@
+ 
+ bool ImagePreviewBar::eventFilter(QObject *obj, QEvent *ev)
+ {
+-    if ( obj == qobject_cast<QObject*>(d->ratingBox) )
++    if ( obj == d->ratingBox )
+     {
+         if ( ev->type() == QEvent::Leave)
+         {
+-            if (d->ratingItem)
++            // Cave: ratingBox->hide can recurse here again! See bug 184473
++            ThumbBarItem *item = d->ratingItem;
++            if (item)
+             {
+                 unsetCursor();
++                d->ratingItem = 0;
+                 d->ratingBox->hide();
+-                ThumbBarItem *item = d->ratingItem;
+-                d->ratingItem      = 0;
+                 item->repaint();
+             }
+         }