summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-10-01 21:10:09 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-10-01 21:10:09 +0000
commit03361da229f20e7b0f6dc6aa4e190ddd708735aa (patch)
treeafb322d447fbbbc527f72bede3da4be40a29237f
parentClean libgnome-keyring, rarian and udisks dependencies. (diff)
downloadgentoo-2-03361da229f20e7b0f6dc6aa4e190ddd708735aa.tar.gz
gentoo-2-03361da229f20e7b0f6dc6aa4e190ddd708735aa.tar.bz2
gentoo-2-03361da229f20e7b0f6dc6aa4e190ddd708735aa.zip
Remove -DG_DISABLE_DEPRECATED and -DGDK_PIXBUF_DISABLE_DEPRECATED also from Makefile in eel/ to allow building against glib-2.30 and pango-1.28.
(Portage version: 2.2.0_alpha59/cvs/Linux x86_64)
-rw-r--r--gnome-base/nautilus/ChangeLog7
-rw-r--r--gnome-base/nautilus/nautilus-2.32.2.1-r1.ebuild7
2 files changed, 10 insertions, 4 deletions
diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index e0ebb1a38766..05037f40e0f0 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for gnome-base/nautilus
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.382 2011/09/22 15:43:04 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.383 2011/10/01 21:10:09 ssuominen Exp $
+
+ 01 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
+ nautilus-2.32.2.1-r1.ebuild:
+ Remove -DG_DISABLE_DEPRECATED and -DGDK_PIXBUF_DISABLE_DEPRECATED also from
+ Makefile in eel/ to allow building against glib-2.30 and pango-1.28.
22 Sep 2011; Pacho Ramos <pacho@gentoo.org> nautilus-2.32.2.1-r1.ebuild,
nautilus-3.0.2.ebuild:
diff --git a/gnome-base/nautilus/nautilus-2.32.2.1-r1.ebuild b/gnome-base/nautilus/nautilus-2.32.2.1-r1.ebuild
index ddb45025abcd..49f20424ea50 100644
--- a/gnome-base/nautilus/nautilus-2.32.2.1-r1.ebuild
+++ b/gnome-base/nautilus/nautilus-2.32.2.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.32.2.1-r1.ebuild,v 1.7 2011/09/22 15:43:04 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.32.2.1-r1.ebuild,v 1.8 2011/10/01 21:10:09 ssuominen Exp $
EAPI="3"
GCONF_DEBUG="no"
@@ -60,8 +60,9 @@ src_prepare() {
epatch "${WORKDIR}/${P}-patches"/*.patch
# Remove crazy CFLAGS
- sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.in configure \
- || die "sed 1 failed"
+ sed -i \
+ -e 's:-DG.*DISABLE_DEPRECATED::g' \
+ configure{,.in} eel/Makefile.{am,in} || die
}
src_test() {