dev-libs/m17n-lib: Fix building with USE="X fontconfig -xft" (bug #636276).

Bug: https://bugs.gentoo.org/636276

diff --git a/dev-libs/m17n-lib/files/m17n-lib-1.7.0-no-freetype.patch b/dev-libs/m17n-lib/files/m17n-lib-1.7.0-no-freetype.patch
new file mode 100644 (file)
index 0000000..59b040c
--- /dev/null
+++ b/dev-libs/m17n-lib/files/m17n-lib-1.7.0-no-freetype.patch
@@ -0,0 +1,46 @@
+--- /src/font.c
++++ /src/font.c
+@@ -1763,10 +1763,10 @@
+ 
+   if (format == Mx || format == Mnil)
+     result = xlfd_parse_name (name, font);
+-#ifdef HAVE_FONTCONFIG
++#if defined (HAVE_FONTCONFIG) && defined (HAVE_FREETYPE)
+   if (format == Mfontconfig || (result < 0 && format == Mnil))
+     result = mfont__ft_parse_name (name, font);
+-#endif /* HAVE_FONTCONFIG */
++#endif /* HAVE_FONTCONFIG && HAVE_FREETYPE*/
+   return result;
+ }
+ 
+@@ -2352,11 +2352,11 @@
+ 
+   if (format == Mx)
+     name = xlfd_unparse_name (font, 1);
+-#ifdef HAVE_FONTCONFIG
++#if defined (HAVE_FONTCONFIG) && defined (HAVE_FREETYPE)
+   else if (format == Mfontconfig)
+     name = mfont__ft_unparse_name (font);
+ 
+-#endif /* HAVE_FONTCONFIG */
++#endif /* HAVE_FONTCONFIG && HAVE_FREETYPE*/
+   else
+     MERROR (MERROR_FONT, NULL);
+   return name;
+--- /src/font.h
++++ /src/font.h
+@@ -307,10 +307,14 @@
+ 
+ extern void mfont__ft_fini ();
+ 
++#ifdef HAVE_FONTCONFIG
++
+ extern int mfont__ft_parse_name (const char *name, MFont *font);
+ 
+ extern char *mfont__ft_unparse_name (MFont *font);
+ 
++#endif /* HAVE_FONTCONFIG */
++
+ #ifdef HAVE_OTF
+ 
+ extern int mfont__ft_drive_otf (MGlyphString *gstring, int from, int to,

diff --git a/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild b/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild
index 12c424df8a4172aa82b72c14b5e38f08e424ce44..72dc298cdd0768553dddbcc9f99e666efeccebba 100644 (file)
--- a/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild
+++ b/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild
@@ -38,6 +38,7 @@ PATCHES=(
        "${FILESDIR}"/${PN}-gui.patch
        "${FILESDIR}"/${PN}-ispell.patch
        "${FILESDIR}"/${PN}-parallel-make.patch
+       "${FILESDIR}"/${PN}-1.7.0-no-freetype.patch
 )
 
 src_prepare() {