[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-7-0' - 2 commits - readlicense_oo/license scp2/source setup_native/source
Andras Timar (via logerrit)
logerrit at kemper.freedesktop.org
Tue May 25 08:17:02 UTC 2021
readlicense_oo/license/license.xml | 5 +++++
scp2/source/ooo/file_ooo.scp | 9 +++++++++
scp2/source/ooo/module_ooo.scp | 11 +++++++++++
scp2/source/ooo/module_ooo.ulf | 6 ++++++
setup_native/source/packinfo/packinfo_office.txt | 15 +++++++++++++++
setup_native/source/packinfo/spellchecker_selection.txt | 3 ++-
6 files changed, 48 insertions(+), 1 deletion(-)
New commits:
commit 2846dc42fcf284f7c9811c44a34bf2379f2aed6b
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Tue May 25 10:16:03 2021 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Tue May 25 10:16:03 2021 +0200
Dictionary list required by MIMO
Change-Id: Idefb9480460ae4ba946d7171811fde432c3c0927
diff --git a/setup_native/source/packinfo/spellchecker_selection.txt b/setup_native/source/packinfo/spellchecker_selection.txt
index 6d9829dcc41c..59594d150621 100644
--- a/setup_native/source/packinfo/spellchecker_selection.txt
+++ b/setup_native/source/packinfo/spellchecker_selection.txt
@@ -46,7 +46,7 @@ en-ZA = "en,es,fr"
eo = "eo"
es = "es,an,ca,fr,gl,oc,pt-PT"
et = "et"
-fr = "fr,es"
+fr = "de,en,eo,es,fr,it,pt-PT"
gd = "gd"
gl = "gl,pt-PT,es"
gu = "gu"
commit 117fe65d72984f4292a9b981ccc924c5284a9fdb
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Sun Apr 11 10:00:41 2021 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Tue May 25 10:13:21 2021 +0200
Add Esperanto dictionaries
Change-Id: I22d73bb5a6e4d215dc35acdd4ded47d29882671e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113941
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.timar at collabora.com>
diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml
index 113861737455..3a8c114447d6 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -3351,6 +3351,11 @@
<p><a href="#a__GPL_version_3">Jump to GPL Version 3</a></p>
<p><a href="#a__LGPL_version_3">Jump to LGPL Version 3</a></p>
<p><a href="#a__MPL_version_1_1">Jump to MPL Version 1.1</a></p>
+ <h2>Esperanto</h2>
+ <h3>Spelling dictionary, hyphenation patterns, and thesaurus</h3>
+ <p>The following software may be included in this product: Esperanto spelling dictionary, hyphenation patterns,
+ and thesaurus. Use of any of this software is governed by the terms of the license below:</p>
+ <p><a href="#a__GPL_version_3">GNU General Public License version 3</a>.</p>
<h2>Estonian</h2>
<h3>Spelling dictionary</h3>
<p>The following software may be included in this product: Estonian spelling dictionary. Use of any of this
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 0610c31bb188..9ae56134b2d2 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -401,6 +401,15 @@ File gid_File_Extension_Dictionary_El
End
#endif
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Eo
+ Dir = FILELIST_DIR;
+ Name = "Dictionary/dict-eo.filelist";
+ Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+ TXT_FILE_BODY;
+End
+#endif
+
#if defined WITH_MYSPELL_DICTS
File gid_File_Extension_Dictionary_Es
Dir = FILELIST_DIR;
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 0c1db4fd4aaf..7c2132b45d08 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -291,6 +291,17 @@ Module gid_Module_Root_Extension_Dictionary_El
Styles = ();
End
+Module gid_Module_Root_Extension_Dictionary_Eo
+ MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_EO );
+ Files = (gid_File_Extension_Dictionary_Eo);
+ InstallOrder = "2000";
+ Sortkey = "721";
+ Spellcheckerlanguage = "eo";
+ PackageInfo = "packinfo_office.txt";
+ ParentID = gid_Module_Dictionaries;
+ Styles = ();
+End
+
Module gid_Module_Root_Extension_Dictionary_Es
MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_ES );
Files = (gid_File_Extension_Dictionary_Es);
diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf
index 5f7609eba8d9..c5cf3a751f5d 100644
--- a/scp2/source/ooo/module_ooo.ulf
+++ b/scp2/source/ooo/module_ooo.ulf
@@ -130,6 +130,12 @@ en-US = "Greek"
[STR_DESC_MODULE_EXTENSION_DICTIONARY_EL]
en-US = "Greek spelling dictionary, and hyphenation rules"
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_EO]
+en-US = "Esperanto"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_EO]
+en-US = "Esperanto spelling dictionary, hyphenation rules, and thesaurus"
+
[STR_NAME_MODULE_EXTENSION_DICTIONARY_ES]
en-US = "Spanish"
diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt
index f3efd5afa4bf..da6c24ee0fb1 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -582,6 +582,21 @@ destpath = "/opt"
packageversion = "%PACKAGEVERSION"
End
+Start
+module = "gid_Module_Root_Extension_Dictionary_Eo"
+solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-eo"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-eo"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+linuxpatchrequires = ""
+copyright = "2021 The Document Foundation"
+solariscopyright = "solariscopyrightfile"
+vendor = "The Document Foundation"
+description = "Eo dictionary for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%PACKAGEVERSION"
+End
+
Start
module = "gid_Module_Root_Extension_Dictionary_Es"
solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-es"
diff --git a/setup_native/source/packinfo/spellchecker_selection.txt b/setup_native/source/packinfo/spellchecker_selection.txt
index 89dd8978e5c2..6d9829dcc41c 100644
--- a/setup_native/source/packinfo/spellchecker_selection.txt
+++ b/setup_native/source/packinfo/spellchecker_selection.txt
@@ -43,6 +43,7 @@ el = "el"
en-US = "en,es,fr"
en-GB = "en,es,fr"
en-ZA = "en,es,fr"
+eo = "eo"
es = "es,an,ca,fr,gl,oc,pt-PT"
et = "et"
fr = "fr,es"
More information about the Libreoffice-commits
mailing list