| 1 |
commit: bfd0ea58a60ecefa2e8d9641ef80a716f7072be6 |
| 2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon Apr 22 07:48:42 2019 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Apr 23 09:54:05 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfd0ea58 |
| 7 |
|
| 8 |
media-libs/ming: remove unused patch(es) |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/11775 |
| 11 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
| 12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 13 |
|
| 14 |
.../ming/files/ming-0.4.8-CVE-2017-8782.patch | 28 ---------- |
| 15 |
.../ming/files/ming-0.4.8-freetype_pkgconfig.patch | 62 ---------------------- |
| 16 |
2 files changed, 90 deletions(-) |
| 17 |
|
| 18 |
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 |
| 19 |
deleted file mode 100644 |
| 20 |
index 223d363ae0b..00000000000 |
| 21 |
--- a/media-libs/ming/files/ming-0.4.8-CVE-2017-8782.patch |
| 22 |
+++ /dev/null |
| 23 |
@@ -1,28 +0,0 @@ |
| 24 |
-https://github.com/libming/libming/commit/6eca133ee9985c298186cbe05f888082c30bf2d9 |
| 25 |
- |
| 26 |
---- a/util/read.c |
| 27 |
-+++ b/util/read.c |
| 28 |
-@@ -247,6 +247,11 @@ char *readString(FILE *f) |
| 29 |
- if(len >= buflen-2) |
| 30 |
- { |
| 31 |
- buf = (char *)realloc(buf, sizeof(char)*(buflen+256)); |
| 32 |
-+ if ( ! buf ) |
| 33 |
-+ { |
| 34 |
-+ fprintf(stderr, "failed reallocating %d bytes\n", buflen+256); |
| 35 |
-+ exit(-1); |
| 36 |
-+ } |
| 37 |
- buflen += 256; |
| 38 |
- p = buf+len; |
| 39 |
- } |
| 40 |
-@@ -350,6 +355,11 @@ char *readSizedString(FILE *f,int size) |
| 41 |
- if(len >= buflen-2) |
| 42 |
- { |
| 43 |
- buf = (char *)realloc(buf, sizeof(char)*(buflen+256)); |
| 44 |
-+ if ( ! buf ) |
| 45 |
-+ { |
| 46 |
-+ fprintf(stderr, "failed reallocating %d bytes\n", buflen+256); |
| 47 |
-+ exit(-1); |
| 48 |
-+ } |
| 49 |
- buflen += 256; |
| 50 |
- p = buf+len; |
| 51 |
- } |
| 52 |
|
| 53 |
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 |
| 54 |
deleted file mode 100644 |
| 55 |
index 5bddf052122..00000000000 |
| 56 |
--- a/media-libs/ming/files/ming-0.4.8-freetype_pkgconfig.patch |
| 57 |
+++ /dev/null |
| 58 |
@@ -1,62 +0,0 @@ |
| 59 |
-From 0d5b3bc1cc492c10072def017fe704782bc4b274 Mon Sep 17 00:00:00 2001 |
| 60 |
-From: Lars Wendler <polynomial-c@g.o> |
| 61 |
-Date: Fri, 4 May 2018 17:40:04 +0200 |
| 62 |
-Subject: [PATCH] Use pkg-config to find freetype |
| 63 |
- |
| 64 |
-As of freetype-2.9.1 the freetype-config script has been deprecated and |
| 65 |
-is no longer shipped by default. |
| 66 |
---- |
| 67 |
- configure.in | 30 +++++++----------------------- |
| 68 |
- 1 file changed, 7 insertions(+), 23 deletions(-) |
| 69 |
- |
| 70 |
-diff --git a/configure.in b/configure.in |
| 71 |
-index 361db86c..cb9423f5 100644 |
| 72 |
---- a/configure.in |
| 73 |
-+++ b/configure.in |
| 74 |
-@@ -257,26 +257,10 @@ freetype_support=yes) |
| 75 |
- |
| 76 |
- if test "$freetype_support" = "yes"; then |
| 77 |
- dnl Check for the freetype library |
| 78 |
-- AC_ARG_WITH(freetype-config, [ --with-freetype-config=PROG Use FreeType configuration program PROG], freetype_config=$withval, freetype_config=yes) |
| 79 |
-- if test "$freetype_config" = "yes"; then |
| 80 |
-- AC_PATH_PROG(ft_config,freetype-config,no) |
| 81 |
-- if test "$ft_config" = "no"; then |
| 82 |
-- echo "To compile ming please install freetype:" |
| 83 |
-- echo " as .deb user: sudo apt-get install libfreetype6 libfreetype6-dev" |
| 84 |
-- echo "" |
| 85 |
-- echo "or disable the freetype configuration option:" |
| 86 |
-- echo " --disable-freetype" |
| 87 |
-- AC_MSG_ERROR([Could not detect freetype-config!]) |
| 88 |
-- fi |
| 89 |
-- else |
| 90 |
-- ft_config="$freetype_config" |
| 91 |
-- fi |
| 92 |
-- |
| 93 |
-- FREETYPE_CFLAGS="`$ft_config --cflags`" |
| 94 |
-- FREETYPE_LIBS="`$ft_config --libs`" |
| 95 |
-- |
| 96 |
-- AC_SUBST(FREETYPE_LIBS) |
| 97 |
-- AC_SUBST(FREETYPE_CFLAGS) |
| 98 |
-+ PKG_PROG_PKG_CONFIG |
| 99 |
-+ PKG_CHECK_MODULES(FREETYPE, freetype2, HAS_FREETYPE=true, |
| 100 |
-+ AC_MSG_ERROR([Could not find freetype]) |
| 101 |
-+ ) |
| 102 |
- fi |
| 103 |
- |
| 104 |
- dnl Check for the ungif or gif (new or old) libraries |
| 105 |
-@@ -334,9 +318,9 @@ if test -n "${ZLIB}" -a -n "${ZLIB_INC}"; then |
| 106 |
- AC_DEFINE([USE_ZLIB], [1], [Use zlib]) |
| 107 |
- fi |
| 108 |
- |
| 109 |
--AM_CONDITIONAL(USE_FREETYPE, test x${ft_config} != x) |
| 110 |
--if test -n "${ft_config}"; then |
| 111 |
-- AC_DEFINE(USE_FREETYPE, [1], [Use freetype library]) |
| 112 |
-+AM_CONDITIONAL(USE_FREETYPE, test x${HAS_FREETYPE} != x) |
| 113 |
-+if test x${HAS_FREETYPE} = xtrue ; then |
| 114 |
-+ AC_DEFINE(USE_FREETYPE, [1], [Use freetype library]) |
| 115 |
- fi |
| 116 |
- |
| 117 |
- AM_CONDITIONAL(GIFLIB_GIFERRORSTRING, test x"$ac_cv_lib_gif_GifErrorString" = xyes) |
| 118 |
--- |
| 119 |
-2.17.0 |
| 120 |
- |
Archives