diff options
| author |   Alastair Tse <liquidx@gentoo.org> | 2004-10-17 23:02:19 +0000 |
|---|---|---|
| committer | Alastair Tse <liquidx@gentoo.org> | 2004-10-17 23:02:19 +0000 |
| commit | 855003bbbf3e9762062bfabd7b032d7e2085b2c9 (patch) | |
| tree | 70b43652301df01f87dd1c375e85509d8280fadc /gnome-base | |
| parent | Stable on sparc wrt security bug #58633. (diff) | |
| download | gentoo-2-855003bbbf3e9762062bfabd7b032d7e2085b2c9.tar.gz gentoo-2-855003bbbf3e9762062bfabd7b032d7e2085b2c9.tar.bz2 gentoo-2-855003bbbf3e9762062bfabd7b032d7e2085b2c9.zip | |
fixing problems with CFLAGS appended without space (#62855)
Diffstat (limited to 'gnome-base')
| -rw-r--r-- | gnome-base/control-center/ChangeLog | 7 | ||||
| -rw-r--r-- | gnome-base/control-center/control-center-1.4.0.5-r1.ebuild | 10 | ||||
| -rw-r--r-- | gnome-base/control-center/files/control-center-1.4.0.5-cflags.patch | 22 |
3 files changed, 36 insertions, 3 deletions
diff --git a/gnome-base/control-center/ChangeLog b/gnome-base/control-center/ChangeLog index 05f42de22db9..e72633491883 100644 --- a/gnome-base/control-center/ChangeLog +++ b/gnome-base/control-center/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-base/control-center # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.76 2004/10/01 07:04:22 geoman Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.77 2004/10/17 23:02:19 liquidx Exp $ + + 18 Oct 2004; Alastair Tse <liquidx@gentoo.org> + +files/control-center-1.4.0.5-cflags.patch, + control-center-1.4.0.5-r1.ebuild: + fixing problems with CFLAGS appended without space (#62855) 01 Oct 2004; Stephen P. Becker <geoman@gentoo.org> control-center-2.6.1.ebuild: diff --git a/gnome-base/control-center/control-center-1.4.0.5-r1.ebuild b/gnome-base/control-center/control-center-1.4.0.5-r1.ebuild index b738bb88fc0e..9899b3748a59 100644 --- a/gnome-base/control-center/control-center-1.4.0.5-r1.ebuild +++ b/gnome-base/control-center/control-center-1.4.0.5-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-1.4.0.5-r1.ebuild,v 1.22 2004/07/14 15:03:09 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-1.4.0.5-r1.ebuild,v 1.23 2004/10/17 23:02:19 liquidx Exp $ -inherit gnome.org +inherit gnome.org eutils IUSE="nls" @@ -20,6 +20,12 @@ DEPEND="${RDEPEND} nls? ( sys-devel/gettext ) >=dev-util/intltool-0.11" +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${P}-cflags.patch +} + src_compile() { local myconf diff --git a/gnome-base/control-center/files/control-center-1.4.0.5-cflags.patch b/gnome-base/control-center/files/control-center-1.4.0.5-cflags.patch new file mode 100644 index 000000000000..8d1399f60582 --- /dev/null +++ b/gnome-base/control-center/files/control-center-1.4.0.5-cflags.patch @@ -0,0 +1,22 @@ +--- control-center-1.4.0.5/configure.old 2004-10-17 23:46:58.212734744 +0100 ++++ control-center-1.4.0.5/configure 2004-10-17 23:47:34.358239792 +0100 +@@ -8629,7 +8629,7 @@ + fi + + +-CFLAGS="`gnome-config --cflags gdk_pixbuf`${CFLAGS}" ++CFLAGS="`gnome-config --cflags gdk_pixbuf` ${CFLAGS}" + + have_libesd=no + # Check whether --with-esd-prefix or --without-esd-prefix was given. +--- control-center-1.4.0.5/configure.in~ 2002-04-06 16:33:59.000000000 +0100 ++++ control-center-1.4.0.5/configure.in 2004-10-17 23:46:29.631079816 +0100 +@@ -95,7 +95,7 @@ + fi + AC_SUBST(PIXBUF_CFLAGS) + AC_SUBST(PIXBUF_LIBS) +-CFLAGS="`gnome-config --cflags gdk_pixbuf`${CFLAGS}" ++CFLAGS="`gnome-config --cflags gdk_pixbuf` ${CFLAGS}" + + dnl esd-manager + have_libesd=no |