diff options
author | Gilles Dartiguelongue <eva@gentoo.org> | 2009-07-12 21:08:12 +0000 |
---|---|---|
committer | Gilles Dartiguelongue <eva@gentoo.org> | 2009-07-12 21:08:12 +0000 |
commit | 89904e0caf1800afd6cc84d5bc7b7e614b5eb6c2 (patch) | |
tree | 1ee1a5e2f9db24c971781e5f5ee04d6e8af23984 /gnome-base | |
parent | Removal of ext4 redundant patches. Bluetooth fix to avoid a hardlock. i915 fi... (diff) | |
download | gentoo-2-89904e0caf1800afd6cc84d5bc7b7e614b5eb6c2.tar.gz gentoo-2-89904e0caf1800afd6cc84d5bc7b7e614b5eb6c2.tar.bz2 gentoo-2-89904e0caf1800afd6cc84d5bc7b7e614b5eb6c2.zip |
Fix crazy -Werror, bug #277291.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'gnome-base')
-rw-r--r-- | gnome-base/libgnomekbd/ChangeLog | 6 | ||||
-rw-r--r-- | gnome-base/libgnomekbd/libgnomekbd-2.24.0.ebuild | 7 | ||||
-rw-r--r-- | gnome-base/libgnomekbd/libgnomekbd-2.26.0.ebuild | 8 |
3 files changed, 18 insertions, 3 deletions
diff --git a/gnome-base/libgnomekbd/ChangeLog b/gnome-base/libgnomekbd/ChangeLog index d963240ae3e8..ac1938cd5396 100644 --- a/gnome-base/libgnomekbd/ChangeLog +++ b/gnome-base/libgnomekbd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnome-base/libgnomekbd # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/ChangeLog,v 1.54 2009/05/10 19:24:32 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/ChangeLog,v 1.55 2009/07/12 21:08:12 eva Exp $ + + 12 Jul 2009; Gilles Dartiguelongue <eva@gentoo.org> + libgnomekbd-2.24.0.ebuild, libgnomekbd-2.26.0.ebuild: + Fix crazy -Werror, bug #277291. *libgnomekbd-2.26.0 (10 May 2009) diff --git a/gnome-base/libgnomekbd/libgnomekbd-2.24.0.ebuild b/gnome-base/libgnomekbd/libgnomekbd-2.24.0.ebuild index 85e1d214661c..71ef75b9da73 100644 --- a/gnome-base/libgnomekbd/libgnomekbd-2.24.0.ebuild +++ b/gnome-base/libgnomekbd/libgnomekbd-2.24.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.24.0.ebuild,v 1.12 2009/04/28 11:23:27 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.24.0.ebuild,v 1.13 2009/07/12 21:08:12 eva Exp $ EAPI="2" @@ -40,6 +40,11 @@ src_prepare() { # Fix linking to system's library, bug #265428 epatch "${FILESDIR}/${PN}-2.22.0-system-relink.patch" + # Fix silly upstream CFLAGS, bug #277291 + sed "s/-Werror//g" -i capplet/Makefile.am capplet/Makefile.in \ + test/Makefile.am test/Makefile.in \ + configure.in configure || die "removing -Werror failed" + # Make it libtool-1 compatible rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed" diff --git a/gnome-base/libgnomekbd/libgnomekbd-2.26.0.ebuild b/gnome-base/libgnomekbd/libgnomekbd-2.26.0.ebuild index 890a990e721e..b1ec9bbfd264 100644 --- a/gnome-base/libgnomekbd/libgnomekbd-2.26.0.ebuild +++ b/gnome-base/libgnomekbd/libgnomekbd-2.26.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.26.0.ebuild,v 1.1 2009/05/10 19:24:32 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.26.0.ebuild,v 1.2 2009/07/12 21:08:12 eva Exp $ EAPI="2" GCONF_DEBUG="no" @@ -37,6 +37,12 @@ src_prepare() { # Fix linking to system's library, bug #265428 epatch "${FILESDIR}/${PN}-2.22.0-system-relink.patch" + # Fix silly upstream CFLAGS, bug #277291 + sed "s/-Werror//g" -i capplet/Makefile.am capplet/Makefile.in \ + libgnomekbd/Makefile.am libgnomekbd/Makefile.in \ + test/Makefile.am test/Makefile.in \ + configure.in configure || die "removing -Werror failed" + # Make it libtool-1 compatible rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed" |