* [gentoo-commits] repo/gentoo:master commit in: media-libs/ming/files/, media-libs/ming/
@ 2017-01-17 18:20 Tim Harder
0 siblings, 0 replies; 3+ messages in thread
From: Tim Harder @ 2017-01-17 18:20 UTC (permalink / raw
To: gentoo-commits
commit: 22519b6fc4ce410ee84d75eb6bf56e6ff04d91d4
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 17 18:19:04 2017 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Tue Jan 17 18:19:04 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22519b6f
media-libs/ming: remove old
media-libs/ming/Manifest | 1 -
media-libs/ming/files/ming-0.4.3-perl-5.14.patch | 43 ----
media-libs/ming/files/ming-0.4.4-vasprintf.patch | 266 -----------------------
media-libs/ming/ming-0.4.4-r1.ebuild | 117 ----------
4 files changed, 427 deletions(-)
diff --git a/media-libs/ming/Manifest b/media-libs/ming/Manifest
index 34fba1e..88c6ea1 100644
--- a/media-libs/ming/Manifest
+++ b/media-libs/ming/Manifest
@@ -1,2 +1 @@
-DIST ming-0.4.4.tar.bz2 14001112 SHA256 40e09d781741ac961338ed8dec7ba2ed06217de9da44dd67af6b881b95d2af7e SHA512 a95cb843b4f88c767d489fc0d55793655fb578c47681131d335c47fbb7368f996ccc2092630cfc33de4487f840b4a4ba8db837bd7115ef9e4742ca9c7e2b7888 WHIRLPOOL b1a6d591f4d9312f564e9a9650df4db8f456d08161341dc7881620493513a69d17de7ee0058333447fb3b01c9be4b75da7b8cfc02123e3f6c2fe3f6b0aa068fd
DIST ming-0_4_7.tar.gz 14903570 SHA256 118aa1338dd74b34dd2cd22bce286ca0571e8b9aa433999646d1c0157ea9a7dc SHA512 232cf45daabd7b60203c9382aa6568455a42ddcd1bd60eec9bfe3f5e80376fcc9ff6304efbafca1ac8a504e2e167bc394e4902e0d067303d9582551461e09d3c WHIRLPOOL 075794f170e7f529ba79a66af4504745da786d7cd73e9673ffd4c48e943fbc8bf1f952f1cc0b0b7b0ca1e26a3bdb255feeaaeb675032616d2060c40f19d4dbdd
diff --git a/media-libs/ming/files/ming-0.4.3-perl-5.14.patch b/media-libs/ming/files/ming-0.4.3-perl-5.14.patch
deleted file mode 100644
index e34eb0f..00000000
--- a/media-libs/ming/files/ming-0.4.3-perl-5.14.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From a0ea1cc47330a3ab316713d720892b6272401890 Mon Sep 17 00:00:00 2001
-From: Niko Tyni <ntyni@debian.org>
-Date: Sun, 10 Jul 2011 21:46:09 +0300
-Subject: [PATCH] GvCV() isn't an lvalue since Perl 5.13.10
-
-GvCV() can't be assigned to anymore with recent perls, so use the new
-GvCV_set() macro when available or implement it the old way if it isn't.
----
- perl_ext/Exports.c | 2 +-
- perl_ext/perl_swf.h | 4 ++++
- 2 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/perl_ext/Exports.c b/perl_ext/Exports.c
-index 65f8912..5529728 100644
---- a/perl_ext/Exports.c
-+++ b/perl_ext/Exports.c
-@@ -190,7 +190,7 @@ void export_cv(SV *class, SV *caller, char *sub)
- SvPVX(caller), sub, SvPVX(class), sub);
- #endif
- gv = gv_fetchpv(form("%s::%s",SvPVX( caller), sub), TRUE, SVt_PVCV);
-- GvCV(gv) = perl_get_cv(form("%s::%s", SvPVX(class), sub), TRUE);
-+ GvCV_set(gv, perl_get_cv(form("%s::%s", SvPVX(class), sub), TRUE));
- GvIMPORTED_CV_on(gv);
- GvMULTI_on(gv);
- }
-diff --git a/perl_ext/perl_swf.h b/perl_ext/perl_swf.h
-index b960229..1a3656e 100644
---- a/perl_ext/perl_swf.h
-+++ b/perl_ext/perl_swf.h
-@@ -58,6 +58,10 @@ typedef SWFFontCollection SWF__FontCollection;
- #define aTHXo_
- #endif
-
-+#ifndef GvCV_set
-+# define GvCV_set(G, C) (GvCV(G) = (C))
-+#endif
-+
- #ifndef S_DEBUG
- #define swf_debug 0 /* Should we get this from, say, $SWF::debug? */
- #define S_DEBUG(level,code) if (swf_debug >= level) { code; }
---
-1.7.5.4
-
diff --git a/media-libs/ming/files/ming-0.4.4-vasprintf.patch b/media-libs/ming/files/ming-0.4.4-vasprintf.patch
deleted file mode 100644
index 1c0da42..00000000
--- a/media-libs/ming/files/ming-0.4.4-vasprintf.patch
+++ /dev/null
@@ -1,266 +0,0 @@
-From 815f18295602dfabfad53b754fbcaad91e2198bc Mon Sep 17 00:00:00 2001
-Message-Id: <815f18295602dfabfad53b754fbcaad91e2198bc.1338912967.git.jlec@gentoo.org>
-From: Sandro Santilli <strk@keybit.net>
-Date: Sat, 29 Oct 2011 08:41:17 +0200
-Subject: [PATCH] Put vasprintf own implementation in its own file
-
----
- test/actionscript/ActionScriptTest.c | 1 +
- test/actionscript/Makefile.am | 2 +-
- util/Makefile.am | 6 +++-
- util/decompile.c | 44 +++------------------------------
- util/makeswf.c | 39 ------------------------------
- util/makeswf_utils.c | 1 +
- util/vasprintf.c | 43 +++++++++++++++++++++++++++++++++
- util/vasprintf.h | 7 +++++
- 8 files changed, 61 insertions(+), 82 deletions(-)
-
-diff --git a/test/actionscript/ActionScriptTest.c b/test/actionscript/ActionScriptTest.c
-index b351711..5af64c4 100644
---- a/test/actionscript/ActionScriptTest.c
-+++ b/test/actionscript/ActionScriptTest.c
-@@ -40,6 +40,7 @@
- #include <sys/stat.h>
- #include <limits.h>
- #include <makeswf.h>
-+#include <vasprintf.h>
-
- static SWFMovie
- compile(const char* filename, const char* ppfile, int version)
-diff --git a/test/actionscript/Makefile.am b/test/actionscript/Makefile.am
-index ae415ab..40e64e2 100644
---- a/test/actionscript/Makefile.am
-+++ b/test/actionscript/Makefile.am
-@@ -83,7 +83,7 @@ CLEANFILES = *.pp *.swf
- check_PROGRAMS = \
- ActionScriptTest
-
--ActionScriptTest_SOURCES = ActionScriptTest.c ../run_test.c ../../util/makeswf_utils.c
-+ActionScriptTest_SOURCES = ActionScriptTest.c ../run_test.c ../../util/makeswf_utils.c ../../util/vasprintf.c
- ActionScriptTest_LDADD = $(top_builddir)/src/libming.la
- ActionScriptTest_CFLAGS = -DTOP_BUILDDIR='"$(top_builddir)"' -DTOP_SOURCEDIR='"$(srcdir)"' -I$(top_srcdir)/util/ -DAS_TESTS='"$(AS_TESTS)"'
-
-diff --git a/util/Makefile.am b/util/Makefile.am
-index 0668f4f..3a7c9c4 100644
---- a/util/Makefile.am
-+++ b/util/Makefile.am
-@@ -45,7 +45,8 @@ libutil_la_SOURCES = \
- blocktypes.c \
- decompile.c \
- parser.c \
-- read.c
-+ read.c \
-+ vasprintf.c
-
- libutil_la_LIBADD = $(MATHLIB) $(ZLIB)
-
-@@ -60,7 +61,8 @@ noinst_HEADERS = \
- parser.h \
- read.h \
- swfoutput.h \
-- swftypes.h
-+ swftypes.h \
-+ vasprintf.c
-
- listswf_SOURCES = outputtxt.c main.c
- listswf_LDADD = libutil.la $(top_builddir)/src/libming.la
-diff --git a/util/decompile.c b/util/decompile.c
-index 1af7a9f..c844fa4 100644
---- a/util/decompile.c
-+++ b/util/decompile.c
-@@ -18,7 +18,7 @@
- *
- ****************************************************************************/
-
--#define _GNU_SOURCE
-+#define _GNU_SOURCE 1
-
- #define DEBUGSTACK
- #define DECOMP_SWITCH
-@@ -42,45 +42,8 @@
- #include "action.h"
- #include "swftypes.h"
- #include "../src/blocks/error.h"
-+#include "vasprintf.h"
-
--#ifndef HAVE_VASPRINTF
--/* Workaround for the lack of vasprintf()
-- * As found on: http://unixpapa.com/incnote/stdio.html
-- * Seems to be Public Domain
-- */
--int
--vasprintf(char **ret, const char *format, va_list ap)
--{
-- va_list ap2;
-- int len = 100; /* First guess at the size */
-- if ((*ret = (char *) malloc(len)) == NULL)
-- {
-- return -1;
-- }
-- while (1)
-- {
-- int nchar;
-- va_copy(ap2, ap);
-- nchar= vsnprintf(*ret, len, format, ap2);
-- if (nchar > -1 && nchar < len)
-- {
-- return nchar;
-- }
-- if (nchar > len)
-- {
-- len= nchar+1;
-- } else
-- {
-- len*= 2;
-- }
-- if ((*ret = (char *) realloc(*ret, len)) == NULL)
-- {
-- free(*ret);
-- return -1;
-- }
-- }
--}
--#endif
-
- static char **pool;
- struct SWF_ACTIONPUSHPARAM *regs[256];
-@@ -247,10 +210,11 @@ static void
- println(const char* fmt, ...)
- {
- char *tmp;
-+ int written;
-
- va_list ap;
- va_start (ap, fmt);
-- vasprintf (&tmp, fmt, ap);
-+ written = vasprintf (&tmp, fmt, ap);
-
- dcprintf("%s%s", tmp, newlinestring);
-
-diff --git a/util/makeswf.c b/util/makeswf.c
-index 0b80728..4fdc826 100644
---- a/util/makeswf.c
-+++ b/util/makeswf.c
-@@ -76,45 +76,6 @@
- #include <getopt.h>
- #endif
-
--#ifndef HAVE_VASPRINTF
--/* Workaround for the lack of vasprintf()
-- * As found on: http://unixpapa.com/incnote/stdio.html
-- * Seems to be Public Domain
-- */
--int
--vasprintf(char **ret, const char *format, va_list ap)
--{
-- va_list ap2;
-- int len = 100; /* First guess at the size */
-- if ((*ret = (char *) malloc(len)) == NULL)
-- {
-- return -1;
-- }
-- while (1)
-- {
-- int nchar;
-- va_copy(ap2, ap);
-- nchar= vsnprintf(*ret, len, format, ap2);
-- if (nchar > -1 && nchar < len)
-- {
-- return nchar;
-- }
-- if (nchar > len)
-- {
-- len= nchar+1;
-- } else
-- {
-- len*= 2;
-- }
-- if ((*ret = (char *) realloc(*ret, len)) == NULL)
-- {
-- free(*ret);
-- return -1;
-- }
-- }
--}
--#endif
--
- #define DEFSWFVERSION 6
- #define DEFSWFCOMPRESSION 9
-
-diff --git a/util/makeswf_utils.c b/util/makeswf_utils.c
-index f9f53bd..6a65d87 100644
---- a/util/makeswf_utils.c
-+++ b/util/makeswf_utils.c
-@@ -41,6 +41,7 @@
- #ifdef HAVE_GETOPT_H
- #include <getopt.h>
- #endif
-+#include "vasprintf.h"
-
- // Cheating, but it works (not sure why the above ifdef for getopt isn't)
- #ifdef _WIN32
-diff --git a/util/vasprintf.c b/util/vasprintf.c
-new file mode 100644
-index 0000000..1127664
---- /dev/null
-+++ b/util/vasprintf.c
-@@ -0,0 +1,43 @@
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <stdarg.h>
-+
-+#ifndef HAVE_VASPRINTF
-+/* Workaround for the lack of vasprintf()
-+ * As found on: http://unixpapa.com/incnote/stdio.html
-+ * Seems to be Public Domain
-+ */
-+int
-+vasprintf(char **ret, const char *format, va_list ap)
-+{
-+ va_list ap2;
-+ int len = 100; /* First guess at the size */
-+ if ((*ret = (char *) malloc(len)) == NULL)
-+ {
-+ return -1;
-+ }
-+ while (1)
-+ {
-+ int nchar;
-+ va_copy(ap2, ap);
-+ nchar= vsnprintf(*ret, len, format, ap2);
-+ if (nchar > -1 && nchar < len)
-+ {
-+ return nchar;
-+ }
-+ if (nchar > len)
-+ {
-+ len= nchar+1;
-+ } else
-+ {
-+ len*= 2;
-+ }
-+ if ((*ret = (char *) realloc(*ret, len)) == NULL)
-+ {
-+ free(*ret);
-+ return -1;
-+ }
-+ }
-+}
-+#endif
-+
-diff --git a/util/vasprintf.h b/util/vasprintf.h
-new file mode 100644
-index 0000000..9391c23
---- /dev/null
-+++ b/util/vasprintf.h
-@@ -0,0 +1,7 @@
-+#include <stdio.h>
-+#include "ming_config.h"
-+
-+#ifndef HAVE_VASPRINTF
-+int vasprintf(char **ret, const char *format, va_list ap);
-+#endif
-+
---
-1.7.8.6
-
diff --git a/media-libs/ming/ming-0.4.4-r1.ebuild b/media-libs/ming/ming-0.4.4-r1.ebuild
deleted file mode 100644
index 33efcab..00000000
--- a/media-libs/ming/ming-0.4.4-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PHP_EXT_NAME=ming
-PHP_EXT_OPTIONAL_USE=php
-USE_PHP="php5-3"
-PYTHON_DEPEND="python? 2"
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils flag-o-matic multilib php-ext-source-r2 perl-module python
-
-DESCRIPTION="An Open Source library for Flash movie generation"
-HOMEPAGE="http://ming.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ming/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="+perl +python php static-libs"
-
-RDEPEND="perl? ( dev-lang/perl )
- python? ( dev-lang/python )
- media-libs/freetype
- media-libs/libpng
- media-libs/giflib
- sys-libs/zlib
- !media-libs/libswf"
-DEPEND="${DEPEND}
- sys-devel/flex
- virtual/yacc"
-
-S=${WORKDIR}/${P/_/.}
-
-# Tests only work when the package is tested on a system
-# which does not presently have any version of ming installed.
-RESTRICT="test"
-
-pkg_setup() {
- use python && python_set_active_version 2 && python_pkg_setup
-}
-
-PATCHES=(
- "${FILESDIR}"/${P}-vasprintf.patch
- "${FILESDIR}"/${PN}-0.4.3-perl-5.14.patch )
-
-src_prepare() {
- # Let's get rid of the TEXTRELS, link dynamic. Use gif.
- sed -i \
- -e 's/libming.a/libming.so/' \
- -e 's/lungif/lgif/' \
- perl_ext/Makefile.PL
- sed -i \
- -e 's/ungif/gif/' \
- py_ext/setup.py.in
-
- if use php; then
- cd "${S}/php_ext"
- php-ext-source-r2_phpize
- cd "${S}"
- fi
-
- sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.in || die
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- # build is sensitive to -O3 (bug #297437)
- replace-flags -O3 -O2
-
- local myeconfargs=(
- $(use_enable static-libs static)
- $(use_enable perl)
- $(use_enable python)
- )
- autotools-utils_src_configure
-}
-
-src_compile() {
- autotools-utils_src_compile
-
- if use php; then
- cd "${S}"/php_ext
- myconf="--disable-rpath
- --disable-static
- --with-ming"
- php-ext-source-r2_src_compile
- fi
-}
-
-src_install() {
- autotools-utils_src_install INSTALLDIRS="vendor"
-
- perl_delete_localpod
-
- use python && python_clean_installation_image
-
- if use php; then
- cd "${S}"/php_ext
- php-ext-source-r2_src_install
- fi
-}
-
-pkg_postinst() {
- use python && python_mod_optimize ming.py mingc.py
-}
-
-pkg_prerm() {
- :
-}
-
-pkg_postrm() {
- use python && python_mod_cleanup ming.py mingc.py
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/ming/files/, media-libs/ming/
@ 2017-06-04 15:38 Thomas Deutschmann
0 siblings, 0 replies; 3+ messages in thread
From: Thomas Deutschmann @ 2017-06-04 15:38 UTC (permalink / raw
To: gentoo-commits
commit: 85ec0fe12f825538a27506b28f9c5368e6a942d9
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 4 15:36:54 2017 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jun 4 15:38:27 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85ec0fe1
media-libs/ming: Rev bump to add patch for CVE-2017-8782 (bug #620318)
Package-Manager: Portage-2.3.5, Repoman-2.3.2
.../ming/files/ming-0.4.8-CVE-2017-8782.patch | 28 ++++++++++++++++++++++
.../{ming-0.4.8.ebuild => ming-0.4.8-r1.ebuild} | 2 ++
2 files changed, 30 insertions(+)
diff --git a/media-libs/ming/files/ming-0.4.8-CVE-2017-8782.patch b/media-libs/ming/files/ming-0.4.8-CVE-2017-8782.patch
new file mode 100644
index 00000000000..223d363ae0b
--- /dev/null
+++ b/media-libs/ming/files/ming-0.4.8-CVE-2017-8782.patch
@@ -0,0 +1,28 @@
+https://github.com/libming/libming/commit/6eca133ee9985c298186cbe05f888082c30bf2d9
+
+--- a/util/read.c
++++ b/util/read.c
+@@ -247,6 +247,11 @@ char *readString(FILE *f)
+ if(len >= buflen-2)
+ {
+ buf = (char *)realloc(buf, sizeof(char)*(buflen+256));
++ if ( ! buf )
++ {
++ fprintf(stderr, "failed reallocating %d bytes\n", buflen+256);
++ exit(-1);
++ }
+ buflen += 256;
+ p = buf+len;
+ }
+@@ -350,6 +355,11 @@ char *readSizedString(FILE *f,int size)
+ if(len >= buflen-2)
+ {
+ buf = (char *)realloc(buf, sizeof(char)*(buflen+256));
++ if ( ! buf )
++ {
++ fprintf(stderr, "failed reallocating %d bytes\n", buflen+256);
++ exit(-1);
++ }
+ buflen += 256;
+ p = buf+len;
+ }
diff --git a/media-libs/ming/ming-0.4.8.ebuild b/media-libs/ming/ming-0.4.8-r1.ebuild
similarity index 97%
rename from media-libs/ming/ming-0.4.8.ebuild
rename to media-libs/ming/ming-0.4.8-r1.ebuild
index 74cb21175c6..ec977abe20e 100644
--- a/media-libs/ming/ming-0.4.8.ebuild
+++ b/media-libs/ming/ming-0.4.8-r1.ebuild
@@ -34,6 +34,8 @@ PDEPEND="php? ( dev-php/ming-php )"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
S=${WORKDIR}/${P//./_}
+PATCHES=( "${FILESDIR}"/${PN}-0.4.8-CVE-2017-8782.patch )
+
# Tests only work when the package is tested on a system
# which does not presently have any version of ming installed.
RESTRICT="test"
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/ming/files/, media-libs/ming/
@ 2018-05-07 21:16 Lars Wendler
0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2018-05-07 21:16 UTC (permalink / raw
To: gentoo-commits
commit: f2696d9b14822e6c76b792b1981ef9c7c06c6eb5
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon May 7 21:16:33 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon May 7 21:16:48 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2696d9b
media-libs/ming: Use pkg-config to find freetype
Bug: https://bugs.gentoo.org/654828
Package-Manager: Portage-2.3.36, Repoman-2.3.9
.../ming/files/ming-0.4.8-freetype_pkgconfig.patch | 47 ++++++++++++++++++++++
media-libs/ming/ming-0.4.8-r1.ebuild | 8 +++-
2 files changed, 53 insertions(+), 2 deletions(-)
diff --git a/media-libs/ming/files/ming-0.4.8-freetype_pkgconfig.patch b/media-libs/ming/files/ming-0.4.8-freetype_pkgconfig.patch
new file mode 100644
index 00000000000..5c2de7554d4
--- /dev/null
+++ b/media-libs/ming/files/ming-0.4.8-freetype_pkgconfig.patch
@@ -0,0 +1,47 @@
+From ef3719d39e8bb7e96c6ec57d60261f1516353460 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Fri, 4 May 2018 17:40:04 +0200
+Subject: [PATCH] Use pkg-config to find freetype
+
+As of freetype-2.9.1 the freetype-config script has been deprecated and
+is no longer shipped by default.
+---
+ configure.in | 22 ++--------------------
+ 1 file changed, 2 insertions(+), 20 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 95943a0b..f1685c26 100644
+--- a/configure.in
++++ b/configure.in
+@@ -257,26 +257,8 @@ freetype_support=yes)
+
+ if test "$freetype_support" = "yes"; then
+ dnl Check for the freetype library
+- AC_ARG_WITH(freetype-config, [ --with-freetype-config=PROG Use FreeType configuration program PROG], freetype_config=$withval, freetype_config=yes)
+- if test "$freetype_config" = "yes"; then
+- AC_PATH_PROG(ft_config,freetype-config,no)
+- if test "$ft_config" = "no"; then
+- echo "To compile ming please install freetype:"
+- echo " as .deb user: sudo apt-get install libfreetype6 libfreetype6-dev"
+- echo ""
+- echo "or disable the freetype configuration option:"
+- echo " --disable-freetype"
+- AC_MSG_ERROR([Could not detect freetype-config!])
+- fi
+- else
+- ft_config="$freetype_config"
+- fi
+-
+- FREETYPE_CFLAGS="`$ft_config --cflags`"
+- FREETYPE_LIBS="`$ft_config --libs`"
+-
+- AC_SUBST(FREETYPE_LIBS)
+- AC_SUBST(FREETYPE_CFLAGS)
++ PKG_PROG_PKG_CONFIG
++ PKG_CHECK_MODULES(FREETYPE, freetype2,, AC_MSG_ERROR([Could not find freetype]))
+ fi
+
+ dnl Check for the ungif or gif (new or old) libraries
+--
+2.17.0
+
diff --git a/media-libs/ming/ming-0.4.8-r1.ebuild b/media-libs/ming/ming-0.4.8-r1.ebuild
index 8015aff99bf..eba066b8448 100644
--- a/media-libs/ming/ming-0.4.8-r1.ebuild
+++ b/media-libs/ming/ming-0.4.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -28,13 +28,17 @@ RDEPEND="perl? ( dev-lang/perl:= )
!media-libs/libswf"
DEPEND="${RDEPEND}
sys-devel/flex
+ virtual/pkgconfig
virtual/yacc"
PDEPEND="php? ( dev-php/ming-php )"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
S=${WORKDIR}/${P//./_}
-PATCHES=( "${FILESDIR}"/${PN}-0.4.8-CVE-2017-8782.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.4.8-CVE-2017-8782.patch
+ "${FILESDIR}"/${PN}-0.4.8-freetype_pkgconfig.patch
+)
# Tests only work when the package is tested on a system
# which does not presently have any version of ming installed.
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-05-07 21:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-17 18:20 [gentoo-commits] repo/gentoo:master commit in: media-libs/ming/files/, media-libs/ming/ Tim Harder
-- strict thread matches above, loose matches on Subject: below --
2017-06-04 15:38 Thomas Deutschmann
2018-05-07 21:16 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox