diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2012-04-30 15:10:14 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2012-04-30 15:10:14 +0000 |
| commit | 783a1379b8bdac51aad35b18fb8286f68748a68f (patch) | |
| tree | 37fb8a870130d660ebfadb518c97923fbb04e30c /gnome-base/nautilus | |
| parent | Extract the version LLVM refers to internally so we can properly fix install_... (diff) | |
| download | gentoo-2-783a1379b8bdac51aad35b18fb8286f68748a68f.tar.gz gentoo-2-783a1379b8bdac51aad35b18fb8286f68748a68f.tar.bz2 gentoo-2-783a1379b8bdac51aad35b18fb8286f68748a68f.zip | |
Add fix for problems with glib-2.32 and gold linker, #414121
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)
Diffstat (limited to 'gnome-base/nautilus')
| -rw-r--r-- | gnome-base/nautilus/ChangeLog | 6 | ||||
| -rw-r--r-- | gnome-base/nautilus/files/nautilus-3.2.1-gold-glib2.32.patch | 15 | ||||
| -rw-r--r-- | gnome-base/nautilus/nautilus-3.2.1-r1.ebuild | 8 |
3 files changed, 26 insertions, 3 deletions
diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog index c4582a4eff9c..5aac0381eac1 100644 --- a/gnome-base/nautilus/ChangeLog +++ b/gnome-base/nautilus/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnome-base/nautilus # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.393 2012/04/29 15:12:11 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.394 2012/04/30 15:10:14 jlec Exp $ + + 30 Apr 2012; Justin Lecher <jlec@gentoo.org> nautilus-3.2.1-r1.ebuild, + +files/nautilus-3.2.1-gold-glib2.32.patch: + Add fix for problems with glib-2.32 and gold linker, #414121 29 Apr 2012; Markus Meier <maekke@gentoo.org> nautilus-2.32.2.1-r2.ebuild: x86 stable, bug #410611 diff --git a/gnome-base/nautilus/files/nautilus-3.2.1-gold-glib2.32.patch b/gnome-base/nautilus/files/nautilus-3.2.1-gold-glib2.32.patch new file mode 100644 index 000000000000..c185d1a222d9 --- /dev/null +++ b/gnome-base/nautilus/files/nautilus-3.2.1-gold-glib2.32.patch @@ -0,0 +1,15 @@ + configure.in | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/configure.in b/configure.in +index 0a83bc9..2c9ebbc 100644 +--- a/configure.in ++++ b/configure.in +@@ -313,6 +313,7 @@ AC_SUBST(COMMON_LIBS) + dnl additional nautilus libs + PKG_CHECK_MODULES(NAUTILUS, [ + gthread-2.0 >= glib_minver ++ gmodule-no-export-2.0 >= glib_minver + gio-2.0 >= glib_minver + gio-unix-2.0 >= glib_minver + gsettings-desktop-schemas diff --git a/gnome-base/nautilus/nautilus-3.2.1-r1.ebuild b/gnome-base/nautilus/nautilus-3.2.1-r1.ebuild index 7659ab0f492d..377a0418df89 100644 --- a/gnome-base/nautilus/nautilus-3.2.1-r1.ebuild +++ b/gnome-base/nautilus/nautilus-3.2.1-r1.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-3.2.1-r1.ebuild,v 1.2 2012/04/02 05:55:14 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-3.2.1-r1.ebuild,v 1.3 2012/04/30 15:10:14 jlec Exp $ EAPI="4" GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" -inherit eutils gnome2 virtualx +inherit autotools eutils gnome2 virtualx DESCRIPTION="A file manager for the GNOME desktop" HOMEPAGE="http://live.gnome.org/Nautilus" @@ -86,6 +86,10 @@ src_prepare() { # Remove crazy CFLAGS sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.in configure \ || die "sed 1 failed" + + # gold plus glib-2.32 #414121 + epatch "${FILESDIR}/${P}-gold-glib2.32.patch" + AT_NOELIBTOOLIZE=yes eautoreconf } src_test() { |