summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Proschofsky <suka@gentoo.org>2008-10-24 19:07:21 +0000
committerAndreas Proschofsky <suka@gentoo.org>2008-10-24 19:07:21 +0000
commit43f1d0a65a4b815d8e8171fe0bd05e9c5702614a (patch)
treebcde5ebc101ff4506b1f1cfa286af86544f79770
parentFix dependencies. (diff)
downloadhistorical-43f1d0a65a4b815d8e8171fe0bd05e9c5702614a.tar.gz
historical-43f1d0a65a4b815d8e8171fe0bd05e9c5702614a.tar.bz2
historical-43f1d0a65a4b815d8e8171fe0bd05e9c5702614a.zip
Trying to fix freeze related to spell checking, see bug #242020
Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27-gentoo-r1 i686
-rw-r--r--app-office/openoffice/ChangeLog7
-rw-r--r--app-office/openoffice/Manifest7
-rw-r--r--app-office/openoffice/files/gentoo-3.0.0.diff6
-rw-r--r--app-office/openoffice/files/hunspell-one-dir-nocrash.diff26
-rw-r--r--app-office/openoffice/openoffice-3.0.0.ebuild3
5 files changed, 42 insertions, 7 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 6cf5b5d1a84c..ae58ec0b3d51 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-office/openoffice
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.435 2008/10/24 10:15:51 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.436 2008/10/24 19:07:13 suka Exp $
+
+ 24 Oct 2008; Andreas Proschofsky <suka@gentoo.org>
+ files/gentoo-3.0.0.diff, +files/hunspell-one-dir-nocrash.diff,
+ openoffice-3.0.0.ebuild:
+ Trying to fix freeze related to spell checking, see bug #242020
24 Oct 2008; Andreas Proschofsky <suka@gentoo.org>
openoffice-3.0.0.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index a5811ac5f7eb..02cd609e5462 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,5 +1,6 @@
AUX gentoo-2.4.1.diff 572 RMD160 1107e41d7b19b1a71e501b4dfa6f8f204517ecdc SHA1 f68cb994ee45080f24c0c97b695cc1fb87e58157 SHA256 bbf60d7d89c3347d0aa10dfa9c9aa899c1ef8a97111584cf7ec3b8d1db30a9f7
-AUX gentoo-3.0.0.diff 3633 RMD160 77f499a41b67197cbd964cbf3371747aada4edae SHA1 1ce3b4c0e9a97f8cafba5b336486b89faa1a0bfc SHA256 29779d4248718cc3c0a71947396a2843dced0a0048810dae2e0185e6dc4442b7
+AUX gentoo-3.0.0.diff 3713 RMD160 4ac021c3fc6235ce20d17f0f22c6463906066b76 SHA1 40a0047db6d0140e89201ef2ff4bd129978d0c44 SHA256 331c4a0457e734c8c82eeb41e80df2463914e5285c46a4c97ba44a4f92699ead
+AUX hunspell-one-dir-nocrash.diff 874 RMD160 b28b5379b59e30debd4aedb290dd8a1c4ac420a5 SHA1 0df98e9d92c779530fd9cd7e7e2e573ee1b7a603 SHA256 1cd1517d3ea63563a5acdb08f20c9d07cd55f0b646b7435b89d4121945a59ac5
AUX nojavanostax.diff 1374 RMD160 676450cd667425b1ac2ad4df561633778469cb82 SHA1 34e4481f199f23ebca4ff89f8ffc00f3cd08337f SHA256 17e39229576e415e52ff3685d5c4cdfb5e2c6f6177aad23e6e341c256fe3b310
AUX ooo-env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
DIST OOo_2.4.1_src_binfilter.tar.bz2 6674779 RMD160 04ffce167f94a250f94f05923a70af0b0744c417 SHA1 a50c7f317643b756c2b0e8937fa9d64b99f05ed9 SHA256 b40403f9adc395846e33f2fc02e0bff133976766988702ef8b13e83448fbd390
@@ -44,6 +45,6 @@ DIST scsolver.2008-10-07.tar.bz2 230102 RMD160 f14539950ca5bd0c25a37f5f1504460b7
DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
DIST writerfilter.2008-02-29.tar.bz2 745803 RMD160 5f1642ee32757bf235ab8ada9f88023608dbf0e6 SHA1 398ebd9a18af5ae4a08305443cd4b16036ad1a37 SHA256 be55befd2694a8f5871a96cf7d33919dece8b890a081d7da493c6889db27dd94
EBUILD openoffice-2.4.1.ebuild 12597 RMD160 cfeb6649376b401d6a24d46c989526e042044b06 SHA1 7c88d424b6de8ef1d041b15df6b219cd017a4dd4 SHA256 402e684acf7565024b645c024f0cce4f8f56579f3fe50b9120fe7db0eccaa7a8
-EBUILD openoffice-3.0.0.ebuild 13300 RMD160 40e5322524f84cb2de50f9daa6f0b2faa4021f3e SHA1 0d2d69ebafe09a481aa26de4f719adc6f177a4d3 SHA256 2a020cd64ab91ef3a4147de62c5ba8f5b3eb8bfd7bdb7833af129c4e7c6bf535
-MISC ChangeLog 90660 RMD160 fee2e3dcbb7d853ac046dd0c9b2baa42ce1f4651 SHA1 8702954c429a4afc600cb495cf8658d8d5fb7bfc SHA256 810c2b7de435a1b4fdfd78426e859e0721017d969ca98d7dca56deb9722c810f
+EBUILD openoffice-3.0.0.ebuild 13380 RMD160 33754d99e201cf231d1875c4583454d11372377e SHA1 df2aaaf4b0733077d445d90020b15267e1ecb896 SHA256 764d4bb239464065204f02f947e8ab301420f493fd5bd7d2050d9da106b8562f
+MISC ChangeLog 90872 RMD160 c56823a4be3f79714d1a63bbdae643ef1e7825c0 SHA1 0e04ec810bcaf8cfa6722d859347e10aeb94d115 SHA256 498556de4fba6f105668a73dce08c7f1383b26f7d25f823340edd80f17b04958
MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78
diff --git a/app-office/openoffice/files/gentoo-3.0.0.diff b/app-office/openoffice/files/gentoo-3.0.0.diff
index ff047aff8113..c11b021514d1 100644
--- a/app-office/openoffice/files/gentoo-3.0.0.diff
+++ b/app-office/openoffice/files/gentoo-3.0.0.diff
@@ -40,14 +40,16 @@
--with-vendor=\"Gentoo Foundation\"
--- patches/dev300/apply
+++ patches/dev300/apply
-@@ -1425,7 +1425,9 @@
+@@ -1425,7 +1425,11 @@
SectionOwner => aprosky
# system lucene classpath
-gentoo-system-lucene.diff
+#gentoo-system-lucene.diff
-+#No java build
++# No java build
+nojavanostax.diff
++# Fix freezes with dict|hyph-stuff in one dir
++hunspell-one-dir-nocrash.diff
# Allow build to proceed with PaX enabled
gentoo-pax-fix.diff, aprosky
# support server-only versions of 64bit JDKs
diff --git a/app-office/openoffice/files/hunspell-one-dir-nocrash.diff b/app-office/openoffice/files/hunspell-one-dir-nocrash.diff
new file mode 100644
index 000000000000..85fa3e8fc304
--- /dev/null
+++ b/app-office/openoffice/files/hunspell-one-dir-nocrash.diff
@@ -0,0 +1,26 @@
+? unxlngx6.pro
+Index: source/lingutil/lingutil.cxx
+===================================================================
+RCS file: /cvs/whiteboard/lingucomponent/source/lingutil/lingutil.cxx,v
+retrieving revision 1.4
+diff -u -r1.4 lingutil.cxx
+--- lingucomponent/source/lingutil/lingutil.cxx 13 Jun 2008 14:02:52 -0000 1.4
++++ lingucomponent/source/lingutil/lingutil.cxx 24 Oct 2008 15:01:43 -0000
+@@ -322,11 +322,15 @@
+ {
+ LanguageType nLang = MsLangId::convertIsoStringToLanguage( aIt2->aLocaleNames[0] );
+
++ if (nLang == LANGUAGE_DONTKNOW || nLang == LANGUAGE_NONE)
++ {
++ DBG_ERROR( "old style dictionary with invalid language found!" );
++ continue;
++ }
++
+ // language not yet added?
+ if (aNewStyleLanguages.count( nLang ) == 0)
+- {
+ rNewStyleDics.push_back( *aIt2 );
+- }
+ }
+ else
+ {
diff --git a/app-office/openoffice/openoffice-3.0.0.ebuild b/app-office/openoffice/openoffice-3.0.0.ebuild
index b040785e2c78..e7bd465a1110 100644
--- a/app-office/openoffice/openoffice-3.0.0.ebuild
+++ b/app-office/openoffice/openoffice-3.0.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.0.ebuild,v 1.14 2008/10/24 10:15:51 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.0.ebuild,v 1.15 2008/10/24 19:07:13 suka Exp $
WANT_AUTOCONF="2.5"
WANT_AUTOMAKE="1.9"
@@ -265,6 +265,7 @@ src_unpack() {
epatch "${FILESDIR}/gentoo-${PV}.diff"
epatch "${FILESDIR}/ooo-env_log.diff"
cp -f "${FILESDIR}/nojavanostax.diff" "${S}/patches/dev300" || die
+ cp -f "${FILESDIR}/hunspell-one-dir-nocrash.diff" "${S}/patches/dev300" || die
#Use flag checks
if use java ; then