summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Goller <morfic@gentoo.org>2004-06-29 13:04:03 +0000
committerDaniel Goller <morfic@gentoo.org>2004-06-29 13:04:03 +0000
commit6beeae2492494c4a29f1cb66cb07a7511551782b (patch)
tree505a52ee80286ff36371e13d6c6e74f1a8e197a6 /media-gfx/gimageview
parentQA: kde-base -> kde (in comment) (Manifest recommit) (diff)
downloadgentoo-2-6beeae2492494c4a29f1cb66cb07a7511551782b.tar.gz
gentoo-2-6beeae2492494c4a29f1cb66cb07a7511551782b.tar.bz2
gentoo-2-6beeae2492494c4a29f1cb66cb07a7511551782b.zip
Added gcc-3.4 patch, closing #53693
Diffstat (limited to 'media-gfx/gimageview')
-rw-r--r--media-gfx/gimageview/ChangeLog7
-rw-r--r--media-gfx/gimageview/files/gimv-gcc34.patch12
-rw-r--r--media-gfx/gimageview/gimageview-0.2.25.ebuild11
3 files changed, 28 insertions, 2 deletions
diff --git a/media-gfx/gimageview/ChangeLog b/media-gfx/gimageview/ChangeLog
index 7cc55ab4240c..442e7b594849 100644
--- a/media-gfx/gimageview/ChangeLog
+++ b/media-gfx/gimageview/ChangeLog
@@ -1,7 +1,12 @@
# ChangeLog for media-gfx/gimageview
# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimageview/ChangeLog,v 1.5 2004/06/28 22:56:48 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimageview/ChangeLog,v 1.6 2004/06/29 13:04:03 morfic Exp $
+ 29 Jun 2004; Daniel Goller <morfic@gentoo.org> gimageview-0.2.25.ebuild:
+ Added patch to allow compilation with gcc-3.4
+ Thanks Bret Towe (Magnade), for the patch.
+ This Closes #53693
+
29 Jun 2004; Danny van Dyk <kugelfang@gentoo.org> gimageview-0.2.25.ebuild:
Marked ~amd64.
diff --git a/media-gfx/gimageview/files/gimv-gcc34.patch b/media-gfx/gimageview/files/gimv-gcc34.patch
new file mode 100644
index 000000000000..11b58c4bd9d0
--- /dev/null
+++ b/media-gfx/gimageview/files/gimv-gcc34.patch
@@ -0,0 +1,12 @@
+diff -ur gimageview-0.2.25/work/gimageview-0.2.25/src/gimv_thumb_win.c gimageview-0.2.25-fixed/work/gimageview-0.2.25/src/gimv_thumb_win.c
+--- gimageview-0.2.25/work/gimageview-0.2.25/src/gimv_thumb_win.c 2003-07-06 09:46:21.000000000 -0700
++++ gimageview-0.2.25-fixed/work/gimageview-0.2.25/src/gimv_thumb_win.c 2004-06-11 22:35:00.516094744 -0700
+@@ -202,7 +202,7 @@
+ guint action,
+ GtkWidget *widget);
+ static void cb_move_tab (GimvThumbWin *tw,
+- GimvSortItem sortitem,
++ MoveTabItem item,
+ GtkWidget *widget);
+ static void cb_cut_out_tab (GimvThumbWin *tw,
+ guint action,
diff --git a/media-gfx/gimageview/gimageview-0.2.25.ebuild b/media-gfx/gimageview/gimageview-0.2.25.ebuild
index f08a39b1fe4f..68c50b61904e 100644
--- a/media-gfx/gimageview/gimageview-0.2.25.ebuild
+++ b/media-gfx/gimageview/gimageview-0.2.25.ebuild
@@ -1,6 +1,8 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimageview/gimageview-0.2.25.ebuild,v 1.4 2004/06/28 22:56:48 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimageview/gimageview-0.2.25.ebuild,v 1.5 2004/06/29 13:04:03 morfic Exp $
+
+inherit eutils gcc
DESCRIPTION="Powerful GTK+ based image & movie viewer"
HOMEPAGE="http://gtkmmviewer.sourceforge.net/"
@@ -39,6 +41,13 @@ src_compile() {
# workaround for gtk+-2.4
sed -i -e "/GTK_DISABLE_DEPRECATED/d" src/dirview2.c || die
+ #apply both patches to compile with gcc-3.4.0 closing bug #53693
+ if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]
+ then
+ epatch ${FILESDIR}/gimv-gcc34.patch
+ fi
+
+
econf \
$(use_enable nls) \
$(use_with wmf libwmf) \