summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2011-10-21 02:22:11 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2011-10-21 02:22:11 +0000
commita1724033aac8ecc8e0e6d241c56401f892eecaa9 (patch)
tree598ccdef7ab348e3f9aee9e4b0b5aa984fe0b324 /gnome-base
parentVersion bump for beta and dev channel releases. (diff)
downloadgentoo-2-a1724033aac8ecc8e0e6d241c56401f892eecaa9.tar.gz
gentoo-2-a1724033aac8ecc8e0e6d241c56401f892eecaa9.tar.bz2
gentoo-2-a1724033aac8ecc8e0e6d241c56401f892eecaa9.zip
Drop -DG_DISABLE_DEPRECATED flag for sanity on glib upgrades (bug #384765). Thanks to Oschtan <dawnstyle@gmail.com> for reporting.
(Portage version: 2.2.0_alpha69/cvs/Linux x86_64)
Diffstat (limited to 'gnome-base')
-rw-r--r--gnome-base/gnome-shell/ChangeLog7
-rw-r--r--gnome-base/gnome-shell/gnome-shell-3.0.2-r1.ebuild6
2 files changed, 11 insertions, 2 deletions
diff --git a/gnome-base/gnome-shell/ChangeLog b/gnome-base/gnome-shell/ChangeLog
index 9148585fc424..ab360d03498e 100644
--- a/gnome-base/gnome-shell/ChangeLog
+++ b/gnome-base/gnome-shell/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for gnome-base/gnome-shell
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.1 2011/09/30 19:43:33 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.2 2011/10/21 02:22:11 tetromino Exp $
+
+ 21 Oct 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+ gnome-shell-3.0.2-r1.ebuild:
+ Drop -DG_DISABLE_DEPRECATED flag for sanity on glib upgrades (bug #384765).
+ Thanks to Oschtan <dawnstyle@gmail.com> for reporting.
*gnome-shell-3.0.2-r1 (30 Sep 2011)
diff --git a/gnome-base/gnome-shell/gnome-shell-3.0.2-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.0.2-r1.ebuild
index 4442c3e4b002..e2d1c67fdde2 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.0.2-r1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.0.2-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/gnome-shell/gnome-shell-3.0.2-r1.ebuild,v 1.1 2011/09/30 19:43:33 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.0.2-r1.ebuild,v 1.2 2011/10/21 02:22:11 tetromino Exp $
EAPI="3"
GCONF_DEBUG="no"
@@ -106,6 +106,10 @@ src_prepare() {
# Don't clobber extensions' styles
epatch "${FILESDIR}/${PN}-3.0.2-unbreak-extension-css.patch"
gnome2_src_prepare
+
+ # Drop G_DISABLE_DEPRECATED for sanity on glib upgrades; bug #384765
+ # Note: sed Makefile.in because it is generated from several Makefile.ams
+ sed -e 's/-DG_DISABLE_DEPRECATED//g' -i src/Makefile.in || die "sed failed"
}
src_install() {