summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanno Böck <hanno@gentoo.org>2006-08-26 17:13:55 +0000
committerHanno Böck <hanno@gentoo.org>2006-08-26 17:13:55 +0000
commitd21825ef737829e640b73aa12ca082ef34ca2f8e (patch)
tree33e07410c9f9b02e6e66f486902a47361a7a8f1e /media-gfx
parentRemoved version 1.0.4. Added version 1.0.5. (diff)
downloadgentoo-2-d21825ef737829e640b73aa12ca082ef34ca2f8e.tar.gz
gentoo-2-d21825ef737829e640b73aa12ca082ef34ca2f8e.tar.bz2
gentoo-2-d21825ef737829e640b73aa12ca082ef34ca2f8e.zip
inkscape gcc42 fix
(Portage version: 2.1.1_rc1)
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/inkscape/ChangeLog6
-rw-r--r--media-gfx/inkscape/files/inkscape-gcc42.diff18
-rw-r--r--media-gfx/inkscape/inkscape-0.44.ebuild4
3 files changed, 26 insertions, 2 deletions
diff --git a/media-gfx/inkscape/ChangeLog b/media-gfx/inkscape/ChangeLog
index ff320ffa3314..21243a1ac0ce 100644
--- a/media-gfx/inkscape/ChangeLog
+++ b/media-gfx/inkscape/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-gfx/inkscape
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.52 2006/07/02 17:05:07 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.53 2006/08/26 17:13:55 hanno Exp $
+
+ 26 Aug 2006; Hanno Boeck <hanno@gentoo.org> +files/inkscape-gcc42.diff,
+ inkscape-0.44.ebuild:
+ Fix for gcc42.
02 Jul 2006; Michael Sterrett <mr_bones_@gentoo.org> inkscape-0.44.ebuild:
fix invalid dep
diff --git a/media-gfx/inkscape/files/inkscape-gcc42.diff b/media-gfx/inkscape/files/inkscape-gcc42.diff
new file mode 100644
index 000000000000..f34bfdadc783
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-gcc42.diff
@@ -0,0 +1,18 @@
+--- inkscape/trunk/src/ui/widget/selected-style.cpp 2006/04/26 23:50:47 11420
++++ inkscape/trunk/src/ui/widget/selected-style.cpp 2006/06/27 15:52:56 12521
+@@ -109,11 +109,12 @@
+
+ _sw_unit(NULL),
+
+- _tooltips (),
++ _tooltips ()
+
+- _drop((void*[]){0,0}),
+- _dropEnabled((bool[]){false, false})
+ {
++ _drop[0] = _drop[1] = 0;
++ _dropEnabled[0] = _dropEnabled[1] = false;
++
+ _fill_label.set_alignment(0.0, 0.5);
+ _fill_label.set_padding(0, 0);
+ _stroke_label.set_alignment(0.0, 0.5);
diff --git a/media-gfx/inkscape/inkscape-0.44.ebuild b/media-gfx/inkscape/inkscape-0.44.ebuild
index 05a8467225a6..a09930ad275c 100644
--- a/media-gfx/inkscape/inkscape-0.44.ebuild
+++ b/media-gfx/inkscape/inkscape-0.44.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.44.ebuild,v 1.5 2006/07/02 17:05:07 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.44.ebuild,v 1.6 2006/08/26 17:13:55 hanno Exp $
inherit gnome2 eutils
@@ -60,6 +60,8 @@ src_unpack() {
cd ${S}
+ epatch ${FILESDIR}/inkscape-gcc42.diff
+
autoconf || die
libtoolize --copy --force || die
}