diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2018-04-11 01:33:05 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2018-04-11 01:33:20 +0200 |
| commit | ba605ebba49476c6147af7abe8cbd5c9668ed20c (patch) | |
| tree | a94f66fa0f5905baa4049b0b4464470db049f874 | |
| parent | media-video/vlc: Fix build with arm (diff) | |
| download | gentoo-ba605ebb.tar.gz gentoo-ba605ebb.tar.bz2 gentoo-ba605ebb.zip | |
media-libs/fontconfig: Rev bump to add missing -lintl
Closes: https://bugs.gentoo.org/652674
Package-Manager: Portage-2.3.28, Repoman-2.3.9
| -rw-r--r-- | media-libs/fontconfig/files/fontconfig-2.13.0-add-missing-lintl.patch | 34 | ||||
| -rw-r--r-- | media-libs/fontconfig/fontconfig-2.13.0-r3.ebuild (renamed from media-libs/fontconfig/fontconfig-2.13.0-r2.ebuild) | 3 |
2 files changed, 36 insertions, 1 deletions
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 index 000000000000..6bea02b1fca8 --- /dev/null +++ b/media-libs/fontconfig/files/fontconfig-2.13.0-add-missing-lintl.patch @@ -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 + diff --git a/media-libs/fontconfig/fontconfig-2.13.0-r2.ebuild b/media-libs/fontconfig/fontconfig-2.13.0-r3.ebuild index 12d1cab673b6..1e73daa19290 100644 --- a/media-libs/fontconfig/fontconfig-2.13.0-r2.ebuild +++ b/media-libs/fontconfig/fontconfig-2.13.0-r3.ebuild @@ -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) ) |