diff options
| author |   Mike Gardiner <obz@gentoo.org> | 2005-02-24 10:14:42 +0000 |
|---|---|---|
| committer | Mike Gardiner <obz@gentoo.org> | 2005-02-24 10:14:42 +0000 |
| commit | e0298c43403af1dc814f11a97307f20f6b2316b1 (patch) | |
| tree | 833742e6007ea05dc53f2c4176ea49458278d6b5 /gnome-base/libgnome | |
| parent | Fix digest. (diff) | |
| download | historical-e0298c43403af1dc814f11a97307f20f6b2316b1.tar.gz historical-e0298c43403af1dc814f11a97307f20f6b2316b1.tar.bz2 historical-e0298c43403af1dc814f11a97307f20f6b2316b1.zip | |
Applied patch to revert va_list initialisation as in Aron's previous patch
Diffstat (limited to 'gnome-base/libgnome')
| -rw-r--r-- | gnome-base/libgnome/ChangeLog | 6 | ||||
| -rw-r--r-- | gnome-base/libgnome/Manifest | 5 | ||||
| -rw-r--r-- | gnome-base/libgnome/files/libgnome-2.8.1-va_list.patch | 12 | ||||
| -rw-r--r-- | gnome-base/libgnome/libgnome-2.8.1.ebuild | 13 |
4 files changed, 32 insertions, 4 deletions
diff --git a/gnome-base/libgnome/ChangeLog b/gnome-base/libgnome/ChangeLog index 5dfa7e4680c5..f81824385fa8 100644 --- a/gnome-base/libgnome/ChangeLog +++ b/gnome-base/libgnome/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnome-base/libgnome # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/ChangeLog,v 1.71 2005/02/24 06:24:12 obz Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/ChangeLog,v 1.72 2005/02/24 10:14:42 obz Exp $ + + 24 Feb 2005; Mike Gardiner <obz@gentoo.org> + +files/libgnome-2.8.1-va_list.patch, libgnome-2.8.1.ebuild: + Applied patch to revert va_list initialisation as in Aron's previous patch *libgnome-2.8.1 (24 Feb 2005) diff --git a/gnome-base/libgnome/Manifest b/gnome-base/libgnome/Manifest index 3f8479eefbe3..d6e40f2e7665 100644 --- a/gnome-base/libgnome/Manifest +++ b/gnome-base/libgnome/Manifest @@ -2,8 +2,8 @@ MD5 553003cbde7bf940e388313910a087cc libgnome-2.8.0.ebuild 901 MD5 1f94f66ef5731fb3e03af5532d6f0298 libgnome-2.4.0.ebuild 819 MD5 b33cbf990d672a2e5f5cacfff3a2b443 libgnome-2.6.0.ebuild 817 MD5 4b8b571d26fd9256174f17cb0e8c9b3d libgnome-2.6.1.1-r1.ebuild 919 -MD5 b9d4e27e8bac56d72ae9d06c1f568122 libgnome-2.8.1.ebuild 825 -MD5 631e7c85d32dffcbe54c3e920d5a6c36 ChangeLog 7975 +MD5 9b24edbc498b374795ace8e7301dcd18 libgnome-2.8.1.ebuild 1098 +MD5 aea802b2636d5914ff2c96a58174ca69 ChangeLog 8161 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 MD5 94680178f319589976646a080856ef12 libgnome-2.6.1.2.ebuild 833 MD5 855dcd3c74ed050bee4e7f8d50a3b870 files/digest-libgnome-2.4.0 67 @@ -12,5 +12,6 @@ MD5 c2e07e8bdba217ff85b031c801efc0d2 files/digest-libgnome-2.8.0 68 MD5 7bbc55d295e56f0371ea0d254dfaf4dc files/digest-libgnome-2.8.1 68 MD5 971c1f5de6aa1275e6e49d2026058beb files/digest-libgnome-2.6.1.1-r1 70 MD5 64f8702ea154f3889f0640ef41e701bf files/libgnome-2.8.0-va_list.patch 772 +MD5 0eeecb52a849c65dbb5101f2ed3305dd files/libgnome-2.8.1-va_list.patch 580 MD5 145e53730390dfc40b6d0f90d57c5fa6 files/digest-libgnome-2.6.1.2 70 MD5 5c0b401f19aeb078f2fb6d04bbb545c0 files/libgnome-2.6.1.1-fix_sound.patch 515 diff --git a/gnome-base/libgnome/files/libgnome-2.8.1-va_list.patch b/gnome-base/libgnome/files/libgnome-2.8.1-va_list.patch new file mode 100644 index 000000000000..b4c2e5bcc038 --- /dev/null +++ b/gnome-base/libgnome/files/libgnome-2.8.1-va_list.patch @@ -0,0 +1,12 @@ +diff -ur libgnome-2.8.1/libgnome/gnome-program.c libgnome-2.8.1-patched/libgnome/gnome-program.c +--- libgnome-2.8.1/libgnome/gnome-program.c 2005-02-21 20:39:01.000000000 +0800 ++++ libgnome-2.8.1-patched/libgnome/gnome-program.c 2005-02-24 18:06:35.184985488 +0800 +@@ -1928,7 +1928,7 @@ + int argc, char **argv, + guint nparams, GParameter *params) + { +- va_list args = 0; ++ va_list args; + + return gnome_program_init_common (type, app_id, app_version, module_info, + argc, argv, NULL, args, nparams, params); diff --git a/gnome-base/libgnome/libgnome-2.8.1.ebuild b/gnome-base/libgnome/libgnome-2.8.1.ebuild index b4c148681bec..c652bb8c8621 100644 --- a/gnome-base/libgnome/libgnome-2.8.1.ebuild +++ b/gnome-base/libgnome/libgnome-2.8.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/libgnome-2.8.1.ebuild,v 1.1 2005/02/24 06:24:12 obz Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/libgnome-2.8.1.ebuild,v 1.2 2005/02/24 10:14:42 obz Exp $ inherit gnome2 eutils @@ -29,3 +29,14 @@ G2CONF="${G2CONF} --disable-schemas-install " DOCS="AUTHORS ChangeLog INSTALL NEWS README" +src_unpack() { + + unpack ${A} + # patch to revert the behaviour of va_list, to stay + # inline with agriffis' previous fix, see: + # http://bugs.gentoo.org/show_bug.cgi?id=83153 and + # http://bugzilla.gnome.org/show_bug.cgi?id=168110 + epatch ${FILESDIR}/${P}-va_list.patch + +} + |