From 12bb627384ddfd47382b9f1b6464481a58d01ebb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Aug 2018 20:19:23 +0100 Subject: gentoo resync : 29.08.2018 --- dev-libs/m17n-lib/files/m17n-lib-ftconfig.patch | 29 +++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 dev-libs/m17n-lib/files/m17n-lib-ftconfig.patch (limited to 'dev-libs/m17n-lib/files/m17n-lib-ftconfig.patch') diff --git a/dev-libs/m17n-lib/files/m17n-lib-ftconfig.patch b/dev-libs/m17n-lib/files/m17n-lib-ftconfig.patch new file mode 100644 index 000000000000..203f836bf942 --- /dev/null +++ b/dev-libs/m17n-lib/files/m17n-lib-ftconfig.patch @@ -0,0 +1,29 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -210,21 +210,20 @@ + dnl Check for Freetype2 usability. + AC_ARG_WITH(freetype, + AS_HELP_STRING([--with-freetype],[enable Freetype support])) +-AC_CHECK_PROG(HAVE_FREETYPE_CONFIG, freetype-config, yes) +-if test "x$with_freetype" != "xno" -a "x$HAVE_FREETYPE_CONFIG" = "xyes"; then +- FREETYPE_INC=`freetype-config --cflags` ++if test "x$with_freetype" != "xno"; then ++ PKG_CHECK_MODULES([FT2], [freetype2]) + save_CPPFLAGS="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS $FREETYPE_INC" ++ CPPFLAGS="$CPPFLAGS $FT2_CFLAGS" + AC_CHECK_HEADER(ft2build.h, HAVE_FREETYPE=yes, + HAVE_FREETYPE=no CPPFLAGS="$save_CPPFLAGS") + if test "x$HAVE_FREETYPE" = "xyes" ; then + save_LIBS="$LIBS" +- LIBS="$LIBS `freetype-config --libs`" ++ LIBS="$LIBS $FT2_LIBS" + AC_CHECK_LIB(freetype, FT_Init_FreeType, HAVE_FREETYPE=yes, + HAVE_FREETYPE=no) + LIBS="$save_LIBS" + if test "x$HAVE_FREETYPE" = "xyes"; then +- FREETYPE_LD_FLAGS=`freetype-config --libs` ++ FREETYPE_LD_FLAGS=$FT2_LIBS + AC_DEFINE(HAVE_FREETYPE, 1, + [Define to 1 if you have FreeType library and header file.]) + M17N_EXT_LIBS="$M17N_EXT_LIBS freetype" -- cgit v1.2.3