diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-09-25 17:16:55 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-09-25 17:16:55 +0000 |
| commit | c78f51b0597090a76928e527ea4606c93ac0538e (patch) | |
| tree | 94d94b1903d3f8c9935086e484ece4ea8ed76913 /gnome-extra/at-spi | |
| parent | Fix building with make >= 3.82 wrt #334569 by Diego E. Pettenò. (diff) | |
| download | gentoo-2-c78f51b0597090a76928e527ea4606c93ac0538e.tar.gz gentoo-2-c78f51b0597090a76928e527ea4606c93ac0538e.tar.bz2 gentoo-2-c78f51b0597090a76928e527ea4606c93ac0538e.zip | |
Fix building with make >= 3.82 wrt #333645 by Jory A. Pratt and Diego E. Pettenò.
(Portage version: 2.2_rc86/cvs/Linux x86_64)
Diffstat (limited to 'gnome-extra/at-spi')
| -rw-r--r-- | gnome-extra/at-spi/ChangeLog | 7 | ||||
| -rw-r--r-- | gnome-extra/at-spi/at-spi-1.30.1.ebuild | 4 | ||||
| -rw-r--r-- | gnome-extra/at-spi/files/at-spi-1.30.1-make-382.patch | 21 |
3 files changed, 30 insertions, 2 deletions
diff --git a/gnome-extra/at-spi/ChangeLog b/gnome-extra/at-spi/ChangeLog index a20e1c0a3f36..62def510a9e4 100644 --- a/gnome-extra/at-spi/ChangeLog +++ b/gnome-extra/at-spi/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-extra/at-spi # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/ChangeLog,v 1.208 2010/09/11 18:37:38 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/ChangeLog,v 1.209 2010/09/25 17:16:55 ssuominen Exp $ + + 25 Sep 2010; Samuli Suominen <ssuominen@gentoo.org> at-spi-1.30.1.ebuild, + +files/at-spi-1.30.1-make-382.patch: + Fix building with make >= 3.82 wrt #333645 by Jory A. Pratt and Diego E. + Pettenò. 11 Sep 2010; Joseph Jezak <josejx@gentoo.org> at-spi-1.30.1.ebuild: Marked ppc for bug #324077. diff --git a/gnome-extra/at-spi/at-spi-1.30.1.ebuild b/gnome-extra/at-spi/at-spi-1.30.1.ebuild index 486dc816b7c8..ce9704cc1c91 100644 --- a/gnome-extra/at-spi/at-spi-1.30.1.ebuild +++ b/gnome-extra/at-spi/at-spi-1.30.1.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/gnome-extra/at-spi/at-spi-1.30.1.ebuild,v 1.5 2010/09/11 18:37:38 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/at-spi-1.30.1.ebuild,v 1.6 2010/09/25 17:16:55 ssuominen Exp $ inherit autotools eutils gnome2 python virtualx @@ -60,6 +60,8 @@ src_unpack() { # should fix tests epatch "${FILESDIR}"/${PN}-1.22.0-tests.patch + epatch "${FILESDIR}"/${PN}-1.30.1-make-382.patch + intltoolize --force --copy --automake || die "intltoolize failed" eautoreconf } diff --git a/gnome-extra/at-spi/files/at-spi-1.30.1-make-382.patch b/gnome-extra/at-spi/files/at-spi-1.30.1-make-382.patch new file mode 100644 index 000000000000..c80aa5874e2d --- /dev/null +++ b/gnome-extra/at-spi/files/at-spi-1.30.1-make-382.patch @@ -0,0 +1,21 @@ +http://bugs.gentoo.org/333645 + +--- Makefile.am ++++ Makefile.am +@@ -12,11 +12,11 @@ + + if GCONF_SCHEMAS_INSTALL + install-data-local: +- if test -z "$(DESTDIR)" ; then \ +- for p in $(schemas_DATA) ; do \ +- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/data/$$p ; \ +- done \ +- fi ++ if test -z "$(DESTDIR)" ; then \ ++ for p in $(schemas_DATA) ; do \ ++ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/data/$$p ; \ ++ done \ ++ fi + else + install-data-local: + endif |