Patch vba-sc-handleautoshapemacro-import.diff to fix build breakage, see bug #132412

Package-Manager: portage-2.1_pre10-r3

3 files changed, 32 insertions, 9 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 5c8d9ff1ed9d..807749a9803d 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.212 2006/05/06 08:45:01 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.213 2006/05/06 14:27:53 suka Exp $
+
+  06 May 2006; Andreas Proschofsky <suka@gentoo.org>
+  files/2.0.2/gentoo-2.0.2.diff:
+  Patch vba-sc-handleautoshapemacro-import.diff to fix build breakage, see bug
+  #132412
 
   06 May 2006; Andreas Proschofsky <suka@gentoo.org>
   openoffice-2.0.2-r2.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 2741a0d7fd84..8122186ae848 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -2,10 +2,10 @@ AUX 2.0.1/alwayscrystal.diff 3222 RMD160 6f563dccad523db881def1fdb711df3949c2a68
 MD5 500f7e71be57d40b0a8042cab1484df9 files/2.0.1/alwayscrystal.diff 3222
 RMD160 6f563dccad523db881def1fdb711df3949c2a687 files/2.0.1/alwayscrystal.diff 3222
 SHA256 22af14b2c3bd7d796eeda2f4a423f4290e71d2f2790a82038b837c6219133ef1 files/2.0.1/alwayscrystal.diff 3222
-AUX 2.0.2/gentoo-2.0.2.diff 840 RMD160 2375bbc2ee803d4e4195b3e0ddae93d767a8a552 SHA1 e5000163bf77c58b89bc0020d406ed10c8bc9b94 SHA256 c2da419a6d23ab7553a2809e7c64729dcd78a1726bad0c47b96b20fa0cce1512 size 840
-MD5 6bdcbcb4270ebd6863e30cc2bd0220d1 files/2.0.2/gentoo-2.0.2.diff 840
-RMD160 2375bbc2ee803d4e4195b3e0ddae93d767a8a552 files/2.0.2/gentoo-2.0.2.diff 840
-SHA256 c2da419a6d23ab7553a2809e7c64729dcd78a1726bad0c47b96b20fa0cce1512 files/2.0.2/gentoo-2.0.2.diff 840
+AUX 2.0.2/gentoo-2.0.2.diff 1492 RMD160 87de23dc8ce07d92c64b656ea97cafb6f0e662a3 SHA1 16ef872339f2fb1c02640a9341d300c44bc033fe SHA256 ca17adbaab1c6ae3d98c9f799cfb243b8da36e0ce48cf62a78cad53868e368ef size 1492
+MD5 9ad30857c42877a5e91ff3bfb7232f8b files/2.0.2/gentoo-2.0.2.diff 1492
+RMD160 87de23dc8ce07d92c64b656ea97cafb6f0e662a3 files/2.0.2/gentoo-2.0.2.diff 1492
+SHA256 ca17adbaab1c6ae3d98c9f799cfb243b8da36e0ce48cf62a78cad53868e368ef files/2.0.2/gentoo-2.0.2.diff 1492
 DIST OOO_2_0_1-binfilter.tar.bz2 18062219 RMD160 2ff50011435543209c3d7956e43c239ac4551450 SHA256 eb9418d43c23e85d4507de43a2b94287203f440a147b12ab9554a7ebd5722df8 size 18062219
 DIST OOO_2_0_1-core.tar.bz2 109793621 RMD160 39af65ae67c6db30b39327da5821064af390a205 SHA256 a24c5021504fa930df563ed003776499579b925515a0b4a31c52fee895910ef3 size 109793621
 DIST OOO_2_0_1-lang.tar.bz2 55193297 RMD160 fad1e8181d9156decd9f34c10e1752c50ce5a41a SHA256 75775d4dd704298e25c6235e9d110495a10982d4d96bd9cac9498b19d014d705 size 55193297
@@ -36,10 +36,10 @@ EBUILD openoffice-2.0.2-r2.ebuild 7960 RMD160 7ec289691e402ab2ebecd78fab6d51cd18
 MD5 b1f45b263a538dc8f8d51499e3aed5f2 openoffice-2.0.2-r2.ebuild 7960
 RMD160 7ec289691e402ab2ebecd78fab6d51cd18e9c0b5 openoffice-2.0.2-r2.ebuild 7960
 SHA256 decbd4a0c1b3329e5d0fe28dc047df2a8c7de277276826b4a92e59cf751caf60 openoffice-2.0.2-r2.ebuild 7960
-MISC ChangeLog 45521 RMD160 7e9d60b108d0fb2b48268ff85bf06fe16cf11ba4 SHA1 48287ea749e09c28d248c3fcc7e737ccbab2ab64 SHA256 c90c2066f4380279c8508caa2978f60de2a5fbe683354293f9629178e821aabe size 45521
-MD5 538865027b72e17b6f0c8b772684c10b ChangeLog 45521
-RMD160 7e9d60b108d0fb2b48268ff85bf06fe16cf11ba4 ChangeLog 45521
-SHA256 c90c2066f4380279c8508caa2978f60de2a5fbe683354293f9629178e821aabe ChangeLog 45521
+MISC ChangeLog 45697 RMD160 2fb194e835a02c009b6b70a36826fd137dacacfa SHA1 f816ab9568324db160066f01253a6bd78317e53d SHA256 54833566ee2e7995392da90582f613a3c3fc576c2e0abd72bc06f729d2059ed2 size 45697
+MD5 858fbadd797ea8338afa003e9f4d0197 ChangeLog 45697
+RMD160 2fb194e835a02c009b6b70a36826fd137dacacfa ChangeLog 45697
+SHA256 54833566ee2e7995392da90582f613a3c3fc576c2e0abd72bc06f729d2059ed2 ChangeLog 45697
 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291 size 461
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461
diff --git a/app-office/openoffice/files/2.0.2/gentoo-2.0.2.diff b/app-office/openoffice/files/2.0.2/gentoo-2.0.2.diff
index 7c338137f9d7..5c28a184909b 100644
--- a/app-office/openoffice/files/2.0.2/gentoo-2.0.2.diff
+++ b/app-office/openoffice/files/2.0.2/gentoo-2.0.2.diff
@@ -31,3 +31,21 @@
  # Fix ODK Java bits
  odk-java-wizpanel.diff
  # add possibility to set ARCH_FLAGS when building libnas
+--- patches/src680/vba-sc-handleautoshapemacro-import.diff	2006/02/28 12:30:52	1.4
++++ patches/src680/vba-sc-handleautoshapemacro-import.diff	2006/05/05 15:08:57	1.6
+@@ -207,6 +207,15 @@
+ diff -u -p -r1.11 fusel.cxx
+ --- sc/source/ui/drawfunc/fusel.cxx	8 Sep 2005 20:58:07 -0000	1.11
+ +++ sc/source/ui/drawfunc/fusel.cxx	14 Dec 2005 11:42:42 -0000
++@@ -55,7 +55,7 @@
++ #include <svx/svdpagv.hxx>
++ #include <svx/outlobj.hxx>
++ #include <svx/svdocapt.hxx>
++-
+++#include <sfx2/app.hxx>
++ 
++ #ifndef _COM_SUN_STAR_EMBED_EMBEDSTATES_HPP_
++ #include <com/sun/star/embed/EmbedStates.hpp>
+ @@ -70,6 +70,7 @@
+  #include "drawpage.hxx"
+  #include "globstr.hrc"