summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2011-10-20 22:11:55 -0400
committerAlexandre Rostovtsev <tetromino@gentoo.org>2011-10-20 22:11:55 -0400
commit282e3048e98d3f07c3636ece8ba5365b2caa67cf (patch)
tree759115de9edc0078d926b4c8f3853b07d5895884 /gnome-base/gnome-shell
parentmedia-libs/grilo, media-plugins/grilo-plugins: in gx86 (diff)
downloadgnome-282e3048e98d3f07c3636ece8ba5365b2caa67cf.tar.gz
gnome-282e3048e98d3f07c3636ece8ba5365b2caa67cf.tar.bz2
gnome-282e3048e98d3f07c3636ece8ba5365b2caa67cf.zip
gnome-base/gnome-shell: drop -DG_DISABLE_DEPRECATED flag
Needed for sanity on glib upgrades. Fixes bug #384765, thanks to Oschtan <dawnstyle@gmail.com> for reporting.
Diffstat (limited to 'gnome-base/gnome-shell')
-rw-r--r--gnome-base/gnome-shell/Manifest4
-rw-r--r--gnome-base/gnome-shell/gnome-shell-3.2.1.ebuild8
-rw-r--r--gnome-base/gnome-shell/gnome-shell-9999.ebuild8
3 files changed, 18 insertions, 2 deletions
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 99dfc286..91475e6e 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,3 +1,3 @@
DIST gnome-shell-3.2.1.tar.xz 1115744 RMD160 b56647fe0dc322110872ee8853d9253c7b870500 SHA1 62bcebbd7f274c6808212b85ad56d2edf894ecec SHA256 ac05e3133bd279c84812d8d3d8e362f8b33563cdc3e7a6aefa9c0b1c2aeab0eb
-EBUILD gnome-shell-3.2.1.ebuild 4079 RMD160 fdc843dee23e191ffc480bdf54a763e9ef4dadbe SHA1 786b69ec6db5044831f921144cf6dd249fce3f77 SHA256 59fa943478664684648d09d22ebcd52236f290ec9039287856100213278cd27f
-EBUILD gnome-shell-9999.ebuild 4079 RMD160 fdc843dee23e191ffc480bdf54a763e9ef4dadbe SHA1 786b69ec6db5044831f921144cf6dd249fce3f77 SHA256 59fa943478664684648d09d22ebcd52236f290ec9039287856100213278cd27f
+EBUILD gnome-shell-3.2.1.ebuild 4371 RMD160 b7d17d23c3ae019b54e18b873cbbf0fb29bbd1dd SHA1 7d261b2f94ab66578482334478ba39febbd3f626 SHA256 e29a076729cee30618ca20f98b718f37a9ad303febfed478e1df596d1efab704
+EBUILD gnome-shell-9999.ebuild 4371 RMD160 b7d17d23c3ae019b54e18b873cbbf0fb29bbd1dd SHA1 7d261b2f94ab66578482334478ba39febbd3f626 SHA256 e29a076729cee30618ca20f98b718f37a9ad303febfed478e1df596d1efab704
diff --git a/gnome-base/gnome-shell/gnome-shell-3.2.1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.2.1.ebuild
index 1fe076b8..d2640348 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.2.1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.2.1.ebuild
@@ -113,6 +113,14 @@ pkg_setup() {
BROWSER_PLUGIN_DIR=${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
}
+src_prepare() {
+ 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 browser-plugin/Makefile.in || die "sed failed"
+}
+
src_install() {
gnome2_src_install
python_convert_shebangs 2 "${D}"/usr/bin/gnome-shell-extension-tool
diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
index 1fe076b8..d2640348 100644
--- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
@@ -113,6 +113,14 @@ pkg_setup() {
BROWSER_PLUGIN_DIR=${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
}
+src_prepare() {
+ 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 browser-plugin/Makefile.in || die "sed failed"
+}
+
src_install() {
gnome2_src_install
python_convert_shebangs 2 "${D}"/usr/bin/gnome-shell-extension-tool