testing/m17n-lib: upgrade to 1.8.1

testing/m17n-lib/APKBUILD

@@ -1,7 +1,7 @@
 # Maintainer: psykose <alice@ayaya.dev>
 pkgname=m17n-lib
-pkgver=1.8.0
-pkgrel=1
+pkgver=1.8.1
+pkgrel=0
 pkgdesc="gnu M-text multilingualization library"
 url="https://www.nongnu.org/m17n/"
 arch="all"
@@ -13,14 +13,11 @@ depends_dev="
 	"
 makedepends="
 	anthy-dev
-	autoconf
-	automake
 	fontconfig-dev
 	freetype-dev
 	fribidi-dev
 	gettext-dev
 	libthai-dev
-	libtool
 	libx11-dev
 	libxaw-dev
 	libxft-dev
@@ -34,16 +31,7 @@ subpackages="
 	libm17n-gui
 	$pkgname-tools
 	"
-source="http://download.savannah.gnu.org/releases/m17n/m17n-lib-$pkgver.tar.gz
-	freetype-detection.patch
-	freetype-detection-2.patch
-	"
-
-prepare() {
-	default_prepare
-
-	autoreconf -fvi
-}
+source="http://download.savannah.gnu.org/releases/m17n/m17n-lib-$pkgver.tar.gz"
 
 build() {
 	export CFLAGS="$CFLAGS -flto=auto $(pkg-config --cflags glib-2.0)"
@@ -90,7 +78,5 @@ tools() {
 }
 
 sha512sums="
-8aba862888393232172c03cdf52531e29ea969c4327e6f69879ecf7438eafee32782f509ec292b3e1b7cd3202e2764984d7a59e85cdb87a7c8bfcbac5b0ee6fd  m17n-lib-1.8.0.tar.gz
-a9ddcc5561095107c8d227139f030ccf5b0ee03f434439004b6324d1d17dfe86edc261e984714cef10108793c6905cae64fb1f41bbea2e1c7f7cd72c1d89a1d0  freetype-detection.patch
-54110757af0c72d678ef84540e4e2873fa9865f8517a797cc882ae702d34e157b1290343978f5020276069f08c3f589cfd0d663d6669ca50638deb574ec62bc1  freetype-detection-2.patch
+d8b97c0145ac9056b962c4ef6204bd9f1766487393def8b31d984199003ba984eb1312b84e2c74261cafee493c370c1676e79dbd850a77bbfb3392f4cd9db437  m17n-lib-1.8.1.tar.gz
 "

testing/m17n-lib/freetype-detection-2.patch

@@ -1,33 +0,0 @@
-Patch-Source: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/m17n-lib/files/m17n-lib-ftconfig.patch?id=33f4c9c6096e290c0ede935cdfea2cfa6ba9aca2
---
-diff --git a/configure.ac b/configure.ac
-index 7f8b08e..556226c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -204,21 +204,20 @@ fi
- AC_SUBST(OTF_LD_FLAGS)
- 
- dnl Check for Freetype2 usability.
--AC_CHECK_PROG(HAVE_FREETYPE_CONFIG, freetype-config, yes)
--if test "x$HAVE_FREETYPE_CONFIG" = "xyes"; then
--  FREETYPE_INC=`freetype-config --cflags`
-+if test "x$with_freetype" != "xno"; then
-+  PKG_CHECK_MODULES([FT2], [freetype2])
-   save_CPPFLAGS="$CPPFLAGS"
--  CPPFLAGS="$CPPFLAGS $FREETYPE_INC"
-+  CPPFLAGS="$CPPFLAGS $FT2_CFLAGS"
-   AC_CHECK_HEADER(ft2build.h, HAVE_FREETYPE=yes,
-   			      HAVE_FREETYPE=no CPPFLAGS="$save_CPPFLAGS")
-   if test "x$HAVE_FREETYPE" = "xyes" ; then
-     save_LIBS="$LIBS"
--    LIBS="$LIBS `freetype-config --libs`"
-+    LIBS="$LIBS $FT2_LIBS"
-     AC_CHECK_LIB(freetype, FT_Init_FreeType, HAVE_FREETYPE=yes,
-     			   		     HAVE_FREETYPE=no)
-     LIBS="$save_LIBS"
-     if test "x$HAVE_FREETYPE" = "xyes"; then
--      FREETYPE_LD_FLAGS=`freetype-config --libs`
-+      FREETYPE_LD_FLAGS=$FT2_LIBS
-       AC_DEFINE(HAVE_FREETYPE, 1, 
- 		[Define to 1 if you have FreeType library and header file.])
-       M17N_EXT_LIBS="$M17N_EXT_LIBS freetype"

testing/m17n-lib/freetype-detection.patch

@@ -1,48 +0,0 @@
-Patch-Source: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/m17n-lib/files/m17n-lib-freetype.patch?id=33f4c9c6096e290c0ede935cdfea2cfa6ba9aca2
---
---- a/src/font.c
-+++ b/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;
---- a/src/font.h
-+++ b/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,