Fix compile when the lcms USE flag is disabled (bug #356285). Fix thanks to Shannon.

Package-Manager: portage-2.2.0_alpha25/cvs/Linux x86_64

4 files changed, 45 insertions, 4 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/Manifest b/media-gfx/inkscape/Manifest
index a8d7f7322882..17841c0c7e5a 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,13 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX inkscape-0.47-gcc45.patch 4797 RMD160 c6f254b0b2bc1f7ae0e29a6952b9f13516385fc8 SHA1 68f66a3c152e1b472f9505dbac354f86a9059ee3 SHA256 49834c862d145c88d82ea016b0c6a274cf935c10d80bd2aefe45c4a8336d214f
 AUX inkscape-0.47-poppler.patch 3733 RMD160 6fad5479d59f1742216fe673e80dac2b420f768e SHA1 de0d3ab2b55bc0c63ef725bad90bd78258b76bc5 SHA256 43f0e3202e179599719e1a857ae319e332dad082bd8ab64c686a00979174c000
 AUX inkscape-0.48.0-poppler-0.16.patch 2643 RMD160 31ca9704d9df32d9534acace96889782ad4b7e13 SHA1 c3f1821740ed638d2de886a4e7825962c947ac89 SHA256 7e240c3af06daa171c42f0dbca19e5ada05877c8127c7be9129804e053a320c4
 AUX inkscape-0.48.0-spell.patch 1815 RMD160 b2b0d777467da3878074734499f96c8bead465cb SHA1 5b68841610b1e7f12c61c88d3df842f679293abd SHA256 697c781a7aa378f0e65160838fd13919f70b4d886dd77b8b9bdfe7f3181f1a4f
+AUX inkscape-0.48.1-lcms.patch 368 RMD160 d0be9057ee064cfa87c15dd13b4f4f8c6ee227ca SHA1 55f3c071825f453959d3b1610d8f7682f8a7d8be SHA256 10afc0e2c125229cd9bd7f34cd8ec743ff9188af81e2d6184298374c58102363
 AUX inkscape-0.48.1-libpng15.patch 1616 RMD160 ea6f011b2cd91db106aaed4ff4d387fc20f96214 SHA1 d6512f3cb38ca8e2436dc485aa652490d17b3a52 SHA256 55e113db90267d6789cdb6a54a6c744bd0e9d755b2a7b5835a3713ea04e98c87
 DIST inkscape-0.47.tar.gz 28044445 RMD160 58fe20b2a103bd8909e27811354e1a3700dcd177 SHA1 aa39d5f7306edb21be4987651041bf50c13baf75 SHA256 e5899be10183d86249516a29bc146706600ae5eafb5be5274c465a8029659b97
 DIST inkscape-0.48.0.tar.gz 25870275 RMD160 0d97c17136fe69a2248bb4cf4d2f6296ce18c37f SHA1 220ade981069a91d3afab9cbff75f65c75119da2 SHA256 0812f6ca63aa7c4bb236c932a02bd4e0cb5209404bb42cff5f65ad0f84844176
 DIST inkscape-0.48.1.tar.bz2 19558565 RMD160 9e25e02258d1b1e4cce24474523e1b37e58aded6 SHA1 9727ed11cef31c2790bf2affbddf6a6ef352753f SHA256 44bda45d14374351f426afa467222093c2f24ddb586e3cfa1cf21e7468e4bb86
 EBUILD inkscape-0.47.ebuild 2485 RMD160 12b085ad458ce2178bb065a5458c7090e2cafa06 SHA1 2845bd68c6ead5c1d9fe34ec345012dfb8fb09e6 SHA256 054b29518c1ed513212bb4230e90382597dd312d97e94890bb04304ce202405d
 EBUILD inkscape-0.48.0.ebuild 2679 RMD160 268a394c82a4279c1bfd4ba1759347f6401d87e6 SHA1 289adf4e1db4e977bbcefe36897d930d252abc99 SHA256 afa9a9e3099652f781bd0a4ffae0c9c91931aebc872db40812df90ec1f552dcc
-EBUILD inkscape-0.48.1.ebuild 2386 RMD160 50900906a781968ff1a1e617bca9fa348177abb8 SHA1 bf27009694e3f3ac8f49f7e7311fb5235d60ef3b SHA256 8ae889bb1555ab7037daa127c185f9fc1cfd577de8b4e0a39a86849ae4d10552
-MISC ChangeLog 21494 RMD160 aa411f9db272ffb6157dce1131931b8e1f51fb6e SHA1 5282d5f00bf1e20d3646de4d81c305935262537b SHA256 e541e976969137b47f17bd756b79a1e589d41834d53937482bf5a6d68885a152
+EBUILD inkscape-0.48.1.ebuild 2424 RMD160 bc4c207ab5f6bb8cbb39e09eb2812c0d7b837351 SHA1 637a0e4304085436d63a8c5bfd074c1eb0ed5db5 SHA256 de275ac66b6e4fcf973354ffa791efd7dc7dce37e3762a2c8b85b10f16283557
+MISC ChangeLog 21694 RMD160 c3c93dd316d269c3e624c01697c36899a6ace81b SHA1 62d3a9a66becbf3524efe33b1d99c5a78befe6db SHA256 6245019efbe16ae48842582e49d465e4a278e2e4cdb3bbad27c48c00ea426676
 MISC metadata.xml 438 RMD160 255e104540381e2eda4bee5e06d13a3e5f9cd978 SHA1 8364d93a2a793fea4d5ace199ac7c25c67e896ab SHA256 d033e82cb1e2d7055baf12ffa4c1a21cfc79d3d45373c122ebf39d4c856437f3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBAgAGBQJNZsPjAAoJEEqz6FtPBkyjzD8IAKZmzPQGctlD0nCWECRei+3S
+H0Wxyq1JigEhEdTcVWR/N6oBaInZbf9mpoBl/+eccX9tGhB8yXH3DqX5Le6bypFg
+ewQxBZxNIEZXns5Vq3gBX3kxW4SAEgyLqziFOXRCBrMclZTjEEENUk3T0ZEwXFd0
+1+EiUfuM65EG3X02SqkxC4K+2wMS6kE7DAgyiQiUUB0BUq3gFQxAycW6wAVz4Iyn
+xCIgLUpeAD0I4bqlYG6Vj8jVI1AEPS0NKx9eHhlHf1KwaafpE8nTVbBB8Pv3u/Xa
+SWDLySuONFlq8gvFwdG+50nOQDSU6hUYlEQRYqBf5fA+DUPU8LK6slU/+mehzNM=
+=Xeqg
+-----END PGP SIGNATURE-----
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
 }