From 329ac7e9aa187a2309fbbbc52cdd3292501361f7 Mon Sep 17 00:00:00 2001
From: Akinori Hattori <hattya@gentoo.org>
Date: Tue, 28 Aug 2018 22:58:00 +0900
Subject: dev-libs/m17n-lib: rename patch

Package-Manager: Portage-2.3.40, Repoman-2.3.9
---
 .../files/m17n-lib-1.7.0-no-freetype.patch         | 46 ----------------------
 dev-libs/m17n-lib/files/m17n-lib-freetype.patch    | 46 ++++++++++++++++++++++
 2 files changed, 46 insertions(+), 46 deletions(-)
 delete mode 100644 dev-libs/m17n-lib/files/m17n-lib-1.7.0-no-freetype.patch
 create mode 100644 dev-libs/m17n-lib/files/m17n-lib-freetype.patch

(limited to 'dev-libs/m17n-lib/files')

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
deleted file mode 100644
index 59b040c4335b..000000000000
--- a/dev-libs/m17n-lib/files/m17n-lib-1.7.0-no-freetype.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- /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/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,
-- 
cgit v1.2.3-65-gdbad