summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <m.mairkeimberger@gmail.com>2019-04-22 09:48:42 +0200
committerDavid Seifert <soap@gentoo.org>2019-04-23 11:54:05 +0200
commitbfd0ea58a60ecefa2e8d9641ef80a716f7072be6 (patch)
treeb4e45be9c9bbf92f7c9ac6716ac73ae047fc21d7
parentnet-misc/iputils: remove unused patches (diff)
downloadgentoo-bfd0ea58a60ecefa2e8d9641ef80a716f7072be6.tar.gz
gentoo-bfd0ea58a60ecefa2e8d9641ef80a716f7072be6.tar.bz2
gentoo-bfd0ea58a60ecefa2e8d9641ef80a716f7072be6.zip
media-libs/ming: remove unused patch(es)
Closes: https://github.com/gentoo/gentoo/pull/11775 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com> Signed-off-by: David Seifert <soap@gentoo.org>
-rw-r--r--media-libs/ming/files/ming-0.4.8-CVE-2017-8782.patch28
-rw-r--r--media-libs/ming/files/ming-0.4.8-freetype_pkgconfig.patch62
2 files changed, 0 insertions, 90 deletions
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
deleted file mode 100644
index 223d363ae0b0..000000000000
--- a/media-libs/ming/files/ming-0.4.8-CVE-2017-8782.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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/files/ming-0.4.8-freetype_pkgconfig.patch b/media-libs/ming/files/ming-0.4.8-freetype_pkgconfig.patch
deleted file mode 100644
index 5bddf0521224..000000000000
--- a/media-libs/ming/files/ming-0.4.8-freetype_pkgconfig.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 0d5b3bc1cc492c10072def017fe704782bc4b274 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 | 30 +++++++-----------------------
- 1 file changed, 7 insertions(+), 23 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 361db86c..cb9423f5 100644
---- a/configure.in
-+++ b/configure.in
-@@ -257,26 +257,10 @@ 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, HAS_FREETYPE=true,
-+ AC_MSG_ERROR([Could not find freetype])
-+ )
- fi
-
- dnl Check for the ungif or gif (new or old) libraries
-@@ -334,9 +318,9 @@ if test -n "${ZLIB}" -a -n "${ZLIB_INC}"; then
- AC_DEFINE([USE_ZLIB], [1], [Use zlib])
- fi
-
--AM_CONDITIONAL(USE_FREETYPE, test x${ft_config} != x)
--if test -n "${ft_config}"; then
-- AC_DEFINE(USE_FREETYPE, [1], [Use freetype library])
-+AM_CONDITIONAL(USE_FREETYPE, test x${HAS_FREETYPE} != x)
-+if test x${HAS_FREETYPE} = xtrue ; then
-+ AC_DEFINE(USE_FREETYPE, [1], [Use freetype library])
- fi
-
- AM_CONDITIONAL(GIFLIB_GIFERRORSTRING, test x"$ac_cv_lib_gif_GifErrorString" = xyes)
---
-2.17.0
-