| 1 |
commit: ae78fd8d3ba93fff04dcd9c692f5f8c10d538003 |
| 2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
| 3 |
AuthorDate: Wed Nov 15 18:17:46 2017 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Nov 15 19:26:14 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae78fd8d |
| 7 |
|
| 8 |
dev-libs/m17n-lib: Fix building with USE="X fontconfig -xft" (bug #636276). |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/636276 |
| 11 |
|
| 12 |
.../files/m17n-lib-1.7.0-no-freetype.patch | 46 ++++++++++++++++++++++ |
| 13 |
dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild | 1 + |
| 14 |
2 files changed, 47 insertions(+) |
| 15 |
|
| 16 |
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 |
| 17 |
new file mode 100644 |
| 18 |
index 00000000000..59b040c4335 |
| 19 |
--- /dev/null |
| 20 |
+++ b/dev-libs/m17n-lib/files/m17n-lib-1.7.0-no-freetype.patch |
| 21 |
@@ -0,0 +1,46 @@ |
| 22 |
+--- /src/font.c |
| 23 |
++++ /src/font.c |
| 24 |
+@@ -1763,10 +1763,10 @@ |
| 25 |
+ |
| 26 |
+ if (format == Mx || format == Mnil) |
| 27 |
+ result = xlfd_parse_name (name, font); |
| 28 |
+-#ifdef HAVE_FONTCONFIG |
| 29 |
++#if defined (HAVE_FONTCONFIG) && defined (HAVE_FREETYPE) |
| 30 |
+ if (format == Mfontconfig || (result < 0 && format == Mnil)) |
| 31 |
+ result = mfont__ft_parse_name (name, font); |
| 32 |
+-#endif /* HAVE_FONTCONFIG */ |
| 33 |
++#endif /* HAVE_FONTCONFIG && HAVE_FREETYPE*/ |
| 34 |
+ return result; |
| 35 |
+ } |
| 36 |
+ |
| 37 |
+@@ -2352,11 +2352,11 @@ |
| 38 |
+ |
| 39 |
+ if (format == Mx) |
| 40 |
+ name = xlfd_unparse_name (font, 1); |
| 41 |
+-#ifdef HAVE_FONTCONFIG |
| 42 |
++#if defined (HAVE_FONTCONFIG) && defined (HAVE_FREETYPE) |
| 43 |
+ else if (format == Mfontconfig) |
| 44 |
+ name = mfont__ft_unparse_name (font); |
| 45 |
+ |
| 46 |
+-#endif /* HAVE_FONTCONFIG */ |
| 47 |
++#endif /* HAVE_FONTCONFIG && HAVE_FREETYPE*/ |
| 48 |
+ else |
| 49 |
+ MERROR (MERROR_FONT, NULL); |
| 50 |
+ return name; |
| 51 |
+--- /src/font.h |
| 52 |
++++ /src/font.h |
| 53 |
+@@ -307,10 +307,14 @@ |
| 54 |
+ |
| 55 |
+ extern void mfont__ft_fini (); |
| 56 |
+ |
| 57 |
++#ifdef HAVE_FONTCONFIG |
| 58 |
++ |
| 59 |
+ extern int mfont__ft_parse_name (const char *name, MFont *font); |
| 60 |
+ |
| 61 |
+ extern char *mfont__ft_unparse_name (MFont *font); |
| 62 |
+ |
| 63 |
++#endif /* HAVE_FONTCONFIG */ |
| 64 |
++ |
| 65 |
+ #ifdef HAVE_OTF |
| 66 |
+ |
| 67 |
+ extern int mfont__ft_drive_otf (MGlyphString *gstring, int from, int to, |
| 68 |
|
| 69 |
diff --git a/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild b/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild |
| 70 |
index 12c424df8a4..72dc298cdd0 100644 |
| 71 |
--- a/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild |
| 72 |
+++ b/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild |
| 73 |
@@ -38,6 +38,7 @@ PATCHES=( |
| 74 |
"${FILESDIR}"/${PN}-gui.patch |
| 75 |
"${FILESDIR}"/${PN}-ispell.patch |
| 76 |
"${FILESDIR}"/${PN}-parallel-make.patch |
| 77 |
+ "${FILESDIR}"/${PN}-1.7.0-no-freetype.patch |
| 78 |
) |
| 79 |
|
| 80 |
src_prepare() { |
Archives