summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-08-09 14:37:30 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-08-09 14:37:30 +0000
commitb68b12ac2e1a90815135e4ccfbd4b09a8a69e71b (patch)
tree03b5bfa74ed7203c3209ac64d98043f2949849c6 /media-gfx/swftools
parentppc stable #280300 (diff)
downloadgentoo-2-b68b12ac2e1a90815135e4ccfbd4b09a8a69e71b.tar.gz
gentoo-2-b68b12ac2e1a90815135e4ccfbd4b09a8a69e71b.tar.bz2
gentoo-2-b68b12ac2e1a90815135e4ccfbd4b09a8a69e71b.zip
Fix building with GLIBC 2.10+ wrt #276066. Fix random QA stuff
(Portage version: 2.2_rc36/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/swftools')
-rw-r--r--media-gfx/swftools/ChangeLog6
-rw-r--r--media-gfx/swftools/files/swftools-0.9.0-glibc-2.10.patch26
-rw-r--r--media-gfx/swftools/swftools-0.9.0.ebuild30
3 files changed, 44 insertions, 18 deletions
diff --git a/media-gfx/swftools/ChangeLog b/media-gfx/swftools/ChangeLog
index 04a1e855d735..21ee7512583c 100644
--- a/media-gfx/swftools/ChangeLog
+++ b/media-gfx/swftools/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-gfx/swftools
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/swftools/ChangeLog,v 1.33 2009/07/06 21:53:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/swftools/ChangeLog,v 1.34 2009/08/09 14:37:30 ssuominen Exp $
+
+ 09 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> swftools-0.9.0.ebuild,
+ +files/swftools-0.9.0-glibc-2.10.patch:
+ Fix building with GLIBC 2.10+ wrt #276066.
06 Jul 2009; Jeroen Roovers <jer@gentoo.org> swftools-0.8.1.ebuild:
Stable for HPPA too.
diff --git a/media-gfx/swftools/files/swftools-0.9.0-glibc-2.10.patch b/media-gfx/swftools/files/swftools-0.9.0-glibc-2.10.patch
new file mode 100644
index 000000000000..ee6918ab4412
--- /dev/null
+++ b/media-gfx/swftools/files/swftools-0.9.0-glibc-2.10.patch
@@ -0,0 +1,26 @@
+diff -ur swftools-0.9.0.orig/lib/pdf/GFXOutputDev.cc swftools-0.9.0/lib/pdf/GFXOutputDev.cc
+--- swftools-0.9.0.orig/lib/pdf/GFXOutputDev.cc 2009-04-13 02:25:32.000000000 +0300
++++ swftools-0.9.0/lib/pdf/GFXOutputDev.cc 2009-08-09 17:33:23.000000000 +0300
+@@ -2504,8 +2504,8 @@
+ memset(f, 0, sizeof(fontfile_t));
+ f->filename = filename;
+ int len = strlen(filename);
+- char*r1 = strrchr(filename, '/');
+- char*r2 = strrchr(filename, '\\');
++ char*r1 = const_cast<char*> (strrchr(filename, '/'));
++ char*r2 = const_cast<char*> (strrchr(filename, '\\'));
+ if(r2>r1)
+ r1 = r2;
+ if(r1) {
+diff -ur swftools-0.9.0.orig/lib/pdf/pdf.cc swftools-0.9.0/lib/pdf/pdf.cc
+--- swftools-0.9.0.orig/lib/pdf/pdf.cc 2009-04-13 02:25:32.000000000 +0300
++++ swftools-0.9.0/lib/pdf/pdf.cc 2009-08-09 17:36:46.000000000 +0300
+@@ -458,7 +458,7 @@
+ i->filename = strdup(filename);
+
+ char*x = 0;
+- if((x = strchr(filename, '|'))) {
++ if((x = const_cast<char*> (strchr(filename, '|')))) {
+ *x = 0;
+ userPassword = x+1;
+ }
diff --git a/media-gfx/swftools/swftools-0.9.0.ebuild b/media-gfx/swftools/swftools-0.9.0.ebuild
index be6e690daffb..9981f8e432b7 100644
--- a/media-gfx/swftools/swftools-0.9.0.ebuild
+++ b/media-gfx/swftools/swftools-0.9.0.ebuild
@@ -1,40 +1,36 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/swftools/swftools-0.9.0.ebuild,v 1.1 2009/06/28 11:18:54 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/swftools/swftools-0.9.0.ebuild,v 1.2 2009/08/09 14:37:30 ssuominen Exp $
+EAPI=2
inherit eutils
DESCRIPTION="SWF Tools is a collection of SWF manipulation and generation utilities"
HOMEPAGE="http://www.swftools.org/"
SRC_URI="http://www.swftools.org/${P}.tar.gz"
+
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
IUSE=""
-DEPEND=">=media-libs/t1lib-1.3.1
+RDEPEND=">=media-libs/t1lib-1.3.1
media-libs/freetype
- media-libs/jpeg
+ media-libs/jpeg"
+DEPEND="${RDEPEND}
!<media-libs/ming-0.4.0_rc2"
-RDEPEND=""
-src_compile() {
- econf
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-glibc-2.10.patch
+}
+src_configure() {
+ econf
# disable the python interface; there's no configure switch; bug 118242
echo "all install uninstall clean:" > lib/python/Makefile
-
- emake
}
src_install() {
- einstall || die "Install died."
- dodoc AUTHORS ChangeLog FAQ TODO
-}
-
-pkg_postinst() {
- elog
- elog "avifile is currently not supported."
- elog "Therefore, avi2swf was not installed."
- elog
+ einstall || die "einstall failed"
+ dodoc AUTHORS ChangeLog FAQ
}