summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2011-12-12 19:56:13 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2011-12-12 19:56:13 +0000
commitae22b67497d9a1d788ce57edcbdb56cbafc6be65 (patch)
treecb42e33ec61135b785b72c89b91158a7cb4ff59f /gnome-extra/gnome-shell-extensions
parentStable for AMD64, wrt bug #393871 (diff)
downloadgentoo-2-ae22b67497d9a1d788ce57edcbdb56cbafc6be65.tar.gz
gentoo-2-ae22b67497d9a1d788ce57edcbdb56cbafc6be65.tar.bz2
gentoo-2-ae22b67497d9a1d788ce57edcbdb56cbafc6be65.zip
Fix building with <intltool-0.50 (bug #394445, thanks to poncho for reporting).
(Portage version: 2.2.0_alpha80/cvs/Linux x86_64)
Diffstat (limited to 'gnome-extra/gnome-shell-extensions')
-rw-r--r--gnome-extra/gnome-shell-extensions/ChangeLog7
-rw-r--r--gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.2.2.ebuild6
2 files changed, 11 insertions, 2 deletions
diff --git a/gnome-extra/gnome-shell-extensions/ChangeLog b/gnome-extra/gnome-shell-extensions/ChangeLog
index 473043aeeba0..25dbcd8d2028 100644
--- a/gnome-extra/gnome-shell-extensions/ChangeLog
+++ b/gnome-extra/gnome-shell-extensions/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for gnome-extra/gnome-shell-extensions
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-shell-extensions/ChangeLog,v 1.2 2011/12/11 23:47:05 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-shell-extensions/ChangeLog,v 1.3 2011/12/12 19:56:13 tetromino Exp $
+
+ 12 Dec 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+ gnome-shell-extensions-3.2.2.ebuild:
+ Fix building with <intltool-0.50 (bug #394445, thanks to poncho for
+ reporting).
*gnome-shell-extensions-3.2.2 (11 Dec 2011)
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.2.2.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.2.2.ebuild
index e0ad00edc5f3..6241bdf3648b 100644
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.2.2.ebuild
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.2.2.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-extra/gnome-shell-extensions/gnome-shell-extensions-3.2.2.ebuild,v 1.1 2011/12/11 23:47:05 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.2.2.ebuild,v 1.2 2011/12/12 19:56:13 tetromino Exp $
EAPI="4"
GCONF_DEBUG="no"
@@ -50,6 +50,10 @@ src_prepare() {
epatch ../patch/*.patch
gnome2_src_prepare
+
+ # Work around intltool-0.50.0's intltool.m4 backwards incompat; bug #394445
+ sed -e 's:\($(INTLTOOL_MERGE) -x -u \)--no-translations:\1/tmp:' \
+ -i configure || die "sed failed"
}
src_install() {