Added patches that fix rating the pictures using shortcuts. Fixes bug #145762.

(Portage version: 2.1-r2)

4 files changed, 258 insertions, 1 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index afe28e0ae90b..f6655e8cf16c 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.57 2006/08/22 13:57:38 deathwing00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.58 2006/09/02 11:54:01 deathwing00 Exp $
+
+*digikam-0.9.0_beta1-r2 (02 Sep 2006)
+
+  02 Sep 2006; Ioannis Aslanidis <deathwing00@gentoo.org>
+  +files/digikam-0.9.0_beta1-rate-pictures-fix.diff,
+  +digikam-0.9.0_beta1-r2.ebuild:
+  Added patches that fix rating the pictures using shortcuts. Fixes bug #145762.
 
   22 Aug 2006; Ioannis Aslanidis <deathwing00@gentoo.org>
   digikam-0.9.0_beta1.ebuild, digikam-0.9.0_beta1-r1.ebuild:
diff --git a/media-gfx/digikam/digikam-0.9.0_beta1-r2.ebuild b/media-gfx/digikam/digikam-0.9.0_beta1-r2.ebuild
new file mode 100644
index 000000000000..72312eb38ec9
--- /dev/null
+++ b/media-gfx/digikam/digikam-0.9.0_beta1-r2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.9.0_beta1-r2.ebuild,v 1.1 2006/09/02 11:54:01 deathwing00 Exp $
+
+inherit kde
+
+P_DOC="${PN}-doc-0.8.0"
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+S_DOC="${WORKDIR}/${P_DOC}"
+
+DESCRIPTION="A digital photo management application for KDE."
+HOMEPAGE="http://www.digikam.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="nfs doc kdehiddenvisibility exif"
+
+DEPEND=">=media-libs/libgphoto2-2
+	>=dev-db/sqlite-3
+	>=media-libs/libkipi-0.1.1
+	media-libs/tiff
+	sys-libs/gdbm
+	media-gfx/dcraw
+	media-gfx/exiv2
+	media-libs/lcms"
+RDEPEND="${DEPEND}
+	|| ( ( kde-base/kgamma kde-base/kamera ) kde-base/kdegraphics )"
+
+need-kde 3.4
+
+LANGS="bg bn br ca cs cy da de el en_GB es et eu fi fr ga gl he hu is it ja km
+lt mk ms mt nb nl nn pa pl pt pt_BR ro ru rw sl sr sr@Latn sv ta tr uk vi zh_CN"
+LANGS_DOC="da es et it nl pt_BR pt sv"
+
+DOC_URI="mirror://sourceforge/digikam/${P_DOC}.tar.bz2"
+SRC_URI="${DOC_URI}"
+
+for lang in ${LANGS}; do
+	IUSE="${IUSE} linguas_${lang}"
+	[[ " ${LANGS_DOC} " != *" ${lang} "* ]] && SRC_URI="!linguas_${lang}? ( ${SRC_URI} )"
+done
+
+for lang in ${LANGS_DOC}; do
+	IUSE="${IUSE} linguas_${lang}"
+	SRC_URI="linguas_${lang}? (
+		mirror://gentoo/${P_DOC}-${lang}.tar.bz2
+		mirror://gentoo/${P_DOC}-gentoo.tar.bz2
+		)
+		!linguas_${lang}? ( ${SRC_URI} )"
+done
+
+SRC_URI="mirror://sourceforge/digikam/${MY_P}.tar.bz2
+	doc? ( linguas_en? ( mirror://gentoo/${P_DOC}-gentoo.tar.bz2 )
+		!linguas_en? ( ${SRC_URI} ) )"
+
+pkg_setup(){
+	slot_rebuild "media-libs/libkipi" && die
+	kde_pkg_setup
+}
+
+src_unpack(){
+	kde_src_unpack
+	rm -f "${S}/configure" "${S_DOC}/configure"
+
+	local MAKE_PO=$(echo "${LINGUAS} ${LANGS}" | fmt -w 1 | sort | uniq -d | tr '\n' ' ')
+	einfo "Enabling translations for: en ${MAKE_PO}"
+	sed -i -e "s:^SUBDIRS =.*:SUBDIRS = . ${MAKE_PO}:" "${S}/po/Makefile.am" || die "sed for locale failed"
+
+	if use doc; then
+		local MAKE_DOC=$(echo "${LINGUAS} ${LANGS_DOC}" | fmt -w 1 | sort | uniq -d | tr '\n' ' ')
+		einfo "Enabling documentation for: en ${LANG_DOCS}"
+	fi
+	epatch ${FILESDIR}/${P}-memory-leak-fix.patch
+	epatch ${FILESDIR}/${P}-rate-pictures-fix.diff
+}
+
+src_compile(){
+	local myconf
+
+	myconf="$(use_enable nfs nfs-hack)"
+	kde_src_compile
+	myconf=""
+	[[ -d "${S_DOC}" ]] && KDE_S="${S_DOC}" kde_src_compile
+}
+
+src_install(){
+	kde_src_install
+	[[ -d "${S_DOC}" ]] && KDE_S="${S_DOC}" kde_src_install
+
+	# Install the .desktop in FDO's suggested directory
+	dodir /usr/share/applications/kde
+	mv "${D}/usr/share/applnk/Graphics/digikam.desktop" \
+		"${D}/usr/share/applications/kde"
+}
diff --git a/media-gfx/digikam/files/digest-digikam-0.9.0_beta1-r2 b/media-gfx/digikam/files/digest-digikam-0.9.0_beta1-r2
new file mode 100644
index 000000000000..58c58c3de95f
--- /dev/null
+++ b/media-gfx/digikam/files/digest-digikam-0.9.0_beta1-r2
@@ -0,0 +1,33 @@
+MD5 fc3a26a91fd6f715ffb75efe8be06e4e digikam-0.9.0-beta1.tar.bz2 6524485
+RMD160 4328f23262ab70e7260e4bf20eb02dc08d9c5517 digikam-0.9.0-beta1.tar.bz2 6524485
+SHA256 f50b7784d15106fe605b0244ecffac099b50a9106eb552709f85491aeb722e42 digikam-0.9.0-beta1.tar.bz2 6524485
+MD5 a18e5e9a4fd17994da5089ddcd9bc0c1 digikam-doc-0.8.0-da.tar.bz2 50493
+RMD160 50fe4b8deb3c5edb759c3844cf3f52c7f2bcaade digikam-doc-0.8.0-da.tar.bz2 50493
+SHA256 9a0c5a0c8d5e86b5836aba3adb22fbfe50b968b7bd19320c967443fbe1860182 digikam-doc-0.8.0-da.tar.bz2 50493
+MD5 06bcc36d7a4dc42c42978f7d1059c2f3 digikam-doc-0.8.0-es.tar.bz2 10816588
+RMD160 d031a6d0601b2a5a98a7d11762bc32a210b80b82 digikam-doc-0.8.0-es.tar.bz2 10816588
+SHA256 de17de6816895db79b56aaeb2106286ad351e51b1acf124eeaf29e3baeb055a0 digikam-doc-0.8.0-es.tar.bz2 10816588
+MD5 6d2c381f78ea883c4bbc925756012b98 digikam-doc-0.8.0-et.tar.bz2 41384
+RMD160 d7d57533d8cdf7d4919c4107e7baa6c2f77b03c9 digikam-doc-0.8.0-et.tar.bz2 41384
+SHA256 ba02a828fbbeb1243e97195b5a333d12b1b4f88456082b6e615709bd07f20b83 digikam-doc-0.8.0-et.tar.bz2 41384
+MD5 7fa628fe68a39efa27fc73aa7430ea90 digikam-doc-0.8.0-gentoo.tar.bz2 19396732
+RMD160 22ac0d7fa874dc853ab3957a145c54d9737a3d2e digikam-doc-0.8.0-gentoo.tar.bz2 19396732
+SHA256 c0f7448e02378f2ef559b9b0e887327422d849c9ba607a254448dcc00eb3699c digikam-doc-0.8.0-gentoo.tar.bz2 19396732
+MD5 a4d535948f5d738e3030beae99bcc674 digikam-doc-0.8.0-it.tar.bz2 702416
+RMD160 bc89f465e073eb64944ef2a9914bb2291878b365 digikam-doc-0.8.0-it.tar.bz2 702416
+SHA256 07fa5ef11f9544b4f3a2b0be8759ea1d7041d56f9188a15101bb53aae8dca3f3 digikam-doc-0.8.0-it.tar.bz2 702416
+MD5 2c1061c24bbf8482d814b1e1ab8c1c89 digikam-doc-0.8.0-nl.tar.bz2 9764577
+RMD160 30968073fedb980b821f332044194b63873c8785 digikam-doc-0.8.0-nl.tar.bz2 9764577
+SHA256 f8d7d934bc25270686b81183dd1dfd3c43d6f479e9961c3d8218f2ae114b7c15 digikam-doc-0.8.0-nl.tar.bz2 9764577
+MD5 9b71a31b61c5679e699365d21b31d1f5 digikam-doc-0.8.0-pt.tar.bz2 52611
+RMD160 5f5e400f79dcfb5f527afe8cc31de261bd05f421 digikam-doc-0.8.0-pt.tar.bz2 52611
+SHA256 727a21963504cd2b1e3b67bfa7fb872b5f9d45d32f770861b51eceaeff763431 digikam-doc-0.8.0-pt.tar.bz2 52611
+MD5 29d2ae35f8aac6109fd98fb630fcbb4f digikam-doc-0.8.0-pt_BR.tar.bz2 1988378
+RMD160 ddcd056964e48b294e6bfb8a5c1e8f1c7390d0c4 digikam-doc-0.8.0-pt_BR.tar.bz2 1988378
+SHA256 82a036d609ad4bfc2f74d9ec291dd463641d4456b2493f03b15cb16337273391 digikam-doc-0.8.0-pt_BR.tar.bz2 1988378
+MD5 7c76dca73e22ca1457387d740f819b83 digikam-doc-0.8.0-sv.tar.bz2 261061
+RMD160 e682527412ebd4732e5010c6bbbd4619159dd0f3 digikam-doc-0.8.0-sv.tar.bz2 261061
+SHA256 bbbc383c04fb16df562126d4d0523364753d26fbf95291922792e03477c378d0 digikam-doc-0.8.0-sv.tar.bz2 261061
+MD5 b958495f3830949bc9c2cd6fd1cd53e6 digikam-doc-0.8.0.tar.bz2 43156836
+RMD160 94d6abb1e58ba8ed91b11a86608d5dce8c9ba3a2 digikam-doc-0.8.0.tar.bz2 43156836
+SHA256 9aa84a94187e0f40939373b264de7ce73e73be44b976f8b890538a68aa1f3f22 digikam-doc-0.8.0.tar.bz2 43156836
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
new file mode 100644
index 000000000000..7aa0f12eb2e7
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-0.9.0_beta1-rate-pictures-fix.diff
@@ -0,0 +1,121 @@
+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~