From 93599c1bb5ef7fab5598f05bd7431bd940a56594 Mon Sep 17 00:00:00 2001 From: Tim Harder Date: Wed, 19 Dec 2012 03:01:40 +0000 Subject: Fix compile issue with older gcc versions (bug #447766). (Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3) --- media-gfx/inkscape/ChangeLog | 6 +++++- .../inkscape/files/inkscape-0.48.4-fix-member-decl.patch | 11 +++++++++++ media-gfx/inkscape/inkscape-0.48.4.ebuild | 5 +++-- 3 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 media-gfx/inkscape/files/inkscape-0.48.4-fix-member-decl.patch (limited to 'media-gfx') diff --git a/media-gfx/inkscape/ChangeLog b/media-gfx/inkscape/ChangeLog index 3806fa14e2e2..dba8f6e3a136 100644 --- a/media-gfx/inkscape/ChangeLog +++ b/media-gfx/inkscape/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/inkscape # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.189 2012/12/18 08:20:07 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.190 2012/12/19 03:01:40 radhermit Exp $ + + 19 Dec 2012; Tim Harder inkscape-0.48.4.ebuild, + +files/inkscape-0.48.4-fix-member-decl.patch: + Fix compile issue with older gcc versions (bug #447766). *inkscape-0.48.4 (18 Dec 2012) diff --git a/media-gfx/inkscape/files/inkscape-0.48.4-fix-member-decl.patch b/media-gfx/inkscape/files/inkscape-0.48.4-fix-member-decl.patch new file mode 100644 index 000000000000..993dfdaf9193 --- /dev/null +++ b/media-gfx/inkscape/files/inkscape-0.48.4-fix-member-decl.patch @@ -0,0 +1,11 @@ +--- inkscape-0.48.4/src/widgets/desktop-widget.h ++++ inkscape-0.48.4/src/widgets/desktop-widget.h +@@ -239,7 +239,7 @@ + private: + GtkWidget *tool_toolbox; + GtkWidget *aux_toolbox; +- GtkWidget *commands_toolbox,; ++ GtkWidget *commands_toolbox; + GtkWidget *snap_toolbox; + + static void init(SPDesktopWidget *widget); diff --git a/media-gfx/inkscape/inkscape-0.48.4.ebuild b/media-gfx/inkscape/inkscape-0.48.4.ebuild index 546b3febfdbe..b639d383f2e7 100644 --- a/media-gfx/inkscape/inkscape-0.48.4.ebuild +++ b/media-gfx/inkscape/inkscape-0.48.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.4.ebuild,v 1.1 2012/12/18 08:20:07 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.4.ebuild,v 1.2 2012/12/19 03:01:40 radhermit Exp $ EAPI=5 @@ -78,7 +78,8 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-0.48.0-spell.patch \ "${FILESDIR}"/${PN}-0.48.2-libwpg.patch \ "${FILESDIR}"/${PN}-0.48.3.1-desktop.patch \ - "${FILESDIR}"/${P}-python2.patch + "${FILESDIR}"/${P}-python2.patch \ + "${FILESDIR}"/${PN}-0.48.4-fix-member-decl.patch eautoreconf -- cgit v1.2.3-65-gdbad