Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/swftools/files/, media-gfx/swftools/, profiles/
Date: Sun, 28 Apr 2019 20:03:07
Message-Id: 1556481753.32edfe461d949f5b809fefe51e0248c2c27f53b4.mgorny@gentoo
1 commit: 32edfe461d949f5b809fefe51e0248c2c27f53b4
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Apr 28 20:01:03 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Apr 28 20:02:33 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32edfe46
7
8 media-gfx/swftools: Remove last-rited pkg
9
10 Bug: https://bugs.gentoo.org/650888
11 Bug: https://bugs.gentoo.org/637172
12 Bug: https://bugs.gentoo.org/635208
13 Bug: https://bugs.gentoo.org/617252
14 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
15
16 media-gfx/swftools/Manifest | 1 -
17 .../swftools/files/swftools-0.9.2-jpeg-9.patch | 17 -----
18 .../swftools/files/swftools-0.9.2_general.patch | 28 -------
19 .../swftools/files/swftools-0.9.2_giflib.patch | 89 ----------------------
20 .../swftools/files/swftools-0.9.2_giflib5.patch | 26 -------
21 .../swftools/files/swftools-0.9.2_nopdf.patch | 40 ----------
22 media-gfx/swftools/metadata.xml | 5 --
23 media-gfx/swftools/swftools-0.9.2-r1.ebuild | 48 ------------
24 profiles/package.mask | 6 --
25 9 files changed, 260 deletions(-)
26
27 diff --git a/media-gfx/swftools/Manifest b/media-gfx/swftools/Manifest
28 deleted file mode 100644
29 index 1e2a3872998..00000000000
30 --- a/media-gfx/swftools/Manifest
31 +++ /dev/null
32 @@ -1 +0,0 @@
33 -DIST swftools-0.9.2.tar.gz 2675939 BLAKE2B e5d2edcb5a23f4c174da61bee97eb708e71a0b14657b27dc01294ee8b368fd53cca08c7c354c9c038a02c4a3e0220d90e80f8637c86469eea169a431f35d0573 SHA512 91bbd48914f9a8a1cdf85532b371721b01982c5f88648b908fbe99fbf4e17e9893ce575e4fd699927e9bc1c79d846f6bcd4f1d868578fb17403467cc1e28259b
34
35 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
36 deleted file mode 100644
37 index 7f809ea9983..00000000000
38 --- a/media-gfx/swftools/files/swftools-0.9.2-jpeg-9.patch
39 +++ /dev/null
40 @@ -1,17 +0,0 @@
41 -Patch kindly borrowed from macports.org.
42 -
43 ---- a/lib/jpeg.c 2011-10-14 15:46:10.000000000 -0500
44 -+++ b/lib/jpeg.c 2014-08-06 20:15:51.000000000 -0500
45 -@@ -5,6 +5,12 @@
46 - #include "../config.h"
47 -
48 - #ifdef HAVE_JPEGLIB
49 -+#ifndef FALSE
50 -+#define FALSE 0
51 -+#endif
52 -+#ifndef TRUE
53 -+#define TRUE 1
54 -+#endif
55 - #define HAVE_BOOLEAN
56 - #include <jpeglib.h>
57 -
58
59 diff --git a/media-gfx/swftools/files/swftools-0.9.2_general.patch b/media-gfx/swftools/files/swftools-0.9.2_general.patch
60 deleted file mode 100644
61 index f49fcb0d2f6..00000000000
62 --- a/media-gfx/swftools/files/swftools-0.9.2_general.patch
63 +++ /dev/null
64 @@ -1,28 +0,0 @@
65 -diff -urB swftools-0.9.2.old/src/png2swf.c swftools-0.9.2.jo/src/png2swf.c
66 ---- swftools-0.9.2.old/src/png2swf.c 2012-04-08 19:25:26.000000000 +0200
67 -+++ swftools-0.9.2.jo/src/png2swf.c 2012-04-11 23:29:08.569700175 +0200
68 -@@ -777,7 +777,7 @@
69 - printf("-q , --quiet Omit normal log messages, only log errors\n");
70 - printf("-C , --cgi For use as CGI- prepend http header, write to stdout\n");
71 - printf("-V , --version Print version information and exit\n");
72 -- printf("-s , --scale <percent> Scale image to <percent>% size.\n");
73 -+ printf("-s , --scale <percent> Scale image to <percent>%% size.\n");
74 - printf("\n");
75 - }
76 -
77 -diff -urB swftools-0.9.2.old/swfs/Makefile.in swftools-0.9.2.jo/swfs/Makefile.in
78 ---- swftools-0.9.2.old/swfs/Makefile.in 2012-04-08 19:25:26.000000000 +0200
79 -+++ swftools-0.9.2.jo/swfs/Makefile.in 2012-04-11 23:29:08.573699972 +0200
80 -@@ -41,10 +41,8 @@
81 - $(INSTALL_DATA) ./PreLoaderTemplate.swf $(pkgdatadir)/swfs/PreLoaderTemplate.swf
82 - $(INSTALL_DATA) ./tessel_loader.swf $(pkgdatadir)/swfs/tessel_loader.swf
83 - $(INSTALL_DATA) ./swft_loader.swf $(pkgdatadir)/swfs/swft_loader.swf
84 -- rm -f $(pkgdatadir)/swfs/default_viewer.swf -o -L $(pkgdatadir)/swfs/default_viewer.swf
85 -- $(LN_S) $(pkgdatadir)/swfs/simple_viewer.swf $(pkgdatadir)/swfs/default_viewer.swf
86 -- rm -f $(pkgdatadir)/swfs/default_loader.swf -o -L $(pkgdatadir)/swfs/default_loader.swf
87 -- $(LN_S) $(pkgdatadir)/swfs/tessel_loader.swf $(pkgdatadir)/swfs/default_loader.swf
88 -+ cd $(pkgdatadir)/swfs; ${LN_S} simple_viewer.swf default_viewer.swf
89 -+ cd $(pkgdatadir)/swfs; ${LN_S} tessel_loader.swf default_loader.swf
90 -
91 - uninstall:
92 - $(UNINSTALL_DATA) $(pkgdatadir)/swfs/simple_viewer.swf
93
94 diff --git a/media-gfx/swftools/files/swftools-0.9.2_giflib.patch b/media-gfx/swftools/files/swftools-0.9.2_giflib.patch
95 deleted file mode 100644
96 index 913b5e3b08d..00000000000
97 --- a/media-gfx/swftools/files/swftools-0.9.2_giflib.patch
98 +++ /dev/null
99 @@ -1,89 +0,0 @@
100 -From 05c1df6a6da28734533722dc0ac99ea5b206a492 Mon Sep 17 00:00:00 2001
101 -From: Matthias Kramm <kramm@×××××.org>
102 -Date: Sat, 6 Jul 2013 12:09:53 -0700
103 -Subject: [PATCH] applied giflib patch from Jan Engelhardt
104 -
105 ----
106 - src/gif2swf.c | 28 ++++++++++++++++++++++++----
107 - 1 file changed, 24 insertions(+), 4 deletions(-)
108 -
109 -diff --git a/src/gif2swf.c b/src/gif2swf.c
110 -index 2359da5..5e52ea8 100644
111 ---- a/src/gif2swf.c
112 -+++ b/src/gif2swf.c
113 -@@ -222,6 +222,7 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id, int imgidx)
114 -
115 - GifFileType *gft;
116 - FILE *fi;
117 -+ int ret;
118 -
119 - if ((fi = fopen(sname, "rb")) == NULL) {
120 - if (VERBOSE(1))
121 -@@ -230,13 +231,24 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id, int imgidx)
122 - }
123 - fclose(fi);
124 -
125 -- if ((gft = DGifOpenFileName(sname)) == NULL) {
126 -+#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5
127 -+ gft = DGifOpenFileName(sname, NULL);
128 -+#else
129 -+ gft = DGifOpenFileName(sname);
130 -+#endif
131 -+ if (gft == NULL) {
132 - fprintf(stderr, "%s is not a GIF file!\n", sname);
133 - return t;
134 - }
135 -
136 -- if (DGifSlurp(gft) != GIF_OK) {
137 -+ if ((ret = DGifSlurp(gft)) != GIF_OK) {
138 -+#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR == 4 && GIFLIB_MINOR >= 2
139 -+ fprintf(stderr, "GIF-LIB: %s\n", GifErrorString());
140 -+#elif defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5
141 -+ fprintf(stderr, "GIF-LIB: %s\n", GifErrorString(ret));
142 -+#else
143 - PrintGifError();
144 -+#endif
145 - return t;
146 - }
147 -
148 -@@ -465,6 +475,7 @@ int CheckInputFile(char *fname, char **realname)
149 - FILE *fi;
150 - char *s = malloc(strlen(fname) + 5);
151 - GifFileType *gft;
152 -+ int ret;
153 -
154 - if (!s)
155 - exit(2);
156 -@@ -488,7 +499,12 @@ int CheckInputFile(char *fname, char **realname)
157 - }
158 - fclose(fi);
159 -
160 -- if ((gft = DGifOpenFileName(s)) == NULL) {
161 -+#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5
162 -+ gft = DGifOpenFileName(s, NULL);
163 -+#else
164 -+ gft = DGifOpenFileName(s);
165 -+#endif
166 -+ if (gft == NULL) {
167 - fprintf(stderr, "%s is not a GIF file!\n", fname);
168 - return -1;
169 - }
170 -@@ -498,8 +514,14 @@ int CheckInputFile(char *fname, char **realname)
171 - if (global.max_image_height < gft->SHeight)
172 - global.max_image_height = gft->SHeight;
173 -
174 -- if (DGifSlurp(gft) != GIF_OK) {
175 -+ if ((ret = DGifSlurp(gft)) != GIF_OK) {
176 -+#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR == 4 && GIFLIB_MINOR >= 2
177 -+ fprintf(stderr, "GIF-LIB: %s\n", GifErrorString());
178 -+#elif defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5
179 -+ fprintf(stderr, "GIF-LIB: %s\n", GifErrorString(ret));
180 -+#else
181 - PrintGifError();
182 -+#endif
183 - return -1;
184 - }
185 - // After DGifSlurp() call, gft->ImageCount become available
186 ---
187 -1.8.4
188 -
189
190 diff --git a/media-gfx/swftools/files/swftools-0.9.2_giflib5.patch b/media-gfx/swftools/files/swftools-0.9.2_giflib5.patch
191 deleted file mode 100644
192 index 6450f827b87..00000000000
193 --- a/media-gfx/swftools/files/swftools-0.9.2_giflib5.patch
194 +++ /dev/null
195 @@ -1,26 +0,0 @@
196 ---- swftools-0.9.2.orig/src/gif2swf.c 2016-02-16 16:15:39.697992195 -0500
197 -+++ swftools-0.9.2/src/gif2swf.c 2016-02-16 16:25:37.047992256 -0500
198 -@@ -467,7 +467,11 @@
199 -
200 - free(pal);
201 - free(imagedata);
202 -+#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1
203 -+ DGifCloseFile(gft, D_GIF_SUCCEEDED);
204 -+#else
205 - DGifCloseFile(gft);
206 -+#endif
207 -
208 - return t;
209 - }
210 -@@ -542,7 +546,11 @@
211 - fprintf(stderr, "frame: %u, delay: %.3f sec\n", i + 1, getGifDelayTime(gft, i) / 100.0);
212 - }
213 -
214 -+#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1
215 -+ DGifCloseFile(gft, D_GIF_SUCCEEDED);
216 -+#else
217 - DGifCloseFile(gft);
218 -+#endif
219 -
220 - return 0;
221 - }
222
223 diff --git a/media-gfx/swftools/files/swftools-0.9.2_nopdf.patch b/media-gfx/swftools/files/swftools-0.9.2_nopdf.patch
224 deleted file mode 100644
225 index 9dc6c2ac256..00000000000
226 --- a/media-gfx/swftools/files/swftools-0.9.2_nopdf.patch
227 +++ /dev/null
228 @@ -1,40 +0,0 @@
229 -diff -urB swftools-0.9.2.old/lib/Makefile.in swftools-0.9.2.jo/lib/Makefile.in
230 ---- swftools-0.9.2.old/lib/Makefile.in 2011-10-07 05:35:18.000000000 +0200
231 -+++ swftools-0.9.2.jo/lib/Makefile.in 2012-04-11 23:33:53.299308801 +0200
232 -@@ -3,7 +3,8 @@
233 - top_srcdir = @top_srcdir@
234 - include ../Makefile.common
235 -
236 --all: librfxswf$(A) libgfxpdf$(A) libbase$(A) libgfx$(A) libgfxswf$(A) libocr$(A)
237 -+#all: librfxswf$(A) libgfxpdf$(A) libbase$(A) libgfx$(A) libgfxswf$(A) libocr$(A)
238 -+all: librfxswf$(A) libbase$(A) libgfx$(A) libgfxswf$(A) libocr$(A)
239 -
240 - 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)
241 - lame_in_source = @lame_in_source@
242 -diff -urB swftools-0.9.2.old/Makefile.in swftools-0.9.2.jo/Makefile.in
243 ---- swftools-0.9.2.old/Makefile.in 2012-04-08 19:25:26.000000000 +0200
244 -+++ swftools-0.9.2.jo/Makefile.in 2012-04-11 23:33:53.299308801 +0200
245 -@@ -8,8 +8,8 @@
246 - cd m4;$(MAKE) $@
247 - @echo making $@ in lib...
248 - cd lib;$(MAKE) $@
249 -- @echo making $@ in lib/pdf...
250 -- cd lib/pdf;$(MAKE) $@
251 -+# @echo making $@ in lib/pdf...
252 -+# cd lib/pdf;$(MAKE) $@
253 - @echo making $@ in lib...
254 - cd lib;$(MAKE) $@
255 - @echo making $@ in lib/python...
256 -diff -urB swftools-0.9.2.old/src/Makefile.in swftools-0.9.2.jo/src/Makefile.in
257 ---- swftools-0.9.2.old/src/Makefile.in 2011-10-07 05:20:17.000000000 +0200
258 -+++ swftools-0.9.2.jo/src/Makefile.in 2012-04-11 23:33:53.299308801 +0200
259 -@@ -3,7 +3,8 @@
260 - top_srcdir = @top_srcdir@
261 - include ../Makefile.common
262 -
263 --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@
264 -+#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@
265 -+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@
266 - programs = $(install_programs) swfbytes$(E) ttftool$(E)
267 -
268 - all: $(programs)
269
270 diff --git a/media-gfx/swftools/metadata.xml b/media-gfx/swftools/metadata.xml
271 deleted file mode 100644
272 index 6f49eba8f49..00000000000
273 --- a/media-gfx/swftools/metadata.xml
274 +++ /dev/null
275 @@ -1,5 +0,0 @@
276 -<?xml version="1.0" encoding="UTF-8"?>
277 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
278 -<pkgmetadata>
279 -<!-- maintainer-needed -->
280 -</pkgmetadata>
281
282 diff --git a/media-gfx/swftools/swftools-0.9.2-r1.ebuild b/media-gfx/swftools/swftools-0.9.2-r1.ebuild
283 deleted file mode 100644
284 index cbdcdb3e1c7..00000000000
285 --- a/media-gfx/swftools/swftools-0.9.2-r1.ebuild
286 +++ /dev/null
287 @@ -1,48 +0,0 @@
288 -# Copyright 1999-2018 Gentoo Foundation
289 -# Distributed under the terms of the GNU General Public License v2
290 -
291 -EAPI=5
292 -inherit eutils
293 -
294 -DESCRIPTION="SWF Tools is a collection of SWF manipulation and generation utilities"
295 -HOMEPAGE="http://www.swftools.org/"
296 -SRC_URI="http://www.swftools.org/${P}.tar.gz"
297 -
298 -LICENSE="GPL-2"
299 -SLOT="0"
300 -KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
301 -IUSE=""
302 -
303 -RDEPEND="
304 - app-text/poppler
305 - media-libs/freetype:2
306 - media-libs/giflib:0=
307 - >=media-libs/t1lib-1.3.1:5
308 - virtual/jpeg:0
309 -"
310 -DEPEND="${RDEPEND}
311 - !<media-libs/ming-0.4.0_rc2
312 -"
313 -
314 -src_prepare() {
315 - epatch "${FILESDIR}"/${P}_nopdf.patch
316 - epatch "${FILESDIR}"/${P}_general.patch
317 - epatch "${FILESDIR}"/${P}_giflib.patch
318 - epatch "${FILESDIR}"/${P}_giflib5.patch
319 - epatch "${FILESDIR}"/${P}-jpeg-9.patch
320 -}
321 -
322 -src_configure() {
323 - econf --enable-poppler
324 - # disable the python interface; there's no configure switch; bug 118242
325 - echo "all install uninstall clean:" > lib/python/Makefile
326 -}
327 -
328 -src_compile() {
329 - emake FLAGS="${CFLAGS}"
330 -}
331 -
332 -src_install() {
333 - einstall
334 - dodoc AUTHORS ChangeLog
335 -}
336
337 diff --git a/profiles/package.mask b/profiles/package.mask
338 index c77689e9d7b..35d3d7ecdc7 100644
339 --- a/profiles/package.mask
340 +++ b/profiles/package.mask
341 @@ -644,12 +644,6 @@ dev-libs/grok
342 # Removal in 30 days. Bug #532502.
343 net-ftp/weex
344
345 -# Aaron Bauamn <bman@g.o> (29 Mar 2019)
346 -# Longstanding security vulnerabilities
347 -# No upstream releases in years
348 -# Removal in 30 days. Bug #650888
349 -media-gfx/swftools
350 -
351 # Robin H. Johnson <robbat2@g.o> (25 Mar 2019)
352 # Requires >=dev-lang/lua-5.3 which is masked
353 sys-apps/likwid
Report Message
Find on MARC Find on Google Groups