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

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 39 insertions, 4 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/Manifest b/media-gfx/digikam/Manifest
index 8efcce487d71..dd22bf434901 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,3 +1,4 @@
+AUX 0.10.0_rc2-browseImages.patch 753 RMD160 18a67d740f50dacf80579273f9ea0412d8e46a87 SHA1 f4ccc9ab7ee23f3bea450e09ab1a1b9cd8d0887d SHA256 8c26fcd8e4f83a7519d133c6764be338a95cfe29d3fc4b5d98b9a6c0c2d7c53e
 AUX digikam-lcms-1.17.patch 468 RMD160 2dfd58fe72450b94cac4b36ce64c02a6055ea356 SHA1 f4c84bb8166876f8a12a7543d262eda15acbd63f SHA256 534877c73bdee6714c3ddd74cb365d5f866b48f4f7bf1eb50d874595afd80d6c
 DIST digikam-0.10.0-rc2.tar.bz2 11009544 RMD160 a38974f3ebc93563f494bd72f743cf5e60b6eae2 SHA1 0c10c1aa7fa7350646f4e72b7367929c2322f086 SHA256 84326e1946e7c811e7a02bc6f732f6004173231c795aa2f6348f60baf46d6270
 DIST digikam-0.9.2.tar.bz2 10514411 RMD160 c9f1faacea00362595a400e0514d388055f53243 SHA1 8344355c3a9e4b8648d2e1a853cdf54e90918d91 SHA256 0b1c3f83c8be3578f2d94a31dc51139a167a078aca1522a8571bf31d633fcf0f
@@ -6,10 +7,10 @@ DIST digikam-0.9.5-beta3.tar.bz2 11314564 RMD160 2806530d0235f473ab0902dc5b67a7a
 DIST digikam-doc-0.9.2-beta2.tar.bz2 40596219 RMD160 32a26bcc1f89da53464e2dd1cd9ca7c5be227a9b SHA1 998900d3327e852dc09aa2baf7fef43ee271eaf3 SHA256 bffcf0de73bbc16870eb68abec7836ab3b997cdb30634f984bd5036658806ceb
 DIST digikam-doc-0.9.4.tar.bz2 58242503 RMD160 6315f32a98c0442ae8577cc06230f88ce2850826 SHA1 16ba0b1e74b405625c166652b72b8c02def08f51 SHA256 0fe52595f7a992fb9749ad2fe26050d19421fe5960cb8b6c328b774bfee5f3e7
 DIST digikam-doc-0.9.5.tar.bz2 55368251 RMD160 791b72883fc7043e8130bb827dae943e208840cb SHA1 42b9a1d6240f87d969fe371f0d66b76cf3259e68 SHA256 8ed9c108110c8c50362241c69bcba5c45ec54987a9640d1e8c5752785a17e484
-EBUILD digikam-0.10.0_rc2.ebuild 2058 RMD160 658ff087af795d060e97218843bc7fecae794b50 SHA1 e4d61726420187bedf65cbc75a39565254e10ec7 SHA256 cec9663584b3e869ec88e672d05b81ea640d2344735055d576a1b2fb4dd72b50
+EBUILD digikam-0.10.0_rc2-r1.ebuild 2111 RMD160 37b3a4e474bc5f20ddf73d7d9a9dd1bbd9cb486d SHA1 a35208508e2c0dfde39e288148d5aa102a7ab29c SHA256 7fde62bda84a0684e9f98737f2585a2349121ff653739367169cc0e26501d7bf
 EBUILD digikam-0.9.2.ebuild 2415 RMD160 8d16c355c0e245dfdb6503855a75cd878227faa2 SHA1 ce9407f902555f0ba96113d2f7c7a9bb3e238b3b SHA256 0e733d44b6ea959568ee8107b62c18fd10cdc53e95046bd395b631de7e7fbe09
 EBUILD digikam-0.9.4-r1.ebuild 2727 RMD160 fbdd71997034679c93d3c6e01abcd6568038bc4b SHA1 d1e5790f70586fd58b83c19477f22eb2e085ceaf SHA256 ddb4ff7e41f13db6c2a0f2e3dc76e11daaaffa73a62b73d49b5188cbb60d6b63
 EBUILD digikam-0.9.4.ebuild 2409 RMD160 095ddc27b4b298af0274bc30b6e2145b5e67378a SHA1 e9b5fb301416f167404e4b17f6f95cb5246bb03e SHA256 00eff2ae53005cd098f7cf591fbadc69cece551d86f1557ef48f23504581ffca
 EBUILD digikam-0.9.5_beta3.ebuild 2735 RMD160 c55da476cf7d7ddd870daa39dd24d8429e62eeee SHA1 42e21f33edcabdd8164184718619a39f99e9be9b SHA256 af47bd69cd3b6c7f34d248b886d2c9f483a906dfcdfb7b239e0689741ca19470
-MISC ChangeLog 20900 RMD160 74bce75e310e7ebbbcf0d9663a924cc4d00c2ac9 SHA1 e57a871c7aaef61f0aee8e38e5ca4e861eded768 SHA256 5ce87cfe68fc4a34c69f2ebad1c8af1e54f30996a80797d9425040c1a6753a91
+MISC ChangeLog 21201 RMD160 bd5d2cfa07c7b4af26c44e218c4013a384b8241f SHA1 5732d7ec179b47ae1dd8f3be553a49b196865f2a SHA256 f76adc9fb0eb5bc80a3f3b03ad08d5eb3f0e9601bd0ced2e5c2c08ef6961a96e
 MISC metadata.xml 376 RMD160 3158e2babdd75064d05a08420e0f1d2d3b318fae SHA1 bf9026c227e27333e688b7a4d639e7eaf7ba5993 SHA256 9ea05856a338312e6d9d3ebe15b935d371bd4bd21eeaa796d71db1a92b4e7231
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();
+             }
+         }