Add a fix for cross compiling media-libs/fontconfig 2.10.2 for mingw, bug #472210

Package-Manager: portage-2.1.12.2

7 files changed, 260 insertions, 0 deletions

diff --git a/media-libs/fontconfig/ChangeLog b/media-libs/fontconfig/ChangeLog
new file mode 100644
index 00000000..384b095c
--- /dev/null
+++ b/media-libs/fontconfig/ChangeLog
@@ -0,0 +1,9 @@
+*fontconfig-2.10.2-r1 (03 Jun 2013)
+
+  03 Jun 2013; Bertrand Jacquin <beber@meleeweb.net>
+  +files/fontconfig-2.10.2-docbook.patch,
+  +files/fontconfig-2.7.1-latin-reorder.patch,
+  +files/fontconfig-Fix-installation-on-MinGW32.patch,
+  +fontconfig-2.10.2-r1.ebuild, +metadata.xml:
+  Add a fix for cross compiling media-libs/fontconfig 2.10.2 for mingw, bug
+  #472210
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
new file mode 100644
index 00000000..d0c52673
--- /dev/null
+++ b/media-libs/fontconfig/Manifest
@@ -0,0 +1,7 @@
+AUX fontconfig-2.10.2-docbook.patch 648 SHA256 d4b5acc1fe079071cbe7b886769dc561d6318f9193c1e32ed2cca9720a3c346e WHIRLPOOL b2cfd619aff49024190409c33bd5ff3754b88e5c04a30df52c90bf0ab9b4ce5cd5727423939b70538760bb1e7a02325d76426cf94bdb9e8eb165966b40767197
+AUX fontconfig-2.7.1-latin-reorder.patch 1701 SHA256 cd27212a9e8a3045106fd427f2e5079ea348789c8760e7af443c2745479c8f82 WHIRLPOOL e6e90c38c7ce04e297c48f5b9859c5e9230a59e9722dacde5ddd434cca8fbd33fab55f704df540eea3f3efd6ee05884987e6ce5da544d2b41f869e47ce3d259d
+AUX fontconfig-Fix-installation-on-MinGW32.patch 869 SHA256 ae1d395c9aaf8b189036c42d79df05ac4a0d1515358c950738d96690a21a1a28 WHIRLPOOL b78e9d188040999ee5080687e01f38e4e59c9c2f466a76bff0a8b22d182d8e1c0b514b612ed9b36dbd28c73e8448b93fc34fbbcec4f90489f899e9ff331152f4
+DIST fontconfig-2.10.2.tar.bz2 1412488 SHA256 8ea8ef56738fd95f0be611015f89614fd4dec79ddac6b3ff26bc4a8338569952 WHIRLPOOL a213c2af9ef1e0ccf19ba8c7119cb1d85e06ec048cf66c933fc9c552b7c642b42636714d214dcbd9794024af123189fcbb73dc4968ba2135b66b6191c05d919e
+EBUILD fontconfig-2.10.2-r1.ebuild 4196 SHA256 c82979c596dd67d8942d90afd2481fc3f90fbda7d93629dc50f20e480b7e8ef9 WHIRLPOOL 797150de085aea6292d060a34373af07e3defbf65b4e43edbe85f2e6818e3c28efb5a62841613c3a7249fedf1962bf6f556e3826fdcc8996da22768e70aaaa39
+MISC ChangeLog 367 SHA256 12fdd7c06dc685ea12754d6c8cfa53b46542be3ec2ec487bada405eed9020ee7 WHIRLPOOL 055f42cfc421166be4bac08440d7a2528063ce33e418a0882667e2e2b08f81eae41df0baf5d54980bfafc7c31ab322d33e263cbc1fe5b214831df91030d2a238
+MISC metadata.xml 727 SHA256 90e4744ccb449b368e08690f44e02d4d8812b2a85223fb28943e5cbfd9bc1cbc WHIRLPOOL fb47925fc948cac4a70befbf369a1cafcc94b00b607e07709692288fca5dd4fadb2e8e2e0b1e495d92ed3746d9fa9d45fd45d6aa4dea403617aa78b13e8b4f89
diff --git a/media-libs/fontconfig/files/fontconfig-2.10.2-docbook.patch b/media-libs/fontconfig/files/fontconfig-2.10.2-docbook.patch
new file mode 100644
index 00000000..33d6549c
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-2.10.2-docbook.patch
@@ -0,0 +1,16 @@
+diff --unified -uNrp fontconfig-2.10.2-orig/configure.ac fontconfig-2.10.2/configure.ac
+--- fontconfig-2.10.2-orig/configure.ac	2012-11-26 09:21:13.000000000 +0100
++++ fontconfig-2.10.2/configure.ac	2013-01-05 15:40:54.541682239 +0100
+@@ -570,7 +570,11 @@ AC_SUBST(XMLDIR)
+ # Let people not build/install docs if they don't have docbook
+ #
+ 
+-AC_CHECK_PROG(HASDOCBOOK, docbook2html, yes, no)
++AC_ARG_ENABLE(docbook,           [  --disable-docbook                Don't build documentation],,)
++
++if test x$enable_docbook != xno; then
++	AC_CHECK_PROG(HASDOCBOOK, docbook2html, yes, no)
++fi
+ 
+ AM_CONDITIONAL(USEDOCBOOK, test "x$HASDOCBOOK" = xyes)
+ 
diff --git a/media-libs/fontconfig/files/fontconfig-2.7.1-latin-reorder.patch b/media-libs/fontconfig/files/fontconfig-2.7.1-latin-reorder.patch
new file mode 100644
index 00000000..6ecf6cb9
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-2.7.1-latin-reorder.patch
@@ -0,0 +1,50 @@
+diff -Naurp fontconfig-2.7.1-orig/conf.d/60-latin.conf fontconfig-2.7.1/conf.d/60-latin.conf
+--- fontconfig-2.7.1-orig/conf.d/60-latin.conf	2009-07-10 11:09:33.000000000 -0600
++++ fontconfig-2.7.1/conf.d/60-latin.conf	2009-08-16 15:25:38.347701112 -0600
+@@ -4,8 +4,8 @@
+ 	<alias>
+ 		<family>serif</family>
+ 		<prefer>
+-			<family>Bitstream Vera Serif</family>
+ 			<family>DejaVu Serif</family>
++			<family>Bitstream Vera Serif</family>
+ 			<family>Times New Roman</family>
+ 			<family>Thorndale AMT</family>
+ 			<family>Luxi Serif</family>
+@@ -16,14 +16,14 @@
+ 	<alias>
+ 		<family>sans-serif</family>
+ 		<prefer>
+-			<family>Bitstream Vera Sans</family>
+ 			<family>DejaVu Sans</family>
+-			<family>Verdana</family>
+-			<family>Arial</family>
+-			<family>Albany AMT</family>
++			<family>Bitstream Vera Sans</family>
+ 			<family>Luxi Sans</family>
+ 			<family>Nimbus Sans L</family>
++			<family>Arial</family>
++			<family>Albany AMT</family>
+ 			<family>Helvetica</family>
++			<family>Verdana</family>
+ 			<family>Lucida Sans Unicode</family>
+ 			<family>BPG Glaho International</family> <!-- lat,cyr,arab,geor -->
+ 			<family>Tahoma</family> <!-- lat,cyr,greek,heb,arab,thai -->
+@@ -32,14 +32,14 @@
+ 	<alias>
+ 		<family>monospace</family>
+ 		<prefer>
+-			<family>Bitstream Vera Sans Mono</family>
+ 			<family>DejaVu Sans Mono</family>
++			<family>Bitstream Vera Sans Mono</family>
+ 			<family>Inconsolata</family>
++			<family>Luxi Mono</family>
++			<family>Nimbus Mono L</family>
+ 			<family>Andale Mono</family>
+ 			<family>Courier New</family>
+ 			<family>Cumberland AMT</family>
+-			<family>Luxi Mono</family>
+-			<family>Nimbus Mono L</family>
+ 			<family>Courier</family>
+ 		</prefer>
+ 	</alias>
diff --git a/media-libs/fontconfig/files/fontconfig-Fix-installation-on-MinGW32.patch b/media-libs/fontconfig/files/fontconfig-Fix-installation-on-MinGW32.patch
new file mode 100644
index 00000000..b98f8b7d
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-Fix-installation-on-MinGW32.patch
@@ -0,0 +1,29 @@
+From 000ca9ccb03013a5b151f0d21148ab0ca4c2f2de Mon Sep 17 00:00:00 2001
+From: Akira TAGOH <akira@tagoh.org>
+Date: Tue, 22 Jan 2013 12:11:56 +0900
+Subject: [PATCH] Fix installation on MinGW32
+
+Patch from LRN
+---
+ src/Makefile.am | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index dba4206..3bb90ea 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -31,8 +31,9 @@ fontconfig_def_dependency = fontconfig.def
+ 
+ # gcc import library install/uninstall
+ 
+-install-libtool-import-lib: 
+-	$(INSTALL) .libs/libfontconfig.dll.a $(DESTDIR)$(libdir)
++install-libtool-import-lib: libfontconfig.la
++	$(MKDIR_P) $(DESTDIR)$(libdir)
++	$(INSTALL) .libs/libfontconfig.dll.a $(DESTDIR)$(libdir)/libfontconfig.dll.a
+ 	$(INSTALL) fontconfig.def $(DESTDIR)$(libdir)/fontconfig.def
+ 
+ uninstall-libtool-import-lib:
+-- 
+1.8.2.1
+
diff --git a/media-libs/fontconfig/fontconfig-2.10.2-r1.ebuild b/media-libs/fontconfig/fontconfig-2.10.2-r1.ebuild
new file mode 100644
index 00000000..55abe33a
--- /dev/null
+++ b/media-libs/fontconfig/fontconfig-2.10.2-r1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.10.2-r1.ebuild,v 1.3 2013/02/27 19:54:27 zmedico Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=yes
+inherit autotools-multilib readme.gentoo
+
+DESCRIPTION="A library for configuring and customizing font access"
+HOMEPAGE="http://fontconfig.org/"
+SRC_URI="http://fontconfig.org/release/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="doc static-libs"
+
+# Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
+# default and used by every distro.  See bug #283191.
+
+# Note: replace emul-linux dep when expat becomes multilib-aware
+# (and add [${MULTILIB_USEDEP}] on it then!)
+RDEPEND=">=media-libs/freetype-2.2.1[${MULTILIB_USEDEP}]
+	>=dev-libs/expat-1.95.3
+	abi_x86_32? (
+		amd64? ( app-emulation/emul-linux-x86-baselibs[development] )
+		!<=app-emulation/emul-linux-x86-xlibs-20130224 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-sgml-utils[jadetex]
+		=app-text/docbook-sgml-dtd-3.1*
+	)"
+PDEPEND="app-admin/eselect-fontconfig
+	virtual/ttf-fonts"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.7.1-latin-reorder.patch	# 130466
+	"${FILESDIR}"/${PN}-2.10.2-docbook.patch		# 310157
+	"${FILESDIR}"/${PN}-Fix-installation-on-MinGW32.patch
+)
+
+pkg_setup() {
+	DOC_CONTENTS="Please make fontconfig configuration changes using
+	\`eselect fontconfig\`. Any changes made to /etc/fonts/fonts.conf will be
+	overwritten. If you need to reset your configuration to upstream defaults,
+	delete the directory ${EROOT}etc/fonts/conf.d/ and re-emerge fontconfig."
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable doc docbook)
+		# always enable docs to install manpages
+		--enable-docs
+		--localstatedir="${EPREFIX}"/var
+		--with-default-fonts="${EPREFIX}"/usr/share/fonts
+		--with-add-fonts="${EPREFIX}"/usr/local/share/fonts
+		--with-templatedir="${EPREFIX}"/etc/fonts/conf.avail
+	)
+
+	autotools-multilib_src_configure
+}
+
+src_install() {
+	autotools-multilib_src_install
+
+	# XXX: avoid calling this multiple times, bug #459210
+	install_others() {
+		# stuff installed from build-dir
+		autotools-utils_src_compile \
+			DESTDIR="${D}" -C doc install-man
+
+		insinto /etc/fonts
+		doins "${BUILD_DIR}"/fonts.conf
+	}
+	multilib_foreach_abi install_others
+
+	#fc-lang directory contains language coverage datafiles
+	#which are needed to test the coverage of fonts.
+	insinto /usr/share/fc-lang
+	doins fc-lang/*.orth
+
+	dodoc doc/fontconfig-user.{txt,pdf}
+
+	if [[ -e ${ED}usr/share/doc/fontconfig/ ]];  then
+		mv "${ED}"usr/share/doc/fontconfig/* "${ED}"/usr/share/doc/${P}
+		rm -rf "${ED}"usr/share/doc/fontconfig
+	fi
+
+	# Changes should be made to /etc/fonts/local.conf, and as we had
+	# too much problems with broken fonts.conf we force update it ...
+	echo 'CONFIG_PROTECT_MASK="/etc/fonts/fonts.conf"' > "${T}"/37fontconfig
+	doenvd "${T}"/37fontconfig
+
+	# As of fontconfig 2.7, everything sticks their noses in here.
+	dodir /etc/sandbox.d
+	echo 'SANDBOX_PREDICT="/var/cache/fontconfig"' > "${ED}"/etc/sandbox.d/37fontconfig
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# Bug #193476
+	# /etc/fonts/conf.d/ contains symlinks to ../conf.avail/ to include various
+	# config files.  If we install as-is, we'll blow away user settings.
+	ebegin "Syncing fontconfig configuration to system"
+	if [[ -e ${EROOT}/etc/fonts/conf.d ]]; then
+		for file in "${EROOT}"/etc/fonts/conf.avail/*; do
+			f=${file##*/}
+			if [[ -L ${EROOT}/etc/fonts/conf.d/${f} ]]; then
+				[[ -f ${ED}etc/fonts/conf.avail/${f} ]] \
+					&& ln -sf ../conf.avail/"${f}" "${ED}"etc/fonts/conf.d/ &>/dev/null
+			else
+				[[ -f ${ED}etc/fonts/conf.avail/${f} ]] \
+					&& rm "${ED}"etc/fonts/conf.d/"${f}" &>/dev/null
+			fi
+		done
+	fi
+	eend $?
+}
+
+pkg_postinst() {
+	einfo "Cleaning broken symlinks in "${EROOT}"etc/fonts/conf.d/"
+	find -L "${EROOT}"etc/fonts/conf.d/ -type l -delete
+
+	readme.gentoo_print_elog
+
+	if [[ ${ROOT} = / ]]; then
+		ebegin "Creating global font cache"
+		"${EPREFIX}"/usr/bin/fc-cache -srf
+		eend $?
+	fi
+}
diff --git a/media-libs/fontconfig/metadata.xml b/media-libs/fontconfig/metadata.xml
new file mode 100644
index 00000000..a46832ff
--- /dev/null
+++ b/media-libs/fontconfig/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>fonts</herd>
+	<maintainer>
+		<email>yngwin@gentoo.org</email>
+		<name>Ben de Groot</name>
+	</maintainer>
+	<maintainer>
+		<email>multilib@gentoo.org</email>
+		<name>gx86-multilib project</name>
+		<description>Handling the bugs related to multilib support in the package and related changes.</description>
+	</maintainer>
+	<longdescription>Fontconfig is a font configuration and customization library, which does not depend on the X Window System. It is designed to locate fonts within the system and select them according to requirements specified by applications.</longdescription>
+</pkgmetadata>