| 1 |
commit: cfe2bf058f9d2e61dd9ce39b46cc4df491a18ec9 |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 29 08:47:49 2018 +0000 |
| 4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 29 13:33:27 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfe2bf05 |
| 7 |
|
| 8 |
dev-libs/m17n-lib: use pkg-config to find freetype |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/664818 |
| 11 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
| 12 |
|
| 13 |
dev-libs/m17n-lib/files/m17n-lib-ftconfig.patch | 29 +++++++++++++++++++++++++ |
| 14 |
dev-libs/m17n-lib/m17n-lib-1.8.0.ebuild | 1 + |
| 15 |
2 files changed, 30 insertions(+) |
| 16 |
|
| 17 |
diff --git a/dev-libs/m17n-lib/files/m17n-lib-ftconfig.patch b/dev-libs/m17n-lib/files/m17n-lib-ftconfig.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..203f836bf94 |
| 20 |
--- /dev/null |
| 21 |
+++ b/dev-libs/m17n-lib/files/m17n-lib-ftconfig.patch |
| 22 |
@@ -0,0 +1,29 @@ |
| 23 |
+--- a/configure.ac |
| 24 |
++++ b/configure.ac |
| 25 |
+@@ -210,21 +210,20 @@ |
| 26 |
+ dnl Check for Freetype2 usability. |
| 27 |
+ AC_ARG_WITH(freetype, |
| 28 |
+ AS_HELP_STRING([--with-freetype],[enable Freetype support])) |
| 29 |
+-AC_CHECK_PROG(HAVE_FREETYPE_CONFIG, freetype-config, yes) |
| 30 |
+-if test "x$with_freetype" != "xno" -a "x$HAVE_FREETYPE_CONFIG" = "xyes"; then |
| 31 |
+- FREETYPE_INC=`freetype-config --cflags` |
| 32 |
++if test "x$with_freetype" != "xno"; then |
| 33 |
++ PKG_CHECK_MODULES([FT2], [freetype2]) |
| 34 |
+ save_CPPFLAGS="$CPPFLAGS" |
| 35 |
+- CPPFLAGS="$CPPFLAGS $FREETYPE_INC" |
| 36 |
++ CPPFLAGS="$CPPFLAGS $FT2_CFLAGS" |
| 37 |
+ AC_CHECK_HEADER(ft2build.h, HAVE_FREETYPE=yes, |
| 38 |
+ HAVE_FREETYPE=no CPPFLAGS="$save_CPPFLAGS") |
| 39 |
+ if test "x$HAVE_FREETYPE" = "xyes" ; then |
| 40 |
+ save_LIBS="$LIBS" |
| 41 |
+- LIBS="$LIBS `freetype-config --libs`" |
| 42 |
++ LIBS="$LIBS $FT2_LIBS" |
| 43 |
+ AC_CHECK_LIB(freetype, FT_Init_FreeType, HAVE_FREETYPE=yes, |
| 44 |
+ HAVE_FREETYPE=no) |
| 45 |
+ LIBS="$save_LIBS" |
| 46 |
+ if test "x$HAVE_FREETYPE" = "xyes"; then |
| 47 |
+- FREETYPE_LD_FLAGS=`freetype-config --libs` |
| 48 |
++ FREETYPE_LD_FLAGS=$FT2_LIBS |
| 49 |
+ AC_DEFINE(HAVE_FREETYPE, 1, |
| 50 |
+ [Define to 1 if you have FreeType library and header file.]) |
| 51 |
+ M17N_EXT_LIBS="$M17N_EXT_LIBS freetype" |
| 52 |
|
| 53 |
diff --git a/dev-libs/m17n-lib/m17n-lib-1.8.0.ebuild b/dev-libs/m17n-lib/m17n-lib-1.8.0.ebuild |
| 54 |
index c98449bc342..767f8eabe5f 100644 |
| 55 |
--- a/dev-libs/m17n-lib/m17n-lib-1.8.0.ebuild |
| 56 |
+++ b/dev-libs/m17n-lib/m17n-lib-1.8.0.ebuild |
| 57 |
@@ -36,6 +36,7 @@ DEPEND="${RDEPEND} |
| 58 |
PATCHES=( |
| 59 |
"${FILESDIR}"/${PN}-configure.patch |
| 60 |
"${FILESDIR}"/${PN}-freetype.patch |
| 61 |
+ "${FILESDIR}"/${PN}-ftconfig.patch |
| 62 |
"${FILESDIR}"/${PN}-ispell.patch |
| 63 |
"${FILESDIR}"/${PN}-parallel-make.patch |
| 64 |
"${FILESDIR}"/${PN}-pkg-config.patch |
Archives