Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--media-gfx/swftools/Manifest1
-rw-r--r--media-gfx/swftools/files/swftools-0.9.2-jpeg-9.patch17
-rw-r--r--media-gfx/swftools/files/swftools-0.9.2_general.patch28
-rw-r--r--media-gfx/swftools/files/swftools-0.9.2_giflib.patch89
-rw-r--r--media-gfx/swftools/files/swftools-0.9.2_giflib5.patch26
-rw-r--r--media-gfx/swftools/files/swftools-0.9.2_nopdf.patch40
-rw-r--r--media-gfx/swftools/metadata.xml5
-rw-r--r--media-gfx/swftools/swftools-0.9.2-r1.ebuild48
-rw-r--r--profiles/package.mask6
9 files changed, 0 insertions, 260 deletions
diff --git a/media-gfx/swftools/Manifest b/media-gfx/swftools/Manifest
deleted file mode 100644
index 1e2a38729985..000000000000
--- a/media-gfx/swftools/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST swftools-0.9.2.tar.gz 2675939 BLAKE2B e5d2edcb5a23f4c174da61bee97eb708e71a0b14657b27dc01294ee8b368fd53cca08c7c354c9c038a02c4a3e0220d90e80f8637c86469eea169a431f35d0573 SHA512 91bbd48914f9a8a1cdf85532b371721b01982c5f88648b908fbe99fbf4e17e9893ce575e4fd699927e9bc1c79d846f6bcd4f1d868578fb17403467cc1e28259b
diff --git a/media-gfx/swftools/files/swftools-0.9.2-jpeg-9.patch b/media-gfx/swftools/files/swftools-0.9.2-jpeg-9.patch
deleted file mode 100644
index 7f809ea99836..000000000000
--- a/media-gfx/swftools/files/swftools-0.9.2-jpeg-9.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Patch kindly borrowed from macports.org.
-
---- a/lib/jpeg.c 2011-10-14 15:46:10.000000000 -0500
-+++ b/lib/jpeg.c 2014-08-06 20:15:51.000000000 -0500
-@@ -5,6 +5,12 @@
- #include "../config.h"
-
- #ifdef HAVE_JPEGLIB
-+#ifndef FALSE
-+#define FALSE 0
-+#endif
-+#ifndef TRUE
-+#define TRUE 1
-+#endif
- #define HAVE_BOOLEAN
- #include <jpeglib.h>
-
diff --git a/media-gfx/swftools/files/swftools-0.9.2_general.patch b/media-gfx/swftools/files/swftools-0.9.2_general.patch
deleted file mode 100644
index f49fcb0d2f64..000000000000
--- a/media-gfx/swftools/files/swftools-0.9.2_general.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -urB swftools-0.9.2.old/src/png2swf.c swftools-0.9.2.jo/src/png2swf.c
---- swftools-0.9.2.old/src/png2swf.c 2012-04-08 19:25:26.000000000 +0200
-+++ swftools-0.9.2.jo/src/png2swf.c 2012-04-11 23:29:08.569700175 +0200
-@@ -777,7 +777,7 @@
- printf("-q , --quiet Omit normal log messages, only log errors\n");
- printf("-C , --cgi For use as CGI- prepend http header, write to stdout\n");
- printf("-V , --version Print version information and exit\n");
-- printf("-s , --scale <percent> Scale image to <percent>% size.\n");
-+ printf("-s , --scale <percent> Scale image to <percent>%% size.\n");
- printf("\n");
- }
-
-diff -urB swftools-0.9.2.old/swfs/Makefile.in swftools-0.9.2.jo/swfs/Makefile.in
---- swftools-0.9.2.old/swfs/Makefile.in 2012-04-08 19:25:26.000000000 +0200
-+++ swftools-0.9.2.jo/swfs/Makefile.in 2012-04-11 23:29:08.573699972 +0200
-@@ -41,10 +41,8 @@
- $(INSTALL_DATA) ./PreLoaderTemplate.swf $(pkgdatadir)/swfs/PreLoaderTemplate.swf
- $(INSTALL_DATA) ./tessel_loader.swf $(pkgdatadir)/swfs/tessel_loader.swf
- $(INSTALL_DATA) ./swft_loader.swf $(pkgdatadir)/swfs/swft_loader.swf
-- rm -f $(pkgdatadir)/swfs/default_viewer.swf -o -L $(pkgdatadir)/swfs/default_viewer.swf
-- $(LN_S) $(pkgdatadir)/swfs/simple_viewer.swf $(pkgdatadir)/swfs/default_viewer.swf
-- rm -f $(pkgdatadir)/swfs/default_loader.swf -o -L $(pkgdatadir)/swfs/default_loader.swf
-- $(LN_S) $(pkgdatadir)/swfs/tessel_loader.swf $(pkgdatadir)/swfs/default_loader.swf
-+ cd $(pkgdatadir)/swfs; ${LN_S} simple_viewer.swf default_viewer.swf
-+ cd $(pkgdatadir)/swfs; ${LN_S} tessel_loader.swf default_loader.swf
-
- uninstall:
- $(UNINSTALL_DATA) $(pkgdatadir)/swfs/simple_viewer.swf
diff --git a/media-gfx/swftools/files/swftools-0.9.2_giflib.patch b/media-gfx/swftools/files/swftools-0.9.2_giflib.patch
deleted file mode 100644
index 913b5e3b08d1..000000000000
--- a/media-gfx/swftools/files/swftools-0.9.2_giflib.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 05c1df6a6da28734533722dc0ac99ea5b206a492 Mon Sep 17 00:00:00 2001
-From: Matthias Kramm <kramm@quiss.org>
-Date: Sat, 6 Jul 2013 12:09:53 -0700
-Subject: [PATCH] applied giflib patch from Jan Engelhardt
-
----
- src/gif2swf.c | 28 ++++++++++++++++++++++++----
- 1 file changed, 24 insertions(+), 4 deletions(-)
-
-diff --git a/src/gif2swf.c b/src/gif2swf.c
-index 2359da5..5e52ea8 100644
---- a/src/gif2swf.c
-+++ b/src/gif2swf.c
-@@ -222,6 +222,7 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id, int imgidx)
-
- GifFileType *gft;
- FILE *fi;
-+ int ret;
-
- if ((fi = fopen(sname, "rb")) == NULL) {
- if (VERBOSE(1))
-@@ -230,13 +231,24 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id, int imgidx)
- }
- fclose(fi);
-
-- if ((gft = DGifOpenFileName(sname)) == NULL) {
-+#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5
-+ gft = DGifOpenFileName(sname, NULL);
-+#else
-+ gft = DGifOpenFileName(sname);
-+#endif
-+ if (gft == NULL) {
- fprintf(stderr, "%s is not a GIF file!\n", sname);
- return t;
- }
-
-- if (DGifSlurp(gft) != GIF_OK) {
-+ if ((ret = DGifSlurp(gft)) != GIF_OK) {
-+#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR == 4 && GIFLIB_MINOR >= 2
-+ fprintf(stderr, "GIF-LIB: %s\n", GifErrorString());
-+#elif defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5
-+ fprintf(stderr, "GIF-LIB: %s\n", GifErrorString(ret));
-+#else
- PrintGifError();
-+#endif
- return t;
- }
-
-@@ -465,6 +475,7 @@ int CheckInputFile(char *fname, char **realname)
- FILE *fi;
- char *s = malloc(strlen(fname) + 5);
- GifFileType *gft;
-+ int ret;
-
- if (!s)
- exit(2);
-@@ -488,7 +499,12 @@ int CheckInputFile(char *fname, char **realname)
- }
- fclose(fi);
-
-- if ((gft = DGifOpenFileName(s)) == NULL) {
-+#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5
-+ gft = DGifOpenFileName(s, NULL);
-+#else
-+ gft = DGifOpenFileName(s);
-+#endif
-+ if (gft == NULL) {
- fprintf(stderr, "%s is not a GIF file!\n", fname);
- return -1;
- }
-@@ -498,8 +514,14 @@ int CheckInputFile(char *fname, char **realname)
- if (global.max_image_height < gft->SHeight)
- global.max_image_height = gft->SHeight;
-
-- if (DGifSlurp(gft) != GIF_OK) {
-+ if ((ret = DGifSlurp(gft)) != GIF_OK) {
-+#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR == 4 && GIFLIB_MINOR >= 2
-+ fprintf(stderr, "GIF-LIB: %s\n", GifErrorString());
-+#elif defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5
-+ fprintf(stderr, "GIF-LIB: %s\n", GifErrorString(ret));
-+#else
- PrintGifError();
-+#endif
- return -1;
- }
- // After DGifSlurp() call, gft->ImageCount become available
---
-1.8.4
-
diff --git a/media-gfx/swftools/files/swftools-0.9.2_giflib5.patch b/media-gfx/swftools/files/swftools-0.9.2_giflib5.patch
deleted file mode 100644
index 6450f827b87b..000000000000
--- a/media-gfx/swftools/files/swftools-0.9.2_giflib5.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- swftools-0.9.2.orig/src/gif2swf.c 2016-02-16 16:15:39.697992195 -0500
-+++ swftools-0.9.2/src/gif2swf.c 2016-02-16 16:25:37.047992256 -0500
-@@ -467,7 +467,11 @@
-
- free(pal);
- free(imagedata);
-+#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1
-+ DGifCloseFile(gft, D_GIF_SUCCEEDED);
-+#else
- DGifCloseFile(gft);
-+#endif
-
- return t;
- }
-@@ -542,7 +546,11 @@
- fprintf(stderr, "frame: %u, delay: %.3f sec\n", i + 1, getGifDelayTime(gft, i) / 100.0);
- }
-
-+#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1
-+ DGifCloseFile(gft, D_GIF_SUCCEEDED);
-+#else
- DGifCloseFile(gft);
-+#endif
-
- return 0;
- }
diff --git a/media-gfx/swftools/files/swftools-0.9.2_nopdf.patch b/media-gfx/swftools/files/swftools-0.9.2_nopdf.patch
deleted file mode 100644
index 9dc6c2ac2560..000000000000
--- a/media-gfx/swftools/files/swftools-0.9.2_nopdf.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -urB swftools-0.9.2.old/lib/Makefile.in swftools-0.9.2.jo/lib/Makefile.in
---- swftools-0.9.2.old/lib/Makefile.in 2011-10-07 05:35:18.000000000 +0200
-+++ swftools-0.9.2.jo/lib/Makefile.in 2012-04-11 23:33:53.299308801 +0200
-@@ -3,7 +3,8 @@
- top_srcdir = @top_srcdir@
- include ../Makefile.common
-
--all: librfxswf$(A) libgfxpdf$(A) libbase$(A) libgfx$(A) libgfxswf$(A) libocr$(A)
-+#all: librfxswf$(A) libgfxpdf$(A) libbase$(A) libgfx$(A) libgfxswf$(A) libocr$(A)
-+all: librfxswf$(A) libbase$(A) libgfx$(A) libgfxswf$(A) libocr$(A)
-
- lame_objects = lame/psymodel.$(O) lame/fft.$(O) lame/newmdct.$(O) lame/quantize.$(O) lame/takehiro.$(O) lame/reservoir.$(O) lame/quantize_pvt.$(O) lame/vbrquantize.$(O) lame/encoder.$(O) lame/id3tag.$(O) lame/version.$(O) lame/tables.$(O) lame/util.$(O) lame/bitstream.$(O) lame/set_get.$(O) lame/VbrTag.$(O) lame/lame.$(O)
- lame_in_source = @lame_in_source@
-diff -urB swftools-0.9.2.old/Makefile.in swftools-0.9.2.jo/Makefile.in
---- swftools-0.9.2.old/Makefile.in 2012-04-08 19:25:26.000000000 +0200
-+++ swftools-0.9.2.jo/Makefile.in 2012-04-11 23:33:53.299308801 +0200
-@@ -8,8 +8,8 @@
- cd m4;$(MAKE) $@
- @echo making $@ in lib...
- cd lib;$(MAKE) $@
-- @echo making $@ in lib/pdf...
-- cd lib/pdf;$(MAKE) $@
-+# @echo making $@ in lib/pdf...
-+# cd lib/pdf;$(MAKE) $@
- @echo making $@ in lib...
- cd lib;$(MAKE) $@
- @echo making $@ in lib/python...
-diff -urB swftools-0.9.2.old/src/Makefile.in swftools-0.9.2.jo/src/Makefile.in
---- swftools-0.9.2.old/src/Makefile.in 2011-10-07 05:20:17.000000000 +0200
-+++ swftools-0.9.2.jo/src/Makefile.in 2012-04-11 23:33:53.299308801 +0200
-@@ -3,7 +3,8 @@
- top_srcdir = @top_srcdir@
- include ../Makefile.common
-
--install_programs = wav2swf$(E) @PNG2SWF@ swfcombine$(E) swfstrings$(E) swfextract$(E) swfdump$(E) swfc$(E) @JPEG2SWF@ @GIF2SWF@ swfbbox$(E) font2swf$(E) swfrender$(E) as3compile$(E) @PDF2SWF@ @PDF2PDF@
-+#install_programs = wav2swf$(E) @PNG2SWF@ swfcombine$(E) swfstrings$(E) swfextract$(E) swfdump$(E) swfc$(E) @JPEG2SWF@ @GIF2SWF@ swfbbox$(E) font2swf$(E) swfrender$(E) as3compile$(E) @PDF2SWF@ @PDF2PDF@
-+install_programs = wav2swf$(E) @PNG2SWF@ swfcombine$(E) swfstrings$(E) swfextract$(E) swfdump$(E) swfc$(E) @JPEG2SWF@ @GIF2SWF@ swfbbox$(E) font2swf$(E) swfrender$(E) as3compile$(E) @PDF2PDF@
- programs = $(install_programs) swfbytes$(E) ttftool$(E)
-
- all: $(programs)
diff --git a/media-gfx/swftools/metadata.xml b/media-gfx/swftools/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/media-gfx/swftools/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/media-gfx/swftools/swftools-0.9.2-r1.ebuild b/media-gfx/swftools/swftools-0.9.2-r1.ebuild
deleted file mode 100644
index cbdcdb3e1c78..000000000000
--- a/media-gfx/swftools/swftools-0.9.2-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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=""
-
-RDEPEND="
- app-text/poppler
- media-libs/freetype:2
- media-libs/giflib:0=
- >=media-libs/t1lib-1.3.1:5
- virtual/jpeg:0
-"
-DEPEND="${RDEPEND}
- !<media-libs/ming-0.4.0_rc2
-"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}_nopdf.patch
- epatch "${FILESDIR}"/${P}_general.patch
- epatch "${FILESDIR}"/${P}_giflib.patch
- epatch "${FILESDIR}"/${P}_giflib5.patch
- epatch "${FILESDIR}"/${P}-jpeg-9.patch
-}
-
-src_configure() {
- econf --enable-poppler
- # disable the python interface; there's no configure switch; bug 118242
- echo "all install uninstall clean:" > lib/python/Makefile
-}
-
-src_compile() {
- emake FLAGS="${CFLAGS}"
-}
-
-src_install() {
- einstall
- dodoc AUTHORS ChangeLog
-}
diff --git a/profiles/package.mask b/profiles/package.mask
index c77689e9d7b9..35d3d7ecdc7d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -644,12 +644,6 @@ dev-libs/grok
# Removal in 30 days. Bug #532502.
net-ftp/weex
-# Aaron Bauamn <bman@gentoo.org> (29 Mar 2019)
-# Longstanding security vulnerabilities
-# No upstream releases in years
-# Removal in 30 days. Bug #650888
-media-gfx/swftools
-
# Robin H. Johnson <robbat2@gentoo.org> (25 Mar 2019)
# Requires >=dev-lang/lua-5.3 which is masked
sys-apps/likwid