From: Aron Griffis Date: Thu, 21 Oct 2004 16:19:50 +0000 (+0000) Subject: add va_list patch for compilation on architectures where va_list isn't implemented... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=47e152a03d68deeb7b10d58c5f4f6d07e9da9c28;p=gentoo.git add va_list patch for compilation on architectures where va_list isn't implemented as a pointer. Thanks to Andrej Filipcic for the patch #67345 --- diff --git a/gnome-base/libgnome/ChangeLog b/gnome-base/libgnome/ChangeLog index 2e9f2600aae6..ac11843ec2b2 100644 --- a/gnome-base/libgnome/ChangeLog +++ b/gnome-base/libgnome/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-base/libgnome # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/ChangeLog,v 1.63 2004/10/01 07:04:23 geoman Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/ChangeLog,v 1.64 2004/10/21 16:19:50 agriffis Exp $ + + 21 Oct 2004; Aron Griffis + +files/libgnome-2.8.0-va_list.patch, libgnome-2.8.0.ebuild: + add va_list patch for compilation on architectures where va_list isn't + implemented as a pointer. Thanks to Andrej Filipcic for the patch #67345 01 Oct 2004; Stephen P. Becker libgnome-2.6.1.1-r1.ebuild: diff --git a/gnome-base/libgnome/Manifest b/gnome-base/libgnome/Manifest index fecb249f40d4..edf9251d6b64 100644 --- a/gnome-base/libgnome/Manifest +++ b/gnome-base/libgnome/Manifest @@ -1,13 +1,14 @@ -MD5 5fa17295f1a571d2402d0f77dc8a02fe libgnome-2.8.0.ebuild 832 +MD5 cf32e9d1f11966c79c2976fb2769e89a ChangeLog 7309 MD5 c26518aaf4f641f5fb201e6f5740a36a libgnome-2.4.0.ebuild 812 MD5 06e14e15235f634153d1d11cd9e4e3b6 libgnome-2.6.0.ebuild 813 -MD5 8db7f10575ceefe56b1677b8f02af333 libgnome-2.6.1.1-r1.ebuild 915 -MD5 391f3ca317af2cb66361c63c56fd3460 ChangeLog 7046 +MD5 c9805f039ff59d49e0e7627282cbf717 libgnome-2.8.0.ebuild 914 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 +MD5 8db7f10575ceefe56b1677b8f02af333 libgnome-2.6.1.1-r1.ebuild 915 MD5 2b0de98dc555c8799312fd2df376ef37 libgnome-2.6.1.2.ebuild 825 MD5 855dcd3c74ed050bee4e7f8d50a3b870 files/digest-libgnome-2.4.0 67 MD5 db85dc1051fbaabe3ef0b73fa8c6f13c files/digest-libgnome-2.6.0 68 -MD5 c2e07e8bdba217ff85b031c801efc0d2 files/digest-libgnome-2.8.0 68 -MD5 971c1f5de6aa1275e6e49d2026058beb files/digest-libgnome-2.6.1.1-r1 70 MD5 145e53730390dfc40b6d0f90d57c5fa6 files/digest-libgnome-2.6.1.2 70 +MD5 971c1f5de6aa1275e6e49d2026058beb files/digest-libgnome-2.6.1.1-r1 70 MD5 5c0b401f19aeb078f2fb6d04bbb545c0 files/libgnome-2.6.1.1-fix_sound.patch 515 +MD5 c2e07e8bdba217ff85b031c801efc0d2 files/digest-libgnome-2.8.0 68 +MD5 64f8702ea154f3889f0640ef41e701bf files/libgnome-2.8.0-va_list.patch 772 diff --git a/gnome-base/libgnome/files/libgnome-2.8.0-va_list.patch b/gnome-base/libgnome/files/libgnome-2.8.0-va_list.patch new file mode 100644 index 000000000000..dc461c7b1d04 --- /dev/null +++ b/gnome-base/libgnome/files/libgnome-2.8.0-va_list.patch @@ -0,0 +1,18 @@ +This patch fixes bug 67345. The problem is that va_list is not always +implemented as a pointer on architectures other than x86. Using an +uninitialized va_list is as safe as using 0 because nparams is checked +in gnome_program_init_common. + +(21 Oct 2004 agriffis) + +--- libgnome-2.8.0/libgnome/gnome-program.c.va_list 2004-10-21 11:59:15.000000000 -0400 ++++ libgnome-2.8.0/libgnome/gnome-program.c 2004-10-21 11:59:25.000000000 -0400 +@@ -1928,6 +1928,7 @@ + int argc, char **argv, + guint nparams, GParameter *params) + { ++ va_list va; + return gnome_program_init_common (type, app_id, app_version, module_info, +- argc, argv, NULL, 0, nparams, params); ++ argc, argv, NULL, va, nparams, params); + } diff --git a/gnome-base/libgnome/libgnome-2.8.0.ebuild b/gnome-base/libgnome/libgnome-2.8.0.ebuild index 602a5f2ed540..510f27326341 100644 --- a/gnome-base/libgnome/libgnome-2.8.0.ebuild +++ b/gnome-base/libgnome/libgnome-2.8.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/libgnome-2.8.0.ebuild,v 1.1 2004/09/15 14:39:15 foser Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/libgnome-2.8.0.ebuild,v 1.2 2004/10/21 16:19:50 agriffis Exp $ inherit gnome2 eutils @@ -28,3 +28,9 @@ DEPEND="${RDEPEND} G2CONF="${G2CONF} --disable-schemas-install " DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS README" + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${P}-va_list.patch +}