diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-09-10 18:25:46 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-09-10 18:25:46 +0000 |
| commit | 353667a57c38ac2f9f0529a1cdc7eae7f665836d (patch) | |
| tree | af7bea2e8e44ce650dfb5e15b966fdaa4b1cb4de /media-libs | |
| parent | rm (diff) | |
| download | gentoo-2-353667a57c38ac2f9f0529a1cdc7eae7f665836d.tar.gz gentoo-2-353667a57c38ac2f9f0529a1cdc7eae7f665836d.tar.bz2 gentoo-2-353667a57c38ac2f9f0529a1cdc7eae7f665836d.zip | |
Fix building with Autoconf >= 2.66 wrt #336598 by S. Holzbach.
(Portage version: 2.2_rc78/cvs/Linux x86_64)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/libgphoto2/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/libgphoto2/files/libgphoto2-2.4.9-dnl.patch | 24 | ||||
| -rw-r--r-- | media-libs/libgphoto2/libgphoto2-2.4.9.ebuild | 4 |
3 files changed, 32 insertions, 2 deletions
diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog index 497fde3157ed..944033482294 100644 --- a/media-libs/libgphoto2/ChangeLog +++ b/media-libs/libgphoto2/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libgphoto2 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.171 2010/08/30 20:06:47 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.172 2010/09/10 18:25:46 ssuominen Exp $ + + 10 Sep 2010; Samuli Suominen <ssuominen@gentoo.org> + libgphoto2-2.4.9.ebuild, +files/libgphoto2-2.4.9-dnl.patch: + Fix building with Autoconf >= 2.66 wrt #336598 by S. Holzbach. 30 Aug 2010; Gilles Dartiguelongue <eva@gentoo.org> libgphoto2-2.4.9.ebuild: diff --git a/media-libs/libgphoto2/files/libgphoto2-2.4.9-dnl.patch b/media-libs/libgphoto2/files/libgphoto2-2.4.9-dnl.patch new file mode 100644 index 000000000000..8ee30baf8f74 --- /dev/null +++ b/media-libs/libgphoto2/files/libgphoto2-2.4.9-dnl.patch @@ -0,0 +1,24 @@ +http://bugs.gentoo.org/336598 + +--- libgphoto2_port/m4/gp-libltdl.m4 ++++ libgphoto2_port/m4/gp-libltdl.m4 +@@ -23,7 +23,7 @@ + + Please make sure that the proper development package is installed + (libltdl-dev, libtool-ltdl-devel, etc.) +-])dnl ++])[]dnl + ])dnl + ]) + else +--- m4m/gp-libltdl.m4 ++++ m4m/gp-libltdl.m4 +@@ -23,7 +23,7 @@ + + Please make sure that the proper development package is installed + (libltdl-dev, libtool-ltdl-devel, etc.) +-])dnl ++])[]dnl + ])dnl + ]) + else diff --git a/media-libs/libgphoto2/libgphoto2-2.4.9.ebuild b/media-libs/libgphoto2/libgphoto2-2.4.9.ebuild index c3c578c9e22d..8aaf28ea29c6 100644 --- a/media-libs/libgphoto2/libgphoto2-2.4.9.ebuild +++ b/media-libs/libgphoto2/libgphoto2-2.4.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.9.ebuild,v 1.2 2010/08/30 20:06:47 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.9.ebuild,v 1.3 2010/09/10 18:25:46 ssuominen Exp $ # TODO # 1. Track upstream bug --disable-docs does not work. @@ -96,6 +96,8 @@ src_prepare() { # Increase max entries from 1024 to 8192 to fix bug #291049 epatch "${FILESDIR}/${PN}-2.4.8-increase_max_entries.patch" + epatch "${FILESDIR}"/${P}-dnl.patch #336598 + eautoreconf # Fix bug #216206, libusb detection |