summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanno Böck <hanno@gentoo.org>2005-11-29 22:03:29 +0000
committerHanno Böck <hanno@gentoo.org>2005-11-29 22:03:29 +0000
commitf7d299469662da35e60546e048d61ef72db04610 (patch)
treeac0d080310ef381e93ce1c10510b4985032e4192 /media-gfx/digikam
parentppracer gcc41 fix (diff)
downloadgentoo-2-f7d299469662da35e60546e048d61ef72db04610.tar.gz
gentoo-2-f7d299469662da35e60546e048d61ef72db04610.tar.bz2
gentoo-2-f7d299469662da35e60546e048d61ef72db04610.zip
digikam gcc41 fix
(Portage version: 2.0.53_rc7)
Diffstat (limited to 'media-gfx/digikam')
-rw-r--r--media-gfx/digikam/ChangeLog6
-rw-r--r--media-gfx/digikam/digikam-0.8.0.ebuild7
-rw-r--r--media-gfx/digikam/files/digikam-0.8.0-gcc41.patch11
3 files changed, 22 insertions, 2 deletions
diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 869e2ad918f3..f54a349fe582 100644
--- 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/digikam-0.8.0.ebuild b/media-gfx/digikam/digikam-0.8.0.ebuild
index 607b082f6684..426072a92f88 100644
--- 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
index 000000000000..5993fe41fcfb
--- /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.