From: Alastair Tse Date: Sun, 17 Oct 2004 23:02:19 +0000 (+0000) Subject: fixing problems with CFLAGS appended without space (#62855) X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cd359d499bde3e921f29b76ad6a093fc0377ee0f;p=gentoo.git fixing problems with CFLAGS appended without space (#62855) --- 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 + +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 control-center-2.6.1.ebuild: diff --git a/gnome-base/control-center/Manifest b/gnome-base/control-center/Manifest index 64bfc667bcf8..c3f797853666 100644 --- a/gnome-base/control-center/Manifest +++ b/gnome-base/control-center/Manifest @@ -1,17 +1,28 @@ -MD5 b5f1bec2b8a62531690d48b531091caf control-center-2.6.0.3.ebuild 1876 -MD5 32122f4354c3048acf8ba48b227250c7 control-center-2.8.0.ebuild 1841 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 90758fa151a4e338b0d95b58d9126ddb ChangeLog 9959 +MD5 aa1848f27a46e7b356ae72294009f619 control-center-1.4.0.5-r1.ebuild 1260 MD5 4d854e293dfbdf4e7176eee28024eb2b control-center-2.4.0.ebuild 1432 +MD5 b5f1bec2b8a62531690d48b531091caf control-center-2.6.0.3.ebuild 1876 MD5 5887ec4b5793eee006bbe5876d9ff32d control-center-2.6.1.ebuild 1878 -MD5 a4beecd533a0284145d070529b270430 control-center-1.4.0.5-r1.ebuild 1176 -MD5 1c2260593f44d23279c9194a8bb270ca ChangeLog 9764 +MD5 32122f4354c3048acf8ba48b227250c7 control-center-2.8.0.ebuild 1841 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 -MD5 440e2fbb11ac5952e79c4205595d54f3 files/digest-control-center-2.4.0 74 -MD5 3afae17cdd913d2de47ec8017cafe327 files/digest-control-center-2.6.1 74 -MD5 0ac36f350969840cdac6ab03ead02612 files/digest-control-center-2.8.0 74 -MD5 111edb31ce663d8dbe8011f77cf9e913 files/control-center-2.5.4-fix_gst_0.8.patch 443 -MD5 b76eaa4944f6f4be761fc68f0c46c52c files/control-center-2.4.0-64bit-fixes.patch 1663 +MD5 adbe3cf7b6918f7681569128f76a4b71 files/control-center-2.2-icons_install.patch 2943 MD5 fdc3d7feea8b429588a2d193c9547dbf files/control-center-2.2.0.1-alpha_hack.patch 2997 +MD5 b76eaa4944f6f4be761fc68f0c46c52c files/control-center-2.4.0-64bit-fixes.patch 1663 +MD5 111edb31ce663d8dbe8011f77cf9e913 files/control-center-2.5.4-fix_gst_0.8.patch 443 MD5 63670f480e3cafb0d9dc8b3423425071 files/control-center-2.6.0-remove-pmu.patch 1210 -MD5 a9a7aa3c505ea4bfac681c5d87d9d451 files/digest-control-center-2.6.0.3 76 -MD5 adbe3cf7b6918f7681569128f76a4b71 files/control-center-2.2-icons_install.patch 2943 MD5 38949ed5d795344f78a96af44764f896 files/digest-control-center-1.4.0.5-r1 76 +MD5 440e2fbb11ac5952e79c4205595d54f3 files/digest-control-center-2.4.0 74 +MD5 a9a7aa3c505ea4bfac681c5d87d9d451 files/digest-control-center-2.6.0.3 76 +MD5 3afae17cdd913d2de47ec8017cafe327 files/digest-control-center-2.6.1 74 +MD5 0ac36f350969840cdac6ab03ead02612 files/digest-control-center-2.8.0 74 +MD5 dbc915ad73576e8f0ae8a948e52fb621 files/control-center-1.4.0.5-cflags.patch 744 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.2.6 (GNU/Linux) + +iD8DBQFBcvpIRkyva5PS18kRAqlJAJ9iHyyRXxKFlVU50xRi0rKxhTX5/QCfVTpZ +yLc4QtrZhfGk5bheS73TPsM= +=hKG1 +-----END PGP SIGNATURE----- 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