digikam gcc41 fix

Package-Manager: portage-2.0.53_rc7

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 869e2ad918f321631689a18dfe02067aa017d1bf..f54a349fe5820d0a5240237ac3b8008bfe1cf343 100644 (file)
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.35 2005/11/27 18:08:43 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.36 2005/11/29 22:03:29 hanno Exp $
+
+  29 Nov 2005; Hanno Boeck <hanno@gentoo.org>
+  +files/digikam-0.8.0-gcc41.patch, digikam-0.8.0.ebuild:
+  Fix for gcc 4.1.
 
   27 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> digikam-0.7.4.ebuild:
   Stable on amd64.

diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index b9ab7d30728fdc3b8165655d236244b829e21902..b189158737bf3e8cd8c230739530cb67ab7390dc 100644 (file)
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 38e8255dca8e012b1b732c86cdb02fe9 ChangeLog 5032
+MD5 acf3d9cc5f7efdfd570ae3dadbcdda5d ChangeLog 5156
 MD5 8ff127446138f30080170bb500661422 digikam-0.7.1.ebuild 633
 MD5 3eb13fa61948e458380c6e2291f15a17 digikam-0.7.4.ebuild 1158
-MD5 1dad93fec5a726680e0ec8480e53b79d digikam-0.8.0.ebuild 743
+MD5 b3470c5d01a49c9a1da331b07e017374 digikam-0.8.0.ebuild 820
 MD5 65d75029c28dfdaa673c86aa6366ddd2 files/digest-digikam-0.7.1 67
 MD5 55bccecf6ae17fe2365bc62da5ab1640 files/digest-digikam-0.7.4 139
 MD5 caa9c610f6ad9f5232720ed123c36ad1 files/digest-digikam-0.8.0 67
+MD5 bd505dc96a326680f720feb450f7d862 files/digikam-0.8.0-gcc41.patch 440
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDifY2ntT9W3vfTuoRAsT2AJ9ZGZRurQPne5f5ZNYimCXT+JQSaQCfZjLE
-S6+B6UTbEkWWit2iGMvY2qs=
-=d4m9
+iD8DBQFDjNDAr2QksT29OyARAgJlAJ9xTCSSKS+oMbp29pYJbyNrZIykUACfbeoS
+2TrYFV7/rPsK0xbcXOkdP9U=
+=qtWo
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/digikam/digikam-0.8.0.ebuild b/media-gfx/digikam/digikam-0.8.0.ebuild
index 607b082f6684c60a877e98b0fd086f0971b50aac..426072a92f8849f068e5d6f27e09bd9b9b02e8f7 100644 (file)
--- a/media-gfx/digikam/digikam-0.8.0.ebuild
+++ b/media-gfx/digikam/digikam-0.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.8.0.ebuild,v 1.1 2005/11/27 15:52:37 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-0.8.0.ebuild,v 1.2 2005/11/29 22:03:29 hanno Exp $
 
 inherit kde
 
@@ -27,3 +27,8 @@ need-kde 3.2
 pkg_setup(){
        slot_rebuild "media-libs/libkipi media-libs/libkexif" && die
 }
+
+src_unpack() {
+       unpack ${A}
+       epatch ${FILESDIR}/digikam-0.8.0-gcc41.patch
+}

diff --git a/media-gfx/digikam/files/digikam-0.8.0-gcc41.patch b/media-gfx/digikam/files/digikam-0.8.0-gcc41.patch
new file mode 100644 (file)
index 0000000..5993fe4
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-0.8.0-gcc41.patch
@@ -0,0 +1,11 @@
+--- digikam-0.8.0/digikam/digikam/albumdb.h    2005-11-21 20:14:05.000000000 +0100
++++ digikam-0.8.0-gcc41/digikam/digikam/albumdb.h      2005-11-29 22:36:31.048370000 +0100
+@@ -436,7 +436,7 @@
+      * @param albumID the id of the albumdb
+      * @return the url of the albumdb
+      */
+-    QString AlbumDB::getAlbumURL(int albumID);
++    QString getAlbumURL(int albumID);
+ 
+     /**
+      * Returns the average date of all images for that album.