summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2011-02-24 20:47:18 +0000
committerTim Harder <radhermit@gentoo.org>2011-02-24 20:47:18 +0000
commit11ebb0232758eb4e79f2401985f6ea3881faf04e (patch)
treef35d0b2e95d3f5a5888fb9f1c412ddd906419ea5 /media-gfx
parentx86 stable per bug 353436 (diff)
downloadgentoo-2-11ebb0232758eb4e79f2401985f6ea3881faf04e.tar.gz
gentoo-2-11ebb0232758eb4e79f2401985f6ea3881faf04e.tar.bz2
gentoo-2-11ebb0232758eb4e79f2401985f6ea3881faf04e.zip
Fix compile when the lcms USE flag is disabled (bug #356285). Fix thanks to Shannon.
(Portage version: 2.2.0_alpha25/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/inkscape/ChangeLog7
-rw-r--r--media-gfx/inkscape/files/inkscape-0.48.1-lcms.patch20
-rw-r--r--media-gfx/inkscape/inkscape-0.48.1.ebuild3
3 files changed, 28 insertions, 2 deletions
diff --git a/media-gfx/inkscape/ChangeLog b/media-gfx/inkscape/ChangeLog
index f46c436bb9fd..149cd9c3063b 100644
--- a/media-gfx/inkscape/ChangeLog
+++ b/media-gfx/inkscape/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-gfx/inkscape
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.154 2011/02/23 19:14:28 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.155 2011/02/24 20:47:18 radhermit Exp $
+
+ 24 Feb 2011; Tim Harder <radhermit@gentoo.org> inkscape-0.48.1.ebuild,
+ +files/inkscape-0.48.1-lcms.patch:
+ Fix compile when the lcms USE flag is disabled (bug #356285). Fix thanks to
+ Shannon.
*inkscape-0.48.1 (23 Feb 2011)
diff --git a/media-gfx/inkscape/files/inkscape-0.48.1-lcms.patch b/media-gfx/inkscape/files/inkscape-0.48.1-lcms.patch
new file mode 100644
index 000000000000..0b19188cca57
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.48.1-lcms.patch
@@ -0,0 +1,20 @@
+--- inkscape-0.48.1/src/color-profile.cpp.orig
++++ inkscape-0.48.1/src/color-profile.cpp
+@@ -31,6 +31,7 @@
+ #include "inkscape.h"
+ #include "document.h"
+ #include "preferences.h"
++#include "io/sys.h"
+
+ #include "dom/uri.h"
+ #include "dom/util/digest.h"
+@@ -557,9 +558,6 @@
+ return (outofgamut == 255);
+ }
+
+-
+-#include <io/sys.h>
+-
+ class ProfileInfo
+ {
+ public:
diff --git a/media-gfx/inkscape/inkscape-0.48.1.ebuild b/media-gfx/inkscape/inkscape-0.48.1.ebuild
index cc75c315dc6d..7e07c022994e 100644
--- a/media-gfx/inkscape/inkscape-0.48.1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.48.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.1.ebuild,v 1.1 2011/02/23 19:14:29 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.1.ebuild,v 1.2 2011/02/24 20:47:18 radhermit Exp $
EAPI=2
inherit eutils flag-o-matic autotools gnome2
@@ -83,6 +83,7 @@ src_prepare() {
gnome2_src_prepare
epatch "${FILESDIR}"/${PN}-0.48.0-spell.patch
epatch "${FILESDIR}"/${P}-libpng15.patch
+ epatch "${FILESDIR}"/${P}-lcms.patch
eautoreconf
}