diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2014-03-15 19:47:38 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2014-03-15 19:47:38 +0000 |
| commit | 75df86db910a99285a3d009c292e4a0af1993fbd (patch) | |
| tree | 05c52c0afdbd844b672f49964ac49c01d9befc67 /x11-misc/xdg-user-dirs | |
| parent | Add missing docbook-xml-dtd dependency wrt #492322 by Tom Nachdenk (diff) | |
| download | gentoo-2-75df86db910a99285a3d009c292e4a0af1993fbd.tar.gz gentoo-2-75df86db910a99285a3d009c292e4a0af1993fbd.tar.bz2 gentoo-2-75df86db910a99285a3d009c292e4a0af1993fbd.zip | |
Fix build for systems with external libiconv wrt #499940 by René Rhéaume, and #366885 by Leho Kraav
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'x11-misc/xdg-user-dirs')
| -rw-r--r-- | x11-misc/xdg-user-dirs/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-misc/xdg-user-dirs/files/xdg-user-dirs-0.15-libiconv.patch | 14 | ||||
| -rw-r--r-- | x11-misc/xdg-user-dirs/xdg-user-dirs-0.15.ebuild | 9 |
3 files changed, 28 insertions, 2 deletions
diff --git a/x11-misc/xdg-user-dirs/ChangeLog b/x11-misc/xdg-user-dirs/ChangeLog index 67a55581d4ab..43dcd40d1a3f 100644 --- a/x11-misc/xdg-user-dirs/ChangeLog +++ b/x11-misc/xdg-user-dirs/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-misc/xdg-user-dirs # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdg-user-dirs/ChangeLog,v 1.41 2014/03/15 19:37:21 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdg-user-dirs/ChangeLog,v 1.42 2014/03/15 19:47:38 ssuominen Exp $ + + 15 Mar 2014; Samuli Suominen <ssuominen@gentoo.org> + +files/xdg-user-dirs-0.15-libiconv.patch, xdg-user-dirs-0.15.ebuild: + Fix build for systems with external libiconv wrt #499940 by René Rhéaume, and + #366885 by Leho Kraav 15 Mar 2014; Samuli Suominen <ssuominen@gentoo.org> xdg-user-dirs-0.15.ebuild: Add missing docbook-xml-dtd dependency wrt #492322 by Tom Nachdenk diff --git a/x11-misc/xdg-user-dirs/files/xdg-user-dirs-0.15-libiconv.patch b/x11-misc/xdg-user-dirs/files/xdg-user-dirs-0.15-libiconv.patch new file mode 100644 index 000000000000..c193fc83447a --- /dev/null +++ b/x11-misc/xdg-user-dirs/files/xdg-user-dirs-0.15-libiconv.patch @@ -0,0 +1,14 @@ +http://bugs.gentoo.org/366885 +http://bugs.gentoo.org/499940 + +--- Makefile.am ++++ Makefile.am +@@ -16,7 +16,7 @@ + xdgdir=$(sysconfdir)/xdg + xdg_DATA=user-dirs.conf user-dirs.defaults + +-libraries = $(LIBINTL) ++libraries = $(LIBINTL) $(LIBICONV) + + bin_PROGRAMS = \ + xdg-user-dirs-update \ diff --git a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.15.ebuild b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.15.ebuild index 024d625f7bcc..4190e2e77531 100644 --- a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.15.ebuild +++ b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.15.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdg-user-dirs/xdg-user-dirs-0.15.ebuild,v 1.11 2014/03/15 19:37:21 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdg-user-dirs/xdg-user-dirs-0.15.ebuild,v 1.12 2014/03/15 19:47:38 ssuominen Exp $ EAPI=5 +inherit autotools eutils DESCRIPTION="A tool to help manage 'well known' user directories" HOMEPAGE="http://www.freedesktop.org/wiki/Software/xdg-user-dirs" @@ -22,3 +23,9 @@ DEPEND="app-text/docbook-xml-dtd:4.3 PDEPEND="gtk? ( x11-misc/xdg-user-dirs-gtk )" DOCS=( AUTHORS ChangeLog NEWS ) + +src_prepare() { + sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467032 + epatch "${FILESDIR}"/${P}-libiconv.patch + eautoreconf # for the above patch +} |