Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 337704 Details for
Bug 455074
media-libs/fontconfig: please review/prepare a multilib-build conversion
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Diff for r2
fontconfig-2.9.0.ebuild.diff (text/plain), 3.18 KB, created by
Michał Górny
on 2013-02-02 19:30:37 UTC
(
hide
)
Description:
Diff for r2
Filename:
MIME Type:
Creator:
Michał Górny
Created:
2013-02-02 19:30:37 UTC
Size:
3.18 KB
patch
obsolete
>--- /usr/portage/media-libs/fontconfig/fontconfig-2.9.0.ebuild 2012-05-05 10:31:18.000000000 +0200 >+++ fontconfig-2.9.0.ebuild 2013-02-02 20:29:07.067773277 +0100 >@@ -2,9 +2,10 @@ > # Distributed under the terms of the GNU General Public License v2 > # $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.9.0.ebuild,v 1.2 2012/05/05 08:02:34 jdhore Exp $ > >-EAPI="4" >+EAPI=5 > >-inherit autotools eutils libtool toolchain-funcs flag-o-matic >+AUTOTOOLS_AUTORECONF=yes >+inherit autotools-multilib toolchain-funcs flag-o-matic > > DESCRIPTION="A library for configuring and customizing font access" > HOMEPAGE="http://fontconfig.org/" >@@ -18,8 +19,9 @@ 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. > >-RDEPEND=">=media-libs/freetype-2.2.1 >- >=dev-libs/expat-1.95.3" >+RDEPEND=">=media-libs/freetype-2.2.1[${MULTILIB_USEDEP}] >+ >=dev-libs/expat-1.95.3 >+ !<app-emulation/emul-linux-x86-xlibs-20121202-r1" > DEPEND="${RDEPEND} > virtual/pkgconfig > doc? ( >@@ -29,51 +31,49 @@ DEPEND="${RDEPEND} > PDEPEND="app-admin/eselect-fontconfig > virtual/ttf-fonts" > >-src_prepare() { >- epatch "${FILESDIR}"/${PN}-2.7.1-latin-reorder.patch # 130466 >- epatch "${FILESDIR}"/${PN}-2.3.2-docbook.patch # 310157 >- >- eautoreconf >- >- # Needed to get a sane .so versioning on fbsd, please dont drop. >- # If you have to run eautoreconf, you can also leave the elibtoolize >- # call as it will be a no-op. >- elibtoolize >-} >+PATCHES=( >+ "${FILESDIR}"/${PN}-2.7.1-latin-reorder.patch # 130466 >+ "${FILESDIR}"/${PN}-2.3.2-docbook.patch # 310157 >+) > > src_configure() { >- local myconf >+ local myeconfargs=( >+ $(use_enable doc docs) >+ $(use_enable doc docbook) >+ --localstatedir=/var >+ --with-default-fonts=/usr/share/fonts >+ --with-add-fonts=/usr/local/share/fonts >+ --with-freetype-config="$(tc-getPKG_CONFIG) freetype2" >+ ) >+ > if tc-is-cross-compiler; then >- myconf="--with-arch=${ARCH}" >+ myeconfargs+=( --with-arch=${ARCH} ) > replace-flags -mtune=* -DMTUNE_CENSORED > replace-flags -march=* -DMARCH_CENSORED > fi >- econf \ >- $(use_enable static-libs static) \ >- $(use_enable doc docs) \ >- $(use_enable doc docbook) \ >- --localstatedir=/var \ >- --with-default-fonts=/usr/share/fonts \ >- --with-add-fonts=/usr/local/share/fonts \ >- ${myconf} || die >+ >+ autotools-multilib_src_configure > } > > src_install() { >- emake DESTDIR="${D}" install || die "emake install" >- emake DESTDIR="${D}" -C doc install-man || die "emake install-man" >+ autotools-multilib_src_install > >- find "${ED}" -name '*.la' -exec rm -f {} + >+ 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 > >- insinto /etc/fonts >- doins "${S}"/fonts.conf >- > dodoc doc/fontconfig-user.{txt,pdf} >- dodoc AUTHORS ChangeLog README > > if [[ -e ${D}usr/share/doc/fontconfig/ ]]; then > mv "${D}"usr/share/doc/fontconfig/* "${D}"/usr/share/doc/${P}
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 455074
:
337634
|
337638
|
337702
| 337704