diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2012-07-13 08:28:11 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2012-07-13 08:28:11 +0000 |
| commit | a2f552287e0090ccb322b306d8506df7e060a1ef (patch) | |
| tree | 05bd0dc71ad533bbc2d7d853712e02d48fb6fac7 /gnome-extra/gnome-games | |
| parent | old (diff) | |
| download | gentoo-2-a2f552287e0090ccb322b306d8506df7e060a1ef.tar.gz gentoo-2-a2f552287e0090ccb322b306d8506df7e060a1ef.tar.bz2 gentoo-2-a2f552287e0090ccb322b306d8506df7e060a1ef.zip | |
Fix build failure with automake 1.11.2, bug 425208.
(Portage version: 2.1.11.5/cvs/Linux x86_64)
Diffstat (limited to 'gnome-extra/gnome-games')
| -rw-r--r-- | gnome-extra/gnome-games/ChangeLog | 6 | ||||
| -rw-r--r-- | gnome-extra/gnome-games/files/gnome-games-2.28.2-automake.patch | 15 | ||||
| -rw-r--r-- | gnome-extra/gnome-games/gnome-games-2.28.2.ebuild | 5 |
3 files changed, 24 insertions, 2 deletions
diff --git a/gnome-extra/gnome-games/ChangeLog b/gnome-extra/gnome-games/ChangeLog index 30525c88ca24..3ac7052b2edd 100644 --- a/gnome-extra/gnome-games/ChangeLog +++ b/gnome-extra/gnome-games/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnome-extra/gnome-games # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.321 2012/07/07 17:17:15 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.322 2012/07/13 08:28:11 ulm Exp $ + + 13 Jul 2012; Ulrich Müller <ulm@gentoo.org> gnome-games-2.28.2.ebuild, + +files/gnome-games-2.28.2-automake.patch: + Fix build failure with automake 1.11.2, bug 425208. 07 Jul 2012; Julian Ospald <hasufell@gentoo.org> gnome-games-2.28.2.ebuild, gnome-games-3.2.1-r1.ebuild, gnome-games-3.4.2.ebuild: diff --git a/gnome-extra/gnome-games/files/gnome-games-2.28.2-automake.patch b/gnome-extra/gnome-games/files/gnome-games-2.28.2-automake.patch new file mode 100644 index 000000000000..31edd9d2155d --- /dev/null +++ b/gnome-extra/gnome-games/files/gnome-games-2.28.2-automake.patch @@ -0,0 +1,15 @@ +Fix build failure with automake 1.11.2. +https://bugs.gentoo.org/425208 + +--- gnome-games-2.28.2-orig/libgames-support/Makefile.am ++++ gnome-games-2.28.2/libgames-support/Makefile.am +@@ -288,7 +288,8 @@ + if BUILD_LIBGAMESCARDS + if HAVE_RSVG + +-pkglib_PROGRAMS = gnome-games-render-cards ++auxdir = $(pkglibdir) ++aux_PROGRAMS = gnome-games-render-cards + + gnome_games_render_cards_SOURCES = \ + render-cards.c diff --git a/gnome-extra/gnome-games/gnome-games-2.28.2.ebuild b/gnome-extra/gnome-games/gnome-games-2.28.2.ebuild index 91fc32668c6b..9979185cda77 100644 --- a/gnome-extra/gnome-games/gnome-games-2.28.2.ebuild +++ b/gnome-extra/gnome-games/gnome-games-2.28.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.28.2.ebuild,v 1.16 2012/07/07 17:17:15 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.28.2.ebuild,v 1.17 2012/07/13 08:28:11 ulm Exp $ EAPI="4" GCONF_DEBUG="no" @@ -137,6 +137,9 @@ src_prepare() { # fix underlinking epatch "${FILESDIR}"/${P}-underlinking.patch + # Fix build failure with automake 1.11.2. #425208 + epatch "${FILESDIR}"/${P}-automake.patch + # If calling eautoreconf, this ebuild uses libtool-2 eautoreconf |