summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Cardona <remi@gentoo.org>2008-04-10 10:27:38 +0000
committerRémi Cardona <remi@gentoo.org>2008-04-10 10:27:38 +0000
commit189d95c1e2afc9b38b6789fc82f3661ee35b9ff2 (patch)
treea12912aa47073ebb525f9ecaf99e815338c1d1b2
parentMissing pkgconfig wrt #216933 (diff)
downloadgentoo-2-189d95c1e2afc9b38b6789fc82f3661ee35b9ff2.tar.gz
gentoo-2-189d95c1e2afc9b38b6789fc82f3661ee35b9ff2.tar.bz2
gentoo-2-189d95c1e2afc9b38b6789fc82f3661ee35b9ff2.zip
gnome-base/nautilus: Fix for autoconf 2.62, see Gnome Bug #527315
(Portage version: 2.1.5_rc2)
-rw-r--r--gnome-base/nautilus/ChangeLog6
-rw-r--r--gnome-base/nautilus/files/nautilus-2.22.2-fix_broken_configure.patch13
-rw-r--r--gnome-base/nautilus/nautilus-2.22.2.ebuild5
3 files changed, 22 insertions, 2 deletions
diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index 032465b93ccb..158fbb0ae0e7 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for gnome-base/nautilus
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.261 2008/04/09 23:32:03 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.262 2008/04/10 10:27:38 remi Exp $
+
+ 10 Apr 2008; Rémi Cardona <remi@gentoo.org>
+ +files/nautilus-2.22.2-fix_broken_configure.patch, nautilus-2.22.2.ebuild:
+ Fix for autoconf 2.62, see Gnome Bug #527315
*nautilus-2.22.2 (10 Apr 2008)
diff --git a/gnome-base/nautilus/files/nautilus-2.22.2-fix_broken_configure.patch b/gnome-base/nautilus/files/nautilus-2.22.2-fix_broken_configure.patch
new file mode 100644
index 000000000000..68c75cc74d7f
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-2.22.2-fix_broken_configure.patch
@@ -0,0 +1,13 @@
+Index: nautilus-2.22.2/configure.in
+===================================================================
+--- nautilus-2.22.2.orig/configure.in
++++ nautilus-2.22.2/configure.in
+@@ -42,7 +42,7 @@ AC_SUBST([ACLOCAL_AMFLAGS], ["\${ACLOCAL
+ AC_SUBST(BONOBO_ACTIVATION_REQUIRED, [bonobo_activation_minver])
+ AC_SUBST(BONOBO_REQUIRED, [bonobo_minver])
+ AC_SUBST(EEL_REQUIRED, [eel_minver])
+-AC_SUBST(GLIB_REQUIRED [glib_minver])
++AC_SUBST(GLIB_REQUIRED, [glib_minver])
+ AC_SUBST(GNOME_DESKTOP_REQUIRED, [gnome_desktop_minver])
+ AC_SUBST(GNOME_REQUIRED, [gnome_minver])
+ AC_SUBST(GNOME_UI_REQUIRED, [gnome_ui_minver])
diff --git a/gnome-base/nautilus/nautilus-2.22.2.ebuild b/gnome-base/nautilus/nautilus-2.22.2.ebuild
index ef7d1d48cfc7..143fa9e46e42 100644
--- a/gnome-base/nautilus/nautilus-2.22.2.ebuild
+++ b/gnome-base/nautilus/nautilus-2.22.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.22.2.ebuild,v 1.1 2008/04/09 23:32:03 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.22.2.ebuild,v 1.2 2008/04/10 10:27:38 remi Exp $
inherit virtualx eutils gnome2 autotools
@@ -50,6 +50,9 @@ src_unpack() {
# Disable compilation with esound
epatch "${FILESDIR}/${P}-no-esound.patch"
+ # Fix for autoconf 2.62, see Gnome Bug #527315
+ epatch "${FILESDIR}/${PN}-2.22.2-fix_broken_configure.patch"
+
eautoreconf
}