summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarinus Schraal <foser@gentoo.org>2004-08-24 13:22:54 +0000
committerMarinus Schraal <foser@gentoo.org>2004-08-24 13:22:54 +0000
commita7f265ff8b3bed283c7723fec5a37bf2edd0707e (patch)
tree33e513e6a8764e68fa41631214796c4411cce2bf /gnome-base/orbit
parentduh remove (diff)
downloadgentoo-2-a7f265ff8b3bed283c7723fec5a37bf2edd0707e.tar.gz
gentoo-2-a7f265ff8b3bed283c7723fec5a37bf2edd0707e.tar.bz2
gentoo-2-a7f265ff8b3bed283c7723fec5a37bf2edd0707e.zip
one more patch
Diffstat (limited to 'gnome-base/orbit')
-rw-r--r--gnome-base/orbit/ChangeLog6
-rw-r--r--gnome-base/orbit/files/orbit2-alignment-fix.patch11
2 files changed, 14 insertions, 3 deletions
diff --git a/gnome-base/orbit/ChangeLog b/gnome-base/orbit/ChangeLog
index 70c5815ff069..d56f4c8a1a50 100644
--- a/gnome-base/orbit/ChangeLog
+++ b/gnome-base/orbit/ChangeLog
@@ -1,9 +1,9 @@
# ChangeLog for gnome-base/orbit
# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/ChangeLog,v 1.2 2004/08/24 13:16:28 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/ChangeLog,v 1.3 2004/08/24 13:22:54 foser Exp $
- 24 Aug 2004; foser <foser@gentoo.org> files/libIDLConf.sh-gentoo.diff :
- Re-add missing orbit-0 patch, remove redundant libc deps
+ 24 Aug 2004; foser <foser@gentoo.org> files/libIDLConf.sh-gentoo.diff files/orbit2-alignment_fix.patch :
+ Re-add missing orbit{1,2} patches, remove redundant libc deps
*orbit-2.10.4 (21 Aug 2004)
diff --git a/gnome-base/orbit/files/orbit2-alignment-fix.patch b/gnome-base/orbit/files/orbit2-alignment-fix.patch
new file mode 100644
index 000000000000..5a62f9fb0ca6
--- /dev/null
+++ b/gnome-base/orbit/files/orbit2-alignment-fix.patch
@@ -0,0 +1,11 @@
+diff -Naur ORBit2-2.10.0/src/orb/orb-core/allocators.c ORBit2-2.10.0.1-cbl/src/orb/orb-core/allocators.c
+--- ORBit2-2.10.0/src/orb/orb-core/allocators.c 2003-07-07 13:11:31.000000000 +0000
++++ ORBit2-2.10.0.1-cbl/src/orb/orb-core/allocators.c 2004-06-16 04:11:27.642691407 +0000
+@@ -59,6 +59,7 @@
+ }
+ case CORBA_tk_except:
+ case CORBA_tk_struct:
++ mem = ALIGN_ADDRESS (mem, tc->c_align);
+ for (i = 0; i < tc->sub_parts; i++) {
+ subtc = tc->subtypes [i];
+ mem = ALIGN_ADDRESS (mem, subtc->c_align);