1 |
suka 08/10/24 19:07:21 |
2 |
|
3 |
Modified: gentoo-3.0.0.diff |
4 |
Added: hunspell-one-dir-nocrash.diff |
5 |
Log: |
6 |
Trying to fix freeze related to spell checking, see bug #242020 |
7 |
(Portage version: 2.2_rc12/cvs/Linux 2.6.27-gentoo-r1 i686) |
8 |
|
9 |
Revision Changes Path |
10 |
1.5 app-office/openoffice/files/gentoo-3.0.0.diff |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/gentoo-3.0.0.diff?rev=1.5&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/gentoo-3.0.0.diff?rev=1.5&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/gentoo-3.0.0.diff?r1=1.4&r2=1.5 |
15 |
|
16 |
Index: gentoo-3.0.0.diff |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice/files/gentoo-3.0.0.diff,v |
19 |
retrieving revision 1.4 |
20 |
retrieving revision 1.5 |
21 |
diff -u -r1.4 -r1.5 |
22 |
--- gentoo-3.0.0.diff 20 Oct 2008 18:27:52 -0000 1.4 |
23 |
+++ gentoo-3.0.0.diff 24 Oct 2008 19:07:21 -0000 1.5 |
24 |
@@ -40,14 +40,16 @@ |
25 |
--with-vendor=\"Gentoo Foundation\" |
26 |
--- patches/dev300/apply |
27 |
+++ patches/dev300/apply |
28 |
-@@ -1425,7 +1425,9 @@ |
29 |
+@@ -1425,7 +1425,11 @@ |
30 |
SectionOwner => aprosky |
31 |
|
32 |
# system lucene classpath |
33 |
-gentoo-system-lucene.diff |
34 |
+#gentoo-system-lucene.diff |
35 |
-+#No java build |
36 |
++# No java build |
37 |
+nojavanostax.diff |
38 |
++# Fix freezes with dict|hyph-stuff in one dir |
39 |
++hunspell-one-dir-nocrash.diff |
40 |
# Allow build to proceed with PaX enabled |
41 |
gentoo-pax-fix.diff, aprosky |
42 |
# support server-only versions of 64bit JDKs |
43 |
|
44 |
|
45 |
|
46 |
1.1 app-office/openoffice/files/hunspell-one-dir-nocrash.diff |
47 |
|
48 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/hunspell-one-dir-nocrash.diff?rev=1.1&view=markup |
49 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/hunspell-one-dir-nocrash.diff?rev=1.1&content-type=text/plain |
50 |
|
51 |
Index: hunspell-one-dir-nocrash.diff |
52 |
=================================================================== |
53 |
? unxlngx6.pro |
54 |
Index: source/lingutil/lingutil.cxx |
55 |
=================================================================== |
56 |
RCS file: /cvs/whiteboard/lingucomponent/source/lingutil/lingutil.cxx,v |
57 |
retrieving revision 1.4 |
58 |
diff -u -r1.4 lingutil.cxx |
59 |
--- lingucomponent/source/lingutil/lingutil.cxx 13 Jun 2008 14:02:52 -0000 1.4 |
60 |
+++ lingucomponent/source/lingutil/lingutil.cxx 24 Oct 2008 15:01:43 -0000 |
61 |
@@ -322,11 +322,15 @@ |
62 |
{ |
63 |
LanguageType nLang = MsLangId::convertIsoStringToLanguage( aIt2->aLocaleNames[0] ); |
64 |
|
65 |
+ if (nLang == LANGUAGE_DONTKNOW || nLang == LANGUAGE_NONE) |
66 |
+ { |
67 |
+ DBG_ERROR( "old style dictionary with invalid language found!" ); |
68 |
+ continue; |
69 |
+ } |
70 |
+ |
71 |
// language not yet added? |
72 |
if (aNewStyleLanguages.count( nLang ) == 0) |
73 |
- { |
74 |
rNewStyleDics.push_back( *aIt2 ); |
75 |
- } |
76 |
} |
77 |
else |
78 |
{ |