Version bump, closes bug 171054. Marked ~amd64, bug 169160.

(Portage version: 2.1.2.2)

6 files changed, 15 insertions, 222 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 57887279cd4b..d7e1da512731 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.81 2007/03/09 17:20:42 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.82 2007/03/17 20:27:29 cryos Exp $
+
+*digikam-0.9.1 (17 Mar 2007)
+
+  17 Mar 2007; Marcus D. Hanwell <cryos@gentoo.org>
+  -files/digikam-0.9.0_beta1-memory-leak-fix.patch,
+  -files/digikam-0.9.0_beta1-rate-pictures-fix.diff,
+  -files/digikam-0.9.0_beta2-asneeded.patch, -digikam-0.9.1_rc1.ebuild,
+  +digikam-0.9.1.ebuild:
+  Version bump, closes bug 171054. Marked ~amd64, bug 169160.
 
   09 Mar 2007; Gustavo Zacarias <gustavoz@gentoo.org>
   digikam-0.9.1_rc1.ebuild:
diff --git a/media-gfx/digikam/digikam-0.9.1_rc1.ebuild b/media-gfx/digikam/digikam-0.9.1.ebuild
index 090a2e78a7ce..12c72962152f 100644
--- a/media-gfx/digikam/digikam-0.9.1_rc1.ebuild
+++ b/media-gfx/digikam/digikam-0.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.9.1_rc1.ebuild,v 1.2 2007/03/09 17:20:42 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.9.1.ebuild,v 1.1 2007/03/17 20:27:29 cryos Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -17,7 +17,7 @@ HOMEPAGE="http://www.digikam.org/"
 SRC_URI=""
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~sparc ~x86"
+KEYWORDS="~amd64 ~sparc ~x86"
 IUSE="nfs doc kdehiddenvisibility kdeenablefinal"
 
 DEPEND=">=media-libs/libgphoto2-2.2
diff --git a/media-gfx/digikam/files/digest-digikam-0.9.1_rc1 b/media-gfx/digikam/files/digest-digikam-0.9.1
index 6f825578a3c4..5847e53a2626 100644
--- a/media-gfx/digikam/files/digest-digikam-0.9.1_rc1
+++ b/media-gfx/digikam/files/digest-digikam-0.9.1
@@ -1,6 +1,6 @@
-MD5 7f7da3908e414f7ac6255b33e5d227a9 digikam-0.9.1-rc1.tar.bz2 6693891
-RMD160 e72277f2bfb59340a0a17979ba1e484a54ba5242 digikam-0.9.1-rc1.tar.bz2 6693891
-SHA256 12c980e434387c6aab74455a04ea66fae3ae7d5fd2f2719478a1c3c1c9a88afc digikam-0.9.1-rc1.tar.bz2 6693891
+MD5 41e673dac4d0bb6203a6ec615d44b893 digikam-0.9.1.tar.bz2 6781756
+RMD160 920cb49315dfbbe8c9944209568a8430b5e0404f digikam-0.9.1.tar.bz2 6781756
+SHA256 7d6a4d9828f05024b206964ddda9119a9767da351c44cd7bbab342d11b24a5a4 digikam-0.9.1.tar.bz2 6781756
 MD5 9576d0d2d9898d4d63964e572b35d8c9 digikam-doc-0.8.2-da.tar.bz2 50158
 RMD160 c78a62d17045e5a47d562acbc4a5cb3f1b62e558 digikam-doc-0.8.2-da.tar.bz2 50158
 SHA256 5b3301301dbbfae999d7398d7ee2651c6c4b94f4baa8566d5d1c9914b2bfe142 digikam-doc-0.8.2-da.tar.bz2 50158
diff --git a/media-gfx/digikam/files/digikam-0.9.0_beta1-memory-leak-fix.patch b/media-gfx/digikam/files/digikam-0.9.0_beta1-memory-leak-fix.patch
deleted file mode 100644
index 450721daf61c..000000000000
--- a/media-gfx/digikam/files/digikam-0.9.0_beta1-memory-leak-fix.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- trunk/extragear/graphics/digikam/digikam/imagepreviewjob.cpp #567459:567460
-@@ -173,6 +173,12 @@
-         stream >> width >> height >> depth;
-         preview = QImage(d->shmaddr, width, height, depth,
-                          0, 0, QImage::IgnoreEndian);
-+
-+        // The buffer supplied to the QImage constructor above must remain valid
-+        // throughout the lifetime of the object.
-+        // This is not true, the shared memory will be freed or reused.
-+        // If we pass the object around, we must do a deep copy.
-+        preview = preview.copy();
-     }
-     else
-     {
---- trunk/extragear/graphics/digikam/digikam/imagepreviewwidget.cpp #567459:567460
-@@ -91,11 +91,11 @@
- 
- ImagePreviewWidget::~ImagePreviewWidget()
- {
--    if (!d->previewJob.isNull())
-+    if (d->previewJob)
-         d->previewJob->kill();
--    
-+
-     d->blinkPreviewTimer->stop();
--            
-+
-     delete d;
- }
- 
-@@ -107,6 +107,9 @@
-     d->previewBlink      = false;
-     d->blinkPreviewTimer->start(200);
- 
-+    if (d->previewJob)
-+        d->previewJob->kill();
-+
-     d->previewJob = new ImagePreviewJob(KURL(path), 1024, AlbumSettings::instance()->getExifRotate());
- 
-     connect(d->previewJob, SIGNAL(signalImagePreview(const KURL&, const QImage&)),
-@@ -129,9 +132,16 @@
- void ImagePreviewWidget::slotGotImagePreview(const KURL&, const QImage& preview)
- {
-     d->blinkPreviewTimer->stop();
--    d->previewJob = 0;    
-     d->preview    = preview;
-     d->pixmap     = QPixmap(contentsRect().size());
-+
-+    // It is very important to kill the thumbnail job properly
-+    // so that is frees its shared memory. Otherwise the memory
-+    // will _never_ be freed, see b.k.o. #131277
-+    if (d->previewJob)
-+        d->previewJob->kill();
-+    d->previewJob = 0;
-+
-     updatePixmap();
-     repaint(false);
-     emit previewComplete();
-@@ -140,7 +150,11 @@
- void ImagePreviewWidget::slotFailedImagePreview(const KURL&)
- {
-     d->blinkPreviewTimer->stop();
--    d->previewJob = 0;    
-+
-+    if (d->previewJob)
-+        d->previewJob->kill();
-+    d->previewJob = 0;
-+
-     d->preview    = QImage();
-     d->pixmap     = QPixmap(contentsRect().size());
-     updatePixmap();
diff --git a/media-gfx/digikam/files/digikam-0.9.0_beta1-rate-pictures-fix.diff b/media-gfx/digikam/files/digikam-0.9.0_beta1-rate-pictures-fix.diff
deleted file mode 100644
index 7aa0f12eb2e7..000000000000
--- a/media-gfx/digikam/files/digikam-0.9.0_beta1-rate-pictures-fix.diff
+++ /dev/null
@@ -1,121 +0,0 @@
-diff -U 4 -H -b -w -B -E -d -i -r digikam-0.9.0-beta1-orig/digikam/digikam/digikamapp.cpp digikam-0.9.0-beta1/digikam/digikam/digikamapp.cpp
---- digikam-0.9.0-beta1-orig/digikam/digikam/digikamapp.cpp	2006-09-02 13:30:02.000000000 +0200
-+++ digikam-0.9.0-beta1/digikam/digikam/digikamapp.cpp	2006-09-02 13:32:15.000000000 +0200
-@@ -678,24 +678,24 @@
-                                    "gamma_adjustment");
- 
-     // -- Rating actions ---------------------------------------------------------------
- 
--    m_0Star = new KAction(i18n("No Star"), CTRL+Key_0,
-+    m_0Star = new KAction(i18n("Assign Rating \"No Star\""), CTRL+Key_0,
-                           mView, SLOT(slotAssignRatingNoStar()),
-                           actionCollection(), "imageview_ratenostar");
--    m_1Star = new KAction(i18n("One Star"), CTRL+Key_1,
-+    m_1Star = new KAction(i18n("Assign Rating \"One Star\""), CTRL+Key_1,
-                           mView, SLOT(slotAssignRatingOneStar()),
-                           actionCollection(), "imageview_rateonestar");
--    m_2Star = new KAction(i18n("Two Star"), CTRL+Key_2, 
-+    m_2Star = new KAction(i18n("Assign Rating \"Two Stars\""), CTRL+Key_2, 
-                           mView, SLOT(slotAssignRatingTwoStar()),
-                           actionCollection(), "imageview_ratetwostar");
--    m_3Star = new KAction(i18n("Three Star"), CTRL+Key_3, 
-+    m_3Star = new KAction(i18n("Assign Rating \"Three Stars\""), CTRL+Key_3, 
-                           mView, SLOT(slotAssignRatingThreeStar()),
-                           actionCollection(), "imageview_ratethreestar");
--    m_4Star = new KAction(i18n("Four Star"), CTRL+Key_4, 
-+    m_4Star = new KAction(i18n("Assign Rating \"Four Stars\""), CTRL+Key_4, 
-                           mView, SLOT(slotAssignRatingFourStar()),
-                           actionCollection(), "imageview_ratefourstar");
--    m_5Star = new KAction(i18n("Five Star"), CTRL+Key_5, 
-+    m_5Star = new KAction(i18n("Assign Rating \"Five Stars\""), CTRL+Key_5, 
-                           mView, SLOT(slotAssignRatingFiveStar()),
-                           actionCollection(), "imageview_ratefivestar");
- 
-     // -----------------------------------------------------------
-Only in digikam-0.9.0-beta1/digikam/digikam: digikamapp.cpp~
-diff -U 4 -H -b -w -B -E -d -i -r digikam-0.9.0-beta1-orig/digikam/digikam/digikamview.cpp digikam-0.9.0-beta1/digikam/digikam/digikamview.cpp
---- digikam-0.9.0-beta1-orig/digikam/digikam/digikamview.cpp	2006-09-02 13:30:02.000000000 +0200
-+++ digikam-0.9.0-beta1/digikam/digikam/digikamview.cpp	2006-09-02 13:34:06.000000000 +0200
-@@ -882,39 +882,39 @@
- }
- 
- void DigikamView::slotAssignRating(int rating)
- {
--    d->rightSideBar->slotAssignRating(rating);
-+    d->iconView->slotAssignRating(rating);
- }
- 
- void DigikamView::slotAssignRatingNoStar()
- {
--    d->rightSideBar->slotAssignRating(0);
-+    d->iconView->slotAssignRating(0);
- }
- 
- void DigikamView::slotAssignRatingOneStar()
- {
--    d->rightSideBar->slotAssignRating(1);
-+    d->iconView->slotAssignRating(1);
- }
- 
- void DigikamView::slotAssignRatingTwoStar()
- {
--    d->rightSideBar->slotAssignRating(2);
-+    d->iconView->slotAssignRating(2);
- }
- 
- void DigikamView::slotAssignRatingThreeStar()
- {
--    d->rightSideBar->slotAssignRating(3);
-+    d->iconView->slotAssignRating(3);
- }
- 
- void DigikamView::slotAssignRatingFourStar()
- {
--    d->rightSideBar->slotAssignRating(4);
-+    d->iconView->slotAssignRating(4);
- }
- 
- void DigikamView::slotAssignRatingFiveStar()
- {
--    d->rightSideBar->slotAssignRating(5);
-+    d->iconView->slotAssignRating(5);
- }
- 
- }  // namespace Digikam
- 
-Only in digikam-0.9.0-beta1/digikam/digikam: digikamview.cpp~
-diff -U 4 -H -b -w -B -E -d -i -r digikam-0.9.0-beta1-orig/digikam/utilities/imageeditor/editor/imagewindow.cpp digikam-0.9.0-beta1/digikam/utilities/imageeditor/editor/imagewindow.cpp
---- digikam-0.9.0-beta1-orig/digikam/utilities/imageeditor/editor/imagewindow.cpp	2006-09-02 13:30:02.000000000 +0200
-+++ digikam-0.9.0-beta1/digikam/utilities/imageeditor/editor/imagewindow.cpp	2006-09-02 13:36:25.000000000 +0200
-@@ -223,24 +223,24 @@
-     setupStandardActions();
- 
-     // -- Rating actions ---------------------------------------------------------------
- 
--    m_0Star = new KAction(i18n("No Star"), CTRL+Key_0,
-+    m_0Star = new KAction(i18n("Assign Rating \"No Star\""), CTRL+Key_0,
-                           m_rightSidebar, SLOT(slotAssignRatingNoStar()),
-                           actionCollection(), "imageview_ratenostar");
--    m_1Star = new KAction(i18n("One Star"), CTRL+Key_1,
-+    m_1Star = new KAction(i18n("Assign Rating \"One Star\""), CTRL+Key_1,
-                           m_rightSidebar, SLOT(slotAssignRatingOneStar()),
-                           actionCollection(), "imageview_rateonestar");
--    m_2Star = new KAction(i18n("Two Star"), CTRL+Key_2, 
-+    m_2Star = new KAction(i18n("Assign Rating \"Two Stars\""), CTRL+Key_2,
-                           m_rightSidebar, SLOT(slotAssignRatingTwoStar()),
-                           actionCollection(), "imageview_ratetwostar");
--    m_3Star = new KAction(i18n("Three Star"), CTRL+Key_3, 
-+    m_3Star = new KAction(i18n("Assign Rating \"Three Stars\""), CTRL+Key_3,
-                           m_rightSidebar, SLOT(slotAssignRatingThreeStar()),
-                           actionCollection(), "imageview_ratethreestar");
--    m_4Star = new KAction(i18n("Four Star"), CTRL+Key_4, 
-+    m_4Star = new KAction(i18n("Assign Rating \"Four Stars\""), CTRL+Key_4,
-                           m_rightSidebar, SLOT(slotAssignRatingFourStar()),
-                           actionCollection(), "imageview_ratefourstar");
--    m_5Star = new KAction(i18n("Five Star"), CTRL+Key_5, 
-+    m_5Star = new KAction(i18n("Assign Rating \"Five Stars\""), CTRL+Key_5,
-                           m_rightSidebar, SLOT(slotAssignRatingFiveStar()),
-                           actionCollection(), "imageview_ratefivestar");
- 
-     // ---------------------------------------------------------------------------------
-Only in digikam-0.9.0-beta1/digikam/utilities/imageeditor/editor: imagewindow.cpp~
diff --git a/media-gfx/digikam/files/digikam-0.9.0_beta2-asneeded.patch b/media-gfx/digikam/files/digikam-0.9.0_beta2-asneeded.patch
deleted file mode 100644
index a876503db3e9..000000000000
--- a/media-gfx/digikam/files/digikam-0.9.0_beta2-asneeded.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- digikam-0.9.0-beta2/digikam/showfoto/Makefile.am.orig	2006-09-30 19:23:15.000000000 +0200
-+++ digikam-0.9.0-beta2/digikam/showfoto/Makefile.am	2006-09-30 19:21:53.000000000 +0200
-@@ -22,9 +22,7 @@
- 
- showfoto_SOURCES = main.cpp showfoto.cpp 
- 
--showfoto_LDADD   = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KUTILS) \
--		   $(LIB_KFILE) $(LIB_KPARTS) $(LIBJPEG) $(LIB_EXIV2) \
--		   $(top_builddir)/digikam/showfoto/setup/libsetup.la \
-+showfoto_LDADD   = $(top_builddir)/digikam/showfoto/setup/libsetup.la \
- 		   $(top_builddir)/digikam/libs/widgets/libwidgets.la \
- 		   $(top_builddir)/digikam/libs/dialogs/libdialog.la \
- 		   $(top_builddir)/digikam/libs/imageproperties/libimagepropertiesshowfoto.la \
-@@ -33,7 +31,9 @@
- 		   $(top_builddir)/digikam/utilities/imageeditor/editor/libdimgeditor.la \
- 		   $(top_builddir)/digikam/utilities/imageeditor/editor/libshowfoto.la \
- 		   $(top_builddir)/digikam/utilities/splashscreen/libsplashscreen.la \
--		   $(top_builddir)/digikam/libs/threadimageio/libthreadimageio.la
-+		   $(top_builddir)/digikam/libs/threadimageio/libthreadimageio.la \
-+		   $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KUTILS) \
-+		   $(LIB_KFILE) $(LIB_KPARTS) $(LIBJPEG) $(LIB_EXIV2) 
- 
- showfoto_LDFLAGS = $(KDE_RPATH) $(all_libraries)
-