| 1 |
commit: f2696d9b14822e6c76b792b1981ef9c7c06c6eb5 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 7 21:16:33 2018 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 7 21:16:48 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2696d9b |
| 7 |
|
| 8 |
media-libs/ming: Use pkg-config to find freetype |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/654828 |
| 11 |
Package-Manager: Portage-2.3.36, Repoman-2.3.9 |
| 12 |
|
| 13 |
.../ming/files/ming-0.4.8-freetype_pkgconfig.patch | 47 ++++++++++++++++++++++ |
| 14 |
media-libs/ming/ming-0.4.8-r1.ebuild | 8 +++- |
| 15 |
2 files changed, 53 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..5c2de7554d4 |
| 20 |
--- /dev/null |
| 21 |
+++ b/media-libs/ming/files/ming-0.4.8-freetype_pkgconfig.patch |
| 22 |
@@ -0,0 +1,47 @@ |
| 23 |
+From ef3719d39e8bb7e96c6ec57d60261f1516353460 Mon Sep 17 00:00:00 2001 |
| 24 |
+From: Lars Wendler <polynomial-c@g.o> |
| 25 |
+Date: Fri, 4 May 2018 17:40:04 +0200 |
| 26 |
+Subject: [PATCH] Use pkg-config to find freetype |
| 27 |
+ |
| 28 |
+As of freetype-2.9.1 the freetype-config script has been deprecated and |
| 29 |
+is no longer shipped by default. |
| 30 |
+--- |
| 31 |
+ configure.in | 22 ++-------------------- |
| 32 |
+ 1 file changed, 2 insertions(+), 20 deletions(-) |
| 33 |
+ |
| 34 |
+diff --git a/configure.in b/configure.in |
| 35 |
+index 95943a0b..f1685c26 100644 |
| 36 |
+--- a/configure.in |
| 37 |
++++ b/configure.in |
| 38 |
+@@ -257,26 +257,8 @@ freetype_support=yes) |
| 39 |
+ |
| 40 |
+ if test "$freetype_support" = "yes"; then |
| 41 |
+ dnl Check for the freetype library |
| 42 |
+- AC_ARG_WITH(freetype-config, [ --with-freetype-config=PROG Use FreeType configuration program PROG], freetype_config=$withval, freetype_config=yes) |
| 43 |
+- if test "$freetype_config" = "yes"; then |
| 44 |
+- AC_PATH_PROG(ft_config,freetype-config,no) |
| 45 |
+- if test "$ft_config" = "no"; then |
| 46 |
+- echo "To compile ming please install freetype:" |
| 47 |
+- echo " as .deb user: sudo apt-get install libfreetype6 libfreetype6-dev" |
| 48 |
+- echo "" |
| 49 |
+- echo "or disable the freetype configuration option:" |
| 50 |
+- echo " --disable-freetype" |
| 51 |
+- AC_MSG_ERROR([Could not detect freetype-config!]) |
| 52 |
+- fi |
| 53 |
+- else |
| 54 |
+- ft_config="$freetype_config" |
| 55 |
+- fi |
| 56 |
+- |
| 57 |
+- FREETYPE_CFLAGS="`$ft_config --cflags`" |
| 58 |
+- FREETYPE_LIBS="`$ft_config --libs`" |
| 59 |
+- |
| 60 |
+- AC_SUBST(FREETYPE_LIBS) |
| 61 |
+- AC_SUBST(FREETYPE_CFLAGS) |
| 62 |
++ PKG_PROG_PKG_CONFIG |
| 63 |
++ PKG_CHECK_MODULES(FREETYPE, freetype2,, AC_MSG_ERROR([Could not find freetype])) |
| 64 |
+ fi |
| 65 |
+ |
| 66 |
+ dnl Check for the ungif or gif (new or old) libraries |
| 67 |
+-- |
| 68 |
+2.17.0 |
| 69 |
+ |
| 70 |
|
| 71 |
diff --git a/media-libs/ming/ming-0.4.8-r1.ebuild b/media-libs/ming/ming-0.4.8-r1.ebuild |
| 72 |
index 8015aff99bf..eba066b8448 100644 |
| 73 |
--- a/media-libs/ming/ming-0.4.8-r1.ebuild |
| 74 |
+++ b/media-libs/ming/ming-0.4.8-r1.ebuild |
| 75 |
@@ -1,4 +1,4 @@ |
| 76 |
-# Copyright 1999-2017 Gentoo Foundation |
| 77 |
+# Copyright 1999-2018 Gentoo Foundation |
| 78 |
# Distributed under the terms of the GNU General Public License v2 |
| 79 |
|
| 80 |
EAPI=6 |
| 81 |
@@ -28,13 +28,17 @@ RDEPEND="perl? ( dev-lang/perl:= ) |
| 82 |
!media-libs/libswf" |
| 83 |
DEPEND="${RDEPEND} |
| 84 |
sys-devel/flex |
| 85 |
+ virtual/pkgconfig |
| 86 |
virtual/yacc" |
| 87 |
PDEPEND="php? ( dev-php/ming-php )" |
| 88 |
|
| 89 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 90 |
S=${WORKDIR}/${P//./_} |
| 91 |
|
| 92 |
-PATCHES=( "${FILESDIR}"/${PN}-0.4.8-CVE-2017-8782.patch ) |
| 93 |
+PATCHES=( |
| 94 |
+ "${FILESDIR}"/${PN}-0.4.8-CVE-2017-8782.patch |
| 95 |
+ "${FILESDIR}"/${PN}-0.4.8-freetype_pkgconfig.patch |
| 96 |
+) |
| 97 |
|
| 98 |
# Tests only work when the package is tested on a system |
| 99 |
# which does not presently have any version of ming installed. |
Archives