From be4bf860b14fe15eeb8d11cd449b7d3f6bb23e25 Mon Sep 17 00:00:00 2001 From: "Marcus D. Hanwell" Date: Sat, 17 Mar 2007 20:27:29 +0000 Subject: [PATCH] Version bump, closes bug 171054. Marked ~amd64, bug 169160. Package-Manager: portage-2.1.2.2 --- media-gfx/digikam/ChangeLog | 11 +- media-gfx/digikam/Manifest | 44 +++---- ...-0.9.1_rc1.ebuild => digikam-0.9.1.ebuild} | 4 +- ...digikam-0.9.1_rc1 => digest-digikam-0.9.1} | 6 +- .../digikam-0.9.0_beta1-memory-leak-fix.patch | 71 ---------- ...digikam-0.9.0_beta1-rate-pictures-fix.diff | 121 ------------------ .../files/digikam-0.9.0_beta2-asneeded.patch | 24 ---- 7 files changed, 31 insertions(+), 250 deletions(-) rename media-gfx/digikam/{digikam-0.9.1_rc1.ebuild => digikam-0.9.1.ebuild} (96%) rename media-gfx/digikam/files/{digest-digikam-0.9.1_rc1 => digest-digikam-0.9.1} (92%) delete mode 100644 media-gfx/digikam/files/digikam-0.9.0_beta1-memory-leak-fix.patch delete mode 100644 media-gfx/digikam/files/digikam-0.9.0_beta1-rate-pictures-fix.diff delete mode 100644 media-gfx/digikam/files/digikam-0.9.0_beta2-asneeded.patch 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 + -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 digikam-0.9.1_rc1.ebuild: diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index 690e70b3167c..a9af3847c531 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -1,22 +1,10 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX digikam-0.9.0_beta1-memory-leak-fix.patch 2182 RMD160 0cb1ffed1a95f288dc1e3788d085c833d5c464ac SHA1 fc01e4f76aa5a8dceee6d45a67babfa824f5e257 SHA256 5bb5564e97d63f88106c5ee264527fb14967ae2c24d612f58a14d4b48a308b4e -MD5 d98a7c321df884d1cd99976387989f64 files/digikam-0.9.0_beta1-memory-leak-fix.patch 2182 -RMD160 0cb1ffed1a95f288dc1e3788d085c833d5c464ac files/digikam-0.9.0_beta1-memory-leak-fix.patch 2182 -SHA256 5bb5564e97d63f88106c5ee264527fb14967ae2c24d612f58a14d4b48a308b4e files/digikam-0.9.0_beta1-memory-leak-fix.patch 2182 -AUX digikam-0.9.0_beta1-rate-pictures-fix.diff 6139 RMD160 56daeece324fd4117ab03fb8b421f639f43eddf5 SHA1 e3e95ebf13ccaa8545b81637f9f8ad0cbca26ccd SHA256 33497a2f0b345b4bf4db0680efa2e5c3ffcf6d65a8fdc919b0ea6f8255a504c5 -MD5 a58c5d610507ee840224a84a03e45a1a files/digikam-0.9.0_beta1-rate-pictures-fix.diff 6139 -RMD160 56daeece324fd4117ab03fb8b421f639f43eddf5 files/digikam-0.9.0_beta1-rate-pictures-fix.diff 6139 -SHA256 33497a2f0b345b4bf4db0680efa2e5c3ffcf6d65a8fdc919b0ea6f8255a504c5 files/digikam-0.9.0_beta1-rate-pictures-fix.diff 6139 -AUX digikam-0.9.0_beta2-asneeded.patch 1271 RMD160 cb1bee28a3056604a84191f237926560defea747 SHA1 ccfd6ce7531b7a8449545c9bdd4ee82841bd1c75 SHA256 a9fc202af21cac08fce1cc0ac293f4f0082d33f0b668db5aa1e30c38e17a5529 -MD5 5bcd4f3c4eb99b5d2e7bdd8eb0decc4a files/digikam-0.9.0_beta2-asneeded.patch 1271 -RMD160 cb1bee28a3056604a84191f237926560defea747 files/digikam-0.9.0_beta2-asneeded.patch 1271 -SHA256 a9fc202af21cac08fce1cc0ac293f4f0082d33f0b668db5aa1e30c38e17a5529 files/digikam-0.9.0_beta2-asneeded.patch 1271 DIST digikam-0.7.4.tar.bz2 2322119 RMD160 c69b2b90ec56cf5e3f536b017db2310e325927b8 SHA1 abbd313517786c0a710c0faffc0a0d9f2771f641 SHA256 38139c41863064d7d388b1d927747392f43f2c97cb55700d7a8f697378cc8cc2 DIST digikam-0.8.2.tar.bz2 4015299 RMD160 6dfc3626d606427e06327c2451010fc50f96df2e SHA1 6305b1c485a3fe82257907410b256966bb012406 SHA256 f6f18c2ad2587cc8477512abb648fed7c9da53ef63dc36e7925e995cf6a2e043 DIST digikam-0.9.0.tar.bz2 5692707 RMD160 f99e95ac99b5c21d248391ebe2dca1018bd51bd0 SHA1 5ccf282ddd3b1df7730536f9e9b360dd0ed2c139 SHA256 8fff9b2277c58ca027100fa4af05dea8b955c8a98b79b6befa90b47ac34c77d2 -DIST digikam-0.9.1-rc1.tar.bz2 6693891 RMD160 e72277f2bfb59340a0a17979ba1e484a54ba5242 SHA1 f2384c2f9dbd1e8774be5b12c4de0a828c729653 SHA256 12c980e434387c6aab74455a04ea66fae3ae7d5fd2f2719478a1c3c1c9a88afc +DIST digikam-0.9.1.tar.bz2 6781756 RMD160 920cb49315dfbbe8c9944209568a8430b5e0404f SHA1 92c9c9a943ad5a806be900758dbdc02ad94b8061 SHA256 7d6a4d9828f05024b206964ddda9119a9767da351c44cd7bbab342d11b24a5a4 DIST digikam-doc-0.7.4.tar.bz2 22977314 RMD160 fbab3112317f7b3ba3dec1a37d308196dfe187e7 SHA1 50cdcbfcbcd05073ff14173a1eb5a0f700129e8f SHA256 7bc6ddb8637b821b4939b33e827141e798234d28145cdaeb9d52eb13e4c64c40 DIST digikam-doc-0.8.2-da.tar.bz2 50158 RMD160 c78a62d17045e5a47d562acbc4a5cb3f1b62e558 SHA1 4fdb5caca7e627074bf7c5d7b90dbc5d19770bea SHA256 5b3301301dbbfae999d7398d7ee2651c6c4b94f4baa8566d5d1c9914b2bfe142 DIST digikam-doc-0.8.2-de.tar.bz2 52448 RMD160 2f48efc9a470da0f18e5b8028b40f15f5d133b19 SHA1 556063435fd6c86fe064b7d812fbf8574515ec89 SHA256 5968243bff59ef2a81482479a8b6c2b7570394c702fe6c41fb179411c12a58f1 @@ -42,14 +30,14 @@ EBUILD digikam-0.9.0.ebuild 2559 RMD160 bc2fbb9d21811db3e3f10351a42674f6303a42fd MD5 3588becc4a043fb56bf7abd1565dd694 digikam-0.9.0.ebuild 2559 RMD160 bc2fbb9d21811db3e3f10351a42674f6303a42fd digikam-0.9.0.ebuild 2559 SHA256 d7636fb396b6947d42bf200c9c64c5a0cd2a43570d71207606ea8f4d6d33ac38 digikam-0.9.0.ebuild 2559 -EBUILD digikam-0.9.1_rc1.ebuild 2489 RMD160 740186b12af6e382c0319e48a452fe753018a464 SHA1 5ac3d456abb42aff3ea1ba6f9092afcca8b7f820 SHA256 a5ede84ad598907350b590c77a3ab3af84847bac71fbae035b748c0a86e1e47a -MD5 f2802074e72cf97ebfc9106973db1d58 digikam-0.9.1_rc1.ebuild 2489 -RMD160 740186b12af6e382c0319e48a452fe753018a464 digikam-0.9.1_rc1.ebuild 2489 -SHA256 a5ede84ad598907350b590c77a3ab3af84847bac71fbae035b748c0a86e1e47a digikam-0.9.1_rc1.ebuild 2489 -MISC ChangeLog 13516 RMD160 9a2ae0b9b4602a115a9676ad07f5b57f46473b44 SHA1 f103217e74226753e9c7ed07e131bc8f8f7cf32b SHA256 d0bd77086186bba442b6dd9a9d42a20afa0ba5ebb39b2b2bd05e241aeb86cc98 -MD5 d2609871394ed026071cf3c3a9293650 ChangeLog 13516 -RMD160 9a2ae0b9b4602a115a9676ad07f5b57f46473b44 ChangeLog 13516 -SHA256 d0bd77086186bba442b6dd9a9d42a20afa0ba5ebb39b2b2bd05e241aeb86cc98 ChangeLog 13516 +EBUILD digikam-0.9.1.ebuild 2489 RMD160 ff1d61cadc5e7e80e84b30f611f9cbaa5c2e3af5 SHA1 7bad621a08d3de194194f7f6cce259eb3c6062c5 SHA256 2992f915360e18ab4bf470c66846e4108e2338bccfca4d421d8f3b8617d4b530 +MD5 1af681a934cef35e02f93fb522569978 digikam-0.9.1.ebuild 2489 +RMD160 ff1d61cadc5e7e80e84b30f611f9cbaa5c2e3af5 digikam-0.9.1.ebuild 2489 +SHA256 2992f915360e18ab4bf470c66846e4108e2338bccfca4d421d8f3b8617d4b530 digikam-0.9.1.ebuild 2489 +MISC ChangeLog 13860 RMD160 b7f2640325aea1c96adebe6c6bab70d2638166f5 SHA1 2b593f2e6d0eb22332d77ee363598cc0d569748a SHA256 964a64bec2a410a084ee7295c74c949cf1a15b3888db285248e979ecbb1e6314 +MD5 4d2e3ce14c255db9cb7a6420fdca1a55 ChangeLog 13860 +RMD160 b7f2640325aea1c96adebe6c6bab70d2638166f5 ChangeLog 13860 +SHA256 964a64bec2a410a084ee7295c74c949cf1a15b3888db285248e979ecbb1e6314 ChangeLog 13860 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156 @@ -63,13 +51,13 @@ SHA256 7326bd82874c61fbc125254f8fd1995274fa8df450eb3887bfef2e40b0888cab files/di MD5 a6db13f2a4c65f6f1999219bc814a7bb files/digest-digikam-0.9.0 3436 RMD160 26ba1348531960a52508a242e156ee0700f80e49 files/digest-digikam-0.9.0 3436 SHA256 26a3e7e6b8ba9a05ad1bd4f64cffd89629307d913ed8bef299781f0c4c922ab7 files/digest-digikam-0.9.0 3436 -MD5 fd47288a26b1b53d8ba4b3c2b51d2726 files/digest-digikam-0.9.1_rc1 3448 -RMD160 1f1812b713a47fe50769ccc00a392febc7e62f14 files/digest-digikam-0.9.1_rc1 3448 -SHA256 a44abd2b206736b193104482659d75db17fcff7e7e8fd16008f3731eea010ed2 files/digest-digikam-0.9.1_rc1 3448 +MD5 f89c968328594b11e2aed43eeabc0f6e files/digest-digikam-0.9.1 3436 +RMD160 1ae0467dd04b6daa78bbd1b6c8871051003637cb files/digest-digikam-0.9.1 3436 +SHA256 d2802478069e139ab494e83f3e3ae764dbd0bb29a907d45992200ab2feccbc36 files/digest-digikam-0.9.1 3436 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux) +Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFF8Zd0KRy60XGEcJIRAubTAJ9QJHxXg3dyoq0rg6fU/8kMW0ReggCfTrp4 -wE7hWiUr4ElxcW1/EU6E+gQ= -=ufvK +iD8DBQFF/E84ntT9W3vfTuoRAghCAJ40umRG7znjG78FGzy65oZx9/GnOgCZARZH +IgG46TxTDGCR+H2t6fKSc6s= +=gXg4 -----END PGP SIGNATURE----- diff --git a/media-gfx/digikam/digikam-0.9.1_rc1.ebuild b/media-gfx/digikam/digikam-0.9.1.ebuild similarity index 96% rename from media-gfx/digikam/digikam-0.9.1_rc1.ebuild rename to 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 similarity index 92% rename from media-gfx/digikam/files/digest-digikam-0.9.1_rc1 rename to 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) - -- 2.26.2