diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2013-07-24 01:32:05 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2013-07-24 01:32:05 +0000 |
| commit | 0d54a296161fc3a5f810eecf2ee93c65d1f82c5e (patch) | |
| tree | 3912b2e96f65247f5bb94a87a350f10454de305e /app-office | |
| parent | Bump - 477946. (diff) | |
| download | gentoo-2-0d54a296161fc3a5f810eecf2ee93c65d1f82c5e.tar.gz gentoo-2-0d54a296161fc3a5f810eecf2ee93c65d1f82c5e.tar.bz2 gentoo-2-0d54a296161fc3a5f810eecf2ee93c65d1f82c5e.zip | |
Fix building with automake-1.13 by Ed Catmur (bug #467594).
(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/passepartout/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/passepartout/files/passepartout-0.7.0-automake-1.13.patch | 13 | ||||
| -rw-r--r-- | app-office/passepartout/passepartout-0.7.0.ebuild | 5 |
3 files changed, 21 insertions, 3 deletions
diff --git a/app-office/passepartout/ChangeLog b/app-office/passepartout/ChangeLog index 40d29075c6e9..6a692a4a56b2 100644 --- a/app-office/passepartout/ChangeLog +++ b/app-office/passepartout/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/passepartout # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/passepartout/ChangeLog,v 1.20 2013/07/21 09:55:57 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/passepartout/ChangeLog,v 1.21 2013/07/24 01:32:05 jer Exp $ + + 24 Jul 2013; Jeroen Roovers <jer@gentoo.org> + +files/passepartout-0.7.0-automake-1.13.patch, passepartout-0.7.0.ebuild: + Fix building with automake-1.13 by Ed Catmur (bug #467594). 21 Jul 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml: Cleanup due http://gentoo.2317880.n4.nabble.com/sgml-herd-has-no-maintainers- diff --git a/app-office/passepartout/files/passepartout-0.7.0-automake-1.13.patch b/app-office/passepartout/files/passepartout-0.7.0-automake-1.13.patch new file mode 100644 index 000000000000..4c57a85c79cd --- /dev/null +++ b/app-office/passepartout/files/passepartout-0.7.0-automake-1.13.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index e59f631..ca329c1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -6,7 +6,7 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2]) + # For automake < 1.6 you need to use this line instead: + #AM_INIT_AUTOMAKE(Passepartout, 0.7-PRE) + +-AM_CONFIG_HEADER(src/defines.h) ++AC_CONFIG_HEADERS([src/defines.h]) + # AC_CONFIG_HEADER(src/defines.h) + + # We're just a few binaries...not worth doing shared by default? diff --git a/app-office/passepartout/passepartout-0.7.0.ebuild b/app-office/passepartout/passepartout-0.7.0.ebuild index 95cd957b1457..0a4af53f2e39 100644 --- a/app-office/passepartout/passepartout-0.7.0.ebuild +++ b/app-office/passepartout/passepartout-0.7.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/passepartout/passepartout-0.7.0.ebuild,v 1.8 2012/05/03 20:00:38 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/passepartout/passepartout-0.7.0.ebuild,v 1.9 2013/07/24 01:32:05 jer Exp $ EAPI=2 @@ -60,6 +60,7 @@ PATCHES=( "${FILESDIR}/${P}-libtoolization.patch" "${FILESDIR}/${P}-safer.patch" "${FILESDIR}/${P}-libxmlpp-2.6-depend.patch" + "${FILESDIR}/${P}-automake-1.13.patch" ) src_unpack() { |