diff options
| author |   Akinori Hattori <hattya@gentoo.org> | 2018-08-28 22:58:00 +0900 |
|---|---|---|
| committer | Akinori Hattori <hattya@gentoo.org> | 2018-08-28 22:58:00 +0900 |
| commit | 329ac7e9aa187a2309fbbbc52cdd3292501361f7 (patch) | |
| tree | c0df53daf8ce5bed37f077e9c41bd221c293d7af /dev-libs/m17n-lib/files/m17n-lib-freetype.patch | |
| parent | dev-db/m17n-db: drop nonexistent dependency (diff) | |
| download | gentoo-329ac7e9aa187a2309fbbbc52cdd3292501361f7.tar.gz gentoo-329ac7e9aa187a2309fbbbc52cdd3292501361f7.tar.bz2 gentoo-329ac7e9aa187a2309fbbbc52cdd3292501361f7.zip | |
dev-libs/m17n-lib: rename patch
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Diffstat (limited to 'dev-libs/m17n-lib/files/m17n-lib-freetype.patch')
| -rw-r--r-- | dev-libs/m17n-lib/files/m17n-lib-freetype.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/dev-libs/m17n-lib/files/m17n-lib-freetype.patch b/dev-libs/m17n-lib/files/m17n-lib-freetype.patch new file mode 100644 index 000000000000..59b040c4335b --- /dev/null +++ b/dev-libs/m17n-lib/files/m17n-lib-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, |