Revision bump. Apply patch to work with the latest libwpd/libwpg (bug #363703 by Pacho Ramos, patch by Fedora) and fix compile with gcc-4.6 (bug #362639 by emil karlson).

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

5 files changed, 195 insertions, 6 deletions

diff --git a/media-gfx/inkscape/ChangeLog b/media-gfx/inkscape/ChangeLog
index 428a5a7d8c37..7140fd8ad64d 100644
--- a/media-gfx/inkscape/ChangeLog
+++ b/media-gfx/inkscape/ChangeLog
@@ -1,6 +1,15 @@
 # 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.157 2011/04/24 17:27:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.158 2011/04/29 09:30:59 radhermit Exp $
+
+*inkscape-0.48.1-r1 (29 Apr 2011)
+
+  29 Apr 2011; Tim Harder <radhermit@gentoo.org>
+  +files/inkscape-0.48.0-libwpd.patch, +inkscape-0.48.1-r1.ebuild,
+  +files/inkscape-0.48.1-gcc-4.6.patch:
+  Revision bump. Apply patch to work with the latest libwpd/libwpg (bug #363703
+  by Pacho Ramos, patch by Fedora) and fix compile with gcc-4.6 (bug #362639 by
+  emil karlson).
 
   24 Apr 2011; Raúl Porcel <armin76@gentoo.org> inkscape-0.47.ebuild,
   inkscape-0.48.0.ebuild:
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 3f587f74c6b4..6b06f8254c16 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -3,8 +3,10 @@ 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-libwpd.patch 1444 RMD160 f5b63be882b6e6757fab8994ad6ade5a6e8e5b44 SHA1 bcf8d143f29e3b1ff3281065a374c9ae1beb276c SHA256 a364a8e302a9d9ff022333c101478755d5bfd262d7ace65619809b3210287547
 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-gcc-4.6.patch 734 RMD160 2e85347875c397da25797e90b8d1e191391d3545 SHA1 bc65a1ec5c6e20ba6e66a62f349e69c10ead039e SHA256 16e43c3cd10fa4d2da4d2abe698d55c24eb22444cf9bcb23427977fb7f15a4a7
 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
@@ -12,13 +14,18 @@ DIST inkscape-0.48.0.tar.gz 25870275 RMD160 0d97c17136fe69a2248bb4cf4d2f6296ce18
 DIST inkscape-0.48.1.tar.bz2 19558565 RMD160 9e25e02258d1b1e4cce24474523e1b37e58aded6 SHA1 9727ed11cef31c2790bf2affbddf6a6ef352753f SHA256 44bda45d14374351f426afa467222093c2f24ddb586e3cfa1cf21e7468e4bb86
 EBUILD inkscape-0.47.ebuild 2477 RMD160 82d4c90ebfda45dc35a490994b32c043469b8a3e SHA1 2be67a6822e1c16f188ae43a3f01e79aa30bf22c SHA256 53a7f568cea5ae3e5fbbbc693d57834bcf0fe733df7c48b94e703dc4c436ba2e
 EBUILD inkscape-0.48.0.ebuild 2671 RMD160 3cce66d32016005cb19fb02a506d8bf8f7b3c21b SHA1 eed240bad05ee9c78e0bc2240dc05ed3f528a932 SHA256 0bab1310c5e5021f89cae9fd4b9daab35b9d9c879f4c43c9069dde98e9a41743
+EBUILD inkscape-0.48.1-r1.ebuild 2541 RMD160 724efefda4bf8712e0a78ab7bb6cf5f5171444f0 SHA1 62c2b0d390fe20cf1ccf7b1673a090934c74ef81 SHA256 7156d3a24823303e9e35ccfa6fad4ec7fd9ec7061f7153350a30155907729996
 EBUILD inkscape-0.48.1.ebuild 2424 RMD160 cb0ec75f07b7d2154affb1fc1835e04163e8c759 SHA1 1a83d9e94cfed40c0fc1deb4d2a9a08e24ccd685 SHA256 cd597ecbdf05e1cb86157daa90c5530ade70e64df1c2a108341533e0f5df294d
-MISC ChangeLog 21914 RMD160 bb6934844f4859f7f936a18c09718088dde4f6e8 SHA1 6538d0e4868a419be9dc261a43cd9a242e76ef67 SHA256 e4cdbf376e9510b982de977fc63aea33e8baa6d6e23b3542c4cf77fad19e9c2b
+MISC ChangeLog 22285 RMD160 f7af125f413a0c37de14ab04626324515c49e759 SHA1 bf5e2e58181a4fbdf52e564488f467f7cf19f3cf SHA256 38edeb61390cbc5afc17507c0a1787214cfc4012a3580df7c586adead984a4d8
 MISC metadata.xml 438 RMD160 255e104540381e2eda4bee5e06d13a3e5f9cd978 SHA1 8364d93a2a793fea4d5ace199ac7c25c67e896ab SHA256 d033e82cb1e2d7055baf12ffa4c1a21cfc79d3d45373c122ebf39d4c856437f3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk20XZsACgkQuQc30/atMkBj8wCgu0VPcFox0qK7iIFZvHL/MKDT
-HfgAnjU8VJABa5ZSKJxV2tMXpbmAyfTn
-=TWnL
+iQEcBAEBAgAGBQJNuoVZAAoJEEqz6FtPBkyjYbUIALJb0wUS0P5G+L8cTlDVkqDH
+VYw8qtO9QVGlBCHXsSvzxxm/SzYz837MepSEU8AWbImFM9Y3zsdIpjFczpP3VWNU
+GXTHEbT2UnBG9FLFBCeb5BcLWL2mJmcj1qY/Rf6x3wyAqxNgVRxS4ISaYOz1+mXG
+6EQnHOjK4MdtzzcnAgPo/bRjPDeUevsVqzmS3T5tLn8oCMZhhlCwmw4adX0lV3pj
+zbdjHRzBxaldwcNKoP5l+5UetW+zMrYssK5mS9pj1ug58D/ZEVx8X+zgsi7UffIL
+rr7dRKC9hKYF37Pk8q9TzXddMaBVNv4Vn5Au4LoHfeeLyjJ2IZD4h3t12McvujM=
+=7oPK
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/inkscape/files/inkscape-0.48.0-libwpd.patch b/media-gfx/inkscape/files/inkscape-0.48.0-libwpd.patch
new file mode 100644
index 000000000000..94b317f57ae1
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.48.0-libwpd.patch
@@ -0,0 +1,45 @@
+--- inkscape-0.48.0/configure.ac
++++ inkscape-0.48.0/configure.ac
+@@ -678,7 +678,7 @@
+ dnl Check for libwpg for extension
+ dnl ******************************
+ 
+-PKG_CHECK_MODULES(LIBWPG, libwpg-0.1 libwpg-stream-0.1, with_libwpg=yes, with_libwpg=no)
++PKG_CHECK_MODULES(LIBWPG, libwpg-0.2 libwpd-0.9 libwpd-stream-0.9, with_libwpg=yes, with_libwpg=no)
+ if test "x$with_libwpg" = "xyes"; then
+ 	AC_DEFINE(WITH_LIBWPG,1,[Build in libwpg])
+ fi
+--- inkscape-0.48.0/src/extension/internal/wpg-input.cpp
++++ inkscape-0.48.0/src/extension/internal/wpg-input.cpp
+@@ -49,7 +49,7 @@
+ #include "document.h"
+ 
+ #include "libwpg/libwpg.h"
+-#include "libwpg/WPGStreamImplementation.h"
++#include "libwpd-stream/libwpd-stream.h"
+ 
+ 
+ using namespace libwpg;
+@@ -61,9 +61,9 @@
+ 
+ SPDocument *
+ WpgInput::open(Inkscape::Extension::Input * mod, const gchar * uri) {
+-    WPXInputStream* input = new libwpg::WPGFileStream(uri);
++    WPXInputStream* input = new WPXFileStream(uri);
+     if (input->isOLEStream()) {
+-        WPXInputStream* olestream = input->getDocumentOLEStream();
++        WPXInputStream* olestream = input->getDocumentOLEStream("PerfectOffice_MAIN");
+         if (olestream) {
+             delete input;
+             input = olestream;
+@@ -78,7 +78,7 @@
+         return NULL;
+     }
+ 
+-    libwpg::WPGString output;
++    WPXString output;
+     if (!libwpg::WPGraphics::generateSVG(input, output)) {
+         delete input;
+         return NULL;
+
+
diff --git a/media-gfx/inkscape/files/inkscape-0.48.1-gcc-4.6.patch b/media-gfx/inkscape/files/inkscape-0.48.1-gcc-4.6.patch
new file mode 100644
index 000000000000..feff68b6b67e
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.48.1-gcc-4.6.patch
@@ -0,0 +1,31 @@
+--- inkscape-0.48.1/src/2geom/utils.h
++++ inkscape-0.48.1-r1/src/2geom/utils.h
+@@ -35,6 +35,7 @@
+ 
+ #include <cmath>
+ #include <vector>
++#include <cstddef>
+ 
+ namespace Geom {
+ 
+--- inkscape-0.48.1/src/libavoid/geomtypes.h
++++ inkscape-0.48.1-r1/src/libavoid/geomtypes.h
+@@ -31,6 +31,7 @@
+ 
+ #include <vector>
+ #include <utility>
++#include <cstddef>
+ 
+ 
+ namespace Avoid
+--- inkscape-0.48.1/src/Makefile.am
++++ inkscape-0.48.1-r1/src/Makefile.am
+@@ -205,7 +205,7 @@
+ 
+ inkscape_SOURCES += main.cpp $(win32_sources)
+ inkscape_LDADD = $(all_libs)
+-inkscape_LDFLAGS = --export-dynamic $(kdeldflags) $(mwindows)
++inkscape_LDFLAGS = $(kdeldflags) $(mwindows)
+ 
+ inkview_SOURCES += inkview.cpp $(win32_sources)
+ inkview_LDADD = $(all_libs)
diff --git a/media-gfx/inkscape/inkscape-0.48.1-r1.ebuild b/media-gfx/inkscape/inkscape-0.48.1-r1.ebuild
new file mode 100644
index 000000000000..ab9c4e37f445
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-0.48.1-r1.ebuild
@@ -0,0 +1,97 @@
+# 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-r1.ebuild,v 1.1 2011/04/29 09:30:59 radhermit Exp $
+
+EAPI=2
+inherit eutils flag-o-matic autotools gnome2
+
+MY_P="${P/_/}"
+S="${WORKDIR}/${MY_P}"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+DESCRIPTION="A SVG based generic vector-drawing program"
+HOMEPAGE="http://www.inkscape.org/"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="dia gnome gs inkjar lcms nls spell wmf"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=app-text/poppler-0.12.3-r3[cairo,xpdf-headers]
+	dev-cpp/glibmm
+	>=dev-cpp/gtkmm-2.18.0:2.4
+	>=dev-libs/boehm-gc-6.4
+	>=dev-libs/glib-2.6.5
+	>=dev-libs/libsigc++-2.0.12
+	>=dev-libs/libxml2-2.6.20
+	>=dev-libs/libxslt-1.0.15
+	dev-libs/popt
+	dev-python/lxml
+	media-gfx/imagemagick
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=media-libs/libpng-1.2
+	app-text/libwpd:0.9
+	media-libs/libwpg:0.2
+	sci-libs/gsl
+	x11-libs/libXft
+	>=x11-libs/gtk+-2.10.7:2
+	>=x11-libs/pango-1.4.0
+	|| ( dev-lang/python[xml] dev-python/pyxml )
+	gnome? ( >=gnome-base/gnome-vfs-2.0 )
+	lcms? ( media-libs/lcms:0 )
+	spell? (
+		app-text/aspell
+		app-text/gtkspell
+	)"
+
+# These only use executables provided by these packages
+# See share/extensions for more details. inkscape can tell you to
+# install these so we could of course just not depend on those and rely
+# on that.
+RDEPEND="
+	${COMMON_DEPEND}
+	dev-python/numpy
+	media-gfx/uniconvertor
+	dia? ( app-office/dia )
+	gs? ( app-text/ghostscript-gpl )
+	wmf? ( media-libs/libwmf )"
+
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	sys-devel/gettext
+	dev-util/pkgconfig
+	x11-libs/libX11
+	>=dev-util/intltool-0.29"
+
+pkg_setup() {
+	G2CONF="${G2CONF} --without-perl"
+	G2CONF="${G2CONF} --enable-poppler-cairo"
+	G2CONF="${G2CONF} --with-xft"
+	G2CONF="${G2CONF} $(use_with gnome gnome-vfs)"
+	G2CONF="${G2CONF} $(use_with inkjar)"
+	G2CONF="${G2CONF} $(use_enable lcms)"
+	G2CONF="${G2CONF} $(use_enable nls)"
+	G2CONF="${G2CONF} $(use_with spell aspell)"
+	G2CONF="${G2CONF} $(use_with spell gtkspell)"
+	DOCS="AUTHORS ChangeLog NEWS README*"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+	epatch "${FILESDIR}"/${PN}-0.48.0-spell.patch
+	epatch "${FILESDIR}"/${PN}-0.48.0-libwpd.patch
+	epatch "${FILESDIR}"/${P}-libpng15.patch
+	epatch "${FILESDIR}"/${P}-lcms.patch
+	epatch "${FILESDIR}"/${P}-gcc-4.6.patch
+	eautoreconf
+}
+
+src_configure() {
+	# aliasing unsafe wrt #310393
+	append-flags -fno-strict-aliasing
+	gnome2_src_configure
+}