Skip to content

Commit

Permalink
media-libs/fontconfig: Rev bump to add missing -lintl
Browse files Browse the repository at this point in the history
Closes: https://bugs.gentoo.org/652674
Package-Manager: Portage-2.3.28, Repoman-2.3.9
  • Loading branch information
Whissi committed Apr 10, 2018
1 parent 8b1c79d commit ba605eb
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
From 07bd14c5c7fed103020dc9b630d6a254861ada07 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <[email protected]>
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

Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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) )
Expand Down

0 comments on commit ba605eb

Please sign in to comment.