rpms/openoffice.org/devel openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch, 1.2, 1.3 openoffice.org.spec, 1.1345, 1.1346
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Sun Nov 25 14:33:49 UTC 2007
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11738
Modified Files:
openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch
openoffice.org.spec
Log Message:
hyphenation dictionary split impl
openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch:
Index: openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch 16 Aug 2007 07:04:22 -0000 1.2
+++ openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch 25 Nov 2007 14:33:45 -0000 1.3
@@ -1,33 +1,147 @@
Index: source/editeng/unolingu.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/editeng/unolingu.cxx,v
-retrieving revision 1.31.22.1
-diff -u -r1.31.22.1 unolingu.cxx
---- openoffice.org.orig/svx/source/editeng/unolingu.cxx 22 Nov 2006 11:39:00 -0000 1.31.22.1
-+++ openoffice.org/svx/source/editeng/unolingu.cxx 29 Nov 2006 19:11:38 -0000
-@@ -526,12 +526,13 @@
+retrieving revision 1.36
+diff -u -r1.36 unolingu.cxx
+--- openoffice.org.orig/svx/source/editeng/unolingu.cxx 27 Jun 2007 18:01:18 -0000 1.36
++++ openoffice.org/svx/source/editeng/unolingu.cxx 25 Nov 2007 11:54:12 -0000
+@@ -526,12 +526,14 @@
// 1: regular OOo dictionary path
// 2: user-dictionary path (where OOo linguistic by bad choice places downloaded dictionaries
// when the permissions for the share tree are missing. E.g. in user installations.)
- const USHORT nDirectories = 3;
- String aDirectories[ 3 /*nDirectories*/ ];
-+ const USHORT nDirectories = 4;
-+ String aDirectories[ 4 /*nDirectories*/ ];
++ const USHORT nDirectories = 5;
++ String aDirectories[ 5 /*nDirectories*/ ];
aDirectories[0] = linguistic::GetFileURL( SvtPathOptions::PATH_LINGUISTIC, String::CreateFromAscii( "x" ) );
aDirectories[1] = linguistic::GetFileURL( SvtPathOptions::PATH_LINGUISTIC, String::CreateFromAscii( "ooo" ) );
//!! warning: see bUseFile below when changing this index !!
aDirectories[2] = linguistic::GetFileURL( SvtPathOptions::PATH_USERDICTIONARY, String::CreateFromAscii( "x" ) );
+ aDirectories[3] = String::CreateFromAscii( "file:///usr/share/myspell" );
++ aDirectories[4] = String::CreateFromAscii( "file:///usr/share/hyphen" );
//
aDirectories[0].Erase( aDirectories[0].Len() - 2, 2 ); // erase /x from URL
aDirectories[2].Erase( aDirectories[2].Len() - 2, 2 ); // erase /x from URL
+Index: source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
+===================================================================
+RCS file: /cvs/whiteboard/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx,v
+retrieving revision 1.20
+diff -u -r1.20 hyphenimp.cxx
+--- openoffice.org.orig/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx 11 Oct 2006 09:25:13 -0000 1.20
++++ openoffice.org/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx 25 Nov 2007 13:59:17 -0000
+@@ -186,8 +186,10 @@
+
+ int numusr; // number of user dictionary entries
+ int numshr; // number of shared dictionary entries
++ int numsys; // number of system dictionary entries
+ dictentry * spdict; // shared dict entry pointer
+ dictentry * updict; // user dict entry pointer
++ std::vector<dictentry*> postsyspdict;
+ std::vector<dictentry*> postspdict;
+ std::vector<dictentry*> postupdict;
+
+@@ -234,15 +236,44 @@
+ postspdict.push_back(&spdict[i]);
+ }
+
++ numsys = 0;
++ const OUString sSystemDictPath(A2OU("file:///usr/share/hyphen"));
++ osl::Directory aSystemDicts(sSystemDictPath);
++ if (aSystemDicts.open() == osl::FileBase::E_None)
++ {
++ DirectoryItem aItem;
++ FileStatus aFileStatus(FileStatusMask_FileURL);
++ while (aSystemDicts.getNextItem(aItem) == osl::FileBase::E_None)
++ {
++ aItem.getFileStatus(aFileStatus);
++ rtl::OUString sPath = aFileStatus.getFileURL();
++ if (sPath.lastIndexOf(A2OU(".dic")) == sPath.getLength()-4)
++ {
++ sal_Int32 nStartIndex = sPath.lastIndexOf(sal_Unicode('/')) + 1;
++ sal_Int32 nIndex = nStartIndex;
++ nIndex += strlen("hyph_");
++ OUString sLang = sPath.getToken( 0, '_', nIndex );
++ OUString sRegion = sPath.getToken( 0, '.', nIndex );
++ sPath = sPath.copy(nStartIndex, nIndex - nStartIndex - 1);
++ dictentry *entry = new dictentry;
++ entry->filename = strdup(OUStringToOString(sPath, RTL_TEXTENCODING_UTF8).getStr());
++ entry->lang = strdup(OUStringToOString(sLang, RTL_TEXTENCODING_UTF8).getStr());
++ entry->region = strdup(OUStringToOString(sRegion, RTL_TEXTENCODING_UTF8).getStr());
++ postsyspdict.push_back(entry);
++ }
++ }
++ }
++
+ numusr = postupdict.size();
+ numshr = postspdict.size();
++ numsys = postsyspdict.size();
+
+ // we really should merge these and remove duplicates but since
+ // users can name their dictionaries anything they want it would
+ // be impossible to know if a real duplication exists unless we
+ // add some unique key to each hyphenation dictionary
+ // we can worry about that when and if issuezilla's flood in
+- numdict = numusr + numshr;
++ numdict = numsys + numshr + numusr;
+
+ if (numdict) {
+ aDicts = new HDInfo[numdict];
+@@ -295,6 +326,32 @@
+ k++;
+ }
+
++ // now add the system dictionaries
++ for (i = 0; i < numsys; i++) {
++ Locale nLoc( A2OU(postsyspdict[i]->lang), A2OU(postsyspdict[i]->region), OUString() );
++ newloc = 1;
++ for (j = 0; j < numlocs; j++) {
++ if (nLoc == pLocale[j]) newloc = 0;
++ }
++ if (newloc) {
++ pLocale[numlocs] = nLoc;
++ numlocs++;
++ }
++ aDicts[k].aPtr = NULL;
++ aDicts[k].aLoc = nLoc;
++ aDicts[k].aEnc = 0;
++ aDicts[k].aName = sSystemDictPath + A2OU("/") + A2OU(postsyspdict[i]->filename);
++ aDicts[k].apCC = new CharClass(nLoc);
++
++ free(postsyspdict[i]->filename);
++ free(postsyspdict[i]->lang);
++ free(postsyspdict[i]->region);
++ delete postsyspdict[i];
++
++ k++;
++ }
++
++
+ // reallocate the size to just cover the unique locales
+ aSuppLocales.realloc(numlocs);
+
+Index: source/hyphenator/altlinuxhyph/hyphen/makefile.mk
+===================================================================
+RCS file: /cvs/whiteboard/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk,v
+retrieving revision 1.14
+diff -u -r1.14 makefile.mk
+--- openoffice.org.orig/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk 31 Jul 2007 13:07:55 -0000 1.14
++++ openoffice.org/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk 25 Nov 2007 13:59:17 -0000
+@@ -41,7 +41,7 @@
+ USE_DEFFILE=TRUE
+
+ .IF "$(GUI)"=="UNX"
+-HNJLIB=-lhnj
++HNJLIB=-lhyphen
+ .ELSE
+ HNJLIB=libhnj.lib
+ .ENDIF
Index: source/spellcheck/spell/sspellimp.cxx
===================================================================
RCS file: /cvs/whiteboard/lingucomponent/source/spellcheck/spell/sspellimp.cxx,v
retrieving revision 1.18
diff -u -r1.18 sspellimp.cxx
--- openoffice.org.orig/lingucomponent/source/spellcheck/spell/sspellimp.cxx 16 Sep 2006 16:12:16 -0000 1.18
-+++ openoffice.org/lingucomponent/source/spellcheck/spell/sspellimp.cxx 29 Nov 2006 19:42:18 -0000
++++ openoffice.org/lingucomponent/source/spellcheck/spell/sspellimp.cxx 25 Nov 2007 13:59:18 -0000
@@ -160,14 +160,15 @@
int numusr; // number of user dictionary entries
@@ -89,11 +203,10 @@
if (numdict) {
aDicts = new Hunspell* [numdict];
-@@ -270,6 +299,31 @@
- aDNames[k] = aPathOpt.GetLinguisticPath() + A2OU("/ooo/") + A2OU(postspdict[i]->filename);
+@@ -271,6 +300,31 @@
k++;
}
-+
+
+ // now add the system dictionaries
+ for (i = 0; i < numsys; i++) {
+ Locale nLoc( A2OU(postsyspdict[i]->lang), A2OU(postsyspdict[i]->region), OUString() );
@@ -118,6 +231,23 @@
+ k++;
+ }
+
-
++
aSuppLocales.realloc(numlocs);
+ } else {
+Index: inc/libs.mk
+===================================================================
+RCS file: /cvs/tools/solenv/inc/libs.mk,v
+retrieving revision 1.117
+diff -u -r1.117 libs.mk
+--- openoffice.org.orig/solenv/inc/libs.mk 31 Jul 2007 13:06:06 -0000 1.117
++++ openoffice.org/solenv/inc/libs.mk 25 Nov 2007 14:04:55 -0000
+@@ -319,7 +319,7 @@
+ SABLOT3RDLIB=-lsablot
+ APP3RDLIB=-lapp
+ SAMPLE3RDLIB=-lsample
+-HNJLIB=-lhnj
++HNJLIB=-lhyphen
+ MYSPELLLIB=-lmyspell
+ COSVLIB=-lcosv
+ UDMLIB=-ludm
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1345
retrieving revision 1.1346
diff -u -r1.1345 -r1.1346
--- openoffice.org.spec 24 Nov 2007 17:57:51 -0000 1.1345
+++ openoffice.org.spec 25 Nov 2007 14:33:45 -0000 1.1346
@@ -73,9 +73,10 @@
BuildRequires: libxml2-devel, neon-devel >= 0.27.0, libidn-devel, pam-devel
BuildRequires: libjpeg-devel, sane-backends-devel, libICE-devel, hunspell-devel
BuildRequires: evolution-data-server-devel, libxslt-devel, desktop-file-utils
-BuildRequires: libxslt-devel, db4-devel, xulrunner-devel, libwpd-devel, xerces-j2
+BuildRequires: libxslt-devel, db4-devel, xulrunner-devel, libwpd-devel,
BuildRequires: gstreamer-devel, gstreamer-plugins-base-devel, libicu-devel
BuildRequires: perl-Archive-Zip, libtextcat-devel, nss-devel >= 3.11.7-8
+BuildRequires: xerces-j2, hyphen-devel
Patch0: openoffice.org-simple-crash_report.sh
Patch1: AutoSaveRecovery.xcu
@@ -346,7 +347,7 @@
Summary: Afrikaans language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-af
+Requires: hunspell-af, hyphen-af
Obsoletes: openoffice.org-i18n
Obsoletes: openoffice.org-langpack-af
Obsoletes: openoffice.org2-langpack-af_ZA
@@ -406,7 +407,7 @@
Summary: Czech language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-cs
+Requires: hunspell-cs, hyphen-cs
Obsoletes: openoffice.org-i18n
Obsoletes: openoffice.org-langpack-cs
Obsoletes: openoffice.org2-langpack-cs_CZ
@@ -431,7 +432,7 @@
Summary: Danish language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-da
+Requires: hunspell-da, hyphen-da
Obsoletes: openoffice.org-i18n
Obsoletes: openoffice.org-langpack-da
Obsoletes: openoffice.org2-langpack-da_DK
@@ -444,7 +445,7 @@
Summary: German language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-de
+Requires: hunspell-de, hyphen-de
Obsoletes: openoffice.org-i18n
Obsoletes: openoffice.org2-langpack-de
@@ -488,7 +489,7 @@
Summary: Estonian language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-ee
+Requires: hunspell-ee, hyphen-et
Obsoletes: openoffice.org-langpack-et
Obsoletes: openoffice.org-i18n
Obsoletes: openoffice.org2-langpack-et_EE
@@ -602,7 +603,7 @@
Summary: Hungarian language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-hu
+Requires: hunspell-hu, hyphen-hu
Obsoletes: openoffice.org-langpack-hu
Obsoletes: openoffice.org-i18n
Obsoletes: openoffice.org2-langpack-hu_HU
@@ -614,7 +615,7 @@
Summary: Croatian language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-hr
+Requires: hunspell-hr, hyphen-hr
Obsoletes: openoffice.org-langpack-hr
Obsoletes: openoffice.org-i18n
Obsoletes: openoffice.org2-langpack-hr_HR
@@ -626,7 +627,7 @@
Summary: Italian language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-it
+Requires: hunspell-it, hyphen-it
Obsoletes: openoffice.org-i18n
Obsoletes: openoffice.org2-langpack-it
@@ -661,7 +662,7 @@
Summary: Lithuanian language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-lt
+Requires: hunspell-lt, hyphen-lt
Obsoletes: openoffice.org-langpack-lt
Obsoletes: openoffice.org-i18n
Obsoletes: openoffice.org2-langpack-lt_LT
@@ -697,7 +698,7 @@
Summary: Dutch language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-nl
+Requires: hunspell-nl, hyphen-nl
Obsoletes: openoffice.org-i18n
Obsoletes: openoffice.org2-langpack-nl
@@ -728,7 +729,7 @@
Summary: Polish language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-pl
+Requires: hunspell-pl, hyphen-pl
Obsoletes: openoffice.org-langpack-pl
Obsoletes: openoffice.org-i18n
Obsoletes: openoffice.org2-langpack-pl_PL
@@ -764,7 +765,7 @@
Summary: Russian language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-ru
+Requires: hunspell-ru, hyphen-ru
Obsoletes: openoffice.org-i18n
Obsoletes: openoffice.org2-langpack-ru
@@ -787,7 +788,7 @@
Summary: Slovenian language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-sl
+Requires: hunspell-sl, hyphen-sl
Obsoletes: openoffice.org-langpack-sl
Obsoletes: openoffice.org-i18n
Obsoletes: openoffice.org2-langpack-sl_SI
@@ -939,7 +940,7 @@
Summary: Zulu language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-zu
+Requires: hunspell-zu, hyphen-zu
Obsoletes: openoffice.org-langpack-zu
Obsoletes: openoffice.org-i18n
Obsoletes: openoffice.org2-langpack-zu_ZA
@@ -1126,7 +1127,7 @@
cd config_office
autoconf
export PATH=$PATH:/usr/sbin
-%configure --with-build-version=%{name}-%{version}-%{release} --with-unix-wrapper=%{name} --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-fontooo --disable-mathmldtd --disable-pasf --disable-Xaw --with-ant-home=/usr/share/ant %{jdkflags} --enable-gstreamer --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-vba --enable-dbus --with-system-libs --with-system-python --with-system-mozilla=xulrunner --with-system-boost --with-system-libwpd --with-system-icu --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --with-system-hunspell --with-system-libtextcat --with-system-vigra --without-system-mspack --without-system-xt --without-fonts --without-nas --without-gpc --without-agg --without-ppds --without-afms %{stlflags} --with-lang="%{langpack_langs!
}" --with-poor-help-localizations="$POORHELPS"
+%configure --with-build-version=%{name}-%{version}-%{release} --with-unix-wrapper=%{name} --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-fontooo --disable-mathmldtd --disable-pasf --disable-Xaw --with-ant-home=/usr/share/ant %{jdkflags} --enable-gstreamer --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-vba --enable-dbus --with-system-libs --with-system-python --with-system-mozilla=xulrunner --with-system-boost --with-system-libwpd --with-system-icu --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --with-system-hunspell --with-system-altlinuxhyph --with-system-libtextcat --with-system-vigra --without-system-mspack --without-system-xt --without-fonts --without-nas --without-gpc --without-agg --without-ppds --without-afms %{stlflags} --!
with-lang="%{langpack_langs}" --with-poor-help-localizations="$POORHELPS"
cd ..
./bootstrap
source Linux*Env.Set.sh
@@ -1326,25 +1327,25 @@
#langpack id, has help or not, extra linguistic data glob, script classification
langpackdetails=\
(\
-af help *hyph_af* western ar nohelp nolingu ctl \
+af help nolingu western ar nohelp nolingu ctl \
bg help nolingu western bn help nolingu western \
ca help nolingu western cs help *cs_CZ* western \
-cy nohelp nolingu western da help *hyph_da_DK* western \
+cy nohelp nolingu western da help nolingu western \
de help *_de_* western el help nolingu western \
-es help nolingu western et help *hyph_et_EE* western \
+es help nolingu western et help nolingu western \
eu nohelp nolingu western fi nohelp nolingu western \
fr help nolingu western ga nohelp nolingu western \
gl help nolingu western gu-IN nohelp nolingu ctl \
pa-IN help nolingu ctl he nohelp nolingu ctl \
-hi-IN help nolingu ctl hu help *hyph_hu_HU* western \
-hr nohelp nolingu western it help *hyph_it_IT* western \
+hi-IN help nolingu ctl hu help nolingu western \
+hr nohelp nolingu western it help nolingu western \
ja help nolingu cjk ko help nolingu cjk \
-lt nohelp *hyph_lt* western ms nohelp nolingu western \
-nb help nolingu western nl help *hyph_nl_NL* western \
+lt nohelp nolingu western ms nohelp nolingu western \
+nb help nolingu western nl help nolingu western \
nn help nolingu western pl help *pl_PL* western \
pt help nolingu western pt-BR help nolingu western \
-ru help *hyph_ru_RU* western sk help *sk_SK* western \
-sl help *hyph_sl_SI* western sr-CS nohelp nolingu western \
+ru help nolingu western sk help *sk_SK* western \
+sl help nolingu western sr-CS nohelp nolingu western \
sv help nolingu western ta-IN nohelp nolingu ctl \
th help nolingu ctl tr help nolingu western \
zh-CN help nolingu cjk zh-TW help nolingu cjk \
@@ -1386,8 +1387,9 @@
#remove the dictionaries, they are in hunspell-XX rpms
grep -v DICT $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/dictionary.lst > $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/dictionary.lst.tmp
-mv -f $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/dictionary.lst.tmp $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/dictionary.lst
-rm -rf $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/??_??.??? $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/README_??_??.txt $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/INSTALL_de.txt
+grep -v HYPH $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/dictionary.lst.tmp > $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/dictionary.lst
+rm -f $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/dictionary.lst.tmp
+rm -rf $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/??_??.??? $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/README_??_??.txt $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/INSTALL_de.txt $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/*hyph*
#add in some templates
tar xzf %{SOURCE2} -C $RPM_BUILD_ROOT/%{instdir}/share
@@ -2809,6 +2811,7 @@
%changelog
* Sat Nov 24 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.1-9.4
- Resolves: rhbz#384391 add openoffice.org-2.3.1.ooo83930.sw.flushanchors.patch
+- split out libhyphen and hyphenators
* Thu Nov 22 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.1-9.3
- Resolves: rhbz#247634 add openoffice.org-2.3.1.ooo82911.sd.insertbackground.patch (jnavrati)
More information about the fedora-extras-commits
mailing list