diff options
author | eroen <eroen@occam.eroen.eu> | 2012-11-14 14:17:41 +0100 |
---|---|---|
committer | eroen <eroen@occam.eroen.eu> | 2012-11-14 14:17:41 +0100 |
commit | dc442713c38c0ac7f7874b755ff243257c38d234 (patch) | |
tree | 91fafad0eadba134c6e9a039211a639fbd108ebb /media-gfx | |
parent | luatex does not build with -flto (diff) | |
download | eroen-dc442713c38c0ac7f7874b755ff243257c38d234.tar.gz eroen-dc442713c38c0ac7f7874b755ff243257c38d234.tar.bz2 eroen-dc442713c38c0ac7f7874b755ff243257c38d234.zip |
imported inkscape-0.48.3.1 from portage
Diffstat (limited to 'media-gfx')
-rw-r--r-- | media-gfx/inkscape/Manifest | 23 | ||||
-rw-r--r-- | media-gfx/inkscape/files/inkscape-0.48.0-spell.patch | 45 | ||||
-rw-r--r-- | media-gfx/inkscape/files/inkscape-0.48.1-libpng15.patch | 40 | ||||
-rw-r--r-- | media-gfx/inkscape/files/inkscape-0.48.2-libwpg.patch | 25 | ||||
-rw-r--r-- | media-gfx/inkscape/files/inkscape-0.48.3.1-desktop.patch | 11 | ||||
-rw-r--r-- | media-gfx/inkscape/inkscape-0.48.3.1.ebuild | 103 | ||||
-rw-r--r-- | media-gfx/inkscape/metadata.xml | 13 |
7 files changed, 260 insertions, 0 deletions
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest new file mode 100644 index 0000000..e9b2b01 --- /dev/null +++ b/media-gfx/inkscape/Manifest @@ -0,0 +1,23 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX inkscape-0.48.0-spell.patch 1815 SHA256 697c781a7aa378f0e65160838fd13919f70b4d886dd77b8b9bdfe7f3181f1a4f SHA512 17f0f9397eebbd5a322757db9f574e4fc848bc1f53e2e0f603eb3c5d7bdf6772b8461189365533fbaa5adb4fdce5264b0c3da015c9ed5ca54873d64cc860880c WHIRLPOOL 6868334e146f00b81c521e54bc261e0153c17e8fd6b176fda826e75203674b8e6904fa092db2856b6512dfe2040b9f268781af909a9a2690bdd8e9152fbdfded +AUX inkscape-0.48.1-libpng15.patch 1616 SHA256 55e113db90267d6789cdb6a54a6c744bd0e9d755b2a7b5835a3713ea04e98c87 SHA512 f783982c8cf2cfc805cb56b6f93e5ecfdce676955f5ddd150f8d9868aa3d7d5ad571dcb1fe12c9c03e35cc05609625ea129894c95b002f0897571016d177c58e WHIRLPOOL d8f3576bb78c9e2491adc0778987f3c72846a3dc1b561c9d4550ef85aca6c8d5fff5a24a8b1854a302891339aecee4aefd4d80121c0db23cb85e2f29a6a10e1c +AUX inkscape-0.48.2-libwpg.patch 1006 SHA256 12cea23c64ef880bbd02e67002ca05c33475701e489d9d0ba3e057b6c2c71c9d SHA512 268df3061749cd5940612b098565d8005de55a1ab7ef9d0f6a51ff93c0535afdcc4943231e019137282ccce0a8cacf0e0176f55926d792590cd22f37bf648c19 WHIRLPOOL a25e107731eab0f7fc5b3652387f090b78f6838f118f6807ad369b599091781f8d0258b8f9a5aa219dd5c57da7cb5661fe482a650d06683b1ab2d9850f067a92 +AUX inkscape-0.48.3.1-desktop.patch 508 SHA256 4d15c12545613e1d63c976d21b5ae86f7808bf34b627cf3e64e92283b96f2ea7 SHA512 ce1ca356dc4f81ad2c5367cc02dab80140c47a9b9964ad82f30d99af64ff36b21da8c62d09269c27e90cd2ebeefa9179298b60e67ec8cd1b1c7eeea38364a891 WHIRLPOOL 70baa134cd8f26982a2dd0f459f13ee893f0fc5ee7af0c1109a316eb1f1656002230da52e257e87d0458d9c767f815b809a3a0e5b65dc5a2e7a7f759e117b93a +DIST inkscape-0.48.3.1-poppler-0.20.patch.bz2 3831 SHA256 c48c8ac90c4d5759bc96facb584db50ad7e32a29398553bf8465f1c5c81548ef SHA512 6f64eea80f19734824de4565698da53d9b033cadef6de0913c88ede5c50a34feb5f500a6c3fe3312f6c8bbaf3a7b6d54680ea0386349076c162c0ecc7b8547d9 WHIRLPOOL dabe6c089491250b3555214beb3e2f45e42bc1a915e7ea8cd89f1e34d2d622c940918808f8a8eb963013769fa218acb3bea1bbf28ce6b5f867b84ab815809aa7 +DIST inkscape-0.48.3.1.tar.bz2 19688778 SHA256 073bf585b6a708747485f2de1f5a1b77c3f45a79e6ee128bf946bae99476db88 SHA512 8b1d75daf2ea6f84d70117381b9e1674a70de5783e08f4095f0ca6f81726096951459cfbde43be3e578fbc3a0b1a02f205de8570e70e167a795296a3eca5c8c3 WHIRLPOOL 427b57006df728bba05c0e79b2c7aa6f81f63ed3475393f1bae1356e6b0af07d1bc0aaee73111902d82d28ccd1c9ce4db51ce10333e03221e60d786007738b4f +EBUILD inkscape-0.48.3.1.ebuild 2569 SHA256 d549398a8c5a9842a2e021660617d3b33f8594b2a437b8e3d376535707b25aff SHA512 5ef5f829021f3b33b7e03c5d6e337742e8a7dc36aae34d37687a9c0f25e066b60518db09d9c0be43b3618f95ccb6bb8bf33f609a162063a5d04dd2f7402b8ed7 WHIRLPOOL 74c4723ae6a7fc950628e9ad46f3bc0fb80e2843be4e4ded1a1a11f172c3b44d2cd8a102a407adc4ab867f304f01193375e4a3544ecf865afdcf915b909657f4 +MISC ChangeLog 26556 SHA256 50b5abe0c82f5caf723d5ddf4bd52a36ea9aaf1e4922582d72735e0fa7ab6d09 SHA512 d4f3858d7a21fe30b8ff2a3ee91f2930dfb20eaa86f32a3d257f3234dab52b4de0326b1c058d8bdaa411efa99f2576e76b308dc7e4f48189a3b9e639eff808f8 WHIRLPOOL 39eb81653fbe439d06c484fe9cf348d697997ac857f23a93ac535080429c9392c3ce822e921e6fbf10f8253661d2814333eb6aac3613f90946566e0e023ee5e2 +MISC metadata.xml 354 SHA256 705fec37c8550d17c1ef9260c24a45843351908700c9fe3eb1d652e4a601e007 SHA512 e8798a3aa2a76aed27f2b7124792d7b4972300146b7cfec3e8e86c42196e8746f63a45a64c12161d1c2b2f4bd211d43eedbb29738277cd319d899dd156089bd3 WHIRLPOOL c1d998bc9e5fdadaaf70bd0f8cf2e7b41a0495f73a1d6ff0c55d1c006b11d263a2fa1c405cf5eacd0a490e6300578a126303ce47dcbc844a362b7e07ee506608 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iQEcBAEBCAAGBQJQncNUAAoJEBzRPIrUMBNCvykIAJyQ7jO2JxHWG56kXq0YG3ud +Ps/uAUxR7VvtNnBRgmL6wBtrUVrd8Z9iblnLQF0J6XVciTg2LuZ+M+S702QlXLJe +7uJlZSt8GBYTGDPCAsjxq00vkFiTjAsTckJv9wOCFb6aTjammfKLMx40l3AAhSP0 +GaLGS7PiP6uLtYXcjPtheB5CBEOpwu/FWv0F3H27suK41KVqngcGmTFT95Xgh/ln +5UiQGgnJEh/riSflZxbmH70daPWAfmSS3aQycg2eJ2MQmu9D5+ygb63+dhmKrWd8 +QhXwgolM95DrND7o2YhW5AVs4PKFE2DAgETNBWHOdelC3RogVaaZwrbPg0L4XBQ= +=6doO +-----END PGP SIGNATURE----- diff --git a/media-gfx/inkscape/files/inkscape-0.48.0-spell.patch b/media-gfx/inkscape/files/inkscape-0.48.0-spell.patch new file mode 100644 index 0000000..9462222 --- /dev/null +++ b/media-gfx/inkscape/files/inkscape-0.48.0-spell.patch @@ -0,0 +1,45 @@ +--- inkscape-0.48.0/configure.ac.orig 2010-10-26 21:22:06.000000000 +0200 ++++ inkscape-0.48.0/configure.ac 2010-10-26 21:33:39.000000000 +0200 +@@ -433,10 +433,15 @@ + fi + AM_CONDITIONAL(INKJAR, test "$with_ij" = "yes") + ++AC_ARG_WITH([gtkspell], ++ AS_HELP_STRING([--without-gtkspell], [disable gtk spelling widget]),[with_gtkspell=$withval], [with_gtkspell=yes]) ++ + ink_spell_pkg= +-if pkg-config --exists gtkspell-2.0; then +- ink_spell_pkg=gtkspell-2.0 +- AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget]) ++if test "x$with_gtkspell" = "xyes"; then ++ if pkg-config --exists gtkspell-2.0; then ++ ink_spell_pkg=gtkspell-2.0 ++ AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget]) ++ fi + fi + + dnl ****************************** +@@ -758,12 +763,17 @@ + dnl ************************** + dnl Check for aspell + dnl ****************************** +-AC_CHECK_LIB(aspell, new_aspell_config, [AC_CHECK_HEADER(aspell.h, aspell_ok=yes, aspell_ok=no)], aspell_ok=no, -lz -lm) +-if test "x$aspell_ok" = "xyes"; then +- AC_DEFINE(HAVE_ASPELL, 1, [Use aspell for built-in spellchecker]) +- INKSCAPE_LIBS="$INKSCAPE_LIBS -laspell" +-else +- AC_MSG_CHECKING([Aspell not found, spell checker will be disabled]) ++AC_ARG_WITH([aspell], ++ AS_HELP_STRING([--without-aspell], [disable aspell spell checker]),[with_aspell=$withval], [with_aspell=yes]) ++ ++if test "x$with_aspell" = "xyes"; then ++ AC_CHECK_LIB(aspell, new_aspell_config, [AC_CHECK_HEADER(aspell.h, aspell_ok=yes, aspell_ok=no)], aspell_ok=no, -lz -lm) ++ if test "x$aspell_ok" = "xyes"; then ++ AC_DEFINE(HAVE_ASPELL, 1, [Use aspell for built-in spellchecker]) ++ INKSCAPE_LIBS="$INKSCAPE_LIBS -laspell" ++ else ++ AC_MSG_CHECKING([Aspell not found, spell checker will be disabled]) ++ fi + fi + + dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in. diff --git a/media-gfx/inkscape/files/inkscape-0.48.1-libpng15.patch b/media-gfx/inkscape/files/inkscape-0.48.1-libpng15.patch new file mode 100644 index 0000000..e24913e --- /dev/null +++ b/media-gfx/inkscape/files/inkscape-0.48.1-libpng15.patch @@ -0,0 +1,40 @@ +--- inkscape-0.48.1/src/extension/internal/pdfinput/svg-builder.cpp ++++ inkscape-0.48.1-mod//src/extension/internal/pdfinput/svg-builder.cpp +@@ -1443,7 +1443,7 @@ + return NULL; + } + // Set error handler +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_write_struct(&png_ptr, &info_ptr); + return NULL; + } +--- inkscape-0.48.1/src/helper/png-write.cpp ++++ inkscape-0.48.1-mod//src/helper/png-write.cpp +@@ -165,7 +165,7 @@ + /* Set error handling. REQUIRED if you aren't supplying your own + * error hadnling functions in the png_create_write_struct() call. + */ +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + /* If we get here, we had a problem reading the file */ + fclose(fp); + png_destroy_write_struct(&png_ptr, &info_ptr); +--- inkscape-0.48.1/src/sp-image.cpp ++++ inkscape-0.48.1-mod//src/sp-image.cpp +@@ -386,9 +386,13 @@ + + #if defined(PNG_iCCP_SUPPORTED) + { +- char* name = 0; ++ png_charp name = 0; + int compression_type = 0; +- char* profile = 0; ++#if (PNG_LIBPNG_VER < 10500) ++ png_charp profile = 0; ++#else ++ png_bytep profile = 0; ++#endif + png_uint_32 proflen = 0; + if ( png_get_iCCP(pngPtr, infoPtr, &name, &compression_type, &profile, &proflen) ) { + // g_message("Found an iCCP chunk named [%s] with %d bytes and comp %d", name, proflen, compression_type); diff --git a/media-gfx/inkscape/files/inkscape-0.48.2-libwpg.patch b/media-gfx/inkscape/files/inkscape-0.48.2-libwpg.patch new file mode 100644 index 0000000..998ce41 --- /dev/null +++ b/media-gfx/inkscape/files/inkscape-0.48.2-libwpg.patch @@ -0,0 +1,25 @@ +--- inkscape-0.48.2/configure.ac.orig ++++ inkscape-0.48.2/configure.ac +@@ -713,14 +713,14 @@ + + with_libwpg=no + +-PKG_CHECK_MODULES(LIBWPG01, libwpg-0.1 libwpg-stream-0.1, with_libwpg01=yes, with_libwpg01=no) +-if test "x$with_libwpg01" = "xyes"; then +- AC_DEFINE(WITH_LIBWPG01,1,[Build in libwpg 0.1.x]) +- with_libwpg=yes +- AC_SUBST(LIBWPG_LIBS, $LIBWPG01_LIBS) +- AC_SUBST(LIBWPG_CFLAGS, $LIBWPG01_CFLAGS) +-fi +-AM_CONDITIONAL(WITH_LIBWPG01, test "x$with_libwpg01" = "xyes") ++#PKG_CHECK_MODULES(LIBWPG01, libwpg-0.1 libwpg-stream-0.1, with_libwpg01=yes, with_libwpg01=no) ++#if test "x$with_libwpg01" = "xyes"; then ++# AC_DEFINE(WITH_LIBWPG01,1,[Build in libwpg 0.1.x]) ++# with_libwpg=yes ++# AC_SUBST(LIBWPG_LIBS, $LIBWPG01_LIBS) ++# AC_SUBST(LIBWPG_CFLAGS, $LIBWPG01_CFLAGS) ++#fi ++#AM_CONDITIONAL(WITH_LIBWPG01, test "x$with_libwpg01" = "xyes") + + PKG_CHECK_MODULES(LIBWPG02, libwpg-0.2 libwpd-0.9 libwpd-stream-0.9, with_libwpg02=yes, with_libwpg02=no) + if test "x$with_libwpg02" = "xyes"; then diff --git a/media-gfx/inkscape/files/inkscape-0.48.3.1-desktop.patch b/media-gfx/inkscape/files/inkscape-0.48.3.1-desktop.patch new file mode 100644 index 0000000..ea5f214 --- /dev/null +++ b/media-gfx/inkscape/files/inkscape-0.48.3.1-desktop.patch @@ -0,0 +1,11 @@ +--- inkscape-0.48.3.1/inkscape.desktop.in ++++ inkscape-0.48.3.1/inkscape.desktop.in +@@ -5,7 +5,7 @@ + _X-GNOME-FullName=Inkscape Vector Graphics Editor + _Comment=Create and edit Scalable Vector Graphics images + Type=Application +-Categories=Graphics;VectorGraphics;GTK; ++Categories=Graphics;2DGraphics;VectorGraphics;GTK; + MimeType=image/svg+xml;image/svg+xml-compressed;application/vnd.corel-draw;application/pdf;application/postscript;image/x-eps;application/illustrator; + Exec=inkscape %F + TryExec=inkscape diff --git a/media-gfx/inkscape/inkscape-0.48.3.1.ebuild b/media-gfx/inkscape/inkscape-0.48.3.1.ebuild new file mode 100644 index 0000000..46208d9 --- /dev/null +++ b/media-gfx/inkscape/inkscape-0.48.3.1.ebuild @@ -0,0 +1,103 @@ +# 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.3.1.ebuild,v 1.15 2012/11/10 02:59:55 flameeyes Exp $ + +EAPI=4 + +PYTHON_DEPEND="*" +PYTHON_USE_WITH="xml" + +GCONF_DEBUG=no + +inherit autotools eutils flag-o-matic gnome2 python + +MY_P="${P/_/}" +S="${WORKDIR}/${MY_P}" +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2 + http://dev.gentoo.org/~radhermit/dist/${P}-poppler-0.20.patch.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 ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" +IUSE="dia gnome postscript 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[cxx] + media-libs/fontconfig + media-libs/freetype:2 + >=media-libs/libpng-1.2 + app-text/libwpd:0.9 + app-text/libwpg:0.2 + sci-libs/gsl + x11-libs/libX11 + >=x11-libs/gtk+-2.10.7:2 + >=x11-libs/pango-1.4.0 + gnome? ( >=gnome-base/gnome-vfs-2.0 ) + lcms? ( media-libs/lcms:2 ) + spell? ( + app-text/aspell + app-text/gtkspell:2 + )" + +# 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 ) + postscript? ( app-text/ghostscript-gpl ) + wmf? ( media-libs/libwmf )" + +DEPEND="${COMMON_DEPEND} + dev-libs/boost + sys-devel/gettext + virtual/pkgconfig + >=dev-util/intltool-0.29" + +DOCS="AUTHORS ChangeLog NEWS README*" + +src_prepare() { + gnome2_src_prepare + epatch "${FILESDIR}"/${PN}-0.48.0-spell.patch \ + "${FILESDIR}"/${PN}-0.48.1-libpng15.patch \ + "${FILESDIR}"/${PN}-0.48.2-libwpg.patch \ + "${FILESDIR}"/${P}-desktop.patch + + has_version ">=app-text/poppler-0.20.0" && epatch "${WORKDIR}"/${P}-poppler-0.20.patch + + eautoreconf +} + +src_configure() { + G2CONF="${G2CONF} + --without-perl + --enable-poppler-cairo + $(use_with gnome gnome-vfs) + $(use_with inkjar) + $(use_enable lcms) + $(use_enable nls) + $(use_with spell aspell) + $(use_with spell gtkspell)" + + # aliasing unsafe wrt #310393 + append-flags -fno-strict-aliasing + gnome2_src_configure +} diff --git a/media-gfx/inkscape/metadata.xml b/media-gfx/inkscape/metadata.xml new file mode 100644 index 0000000..5e939ec --- /dev/null +++ b/media-gfx/inkscape/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>graphics</herd> + <use> + <flag name='dia'> + pull in <pkg>app-office/dia</pkg> for dia import extension + </flag> + <flag name='inkjar'> + enables support for OpenOffice.org SVG jar files + </flag> + </use> +</pkgmetadata> |