summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2011-02-25 22:02:49 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2011-02-25 22:02:49 +0000
commit33d816a596687c3b7ee6b87bc55f8a9ff41f3ee6 (patch)
tree54cb5a434dffc001d6483ad9f8313017bf12673c /gnome-base
parentdepend virtual/jpeg (diff)
downloadgentoo-2-33d816a596687c3b7ee6b87bc55f8a9ff41f3ee6.tar.gz
gentoo-2-33d816a596687c3b7ee6b87bc55f8a9ff41f3ee6.tar.bz2
gentoo-2-33d816a596687c3b7ee6b87bc55f8a9ff41f3ee6.zip
Fix build with >=glib-2.27, bug #346055.
(Portage version: 2.2.0_alpha24/cvs/Linux x86_64, RepoMan options: --force)
Diffstat (limited to 'gnome-base')
-rw-r--r--gnome-base/gvfs/ChangeLog5
-rw-r--r--gnome-base/gvfs/gvfs-1.6.6-r1.ebuild7
2 files changed, 10 insertions, 2 deletions
diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index 682876b57fee..8774c0ad6525 100644
--- a/gnome-base/gvfs/ChangeLog
+++ b/gnome-base/gvfs/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for gnome-base/gvfs
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.130 2011/01/30 18:45:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.131 2011/02/25 22:02:49 eva Exp $
+
+ 25 Feb 2011; Gilles Dartiguelongue <eva@gentoo.org> gvfs-1.6.6-r1.ebuild:
+ Fix build with >=glib-2.27, bug #346055.
30 Jan 2011; Raúl Porcel <armin76@gentoo.org> gvfs-1.6.6-r1.ebuild:
alpha/arm/ia64/sh/sparc stable wrt #348987
diff --git a/gnome-base/gvfs/gvfs-1.6.6-r1.ebuild b/gnome-base/gvfs/gvfs-1.6.6-r1.ebuild
index d929b7dffefb..8143372e6733 100644
--- a/gnome-base/gvfs/gvfs-1.6.6-r1.ebuild
+++ b/gnome-base/gvfs/gvfs-1.6.6-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/gvfs/gvfs-1.6.6-r1.ebuild,v 1.5 2011/01/30 18:45:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.6.6-r1.ebuild,v 1.6 2011/02/25 22:02:49 eva Exp $
EAPI="3"
GCONF_DEBUG="no"
@@ -95,6 +95,11 @@ src_prepare() {
fi
use gphoto2 || use archive && eautoreconf
+
+ # Disable API deprecation
+ sed 's/-DG_DISABLE_DEPRECATED//' \
+ -i */*/Makefile.am */*/Makefile.in */Makefile.am */Makefile.in \
+ || die "sed failed"
}
src_install() {