external/liborcus/UnpackedTarball_liborcus.mk | 4 ++
instsetoo_native/CustomTarget_install.mk | 2 -
officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs | 2 -
postprocess/CustomTarget_signing.mk | 2 -
postprocess/signing/signing.pl | 3 +-
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 +-
solenv/bin/modules/installer/windows/msp.pm | 2 -
12 files changed, 58 insertions(+), 6 deletions(-)
New commits:
commit 398ea01a373c0bb373b6a3de9fa75d97ec2a633a
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Mon Jun 7 09:00:47 2021 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon Mar 14 20:54:47 2022 +0100
no MinimumWidth of Sidebar for MIMO
Change-Id: I66fc17b1d791e06debe95248a8952986171a4596
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
b/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
index c54c3d6076c0..0fba94791836 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
@@ -247,7 +247,7 @@
<desc>Minimum width the sidebar can have. If true, the minumum width
is calculated from the largest deck.</desc>
</info>
- <value>true</value>
+ <value>false</value>
</prop>
</group>
<group oor:name="Content">
commit c1631593b3e61ed71f290ea8dfba4c610f07498a
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Tue May 25 10:16:03 2021 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon Mar 14 20:53:08 2022 +0100
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 b4f568b8e673..4a6a7ff83f8f 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 c056b7a92d16b6e8c7465169e18ef40be4a14202
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Sun Apr 11 10:00:41 2021 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon Mar 14 20:53:03 2022 +0100
Add Esperanto dictionaries
Change-Id: I22d73bb5a6e4d215dc35acdd4ded47d29882671e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113941
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/readlicense_oo/license/license.xml
b/readlicense_oo/license/license.xml
index 2c45a12fd202..eb02fd8588cb 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 7d2a1eed2f0e..dc1697395b14 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 ee8024fe8f21..5bfc0137a38a 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 5aaa1dc05ccd..9c65148431ae 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 56866e7d6a3d..2384cdfc1cdf 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 a5a7649e3317..b4f568b8e673 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"
commit a72c00cff34c90d9dc3bfcbf7c943641f0d803af
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Wed Apr 18 07:19:00 2018 -0700
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon Mar 14 20:52:23 2022 +0100
[cp] HACK: sleep before sign
On Windows, with 16x parallel build, build-nocheck target fails,
because it tries to sign a file that is already in use (gengal).
Change-Id: Ic582334f2c02f5e38f49d048fc0425025ffeee41
Reviewed-on: https://gerrit.libreoffice.org/75235
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/postprocess/signing/signing.pl b/postprocess/signing/signing.pl
index 769b9efbcc7a..a443984a2a7b 100644
--- a/postprocess/signing/signing.pl
+++ b/postprocess/signing/signing.pl
@@ -41,6 +41,7 @@ my @args = ();
my @files_to_sign = ();
#### main #####
+sleep(120);
$myname = script_id();
if ( $#ARGV < 2 ) {
usage();
commit e6a51aadb3d106c20e08e07e2ecde54d3ab2e343
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Thu Feb 11 08:27:23 2021 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon Mar 14 20:52:16 2022 +0100
try to use a different timestamp service
Change-Id: I0fdbe2871d74836d530a69532bf22c17f642c922
diff --git a/instsetoo_native/CustomTarget_install.mk
b/instsetoo_native/CustomTarget_install.mk
index b9991d208dd4..36e8c15fe5dc 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -133,7 +133,7 @@ endif # LIBO_TEST_INSTALL
touch $@
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),PRL)
-TIMESTAMPURL ?= "http://timestamp.globalsign.com/scripts/timestamp.dll";
+TIMESTAMPURL ?= "http://timestamp.digicert.com/";
$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_signing.done:
\
$(if $(filter HELP,$(BUILD_TYPE)),$(call
gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_helppack_signing.done)
\
$(if $(filter ODK,$(BUILD_TYPE)),$(call
gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_sdk_signing.done) \
diff --git a/postprocess/CustomTarget_signing.mk
b/postprocess/CustomTarget_signing.mk
index a00faa857f2a..3f0c5ec5b6ca 100644
--- a/postprocess/CustomTarget_signing.mk
+++ b/postprocess/CustomTarget_signing.mk
@@ -15,7 +15,7 @@ $(eval $(call
gb_CustomTarget_register_targets,postprocess/signing,\
))
# PFXFILE and PFXPASSWORD should be set in environment
-TIMESTAMPURL ?= "http://timestamp.globalsign.com/scripts/timestamp.dll";
+TIMESTAMPURL ?= "http://timestamp.digicert.com/";
$(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done: \
$(SRCDIR)/postprocess/signing/signing.pl \
diff --git a/postprocess/signing/signing.pl b/postprocess/signing/signing.pl
index ed8065399f05..769b9efbcc7a 100644
--- a/postprocess/signing/signing.pl
+++ b/postprocess/signing/signing.pl
@@ -241,7 +241,7 @@ sub usage #09.07.2007 08:39
print "\t -e filename\t\t\tFile which contains a list of files which don't
have to be signed.\n";
print "\t -f pfx_filename\t\t\"Personal Information Exchange\" file.\n";
print "\t -p password\t\t\tPassword for \"Personal Information Exchange\"
file.\n";
- print "\t -t timestamp\t\t\tTimestamp URL e.g.
\"http://timestamp.verisign.com/scripts/timstamp.dll\"\n";;
+ print "\t -t timestamp\t\t\tTimestamp URL e.g.
\"http://timestamp.digicert.com/\"\n";;
print "\t -l log_filename\t\tFile for logging.\n";
print "\t -v\t\t\t\tVerbose.\n";
} ##usage
diff --git a/solenv/bin/modules/installer/windows/msp.pm
b/solenv/bin/modules/installer/windows/msp.pm
index 1bbeea8d20cb..95f51d846c40 100644
--- a/solenv/bin/modules/installer/windows/msp.pm
+++ b/solenv/bin/modules/installer/windows/msp.pm
@@ -1194,7 +1194,7 @@ sub create_msp_patch
my $systemcall = "signtool.exe sign ";
if ( defined($ENV{'PFXFILE'}) ) { $systemcall .= "-f $ENV{'PFXFILE'}
"; }
if ( defined($ENV{'PFXPASSWORD'}) ) { $systemcall .= "-p
$ENV{'PFXPASSWORD'} "; }
- if ( defined($ENV{'TIMESTAMPURL'}) ) { $systemcall .= "-t
$ENV{'TIMESTAMPURL'} "; } else { $systemcall .= "-t
http://timestamp.globalsign.com/scripts/timestamp.dll "; }
+ if ( defined($ENV{'TIMESTAMPURL'}) ) { $systemcall .= "-t
$ENV{'TIMESTAMPURL'} "; } else { $systemcall .= "-t
http://timestamp.digicert.com/ "; }
$systemcall .= "-d \"" . $allvariables->{'PRODUCTNAME'} . " " .
$allvariables->{'PRODUCTVERSION'} . " Patch " .
$allvariables->{'WINDOWSPATCHLEVEL'} . "\" ";
$systemcall .= $localmspfilename;
installer::logger::print_message( "... code signing and timestamping
with signtool.exe ...\n" );
commit 0372039383cec551b534500e26dbecf27f391b11
Author: Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Thu Apr 29 20:10:34 2021 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon Mar 14 20:52:01 2022 +0100
allow utf-8 in xml names (liborcus) (tdf#141672)
Change-Id: Ib150d55b588a572e4352396f18de2331983b2aae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114892
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lu...@collabora.com>
(cherry picked from commit 6b7c2fa65eb68be520ed4135cc245e33fa22e8bf)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114915
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk
b/external/liborcus/UnpackedTarball_liborcus.mk
index 710d126a8c17..00b17131f933 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -28,6 +28,10 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/allow-utf-8-in-xml-names.patch \
))
+$(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
+ external/liborcus/allow-utf-8-in-xml-names.patch \
+))
+
ifeq ($(OS),WNT)
$(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/windows-constants-hack.patch \
