summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2012-05-14 13:15:30 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2012-05-14 13:15:30 +0000
commit3bdd80f3f14807eddd7ee1a75e1d75878015f487 (patch)
tree9ab1105bec19ceed9c558c2a473d360c7dbaed42 /gnome-base
parentRemoving Qt-4.7.2 (diff)
downloadgentoo-2-3bdd80f3f14807eddd7ee1a75e1d75878015f487.tar.gz
gentoo-2-3bdd80f3f14807eddd7ee1a75e1d75878015f487.tar.bz2
gentoo-2-3bdd80f3f14807eddd7ee1a75e1d75878015f487.zip
Avoid accidentally running gdbus-codegen (bug #415901, thanks to Albert W. Hopkins).
(Portage version: 2.2.0_alpha104/cvs/Linux x86_64)
Diffstat (limited to 'gnome-base')
-rw-r--r--gnome-base/gnome-control-center/ChangeLog7
-rw-r--r--gnome-base/gnome-control-center/gnome-control-center-3.4.1.ebuild8
2 files changed, 13 insertions, 2 deletions
diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog
index a64d9ee6af56..298d978c14b0 100644
--- a/gnome-base/gnome-control-center/ChangeLog
+++ b/gnome-base/gnome-control-center/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for gnome-base/gnome-control-center
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.100 2012/05/13 23:59:00 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.101 2012/05/14 13:15:30 tetromino Exp $
+
+ 14 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+ gnome-control-center-3.4.1.ebuild:
+ Avoid accidentally running gdbus-codegen (bug #415901, thanks to Albert W.
+ Hopkins).
*gnome-control-center-3.4.1 (13 May 2012)
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.4.1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.4.1.ebuild
index cf9305e9277a..24bdd946532a 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.4.1.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.4.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.4.1.ebuild,v 1.1 2012/05/13 23:59:00 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.4.1.ebuild,v 1.2 2012/05/14 13:15:30 tetromino Exp $
EAPI="4"
GCONF_DEBUG="yes"
@@ -117,4 +117,10 @@ src_prepare() {
eautoreconf
gnome2_src_prepare
+
+ # panels/datetime/Makefile.am gets touched as a result of something in our
+ # src_prepare(). We need to touch timedated{c,h} to prevent them from being
+ # regenerated (bug #415901)
+ [[ -f panels/datetime/timedated.h ]] && touch panels/datetime/timedated.h
+ [[ -f panels/datetime/timedated.c ]] && touch panels/datetime/timedated.c
}