media-libs/fontconfig: Rev bump to add missing -lintl
authorThomas Deutschmann <whissi@gentoo.org>
Tue, 10 Apr 2018 23:33:05 +0000 (01:33 +0200)
committerThomas Deutschmann <whissi@gentoo.org>
Tue, 10 Apr 2018 23:33:20 +0000 (01:33 +0200)
Closes: https://bugs.gentoo.org/652674
Package-Manager: Portage-2.3.28, Repoman-2.3.9

media-libs/fontconfig/files/fontconfig-2.13.0-add-missing-lintl.patch [new file with mode: 0644]
media-libs/fontconfig/fontconfig-2.13.0-r3.ebuild [moved from media-libs/fontconfig/fontconfig-2.13.0-r2.ebuild with 98% similarity]

diff --git a/media-libs/fontconfig/files/fontconfig-2.13.0-add-missing-lintl.patch b/media-libs/fontconfig/files/fontconfig-2.13.0-add-missing-lintl.patch
new file mode 100644 (file)
index 0000000..6bea02b
--- /dev/null
@@ -0,0 +1,34 @@
+From 07bd14c5c7fed103020dc9b630d6a254861ada07 Mon Sep 17 00:00:00 2001
+From: Akira TAGOH <akira@tagoh.org>
+Date: Fri, 9 Mar 2018 11:55:43 +0900
+Subject: Fix the build issue again on MinGW with enabling nls
+
+---
+ src/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 1ff065b..2111ce0 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -82,7 +82,7 @@ AM_CPPFLAGS =                                                \
+       -DFC_CACHEDIR='"$(FC_CACHEDIR)"'                \
+       -DFONTCONFIG_PATH='"$(BASECONFIGDIR)"'          \
+       -DFC_TEMPLATEDIR='"$(TEMPLATEDIR)"'
+-LDADD  = $(INTLLIBS)
++LDADD  = $(LIBINTL)
+ EXTRA_DIST += makealias
+@@ -168,7 +168,7 @@ lib_LTLIBRARIES = libfontconfig.la
+ libfontconfig_la_LDFLAGS =                    \
+       -version-info @LIBT_VERSION_INFO@ -no-undefined $(export_symbols)
+-libfontconfig_la_LIBADD = $(ICONV_LIBS) $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS) $(UUID_LIBS) $(INTLLIBS)
++libfontconfig_la_LIBADD = $(ICONV_LIBS) $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS) $(UUID_LIBS) $(LTLIBINTL)
+ libfontconfig_la_DEPENDENCIES = $(fontconfig_def_dependency)
+-- 
+cgit v1.1
+
similarity index 98%
rename from media-libs/fontconfig/fontconfig-2.13.0-r2.ebuild
rename to media-libs/fontconfig/fontconfig-2.13.0-r3.ebuild
index 12d1cab673b697d3cd590b5911cf309477a63224..1e73daa192905b84a7ba8a76a7dc4d88488b0f0e 100644 (file)
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools multilib-minimal readme.gentoo-r1 eapi7-ver
 
 DESCRIPTION="A library for configuring and customizing font access"
-HOMEPAGE="http://fontconfig.org/"
+HOMEPAGE="https://fontconfig.org/"
 SRC_URI="http://fontconfig.org/release/${P}.tar.bz2"
 
 LICENSE="MIT"
@@ -32,6 +32,7 @@ PATCHES=(
        "${FILESDIR}"/${PN}-2.12.3-latin-update.patch # 130466 + make liberation default
        "${FILESDIR}"/${P}-locale.patch #650332
        "${FILESDIR}"/${P}-names.patch #650370
+       "${FILESDIR}"/${P}-add-missing-lintl.patch #652674
 )
 
 MULTILIB_CHOST_TOOLS=( /usr/bin/fc-cache$(get_exeext) )