[gentoo-commits] repo/gentoo:master commit in: dev-libs/m17n-lib/, dev-libs/m17n-lib/files/

["Akinori Hattori" <hattya@gentoo.org>]

commit:     a286836697fc5fcd3408434ea320b0e8559f0c89
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 28 12:26:50 2024 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Fri Jun 28 12:28:58 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2868366

dev-libs/m17n-lib: fix build with USE=xft

Closes: https://bugs.gentoo.org/935025
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 dev-libs/m17n-lib/files/m17n-lib-configure.patch                  | 8 +++++++-
 .../m17n-lib/{m17n-lib-1.8.4.ebuild => m17n-lib-1.8.4-r1.ebuild}  | 0
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/dev-libs/m17n-lib/files/m17n-lib-configure.patch b/dev-libs/m17n-lib/files/m17n-lib-configure.patch
index 90cfc774b806..12e571bd086b 100644
--- a/dev-libs/m17n-lib/files/m17n-lib-configure.patch
+++ b/dev-libs/m17n-lib/files/m17n-lib-configure.patch
@@ -56,7 +56,7 @@
  AC_SUBST(FRIBIDI_LD_FLAGS)
  
  dnl Check for otflib usability.
-@@ -201,6 +209,9 @@
+@@ -201,11 +209,14 @@
  AC_SUBST(OTF_LD_FLAGS)
  
  dnl Check for Freetype2 usability.
@@ -66,6 +66,12 @@
  PKG_CHECK_MODULES([FREETYPE], [freetype2], [HAVE_FREETYPE=yes],
                                             [HAVE_FREETYPE=no])
  AS_IF([test "x$HAVE_FREETYPE" = "xyes"],
+   [CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS";
+-   FREETYPE_LD_FLAGS=FREETYPE_LIBS;
++   FREETYPE_LD_FLAGS=$FREETYPE_LIBS;
+    AC_DEFINE([HAVE_FREETYPE], [1],
+              [Define to 1 if you have FreeType library and header file.])
+    M17N_EXT_LIBS="$M17N_EXT_LIBS freetype";
 @@ -220,9 +231,13 @@
    ],
    []

diff --git a/dev-libs/m17n-lib/m17n-lib-1.8.4.ebuild b/dev-libs/m17n-lib/m17n-lib-1.8.4-r1.ebuild
similarity index 100%
rename from dev-libs/m17n-lib/m17n-lib-1.8.4.ebuild
rename to dev-libs/m17n-lib/m17n-lib-1.8.4-r1.ebuild