instsetoo_native/CustomTarget_install.mk | 2 +-
officecfg/registry/schema/org/openoffice/Office/UI/Infobar.xcs | 4 ++--
officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs | 2 +-
postprocess/CustomTarget_signing.mk | 2 +-
postprocess/signing/signing.pl | 3 ++-
setup_native/source/packinfo/spellchecker_selection.txt | 2 +-
solenv/bin/modules/installer/epmfile.pm | 2 +-
solenv/bin/modules/installer/windows/msp.pm | 2 +-
8 files changed, 10 insertions(+), 9 deletions(-)
New commits:
commit 705f89a66b736f2680a8e40268aab8a898669d4b
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Tue Aug 23 21:57:10 2022 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Jun 14 14:28:49 2023 +0200
Debian package names must not contain uppercase letters
MIMO packageversion string contains capital M.
Change-Id: Iefa3d8102e1c7ebb779e84a246abb7262bbad384
diff --git a/solenv/bin/modules/installer/epmfile.pm
b/solenv/bin/modules/installer/epmfile.pm
index 495366823604..e6a2042f4fbb 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -289,7 +289,7 @@ sub create_epm_header
installer::packagelist::resolve_packagevariables(\$installer::globals::packageversion,
$variableshashref, 0);
if ( $variableshashref->{'PACKAGEREVISION'} ) {
$installer::globals::packagerevision = $variableshashref->{'PACKAGEREVISION'}; }
- $line = "%version" . " " . $installer::globals::packageversion . "\n";
+ $line = "%version" . " " . lc $installer::globals::packageversion . "\n";
push(@epmheader, $line);
$line = "%release" . " " . $installer::globals::packagerevision . "\n";
commit d069265dfa1cee8bfc8c52d6c5502094e81b83e8
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Tue Aug 23 21:14:10 2022 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Jun 14 14:28:41 2023 +0200
Linux languagepacks take the first from the language list
Change-Id: Id470e88f16b502aeb576a8512f55cd34c56f3500
diff --git a/setup_native/source/packinfo/spellchecker_selection.txt
b/setup_native/source/packinfo/spellchecker_selection.txt
index 2b97ab69c594..a77ef1aaafe4 100644
--- a/setup_native/source/packinfo/spellchecker_selection.txt
+++ b/setup_native/source/packinfo/spellchecker_selection.txt
@@ -47,7 +47,7 @@ en-ZA = "en,es,fr"
eo = "eo"
es = "es,an,ca,fr,gl,oc,pt-PT"
et = "et"
-fr = "de,en,eo,es,fr,it,pt-PT"
+fr = "fr,de,en,eo,es,it,pt-PT"
gd = "gd"
gl = "gl,pt-PT,es"
gu = "gu"
commit 9f515ed0953ebfad72b9af626585ff7e0f0194a0
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Wed Mar 30 11:08:43 2022 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Jun 14 14:28:34 2023 +0200
[MIMO] disable Donate and GetInvolved infobars
Change-Id: I991cf07a89b417fde332fb665a5d2df9930015a4
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/Infobar.xcs
b/officecfg/registry/schema/org/openoffice/Office/UI/Infobar.xcs
index 6b29f0b47e6a..d919f7440571 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/Infobar.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/Infobar.xcs
@@ -34,13 +34,13 @@
<info>
<desc>Whether the Infobar showing the call for donations is
enabled</desc>
</info>
- <value>true</value>
+ <value>false</value>
</prop>
<prop oor:name="GetInvolved" oor:type="xs:boolean" oor:nillable="false">
<info>
<desc>Whether the Infobar showing the call to 'Get Involved' is
enabled</desc>
</info>
- <value>true</value>
+ <value>false</value>
</prop>
<prop oor:name="HyphenationMissing" oor:type="xs:boolean"
oor:nillable="false">
<info>
commit a036ed92172af99ee202a6c97c317441c99d7ea2
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Mon Jun 7 09:00:47 2021 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Jun 14 14:28:28 2023 +0200
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 4b5d13b63c5f..29ad0e7a69cc 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
@@ -259,7 +259,7 @@
<desc>Enables the calculation of the sidebar's minimum width based
on the size of all decks.
If false, the user has full control over the sidebar width.</desc>
</info>
- <value>true</value>
+ <value>false</value>
</prop>
</group>
<group oor:name="Content">
commit 41411bce0f1f66d9d946a9ba5046bbc75b7a7fe7
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Tue May 25 10:16:03 2021 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Jun 14 14:28:20 2023 +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 7d4f8b25a83d..2b97ab69c594 100644
--- a/setup_native/source/packinfo/spellchecker_selection.txt
+++ b/setup_native/source/packinfo/spellchecker_selection.txt
@@ -47,7 +47,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 7d709e17bdc2dcf1fc7b5050d9a3dacc2fb0502f
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Wed Apr 18 07:19:00 2018 -0700
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Jun 14 14:28:14 2023 +0200
[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 ddfa5b202159..13e6e940c385 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 bfc52803665efa9ba65a5413e05f6e8b20d0e440
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Thu Feb 11 08:27:23 2021 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Jun 14 14:28:09 2023 +0200
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 fd27209c533e..eca0551b855f 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -129,7 +129,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 6fdd4950f4cb..85f3c0c60611 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 793900ca074c..ddfa5b202159 100644
--- a/postprocess/signing/signing.pl
+++ b/postprocess/signing/signing.pl
@@ -242,7 +242,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" );
