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 +- 7 files changed, 9 insertions(+), 8 deletions(-)
New commits: commit dc2525480bf32192f249caf981e37d773da23c12 Author: Andras Timar <andras.ti...@collabora.com> AuthorDate: Tue Aug 23 21:57:10 2022 +0200 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Sat Oct 7 20:46:59 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 51d596dcb519..63e9a1bba06f 100644 --- a/solenv/bin/modules/installer/epmfile.pm +++ b/solenv/bin/modules/installer/epmfile.pm @@ -292,7 +292,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 8a5c26a5c1aab9326bd2a140480f1b45790f502b Author: Andras Timar <andras.ti...@collabora.com> AuthorDate: Tue Aug 23 21:14:10 2022 +0200 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Sat Oct 7 20:46:56 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 d0627963f3ab..304fff501f0a 100644 --- a/setup_native/source/packinfo/spellchecker_selection.txt +++ b/setup_native/source/packinfo/spellchecker_selection.txt @@ -48,7 +48,7 @@ eo = "eo" es = "es,an,ca,fr,gl,oc,pt-PT" et = "et" fa = "fa" -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 fb276df1bedd2ed4f0bc80ee3607e62e284035de Author: Andras Timar <andras.ti...@collabora.com> AuthorDate: Wed Mar 30 11:08:43 2022 +0200 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Sat Oct 7 20:46:33 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 2779b7d4a8a60e41f51da707c849063e7f961e77 Author: Andras Timar <andras.ti...@collabora.com> AuthorDate: Mon Jun 7 09:00:47 2021 +0200 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Sat Oct 7 20:46:33 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 cc8cdf89e3fe3e08b1dcc85df9fd63faa7038dc6 Author: Andras Timar <andras.ti...@collabora.com> AuthorDate: Tue May 25 10:16:03 2021 +0200 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Sat Oct 7 20:46:29 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 602bf0b51603..d0627963f3ab 100644 --- a/setup_native/source/packinfo/spellchecker_selection.txt +++ b/setup_native/source/packinfo/spellchecker_selection.txt @@ -48,7 +48,7 @@ eo = "eo" es = "es,an,ca,fr,gl,oc,pt-PT" et = "et" fa = "fa" -fr = "fr,es" +fr = "de,en,eo,es,fr,it,pt-PT" gd = "gd" gl = "gl,pt-PT,es" gu = "gu" commit 0cfd2b16a5b4b2e725a67f7b2d519d9d27bee480 Author: Andras Timar <andras.ti...@collabora.com> AuthorDate: Wed Apr 18 07:19:00 2018 -0700 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Sat Oct 7 20:45:47 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 d9ea24c61c231ca6a6748232e43478b30bc939df Author: Andras Timar <andras.ti...@collabora.com> AuthorDate: Thu Feb 11 08:27:23 2021 +0100 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Sat Oct 7 20:45:42 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 29dcb4b0b1cd..0c33e32e43f7 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