Fix for CJK problems, see bug #116473

(Portage version: 2.1_pre3-r1)

4 files changed, 40 insertions, 14 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index e75f79f3213b..66baea9fb09d 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.175 2006/01/22 09:34:01 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.176 2006/01/22 20:12:27 suka Exp $
+
+  22 Jan 2006; Andreas Proschofsky <suka@gentoo.org>
+  -files/2.0.1/ooo-build-gentoo-gcc-version.diff,
+  +files/2.0.1/gentoo-2.0.1.diff, openoffice-2.0.1.ebuild:
+  Fix for CJK problems, see bug #116473
 
   22 Jan 2006; Andreas Proschofsky <suka@gentoo.org>
   -files/1.1.4/gcc-instlib.patch, -files/1.1.4/getcompver.awk.patch,
diff --git a/app-office/openoffice/files/2.0.1/gentoo-2.0.1.diff b/app-office/openoffice/files/2.0.1/gentoo-2.0.1.diff
new file mode 100644
index 000000000000..7cb30f029c20
--- /dev/null
+++ b/app-office/openoffice/files/2.0.1/gentoo-2.0.1.diff
@@ -0,0 +1,32 @@
+--- patches/src680/apply 
++++ patches/src680/apply 
+@@ -313,9 +313,6 @@
+ [ Shrink ]
+ # strip 450k of .comment sections - i#57063
+ size-strip.diff
+-# save 1.7Mb of (shared) memory for non-asian locales
+-cws-i18nshrink.diff
+-
+ 
+ [ QuickStarter ]
+ # An improved built-in quick-starter applet / systray thing. i#57872
+@@ -941,6 +941,8 @@
+ stlport-ppc-buildfix.diff
+ # Re-add DicOOo
+ gentoo-dicooo.diff
++# Fix for odd compiler versions
++gentoo-gcc-version.diff
+ 
+ #
+ # NOTE: 64 bit OOo is work in progress!
+--- patches/src680/buildfix-gcc41-friend-decl-i18npool.diff 
++++ patches/src680/buildfix-gcc41-friend-decl-i18npool.diff 
+@@ -8,7 +8,7 @@
+ +    return l1.Language == l2.Language && l1.Country == l2.Country && l1.Variant == l2.Variant;
+ +};
+ +
+- class I18NPOOL_DLLPUBLIC LocaleData : public cppu::WeakImplHelper2
++ class LocaleData : public cppu::WeakImplHelper2
+  <
+  	XLocaleData,
+ @@ -131,13 +135,7 @@
diff --git a/app-office/openoffice/files/2.0.1/ooo-build-gentoo-gcc-version.diff b/app-office/openoffice/files/2.0.1/ooo-build-gentoo-gcc-version.diff
deleted file mode 100644
index a8ea2f5d47a6..000000000000
--- a/app-office/openoffice/files/2.0.1/ooo-build-gentoo-gcc-version.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- patches/src680/apply.orig	2005-12-29 10:37:11.000000000 +0200
-+++ patches/src680/apply	2005-12-29 10:37:45.000000000 +0200
-@@ -941,6 +941,8 @@
- stlport-ppc-buildfix.diff
- # Re-add DicOOo
- gentoo-dicooo.diff
-+# Fix for odd compiler versions
-+gentoo-gcc-version.diff
- 
- #
- # NOTE: 64 bit OOo is work in progress!
diff --git a/app-office/openoffice/openoffice-2.0.1.ebuild b/app-office/openoffice/openoffice-2.0.1.ebuild
index b4d7bcf21232..f6ba25bfc251 100644
--- a/app-office/openoffice/openoffice-2.0.1.ebuild
+++ b/app-office/openoffice/openoffice-2.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.1.ebuild,v 1.16 2006/01/21 20:47:48 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.1.ebuild,v 1.17 2006/01/22 20:12:27 suka Exp $
 
 inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs
 
@@ -139,7 +139,7 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${PV}/alwayscrystal.diff
 	cp ${FILESDIR}/${PV}/gentoo-gcc-version.diff ${S}/patches/src680/ || die
-	epatch ${FILESDIR}/${PV}/ooo-build-gentoo-gcc-version.diff
+	epatch ${FILESDIR}/${PV}/gentoo-${PV}.diff
 
 	#Detect which look and patchset we are using, amd64 is known not to be working atm, so this is here for testing purposes only
 	use amd64 && export DISTRO="Gentoo64" || export DISTRO="Gentoo"