diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2010-07-10 19:17:26 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-07-10 19:17:26 +0000 |
commit | f3a973c19d17631ef071e129023875216d6316d9 (patch) | |
tree | b8776a5b8ae2338228dfc8cf72149615d09a6c39 /media-gfx | |
parent | alpha/sparc stable wrt #298221 (diff) | |
download | gentoo-2-f3a973c19d17631ef071e129023875216d6316d9.tar.gz gentoo-2-f3a973c19d17631ef071e129023875216d6316d9.tar.bz2 gentoo-2-f3a973c19d17631ef071e129023875216d6316d9.zip |
Support libp2edrvswf (and media-libs/ming) again wrt #238803 by Martin Mokrejš.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx')
-rw-r--r-- | media-gfx/pstoedit/ChangeLog | 8 | ||||
-rw-r--r-- | media-gfx/pstoedit/files/pstoedit-3.45-am_path_pstoedit.patch | 18 | ||||
-rw-r--r-- | media-gfx/pstoedit/files/pstoedit-3.45-gcc-4.3.patch | 11 | ||||
-rw-r--r-- | media-gfx/pstoedit/files/pstoedit-3.45-gcc-4.4.patch | 11 | ||||
-rw-r--r-- | media-gfx/pstoedit/files/pstoedit-3.50-parallel.patch | 6 | ||||
-rw-r--r-- | media-gfx/pstoedit/files/pstoedit-3.50-plugin-close.patch | 6 | ||||
-rw-r--r-- | media-gfx/pstoedit/files/pstoedit-3.50-swf.patch | 25 | ||||
-rw-r--r-- | media-gfx/pstoedit/metadata.xml | 13 | ||||
-rw-r--r-- | media-gfx/pstoedit/pstoedit-3.45-r1.ebuild | 56 | ||||
-rw-r--r-- | media-gfx/pstoedit/pstoedit-3.50-r1.ebuild | 54 |
10 files changed, 96 insertions, 112 deletions
diff --git a/media-gfx/pstoedit/ChangeLog b/media-gfx/pstoedit/ChangeLog index 6d9884988638..5b1bac14a9a0 100644 --- a/media-gfx/pstoedit/ChangeLog +++ b/media-gfx/pstoedit/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-gfx/pstoedit # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/ChangeLog,v 1.67 2010/07/06 10:08:49 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/ChangeLog,v 1.68 2010/07/10 19:17:25 ssuominen Exp $ + +*pstoedit-3.50-r1 (10 Jul 2010) + + 10 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> + +pstoedit-3.50-r1.ebuild, +files/pstoedit-3.50-swf.patch: + Support libp2edrvswf (and media-libs/ming) again wrt #238803 by Martin Mokrejš. 06 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> pstoedit-3.50.ebuild: ppc64 stable wrt #294109 diff --git a/media-gfx/pstoedit/files/pstoedit-3.45-am_path_pstoedit.patch b/media-gfx/pstoedit/files/pstoedit-3.45-am_path_pstoedit.patch deleted file mode 100644 index bc4909abc2c8..000000000000 --- a/media-gfx/pstoedit/files/pstoedit-3.45-am_path_pstoedit.patch +++ /dev/null @@ -1,18 +0,0 @@ -https://bugs.gentoo.org/175679 - -diff --git a/config/pstoedit.m4 b/config/pstoedit.m4 -index b6fa407..67b923b 100644 ---- a/config/pstoedit.m4 -+++ b/config/pstoedit.m4 -@@ -5,6 +5,11 @@ dnl AM_PATH_PSTOEDIT([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]] - dnl Test to see if libpstoedit is installed, and define PSTOEDIT_CFLAGS, LIBS - dnl - -+AC_DEFUN([AM_PATH_PSTOEDIT], -+[dnl -+dnl Get the cflags and libraries from the pstoedit-config script -+dnl -+ - AC_ARG_WITH(pstoedit-prefix,[ --with-pstoedit-prefix=PFX Prefix where Pstoedit is installed (optional)], - pstoedit_prefix="$withval", pstoedit_prefix="") - AC_ARG_WITH(pstoedit-exec-prefix,[ --with-pstoedit-exec-prefix=PFX Exec prefix where Pstoedit is installed (optional)], diff --git a/media-gfx/pstoedit/files/pstoedit-3.45-gcc-4.3.patch b/media-gfx/pstoedit/files/pstoedit-3.45-gcc-4.3.patch deleted file mode 100644 index 3bec05e69e6e..000000000000 --- a/media-gfx/pstoedit/files/pstoedit-3.45-gcc-4.3.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/cppcomp.h -+++ src/cppcomp.h -@@ -122,6 +122,8 @@ - #define I_iomanip <iomanip> - #define I_ios <ios> - #define I_iostream <iostream> -+#include <cstdlib> -+#include <cstring> - - #if (defined (_MSC_VER) && _MSC_VER >= 1100) - // 1100 is version 5.0 diff --git a/media-gfx/pstoedit/files/pstoedit-3.45-gcc-4.4.patch b/media-gfx/pstoedit/files/pstoedit-3.45-gcc-4.4.patch deleted file mode 100644 index 9a41271fbaa4..000000000000 --- a/media-gfx/pstoedit/files/pstoedit-3.45-gcc-4.4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/dynload.cpp 2009-04-05 21:52:11.000000000 -0400 -+++ src/dynload.cpp 2009-04-05 21:53:09.000000000 -0400 -@@ -138,7 +138,7 @@ - dlclose(handle); - #elif defined(_WIN32) - (void) WINFREELIB((HINSTANCE) handle); --#elif -+#else - #error "system unsupported so far" - #endif - handle = 0; diff --git a/media-gfx/pstoedit/files/pstoedit-3.50-parallel.patch b/media-gfx/pstoedit/files/pstoedit-3.50-parallel.patch index 4f1f73b04528..480efd7250c9 100644 --- a/media-gfx/pstoedit/files/pstoedit-3.50-parallel.patch +++ b/media-gfx/pstoedit/files/pstoedit-3.50-parallel.patch @@ -1,7 +1,5 @@ -diff --git a/src/Makefile.am b/src/Makefile.am -index d6178df..66f377b 100755 ---- a/src/Makefile.am -+++ b/src/Makefile.am +--- src/Makefile.am ++++ src/Makefile.am @@ -86,6 +86,7 @@ libp2edrvstd_la_SOURCES= \ $(sample_drivers_src) libp2edrvstd_la_LIBADD=-L. libpstoedit.la diff --git a/media-gfx/pstoedit/files/pstoedit-3.50-plugin-close.patch b/media-gfx/pstoedit/files/pstoedit-3.50-plugin-close.patch index 6787d6aefd4a..df2aa7c47d05 100644 --- a/media-gfx/pstoedit/files/pstoedit-3.50-plugin-close.patch +++ b/media-gfx/pstoedit/files/pstoedit-3.50-plugin-close.patch @@ -1,9 +1,7 @@ http://bugzilla.redhat.com/507035 -diff --git a/src/dynload.cpp b/src/dynload.cpp -index c0db355..7c073ef 100644 ---- a/src/dynload.cpp -+++ b/src/dynload.cpp +--- src/dynload.cpp ++++ src/dynload.cpp @@ -147,7 +147,6 @@ void DynLoader::close() DynLoader::~DynLoader() diff --git a/media-gfx/pstoedit/files/pstoedit-3.50-swf.patch b/media-gfx/pstoedit/files/pstoedit-3.50-swf.patch new file mode 100644 index 000000000000..36500935ec11 --- /dev/null +++ b/media-gfx/pstoedit/files/pstoedit-3.50-swf.patch @@ -0,0 +1,25 @@ +http://bugs.gentoo.org/238803 + +--- configure.ac ++++ configure.ac +@@ -181,7 +181,7 @@ + [LIBMING_CFLAGS="-DHAVE_LIBMING"]) + if test -n "${LIBMING_LDFLAGS}" && test -n "${LIBMING_CFLAGS}"; then + HAVE_LIBMING=yes +- AC_CHECK_HEADER(util/png2dbl.c,[LIBMING_CFLAGS="$LIBMING_CFLAGS -DHAVE_LIBMINGUTIL"]) ++ AC_CHECK_HEADER(util/png2dbl.c,[LIBMING_CFLAGS="$LIBMING_CFLAGS -DHAVE_LIBMINGUTIL -DUSE_PNG"]) + else + LIBMING_LDFLAGS= + LIBMING_CFLAGS= +--- src/drvswf.cpp ++++ src/drvswf.cpp +@@ -31,8 +31,7 @@ + //static bool trace = false; + //static bool cubic = false; + +-#include "mingpp.h" +-#include "ming_config.h" ++#include <mingpp.h> + + #if defined(_WIN32) + extern "C" { diff --git a/media-gfx/pstoedit/metadata.xml b/media-gfx/pstoedit/metadata.xml index 37a303c5fe8c..798d53450a33 100644 --- a/media-gfx/pstoedit/metadata.xml +++ b/media-gfx/pstoedit/metadata.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>tex</herd> -<herd>printing</herd> -<use> - <flag name='emf'> - enables <pkg>media-libs/libemf</pkg> support - </flag> -</use> + <herd>tex</herd> + <herd>printing</herd> + <use> + <flag name='emf'>Enable <pkg>media-libs/libemf</pkg> support</flag> + <flag name='flash'>Enable <pkg>media-libs/ming</pkg> SWF support</flag> + </use> </pkgmetadata> diff --git a/media-gfx/pstoedit/pstoedit-3.45-r1.ebuild b/media-gfx/pstoedit/pstoedit-3.45-r1.ebuild deleted file mode 100644 index a2b97b871e9f..000000000000 --- a/media-gfx/pstoedit/pstoedit-3.45-r1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/pstoedit-3.45-r1.ebuild,v 1.4 2010/05/27 10:54:29 maekke Exp $ - -EAPI="2" - -inherit base eutils - -DESCRIPTION="translates PostScript and PDF graphics into other vector formats" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -HOMEPAGE="http://www.pstoedit.net/pstoedit" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86" - -# Add flash when media-libs/ming-0.3 gets out of package.mask -IUSE="emf imagemagick plotutils" - -# Strangely when emerging with --as-needed libpng is not needed -DEPEND="media-libs/libpng - app-text/ghostscript-gpl - media-libs/gd - emf? ( >=media-libs/libemf-1.0.3 ) - imagemagick? ( media-gfx/imagemagick[cxx] ) - plotutils? ( media-libs/plotutils )" -#flash? ( >=media-libs/ming-0.3 ) - -src_prepare() { - # Fails due to imagemagick having 'long long' in its headers (at least in - # 6.3.9.8). - sed -i -e "s/-pedantic //" configure - epatch "${FILESDIR}"/${P}-am_path_pstoedit.patch # bug 175679 (fixed in 3.50) - epatch "${FILESDIR}/${P}-gcc-4.3.patch" - epatch "${FILESDIR}/${P}-gcc-4.4.patch" -} - -src_configure() { - #$(use_with flash swf) - # --without-swf for bug https://bugs.gentoo.org/show_bug.cgi?id=137204 - econf $(use_with emf) --without-swf $(use_with imagemagick magick) \ - $(use_with plotutils libplot) || die 'econf failed' -} - -src_compile() { - # bug #278417 - emake -j1 || die 'compilation failed' -} - -src_install () { - emake DESTDIR="${D}" install || die 'make install failed' - cd doc - dodoc readme.txt || die - dohtml *.htm || die - doman pstoedit.1 || die -} diff --git a/media-gfx/pstoedit/pstoedit-3.50-r1.ebuild b/media-gfx/pstoedit/pstoedit-3.50-r1.ebuild new file mode 100644 index 000000000000..167e79eac8cb --- /dev/null +++ b/media-gfx/pstoedit/pstoedit-3.50-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/pstoedit-3.50-r1.ebuild,v 1.1 2010/07/10 19:17:25 ssuominen Exp $ + +EAPI=2 +inherit autotools eutils + +DESCRIPTION="Translate PostScript and PDF graphics into other vector formats" +HOMEPAGE="http://sourceforge.net/projects/pstoedit/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="emf flash imagemagick plotutils" + +RDEPEND=">=media-libs/libpng-1.4.3 + >=media-libs/gd-2.0.35-r1 + >=app-text/ghostscript-gpl-8.71-r1 + emf? ( >=media-libs/libemf-1.0.3 ) + flash? ( >=media-libs/ming-0.4.3 ) + imagemagick? ( >=media-gfx/imagemagick-6.6.1.2[cxx] ) + plotutils? ( media-libs/plotutils )" +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +src_prepare() { + sed -i \ + -e '/CXXFLAGS="-g"/d' \ + -e 's:-pedantic::' \ + configure.ac || die + + epatch "${FILESDIR}"/${P}-parallel.patch \ + "${FILESDIR}"/${P}-plugin-close.patch \ + "${FILESDIR}"/${P}-swf.patch + + eautoreconf +} + +src_configure() { + econf \ + --disable-dependency-tracking \ + $(use_with emf) \ + $(use_with imagemagick magick) \ + $(use_with plotutils libplot) \ + $(use_with flash swf) +} + +src_install () { + emake DESTDIR="${D}" install || die + doman doc/pstoedit.1 || die + dodoc doc/*.txt + dohtml doc/*.htm +} |