core.git: 2 commits - bin/update desktop/source Makefile.gbuild
Makefile.gbuild | 26 -- bin/update/create_partial_update.py | 27 ++- desktop/source/app/updater.cxx | 14 +++--- 3 files changed, 45 insertions(+), 22 deletions(-) New commits: commit 7cea20d132f8f419bab28ed954635e29a16e5ae2 Author: Christian Lohmaier AuthorDate: Mon May 27 14:16:29 2024 +0200 Commit: Christian Lohmaier CommitDate: Thu Jun 6 16:00:43 2024 +0200 mar: allow parallel creation of diff packages also include the version number in the base-URL for the mar files in the json-file Change-Id: I613ac7c1cf3aeb1eff856c58f00a67151267606c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168100 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/Makefile.gbuild b/Makefile.gbuild index bb072340e19f..bad2fc9f7f15 100644 --- a/Makefile.gbuild +++ b/Makefile.gbuild @@ -43,12 +43,26 @@ create-update-info: mkdir -p $(MAR_DIR)/language MAR=$(INSTDIR)/program/mar $(if $(filter WNT,$(OS)),$(shell cygpath -u $(SRCDIR)/bin/update/create_full_mar.py),$(SRCDIR)/bin/update/create_full_mar.py) "$(PRODUCTNAME)" "$(WORKDIR)" "$(MAR_NAME_PREFIX)" "$(ONLINEUPDATE_MAR_CERTIFICATEPATH)" "$(ONLINEUPDATE_MAR_CERTIFICATENAME)" "$(ONLINEUPDATE_MAR_BASEURL)" '$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)' -create-partial-info: - $(eval BUILDID := $(shell git -C $(SRCDIR) log -1 --format=%H)) - $(eval VERSION := $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(LIBO_VERSION_SUFFIX)$(LIBO_VERSION_SUFFIX_SUFFIX)) - $(eval PLATFORM := $(RTL_OS)_$(RTL_ARCH)) - $(eval MAR_NAME_PREFIX := $(PRODUCTNAME)_$(VERSION)_$(PLATFORM)_$(BUILDID)) - MBSDIFF=$(WORKDIR)/LinkTarget/Executable/mbsdiff MAR=$(INSTDIR)/program/mar $(if $(filter WNT,$(OS)),$(shell cygpath -u $(SRCDIR)/bin/update/create_partial_update.py),$(SRCDIR)/bin/update/create_partial_update.py) "$(WORKDIR)" "$(MAR_NAME_PREFIX)" LOOnlineUpdater "$(ONLINEUPDATE_MAR_CERTIFICATEPATH)" "$(ONLINEUPDATE_MAR_CERTIFICATENAME)" "$(ONLINEUPDATE_MAR_BASEURL)" "$(PRODUCTNAME)" '$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)' "$(ONLINEUPDATE_MAR_OLDMSI)" +# target-variables also will apply to the target's prerequisites (i.e. the individual platform targets) +# arch is taken from the stem of the rule +# MSIDIR and OLD_VER are expected to be specified on the make commandline but others like VERSION, +# BUILDID, ONLINEUPDATE_MAR_NEWMSI and ONLINEUPDATE_MAR_OLDMSI can be overridden as well if needed. +# If VERSION is specified on the commandline, BUILDID defaults to the corresponding libreoffice tag +create-partial-info: export ARCH = $* +create-partial-info: PLATFORM = $(RTL_OS)_$(ARCH) +create-partial-info: VERSION := $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH) +create-partial-info: VERSION_FULL := $(VERSION)$(LIBO_VERSION_SUFFIX)$(LIBO_VERSION_SUFFIX_SUFFIX) +create-partial-info: BUILDID := $(shell git -C $(SRCDIR) log -1 --format=%H$(if $(filter command line,$(origin VERSION)), libreoffice-$(VERSION))) +create-partial-info: MAR_NAME_PREFIX = $(PRODUCTNAME)_$(VERSION_FULL)_$(PLATFORM)_$(BUILDID) +create-partial-info: ONLINEUPDATE_MAR_OLDMSI = $(MSIDIR)$(PRODUCTNAME)_$(OLD_VER)_Win_$(subst AARCH64,aarch64,$(subst X86_64,x86-64,$(ARCH))).msi +create-partial-info: ONLINEUPDATE_MAR_NEWMSI = $(MSIDIR)$(PRODUCTNAME)_$(VERSION)_Win_$(subst AARCH64,aarch64,$(subst X86_64,x86-64,$(ARCH))).msi +create-partial-info: export MBSDIFF := $(WORKDIR)/LinkTarget/Executable/mbsdiff +create-partial-info: export MAR := $(INSTDIR)/program/mar + +create-partial-info: create-partial-info-AARCH64 create-partial-info-X86_64 create-partial-info-x86 + +create-partial-info-%: + $(if $(filter WNT,$(OS)),$(shell cygpath -u $(SRCDIR)/bin/update/create_partial_update.py),$(SRCDIR)/bin/update/create_partial_update.py) "$(WORKDIR)" "$(MAR_NAME_PREFIX)" LOOnlineUpdater "$(ONLINEUPDATE_MAR_CERTIFICATEPATH)" "$(ONLINEUPDATE_MAR_CERTIFICATENAME)" "$(ONLINEUPDATE_MAR_BASEURL)$(VERSION)/" "$(PRODUCTNAME)" '$(VERSION)' "$(ONLINEUPDATE_MAR_OLDMSI)" "$(ONLINEUPDATE_MAR_NEWMSI)" # also possible to bypass the dependencies/the gbuild processing by just running # LD_LIBRARY_PATH=instdir/program make cmd cmd='ALL_LANGS="$(ALL_LANGS)" workdir/LinkTarget/Executable/pocheck' diff --git a/bin/update/create_partial_update.py b/bin/update/create_partial_update.py index 3d9f459f1fdf..8dfa370e5fa7 100755 --- a/bin/update/create_partial_update.py +++ b/bin/update/create_partial_update.py @@ -1,10 +1,10 @@ #!/usr/bin/env python3 -import glob import json import os import re import subprocess import sys +import time from path import UpdaterPath, convert_to_native from signing import sign_mar_file @@ -15,11 +15,23 @@ def
core.git: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit be462215766a2bc53e50de24e0a95950e0afa6f8 Author: Christian Lohmaier AuthorDate: Thu Jun 6 13:57:01 2024 +0200 Commit: Gerrit Code Review CommitDate: Thu Jun 6 13:57:01 2024 +0200 Update git submodules * Update translations from branch 'master' to e792da64bdd30891f9403604d68eebfea07c82e0 - update translations for master / 24.8.0 beta1 and force-fix errors using pocheck Change-Id: Icb1e64bed6621dec76e972ecaf58197d4c0f1d6e diff --git a/translations b/translations index fbbd7b927a86..e792da64bdd3 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit fbbd7b927a869cfe63dfbf0542b967da94eef28e +Subproject commit e792da64bdd30891f9403604d68eebfea07c82e0
core.git: Changes to 'distro/collabora/libreoffice-7-6+backports'
New branch 'distro/collabora/libreoffice-7-6+backports' available with the following commits:
core.git: solenv/bin
solenv/bin/job-limiter.cpp |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit da4259bd7fef35185418cad7a695268add6341a2 Author: Christian Lohmaier AuthorDate: Tue Jun 4 14:32:08 2024 +0200 Commit: Christian Lohmaier CommitDate: Tue Jun 4 16:43:56 2024 +0200 windows packaging: reduce parallelism further to three Some jenkins daily builders still run into issues from time to time, and even at a reduced parallelism of three it doesn't affect overall buildtime when building with just two or three languages and also not when building with all languages. There might be a number of languages where this has a penalty, but probably not a significant one. Change-Id: I778b5fe21fe8f9bb1fcca1da3c4c0eeeda6c29d8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168403 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/solenv/bin/job-limiter.cpp b/solenv/bin/job-limiter.cpp index 9111ead35127..ee1bd8e6edab 100644 --- a/solenv/bin/job-limiter.cpp +++ b/solenv/bin/job-limiter.cpp @@ -79,12 +79,12 @@ int wmain(int argc, wchar_t* argv[]) // system. So when it creates a new one to use, and then releases one it would hit the max // limit otherwise. This only happens when nothing else is waiting for a slot anymore, // i.e. when there are already fewer jobs than imposed by the limiter. -// A limit of four (main installer and 3 controlled by this limiter) was chosen because that +// A limit of three (main installer + 2 controlled by this limiter) was chosen because that // won't affect overall build time (creating the main installer with multiple languages // takes much longer than all the helppackages and the single sdk package combined, even // when those are limited to three jobs), and seems to be low enough to avoid the random // cscript/WiLangId.vbs failures. -semaphore_handle = CreateSemaphoreW(NULL, 3, 4, semaphorename); +semaphore_handle = CreateSemaphoreW(NULL, 2, 3, semaphorename); // keep this process alive for other jobs to grab the semaphore, otherwise it is gone too // quickly and everything creates their own semaphore that immediately has enough slots, // completely bypassing the point of having a limiter...
translations.git: Changes to 'refs/tags/libreoffice-24.2.4.2'
Tag 'libreoffice-24.2.4.2' created by Christian Lohmaier at 2024-06-04 10:40 + Tag libreoffice-24.2.4.2 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmZe7zYACgkQ9DSh76/u rqOq3g//UrkYTpwqPh0Y70JPY688CQpVPAxODJGgEFd6dPOcdXKBV0ZFlmiqV0Sz Sk18GbYrH+GuNNdL6VUK35KAhZ7Kwky/C8T+vxcvFbsTit8outLuW23+fB6ocenF hMYeT1LuvMjlZ6lXPTtoM/CHAst03pXP9bla5XNybMgnSUyG0aNGRlW1MInM8cHA rXJVG5VwnW4gBf6rVRTf+7Fp85D2yZDiqirBxilQ9G1igjDvxQ8GT3DPMSp7Y17c bJCmo9bCR4m8yoDHkfwbxIdEpxUOudsp9zmLJaODo4v7PhMGtpLQpHrWhkCTmij/ paPHTs/afNN62y+YEKgab6tzF/OwU8ovcqWs9zfRc1XNRittu19NIfzM7friqXM3 rljLKuqadti1tFZqSgk4gBLIjpIuwHPbf3Y5luTUw4ajCoh5PeyStjaUHgP3640h HA3wfqS1q5N8pg4zf4DMFbqaA1fy4d08e1ajUAhy96Vn5Ug8UdHA8r73C1/Cygri a/Gk4JXJIgetXhZszHDjxgeTvb9sTd3M7Q0RZLGbjrqPXHEeL4m73uI7rUaARZ1q cwHGvrue7c1iEIvp+/yYaU5tgOkOeIP5c0UeH7hYs6316w3RUO+nNWeGf76SBhgV hLpzEjXDspcGdphCfdfhyThHOJWVuytxBDOe1/jngkRe61bEys8= =8+lw -END PGP SIGNATURE- Changes since cp-24.04.0-1-12: --- 0 files changed ---
help.git: Changes to 'refs/tags/libreoffice-24.2.4.2'
Tag 'libreoffice-24.2.4.2' created by Christian Lohmaier at 2024-06-04 10:40 + Tag libreoffice-24.2.4.2 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmZe7zYACgkQ9DSh76/u rqNDBA/9F9HD9AH7kGSFRH4qs0zyPv9jHcbhywxK906Cf21fZhwT8CfFpyDxzoic qBELuIvUiCh8ibidZDAw1slzHx2xK8DnsGvxJFT03gxbUVJe0sPSuIjsSAcVvk8i A3hqyHZaQhG9rXzHSxILCbnWwCRKl64jU7/pIMmmFvaEAg/SqI/G9bCsPvpCRmzn 4A2tZsTT7lW6XbZ3gN/e7IlXBp1njD0FqsR1hnFwMDcMFNMkqCs+sFBwbWtQTTfQ AZGZxNvzvB4ZaiqD2kVIxyvWMHi4NSIB8gBp98p6TFoQo71bQQGrxBst8S1jtahR XunZ/re04gmu5rz38qNxVg/hhYSpZr/nbj2J8TbTH+QAr234utU/1216I1nAqbtI crJ//pY0J6Rnqv9FKZ3TpSFVmEQvH2asVQ5bLbzlFvuRqvaJR/AMeQDiOjWsDsvd fkMEqOSeE0TeRzjNwR1VxreBCk8RUzbK4H5qeKfwf3ShSGmGsDEU7Gvf73UYbB44 /+G3oI7IcVCz/0N2x74udwjogXt82ECrmNThbTKTeXIiB9YM3sZsUDKiCIuX97Wy BS+WonEfax39e8JzPcZ4mcjFagSsNTE1f36/o104K0fuSYOYVTcnC+oWwtVqq6Qa Iq0jPJ590JV1zVZvJ5kNddDujWarIG/V2bAUIk7hESNCjwt9dqQ= =qs19 -END PGP SIGNATURE- Changes since co-24.04-branch-point-15: --- 0 files changed ---
dictionaries.git: Changes to 'refs/tags/libreoffice-24.2.4.2'
Tag 'libreoffice-24.2.4.2' created by Christian Lohmaier at 2024-06-04 10:40 + Tag libreoffice-24.2.4.2 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmZe7zMACgkQ9DSh76/u rqN60Q//QB3DyP4lED7ItUW87L+aeCT3Be7ApUvyLDjpNp0Fi24pz93LU/20Fmix SooSSO574yBR3XdWcWaPTHlf7ZXYtOrCxxhNV1cWyuYqw1qbxin3lMjNXeJiQdfS awYqPjLvbSSUgOohUPGq2y6jAFSlhk9bO6GUrJ0350aBaiVcGEfgAzNDcw+HG/rP ay+6d4iCLlBY4I/AIL7ETGQyHZYe24HjAPPt28EAbhfq7cF0TBLmgLBhCPW56y+4 uY1wVkNms6PScPuZPK8YBs0OWvh88g56D/h38mwRFvdbQn3r9TTLdIfxwCLXCrTd m04VGEoPDy0sD+sS/apSTXldLi2nZtdbqmzncLtShlATfe70JuA87VrFg53HWmMC CU/BzJ1PTeyiXeUrmruRsFB5lZkDuA4buYSCxzKgQ43TBQlkT333Mzl79D0Pf42p ho8xt2Azsj0GGEpEeNBzYP06W4648qsNnd5TNrkCuOP85HHAuBovWFzQNGFZiTKM rOTnc8juNY8K239RLVN+GPU0EQdKKGTPg19rRmlH+v3c+Z502+9YOm+dBcIUaY7c Ccyh/8BdTz+sWxZk4ystdHG/+xCs6Y2SmHanp9RBctqGecMG3E6iGYXe14VU/Wq6 GKdal4IVxRsUToj0XVC22/rO5WYtOPbzYPXjcaEdpxPAYkCCcDs= =IdJ+ -END PGP SIGNATURE- Changes since cp-24.04.1-2-5: --- 0 files changed ---
core.git: Branch 'libreoffice-24-2-4' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7897b6c55f863411d5d0d3fa61f4da37618dd22f Author: Christian Lohmaier AuthorDate: Tue Jun 4 12:41:17 2024 +0200 Commit: Christian Lohmaier CommitDate: Tue Jun 4 12:41:17 2024 +0200 bump product version to 24.2.4.2.0+ Change-Id: I1fce883b881651cd72eaa7f252686dbfafabe1ad diff --git a/configure.ac b/configure.ac index 8fc5f88de3c1..76f11edfe2e3 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[24.2.4.1.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[24.2.4.2.0+],[],[],[http://documentfoundation.org/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
core.git: Changes to 'refs/tags/libreoffice-24.2.4.2'
Tag 'libreoffice-24.2.4.2' created by Christian Lohmaier at 2024-06-04 10:40 + Tag libreoffice-24.2.4.2 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmZe7zYACgkQ9DSh76/u rqMt1Q/+IZnYlg56ii3Je7viKRCG0ikABi1eHCHKL4rYoL8++tnL5maJdQGO2dQx cNxTP84F9xBGeBbGunWz2tYGQOn6ZkCyxFkUtfK0EV44AMa+BPB4dy0ImFOxgdrB UvBAhfLw2BOUHoSPbgQGI5Lreqg/YsOCGgTz85AxexCrnDP1YpH4u76p7VW7sEeG oqe0o2eoEEJIEDSditJUtUAwDOb0OkBPTRuzyvcZNEWA3ZimF3OyW09YjghrlkDw DRG5cvmR69ySs3BBUEmXRoXcMvGblXgYi2uKY7R9qB0MFYriBxLJ+lKENX1SnoQA og4eAZUEBppk4k8yM030j2dg0dTUIHzOCcFnkKTmCHMMJ6RpYRYpITQgH+ijj+DS pHBKE6Lw7o8VDeNV65Bfuz+/ZNcXc2D2VduAh/KPPEtCe9mQ5xSeS7Anq6xchOIW 0R4++P9vhgC4na1ImhVtKhHtSL/uin7RRbhkn1W07FwG5SGJoAdOkkrMSxcDJ4Zg mfGnVC2/GUh79MeeS48b+YS42K+DL2wbptqLOgtzAiE4BWN5M+53AUZgpQ7tPKJM Ivku2LEQVI8FWfoL817NDL+vLminhvRDedY2g2XqYrwFkubdQlFb79uQHdG1+D+L Q8+WbhV7P+Fh76Er875txgPMnMyUcdauW1Xda6AF/r4/JUgV8Es= =xwfR -END PGP SIGNATURE- Changes since co-24.04-branch-point-587: --- 0 files changed ---
core.git: Branch 'libreoffice-24-2-4' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e3ce5d358dcf7cac002bee7b0c885a3d19859f57 Author: Christian Lohmaier AuthorDate: Tue Jun 4 12:45:55 2024 +0200 Commit: Gerrit Code Review CommitDate: Tue Jun 4 12:45:55 2024 +0200 Update git submodules * Update translations from branch 'libreoffice-24-2-4' to 3357c0b88c8b0d218ccc7c40558a9ee8cd4612ea - update translations for 24.2.4 rc2 and force-fix errors using pocheck Change-Id: Iecf863e23df6934c7fc9125f9eda4ec05c26739f (cherry picked from commit 8bde22939d49fb6cebb30841b269b1625c07eb5a) diff --git a/translations b/translations index f07002ad3f6f..3357c0b88c8b 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit f07002ad3f6f59f2808369beec84ace71b5af5fc +Subproject commit 3357c0b88c8b0d218ccc7c40558a9ee8cd4612ea
translations.git: Branch 'libreoffice-24-2-4' - source/ab source/ast source/ca source/da source/de source/es source/fa source/fi source/fr source/gug source/hsb source/ja source/ka source/ko source/nl
source/ab/sc/messages.po | 122 +++ source/ast/cui/messages.po| 11 source/ast/helpcontent2/source/text/sbasic/shared/03.po | 36 +- source/ast/helpcontent2/source/text/scalc/02.po |8 source/ast/helpcontent2/source/text/sdraw/00.po | 14 source/ast/helpcontent2/source/text/shared/00.po |6 source/ast/helpcontent2/source/text/shared/guide.po |6 source/ast/helpcontent2/source/text/swriter/guide.po |6 source/ast/sw/messages.po |6 source/ca/helpcontent2/source/text/sbasic/shared/03.po| 14 source/ca/helpcontent2/source/text/sdraw/00.po| 10 source/ca/helpcontent2/source/text/shared/00.po |6 source/ca/helpcontent2/source/text/shared/guide.po|6 source/da/cui/messages.po |8 source/da/helpcontent2/source/text/sbasic/shared.po | 32 - source/da/helpcontent2/source/text/scalc.po | 18 - source/da/helpcontent2/source/text/scalc/05.po| 10 source/da/helpcontent2/source/text/sdatabase.po | 14 source/da/helpcontent2/source/text/sdraw/01.po|8 source/da/helpcontent2/source/text/shared/06.po | 18 - source/da/helpcontent2/source/text/shared/help.po | 22 - source/da/helpcontent2/source/text/shared/menu.po | 70 ++-- source/da/helpcontent2/source/text/simpress.po| 10 source/da/helpcontent2/source/text/simpress/00.po |6 source/da/helpcontent2/source/text/simpress/01.po |6 source/da/helpcontent2/source/text/swriter/librelogo.po |8 source/da/helpcontent2/source/text/swriter/menu.po| 14 source/da/officecfg/registry/data/org/openoffice/Office/UI.po | 10 source/da/sd/messages.po |4 source/da/svtools/messages.po |6 source/da/svx/messages.po | 34 +- source/de/helpcontent2/source/text/sbasic/shared.po | 26 - source/de/helpcontent2/source/text/sbasic/shared/03.po| 14 source/de/helpcontent2/source/text/scalc/01.po| 26 - source/de/helpcontent2/source/text/scalc/guide.po |6 source/de/helpcontent2/source/text/schart/01.po |6 source/de/helpcontent2/source/text/sdatabase.po | 28 - source/de/helpcontent2/source/text/shared/01.po | 26 - source/de/helpcontent2/source/text/shared/02.po |6 source/de/helpcontent2/source/text/shared/guide.po| 26 - source/de/helpcontent2/source/text/shared/optionen.po | 18 - source/de/helpcontent2/source/text/simpress/01.po |8 source/de/helpcontent2/source/text/simpress/guide.po |6 source/de/helpcontent2/source/text/swriter/01.po | 12 source/de/helpcontent2/source/text/swriter/guide.po |8 source/es/helpcontent2/source/text/sbasic/shared/03.po| 14 source/es/helpcontent2/source/text/scalc.po |8 source/es/helpcontent2/source/text/shared/00.po |6 source/es/helpcontent2/source/text/shared/guide.po|6 source/es/sw/messages.po |6 source/es/xmlsecurity/messages.po |8 source/fa/wizards/messages.po | 129 +++ source/fi/cui/messages.po |6 source/fr/sw/messages.po |6 source/gug/helpcontent2/source/text/sbasic/shared/03.po | 14 source/gug/helpcontent2/source/text/scalc.po |8 source/gug/helpcontent2/source/text/shared/00.po |6 source/gug/helpcontent2/source/text/shared/guide.po |6 source/hsb/helpcontent2/source/text/swriter/guide.po | 162 +- source/ja/cui/messages.po |8 source/ja/helpcontent2/source/text/sdatabase.po | 32 - source/ja/helpcontent2/source/text/shared/00.po |6 source/ja/helpcontent2/source/text/shared/01.po | 22 - source/ja/helpcontent2/source/text/shared/guide.po| 10 source/ja/helpcontent2/source/text/smath/01.po|6 source/ja/helpcontent2/source/text/swriter/01.po | 28 - source/ja/helpcontent2/source/text/swriter/menu.po|6 source/ja/sc/messages.po |8 source/ja/svtools/messages.po |6 source/ja/svx/messages.po
core.git: Branch 'libreoffice-24-2' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f6e74a4e0f3c3008b0901bcadc4d6ae384b39e02 Author: Christian Lohmaier AuthorDate: Tue Jun 4 12:44:45 2024 +0200 Commit: Gerrit Code Review CommitDate: Tue Jun 4 12:44:45 2024 +0200 Update git submodules * Update translations from branch 'libreoffice-24-2' to 8bde22939d49fb6cebb30841b269b1625c07eb5a - update translations for 24.2.4 rc2 and force-fix errors using pocheck Change-Id: Iecf863e23df6934c7fc9125f9eda4ec05c26739f diff --git a/translations b/translations index 70127e22568e..8bde22939d49 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 70127e22568ed8e3993d85ab681f8e23b2bf1e0b +Subproject commit 8bde22939d49fb6cebb30841b269b1625c07eb5a
translations.git: Branch 'libreoffice-24-2' - source/ab source/ast source/ca source/da source/de source/es source/fa source/fi source/fr source/gug source/hsb source/ja source/ka source/ko source/nl s
source/ab/sc/messages.po | 122 +++ source/ast/cui/messages.po| 11 source/ast/helpcontent2/source/text/sbasic/shared/03.po | 36 +- source/ast/helpcontent2/source/text/scalc/02.po |8 source/ast/helpcontent2/source/text/sdraw/00.po | 14 source/ast/helpcontent2/source/text/shared/00.po |6 source/ast/helpcontent2/source/text/shared/guide.po |6 source/ast/helpcontent2/source/text/swriter/guide.po |6 source/ast/sw/messages.po |6 source/ca/helpcontent2/source/text/sbasic/shared/03.po| 14 source/ca/helpcontent2/source/text/sdraw/00.po| 10 source/ca/helpcontent2/source/text/shared/00.po |6 source/ca/helpcontent2/source/text/shared/guide.po|6 source/da/cui/messages.po |8 source/da/helpcontent2/source/text/sbasic/shared.po | 32 - source/da/helpcontent2/source/text/scalc.po | 18 - source/da/helpcontent2/source/text/scalc/05.po| 10 source/da/helpcontent2/source/text/sdatabase.po | 14 source/da/helpcontent2/source/text/sdraw/01.po|8 source/da/helpcontent2/source/text/shared/06.po | 18 - source/da/helpcontent2/source/text/shared/help.po | 22 - source/da/helpcontent2/source/text/shared/menu.po | 70 ++-- source/da/helpcontent2/source/text/simpress.po| 10 source/da/helpcontent2/source/text/simpress/00.po |6 source/da/helpcontent2/source/text/simpress/01.po |6 source/da/helpcontent2/source/text/swriter/librelogo.po |8 source/da/helpcontent2/source/text/swriter/menu.po| 14 source/da/officecfg/registry/data/org/openoffice/Office/UI.po | 10 source/da/sd/messages.po |4 source/da/svtools/messages.po |6 source/da/svx/messages.po | 34 +- source/de/helpcontent2/source/text/sbasic/shared.po | 26 - source/de/helpcontent2/source/text/sbasic/shared/03.po| 14 source/de/helpcontent2/source/text/scalc/01.po| 26 - source/de/helpcontent2/source/text/scalc/guide.po |6 source/de/helpcontent2/source/text/schart/01.po |6 source/de/helpcontent2/source/text/sdatabase.po | 28 - source/de/helpcontent2/source/text/shared/01.po | 26 - source/de/helpcontent2/source/text/shared/02.po |6 source/de/helpcontent2/source/text/shared/guide.po| 26 - source/de/helpcontent2/source/text/shared/optionen.po | 18 - source/de/helpcontent2/source/text/simpress/01.po |8 source/de/helpcontent2/source/text/simpress/guide.po |6 source/de/helpcontent2/source/text/swriter/01.po | 12 source/de/helpcontent2/source/text/swriter/guide.po |8 source/es/helpcontent2/source/text/sbasic/shared/03.po| 14 source/es/helpcontent2/source/text/scalc.po |8 source/es/helpcontent2/source/text/shared/00.po |6 source/es/helpcontent2/source/text/shared/guide.po|6 source/es/sw/messages.po |6 source/es/xmlsecurity/messages.po |8 source/fa/wizards/messages.po | 129 +++ source/fi/cui/messages.po |6 source/fr/sw/messages.po |6 source/gug/helpcontent2/source/text/sbasic/shared/03.po | 14 source/gug/helpcontent2/source/text/scalc.po |8 source/gug/helpcontent2/source/text/shared/00.po |6 source/gug/helpcontent2/source/text/shared/guide.po |6 source/hsb/helpcontent2/source/text/swriter/guide.po | 162 +- source/ja/cui/messages.po |8 source/ja/helpcontent2/source/text/sdatabase.po | 32 - source/ja/helpcontent2/source/text/shared/00.po |6 source/ja/helpcontent2/source/text/shared/01.po | 22 - source/ja/helpcontent2/source/text/shared/guide.po| 10 source/ja/helpcontent2/source/text/smath/01.po|6 source/ja/helpcontent2/source/text/swriter/01.po | 28 - source/ja/helpcontent2/source/text/swriter/menu.po|6 source/ja/sc/messages.po |8 source/ja/svtools/messages.po |6 source/ja/svx/messages.po
core.git: Branch 'distro/collabora/co-24.04' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ea5fdd799fdcbe20d218873e44b8dc95ab6d305a Author: Christian Lohmaier AuthorDate: Mon Jun 3 17:31:44 2024 +0200 Commit: Gerrit Code Review CommitDate: Mon Jun 3 17:31:44 2024 +0200 Update git submodules * Update translations from branch 'distro/collabora/co-24.04' to eb9a6b26a36adfac6235cbd2852e5e7abeda54a3 - update translations for 24.2.4 rc2 and force-fix errors using pocheck Change-Id: I72d7d0cfe6d2cf73e9d77b235e568607dc2e64ac - update translations for 24.2.4 rc1 and force-fix errors using pocheck Change-Id: I33b8c9512615cb5d058159e40785d20255b645df - update translations for 24.2.3 rc2 and force-fix errors using pocheck Change-Id: Ia1b6ca2a6abad23632aafb021c8bba19a20e1a7b diff --git a/translations b/translations index d835b3bec673..eb9a6b26a36a 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit d835b3bec673fcb88a3e9c4aed8067ec0e838773 +Subproject commit eb9a6b26a36adfac6235cbd2852e5e7abeda54a3
core.git: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0fc56575b69e0083d66149adeeb90662e29cdac7 Author: Christian Lohmaier AuthorDate: Mon Jun 3 13:51:56 2024 +0200 Commit: Gerrit Code Review CommitDate: Mon Jun 3 13:51:56 2024 +0200 Update git submodules * Update translations from branch 'master' to fbbd7b927a869cfe63dfbf0542b967da94eef28e - update translations for master and force-fix errors using pocheck Change-Id: I49098e6b67b2b13457c5f911910aac85b0d70b5d diff --git a/translations b/translations index 113c6c3c2498..fbbd7b927a86 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 113c6c3c2498ffc2f99f20c088367bca1fecc50b +Subproject commit fbbd7b927a869cfe63dfbf0542b967da94eef28e
core.git: solenv/gbuild
solenv/gbuild/platform/com_MSC_defs.mk |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit c2f9689cd489f44122b50d7c0d7841c47381df99 Author: Christian Lohmaier AuthorDate: Mon Jun 3 11:55:14 2024 +0200 Commit: Christian Lohmaier CommitDate: Mon Jun 3 13:08:43 2024 +0200 disable MSVC -analyse when run in CI - build time penalty is too much times went from 55min to 88min when doing a single build Change-Id: I9304eae9f2326c206bd571e7b8a3ef861206282f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168362 Tested-by: Jenkins Reviewed-by: Christian Lohmaier Reviewed-by: Noel Grandin diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index 506cfbe7d30a..67aa47320c6c 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -104,7 +104,8 @@ gb_AFLAGS := $(AFLAGS) # C4706: assignment within conditional expression -MSVC_ANALYZE_FLAGS := -analyze:ruleset$(SRCDIR)/solenv/vs/LibreOffice.ruleset +# build-time penalty is to high for ci use/disable when JENKINS_HOME is set +MSVC_ANALYZE_FLAGS := $(if $(JENKINS_HOME),,-analyze:ruleset$(SRCDIR)/solenv/vs/LibreOffice.ruleset) gb_FilterOutClangCFLAGS += $(MSVC_ANALYZE_FLAGS)
core.git: configure.ac l10ntools/source scp2/source solenv/inc
configure.ac | 16 l10ntools/source/ulfconv/msi-encodinglist.txt |1 + scp2/source/ooo/module_langpack.ulf |6 ++ solenv/inc/langlist.mk|9 + 4 files changed, 24 insertions(+), 8 deletions(-) New commits: commit e8392bc1c984da1f09674055b1bac95e12de59a6 Author: Christian Lohmaier AuthorDate: Sat Jun 1 17:45:55 2024 +0200 Commit: Christian Lohmaier CommitDate: Sun Jun 2 19:26:46 2024 +0200 allow low-translation-completion-langs for dev-builds (e.g.: Sundanese) will be included when using --with-lang=ALL in non-release configuration (i.e. tinderbox provided daily builds), but not when using --enable-release-build. Change the way how configure fetches the list of all supported languages from a fancy sed call to running make with a dummy-recipe. Change-Id: I8bbea5fd95d37eac5bbce2e55ae34830b0ab4ebb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168334 Reviewed-by: Christian Lohmaier Tested-by: Jenkins diff --git a/configure.ac b/configure.ac index 2cccb004e8dd..172417596a84 100644 --- a/configure.ac +++ b/configure.ac @@ -14457,14 +14457,14 @@ dnl === AC_MSG_CHECKING([which languages to be built]) # get list of all languages # generate shell variable from completelangiso= from solenv/inc/langlist.mk -# the sed command does the following: -# + if a line ends with a backslash, append the next line to it -# + adds " on the beginning of the value (after =) -# + adds " at the end of the value -# + removes en-US; we want to put it on the beginning -# + prints just the section starting with 'completelangiso=' and ending with the " at the end of line -[eval $(sed -e :a -e '/\$/N; s/\ //; ta' -n -e 's/=/="/;s/\([^\]\)$/"/;s/en-US//;/^completelangiso/p' $SRC_ROOT/solenv/inc/langlist.mk)] -ALL_LANGS="en-US $completelangiso" +# we want en-US at the beginning +ALL_LANGS=$($GNUMAKE SRC_ROOT=$SRC_ROOT WITH_LANG="$with_lang" ENABLE_RELEASE_BUILD="$ENABLE_RELEASE_BUILD" -sr -f - <<'EOF' | tr -d ' ' +include $(SRC_ROOT)/solenv/inc/langlist.mk +all: + $(info en-US $(filter-out en-US,$(sort $(completelangiso +EOF +) + # check the configured localizations WITH_LANG="$with_lang" diff --git a/l10ntools/source/ulfconv/msi-encodinglist.txt b/l10ntools/source/ulfconv/msi-encodinglist.txt index eaa1754cf538..453d1330dd39 100644 --- a/l10ntools/source/ulfconv/msi-encodinglist.txt +++ b/l10ntools/source/ulfconv/msi-encodinglist.txt @@ -147,6 +147,7 @@ sr-Latn 0 2074 # Serbian Latin sr-SP0 3098 # Serbian Cyrillic ss 0 1579 # Swazi st 0 1072 # Southern Sotho, Sutu +sun 0 1690 # Sundanese, fake LCID sv 0 1053 sw 0 1089 # Swahili sw-TZ0 1089 # Swahili diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf index 5b51e7fa9f64..e9274207734c 100644 --- a/scp2/source/ooo/module_langpack.ulf +++ b/scp2/source/ooo/module_langpack.ulf @@ -70,6 +70,12 @@ en-US = "Spanish" [STR_DESC_MODULE_LANGPACK_ES] en-US = "Installs the Spanish user interface" +[STR_NAME_MODULE_LANGPACK_SUN] +en-US = "Sundanese" + +[STR_DESC_MODULE_LANGPACK_SUN] +en-US = "Installs the Sundanese user interface" + [STR_NAME_MODULE_LANGPACK_SV] en-US = "Swedish" diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk index 0de00dff99a7..95a295c10738 100644 --- a/solenv/inc/langlist.mk +++ b/solenv/inc/langlist.mk @@ -138,6 +138,15 @@ zh-CN \ zh-TW \ zu +# languages with low translation percentage, but still wish to have daily builds +lowcompletion_langs = sun +ifneq ($(ENABLE_RELEASE_BUILD),TRUE) +completelangiso += $(lowcompletion_langs) +else +# allow to manually specify even in release config +completelangiso += $(foreach lang,$(WITH_LANG),$(filter $(lang),$(lowcompletion_langs))) +endif + ifneq ($(WITH_LANG),ALL) gb_WITH_LANG=$(WITH_LANG) else
core.git: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9265dd87222763453784938553f9be41277acd6a Author: Christian Lohmaier AuthorDate: Sat Jun 1 18:23:09 2024 +0200 Commit: Gerrit Code Review CommitDate: Sat Jun 1 18:23:09 2024 +0200 Update git submodules * Update translations from branch 'master' to 113c6c3c2498ffc2f99f20c088367bca1fecc50b - add files for Sundanese (sun) Change-Id: Ic64f8f20a409024e8e0bf8d07aa644d7caa38bda - update translations for master and force-fix errors using pocheck Change-Id: I9e8399ac390552903a010f54802d722a2acf36f4 diff --git a/translations b/translations index 833ed440d8ca..113c6c3c2498 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 833ed440d8cae32801d2e6a4b6e45d8210e99251 +Subproject commit 113c6c3c2498ffc2f99f20c088367bca1fecc50b
core.git: Branch 'libreoffice-24-2-4' - readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 2782 ++-- 1 file changed, 1401 insertions(+), 1381 deletions(-) New commits: commit cb1ee2011436c6aa45c5a678f41c2f77fc925b63 Author: Christian Lohmaier AuthorDate: Fri May 31 15:04:09 2024 +0200 Commit: Christian Lohmaier CommitDate: Fri May 31 15:08:18 2024 +0200 update credits Change-Id: I8f3b3bbed98c026302400be448d621ce530d5e79 (cherry picked from commit 64bf123ebae9873758c30cb41aaf3a1098c5e678) (cherry picked from commit 6d02039027b245ddcdb72638fd25d5a470d3dc51) diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index c3d752e2232c..7b2c705d9bde 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,10 +1,10 @@ http://www.w3.org/TR/css3-text/; xmlns:grddl="http://www.w3.org/2003/g/data-view#; xmlns:xhtml="http://www.w3.org/1999/xhtml; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xmlns:xsd="http://www.w3.org/2001/XMLSchema; xmlns:xforms="http://www.w3.org/2002/xforms; xmlns:dom="http://www.w3.org/2001/xml-events; xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML; xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office; xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooow="http://openoffice.org/2004/writer; xmlns:xlink="http://www.w3.org/1999/xlink; xmlns:drawooo="http://openoffice.org/2010/draw; xmlns:oooc="http://openoffice.org/2004/calc; xmlns:dc="http://purl.org/dc/elements/1.1/; xmlns:c alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:tableooo="http://openoffice.org/2009/table; xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:rpt="http://openoffice.org/2005/report; xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:officeooo="http://openoffice.org/2009/office; xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns: meta:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/24.2.2.2$Linux_X86_64 LibreOffice_project/d56cc158d8a96260b836f100ef4b4ef25d6f1a012012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/24.2.3.2$Linux_X86_64 LibreOffice_project/433d9c2ded56988e8a90e6b2e771ee4e6a5ab2ba2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 2360 + 656 501 55167 26963 @@ -16,9 +16,9 @@ 3623 3434 501 - 2360 + 656 55667 - 29321 + 27617 0 0 false @@ -146,7 +146,7 @@ false true - 13478728 + 13597256 true false false @@ -176,7 +176,7 @@ - + @@ -370,21 +370,21 @@ - + - + - + - + - + @@ -448,24 +448,24 @@ - + - + - + - + - + - + @@ -1163,20 +1163,20 @@ Credits -1971 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2024-05-07 16:01:41. +1972 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2024-05-28 14:34:40. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 - + Ruediger TimmCommits: 82464Joined: 2000-10-10 - Caolán McNamaraCommits: 35426Joined: 2000-10-10 + Caolán McNamaraCommits: 35504Joined: 2000-10-10 Kurt ZenkerCommits: 31752Joined: 2000-09-25 @@
core.git: Branch 'libreoffice-24-2' - readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 2782 ++-- 1 file changed, 1401 insertions(+), 1381 deletions(-) New commits: commit 6d02039027b245ddcdb72638fd25d5a470d3dc51 Author: Christian Lohmaier AuthorDate: Fri May 31 15:04:09 2024 +0200 Commit: Christian Lohmaier CommitDate: Fri May 31 15:05:55 2024 +0200 update credits Change-Id: I8f3b3bbed98c026302400be448d621ce530d5e79 (cherry picked from commit 64bf123ebae9873758c30cb41aaf3a1098c5e678) diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index c3d752e2232c..7b2c705d9bde 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,10 +1,10 @@ http://www.w3.org/TR/css3-text/; xmlns:grddl="http://www.w3.org/2003/g/data-view#; xmlns:xhtml="http://www.w3.org/1999/xhtml; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xmlns:xsd="http://www.w3.org/2001/XMLSchema; xmlns:xforms="http://www.w3.org/2002/xforms; xmlns:dom="http://www.w3.org/2001/xml-events; xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML; xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office; xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooow="http://openoffice.org/2004/writer; xmlns:xlink="http://www.w3.org/1999/xlink; xmlns:drawooo="http://openoffice.org/2010/draw; xmlns:oooc="http://openoffice.org/2004/calc; xmlns:dc="http://purl.org/dc/elements/1.1/; xmlns:c alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:tableooo="http://openoffice.org/2009/table; xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:rpt="http://openoffice.org/2005/report; xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:officeooo="http://openoffice.org/2009/office; xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns: meta:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/24.2.2.2$Linux_X86_64 LibreOffice_project/d56cc158d8a96260b836f100ef4b4ef25d6f1a012012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/24.2.3.2$Linux_X86_64 LibreOffice_project/433d9c2ded56988e8a90e6b2e771ee4e6a5ab2ba2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 2360 + 656 501 55167 26963 @@ -16,9 +16,9 @@ 3623 3434 501 - 2360 + 656 55667 - 29321 + 27617 0 0 false @@ -146,7 +146,7 @@ false true - 13478728 + 13597256 true false false @@ -176,7 +176,7 @@ - + @@ -370,21 +370,21 @@ - + - + - + - + - + @@ -448,24 +448,24 @@ - + - + - + - + - + - + @@ -1163,20 +1163,20 @@ Credits -1971 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2024-05-07 16:01:41. +1972 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2024-05-28 14:34:40. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 - + Ruediger TimmCommits: 82464Joined: 2000-10-10 - Caolán McNamaraCommits: 35426Joined: 2000-10-10 + Caolán McNamaraCommits: 35504Joined: 2000-10-10 Kurt ZenkerCommits: 31752Joined: 2000-09-25 @@ -1193,15 +1193,15 @@ Vladimir GlazunovCommits: 25434Joined: 2000-12-04
core.git: 2 commits - readlicense_oo/license solenv/gbuild
readlicense_oo/license/CREDITS.fodt | 2782 ++-- solenv/gbuild/Output.mk |3 2 files changed, 1403 insertions(+), 1382 deletions(-) New commits: commit 64bf123ebae9873758c30cb41aaf3a1098c5e678 Author: Christian Lohmaier AuthorDate: Fri May 31 15:04:09 2024 +0200 Commit: Christian Lohmaier CommitDate: Fri May 31 15:04:21 2024 +0200 update credits Change-Id: I8f3b3bbed98c026302400be448d621ce530d5e79 diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index c3d752e2232c..7b2c705d9bde 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,10 +1,10 @@ http://www.w3.org/TR/css3-text/; xmlns:grddl="http://www.w3.org/2003/g/data-view#; xmlns:xhtml="http://www.w3.org/1999/xhtml; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xmlns:xsd="http://www.w3.org/2001/XMLSchema; xmlns:xforms="http://www.w3.org/2002/xforms; xmlns:dom="http://www.w3.org/2001/xml-events; xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML; xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office; xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooow="http://openoffice.org/2004/writer; xmlns:xlink="http://www.w3.org/1999/xlink; xmlns:drawooo="http://openoffice.org/2010/draw; xmlns:oooc="http://openoffice.org/2004/calc; xmlns:dc="http://purl.org/dc/elements/1.1/; xmlns:c alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:tableooo="http://openoffice.org/2009/table; xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:rpt="http://openoffice.org/2005/report; xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:officeooo="http://openoffice.org/2009/office; xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns: meta:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/24.2.2.2$Linux_X86_64 LibreOffice_project/d56cc158d8a96260b836f100ef4b4ef25d6f1a012012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/24.2.3.2$Linux_X86_64 LibreOffice_project/433d9c2ded56988e8a90e6b2e771ee4e6a5ab2ba2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 2360 + 656 501 55167 26963 @@ -16,9 +16,9 @@ 3623 3434 501 - 2360 + 656 55667 - 29321 + 27617 0 0 false @@ -146,7 +146,7 @@ false true - 13478728 + 13597256 true false false @@ -176,7 +176,7 @@ - + @@ -370,21 +370,21 @@ - + - + - + - + - + @@ -448,24 +448,24 @@ - + - + - + - + - + - + @@ -1163,20 +1163,20 @@ Credits -1971 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2024-05-07 16:01:41. +1972 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2024-05-28 14:34:40. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 - + Ruediger TimmCommits: 82464Joined: 2000-10-10 - Caolán McNamaraCommits: 35426Joined: 2000-10-10 + Caolán McNamaraCommits: 35504Joined: 2000-10-10 Kurt ZenkerCommits: 31752Joined: 2000-09-25 @@ -1193,15 +1193,15 @@ Vladimir GlazunovCommits: 25434Joined: 2000-12-04 -
core.git: Branch 'libreoffice-24-2-4' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9ceeb2e476d2921fc174280ede09a7b97eb4b1c2 Author: Christian Lohmaier AuthorDate: Fri May 31 14:57:11 2024 +0200 Commit: Gerrit Code Review CommitDate: Fri May 31 14:57:11 2024 +0200 Update git submodules * Update translations from branch 'libreoffice-24-2-4' to f07002ad3f6f59f2808369beec84ace71b5af5fc - update translations for 24.2.4 rc2 and force-fix errors using pocheck Change-Id: I72d7d0cfe6d2cf73e9d77b235e568607dc2e64ac (cherry picked from commit 70127e22568ed8e3993d85ab681f8e23b2bf1e0b) diff --git a/translations b/translations index 788f33aa5169..f07002ad3f6f 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 788f33aa5169aa152f1628a8007e0cd3aa7d2ea2 +Subproject commit f07002ad3f6f59f2808369beec84ace71b5af5fc
translations.git: Branch 'libreoffice-24-2-4' - source/ab source/af source/am source/an source/ar source/as source/ast source/az source/be source/bg source/bn source/bn-IN source/bo source/br source/b
source/ab/chart2/messages.po| 42 source/ab/cui/messages.po | 118 source/ab/sc/messages.po| 190 source/af/cui/messages.po | 118 source/af/sc/messages.po| 190 source/am/cui/messages.po | 118 source/am/sc/messages.po| 188 source/an/cui/messages.po | 125 source/an/extensions/messages.po|9 source/an/formula/messages.po |4 source/an/officecfg/registry/data/org/openoffice/Office/UI.po | 19 source/an/sc/messages.po| 201 source/an/scp2/source/ooo.po| 16 source/an/sd/messages.po|6 source/an/sfx2/messages.po | 10 source/an/svx/messages.po |8 source/an/sw/messages.po| 28 source/ar/cui/messages.po | 118 source/ar/sc/messages.po| 188 source/as/cui/messages.po | 118 source/as/sc/messages.po| 188 source/ast/chart2/messages.po |6 source/ast/cui/messages.po | 125 source/ast/extras/source/autocorr/emoji.po |6 source/ast/helpcontent2/source/text/sbasic/shared.po|8 source/ast/helpcontent2/source/text/schart/01.po|4 source/ast/helpcontent2/source/text/schart/04.po|6 source/ast/helpcontent2/source/text/sdraw/01.po |8 source/ast/helpcontent2/source/text/shared/01.po| 16 source/ast/helpcontent2/source/text/shared/02.po|8 source/ast/helpcontent2/source/text/shared/guide.po |4 source/ast/helpcontent2/source/text/shared/help.po |6 source/ast/helpcontent2/source/text/shared/optionen.po |4 source/ast/officecfg/registry/data/org/openoffice/Office/UI.po |6 source/ast/sc/messages.po | 222 source/ast/sfx2/messages.po | 13 source/ast/svtools/messages.po |4 source/ast/svx/messages.po | 29 source/ast/sw/messages.po |5 source/ast/vcl/messages.po | 12 source/az/cui/messages.po | 118 source/az/sc/messages.po| 188 source/be/cui/messages.po | 118 source/be/sc/messages.po| 188 source/bg/cui/messages.po | 120 source/bg/helpcontent2/source/text/scalc/01.po |6 source/bg/helpcontent2/source/text/swriter/guide.po |6 source/bg/sc/messages.po| 190 source/bn-IN/cui/messages.po| 118 source/bn-IN/sc/messages.po | 188 source/bn/cui/messages.po | 118 source/bn/sc/messages.po| 188 source/bo/cui/messages.po | 118 source/bo/sc/messages.po| 188 source/br/cui/messages.po | 118 source/br/sc/messages.po| 188 source/brx/cui/messages.po | 118 source/brx/sc/messages.po | 188 source/bs/cui/messages.po | 118 source/bs/sc/messages.po| 188 source/ca-valencia/cui/messages.po | 118 source/ca-valencia/sc/messages.po
core.git: Branch 'libreoffice-24-2' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f08b023efc44dbb7dbd15f1f563ad43a58e4c7be Author: Christian Lohmaier AuthorDate: Fri May 31 14:55:09 2024 +0200 Commit: Gerrit Code Review CommitDate: Fri May 31 14:55:09 2024 +0200 Update git submodules * Update translations from branch 'libreoffice-24-2' to 70127e22568ed8e3993d85ab681f8e23b2bf1e0b - update translations for 24.2.4 rc2 and force-fix errors using pocheck Change-Id: I72d7d0cfe6d2cf73e9d77b235e568607dc2e64ac diff --git a/translations b/translations index 5569d097c461..70127e22568e 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 5569d097c4619640613e373a9d494e380ecf564e +Subproject commit 70127e22568ed8e3993d85ab681f8e23b2bf1e0b
translations.git: Branch 'libreoffice-24-2' - source/ab source/af source/am source/an source/ar source/as source/ast source/az source/be source/bg source/bn source/bn-IN source/bo source/br source/brx
source/ab/chart2/messages.po| 42 source/ab/cui/messages.po | 118 source/ab/sc/messages.po| 190 source/af/cui/messages.po | 118 source/af/sc/messages.po| 190 source/am/cui/messages.po | 118 source/am/sc/messages.po| 188 source/an/cui/messages.po | 125 source/an/extensions/messages.po|9 source/an/formula/messages.po |4 source/an/officecfg/registry/data/org/openoffice/Office/UI.po | 19 source/an/sc/messages.po| 201 source/an/scp2/source/ooo.po| 16 source/an/sd/messages.po|6 source/an/sfx2/messages.po | 10 source/an/svx/messages.po |8 source/an/sw/messages.po| 28 source/ar/cui/messages.po | 118 source/ar/sc/messages.po| 188 source/as/cui/messages.po | 118 source/as/sc/messages.po| 188 source/ast/chart2/messages.po |6 source/ast/cui/messages.po | 125 source/ast/extras/source/autocorr/emoji.po |6 source/ast/helpcontent2/source/text/sbasic/shared.po|8 source/ast/helpcontent2/source/text/schart/01.po|4 source/ast/helpcontent2/source/text/schart/04.po|6 source/ast/helpcontent2/source/text/sdraw/01.po |8 source/ast/helpcontent2/source/text/shared/01.po| 16 source/ast/helpcontent2/source/text/shared/02.po|8 source/ast/helpcontent2/source/text/shared/guide.po |4 source/ast/helpcontent2/source/text/shared/help.po |6 source/ast/helpcontent2/source/text/shared/optionen.po |4 source/ast/officecfg/registry/data/org/openoffice/Office/UI.po |6 source/ast/sc/messages.po | 222 source/ast/sfx2/messages.po | 13 source/ast/svtools/messages.po |4 source/ast/svx/messages.po | 29 source/ast/sw/messages.po |5 source/ast/vcl/messages.po | 12 source/az/cui/messages.po | 118 source/az/sc/messages.po| 188 source/be/cui/messages.po | 118 source/be/sc/messages.po| 188 source/bg/cui/messages.po | 120 source/bg/helpcontent2/source/text/scalc/01.po |6 source/bg/helpcontent2/source/text/swriter/guide.po |6 source/bg/sc/messages.po| 190 source/bn-IN/cui/messages.po| 118 source/bn-IN/sc/messages.po | 188 source/bn/cui/messages.po | 118 source/bn/sc/messages.po| 188 source/bo/cui/messages.po | 118 source/bo/sc/messages.po| 188 source/br/cui/messages.po | 118 source/br/sc/messages.po| 188 source/brx/cui/messages.po | 118 source/brx/sc/messages.po | 188 source/bs/cui/messages.po | 118 source/bs/sc/messages.po| 188 source/ca-valencia/cui/messages.po | 118 source/ca-valencia/sc/messages.po
translations.git: Changes to 'refs/tags/cp-24.04.3-2'
Tag 'cp-24.04.3-2' created by Andras Timar at 2024-05-30 05:55 + cp-24.04.3-2 Changes since cp-24.04.1-2-1: --- 0 files changed ---
core.git: odk/settings
odk/settings/settings.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 9b072ee21a31127b008323749fe343f406da0fe4 Author: Christian Lohmaier AuthorDate: Mon May 27 12:16:06 2024 +0200 Commit: Christian Lohmaier CommitDate: Tue May 28 14:10:29 2024 +0200 odk: don't run compiler -dumpversion for eaach include of settings.mk VAR=$(shell … ) will run the shell command each time the line is parsed, i.e. for each include of the settings.mk from the examples. Use simple/one-time expansion using := avoids that. Change-Id: I46e6c486fbbe03bba37436d4ca98ddd0b6562ad3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168091 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index 13289c96db6e..a479dd702fae 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -319,7 +319,7 @@ SHAREDLIB_EXT=so SHAREDLIB_PRE=lib SHAREDLIB_OUT=$(OUT_LIB) -GCC_VERSION=$(shell $(CC) -dumpversion) +GCC_VERSION:=$(shell $(CC) -dumpversion) COMID=gcc3 CPPU_ENV=gcc3 @@ -530,7 +530,7 @@ SHAREDLIB_EXT=so SHAREDLIB_PRE=lib SHAREDLIB_OUT=$(OUT_LIB) -GCC_VERSION=$(shell $(CC) -dumpversion) +GCC_VERSION:=$(shell $(CC) -dumpversion) COMID=gcc3 CPPU_ENV=gcc3
core.git: Makefile.in
Makefile.in |1 + 1 file changed, 1 insertion(+) New commits: commit 9ec0fa7ec3a62586f95e38f070b0d95e85fce6c3 Author: Christian Lohmaier AuthorDate: Sun May 5 18:43:53 2024 +0200 Commit: Christian Lohmaier CommitDate: Tue May 28 14:10:02 2024 +0200 use internal python for gbuild-to-ide on windows and python=fully-internal env python3 likely won't work in that case Change-Id: I1b24119af21db9db04c9fa6445e59cb328f39252 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167162 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/Makefile.in b/Makefile.in index ac3e8aafb529..977e70da615e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -522,6 +522,7 @@ define gb_Top_GbuildToIdeIntegration $(1)-ide-integration: gbuildtojson $(if $(filter MACOSX,$(OS_FOR_BUILD)),python3.allbuild) cd $(SRCDIR) && \ $(if $(filter MACOSX,$(OS_FOR_BUILD)),PATH="$(INSTROOT_FOR_BUILD)/Frameworks/LibreOfficePython.framework/Versions/Current/bin:$(PATH)") \ + $(if $(filter WNT,$(OS_FOR_BUILD)$(PYTHON_FOR_BUILD)),$(INSTROOT_FOR_BUILD)/program/python.exe) \ bin/gbuild-to-ide --ide $(1) --make $(MAKE) endef
translations.git: Changes to 'refs/tags/co-24.04.3-2'
Tag 'co-24.04.3-2' created by Andras Timar at 2024-05-28 11:29 + co-24.04.3-2 Changes since cp-24.04.1-2-1: --- 0 files changed ---
core.git: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bd4b345ac6017483839091102d732ff3d899ec87 Author: Christian Lohmaier AuthorDate: Thu May 23 13:30:24 2024 +0200 Commit: Gerrit Code Review CommitDate: Thu May 23 13:30:24 2024 +0200 Update git submodules * Update translations from branch 'master' to b46612b5cf30742f137cc685ff3bb75b42a75619 - update translations for master and force-fix errors using pocheck Change-Id: I062d883de199aa7dd9015d72f519e190614c6d86 diff --git a/translations b/translations index fa6c5405a769..b46612b5cf30 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit fa6c5405a7696a8b954d555a8373058fb4853bd1 +Subproject commit b46612b5cf30742f137cc685ff3bb75b42a75619
translations.git: Changes to 'refs/tags/libreoffice-24.2.4.1'
Tag 'libreoffice-24.2.4.1' created by Christian Lohmaier at 2024-05-21 19:32 + Tag libreoffice-24.2.4.1 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmZM9r4ACgkQ9DSh76/u rqOwWg//anE0dmH5q9xr7vo2jDL0l5LwFx8O8odVzUv8D0o88/0MV/BdGhIy4c9l sbNLDr9BzK/IYcsLjwZWpN0YdGRgcL5lE+ApTLEBG7cGELTd8SfOIm3nAL1taDsL N3lYwotRUKmoqOnVcsOCwZnJ3Qqugg2EXBh+JC9kaXS7cPVne6lti+Lqp+/2nUma hMnlg1LK4nHEcCihmQQvkFogv+nknH4mY1bnqHbKpdAALOSoiA3qCZq0IpE5qI2g zd8fHQUpZuSyejvxxybRIdvCEAAZTzl/y3tC7SvXgnkiYmIs6XcRb8Pfr+HI11QC DhbIDwlpOWTVyusx+rr5R6s5CEAUo1OUOOMzjzWcGnDEI1Ufq67adtqFCFFP6Gi5 xKjkfT9Fk2oyw4kvbWsNdixyfd5NUy1VZlEJNq14CuCZF7dDYsjxCmbMK+WXcnYI RzaqWakbwD/QGtkaFrOKQF/hop7BkhyzqZ/gKV1+WNYUNz60PAIhW+BqZQksUexx tx5v6TUNkST+QEncVvCiHbl59YGPHdL7ar0FuAtQXT5JvfvdNtfSs5uQGf28rMbP 3ribxN1ATWuag4LjoYoKd8dvL8td2LJOvIoZauLKPA6jSDoUtv73OmrRGa5LSoJY 82iMcK9XErJUXCH4R3oNncPz8OUFQ2rpCO965BM/9eadajU5AGY= =iYuy -END PGP SIGNATURE- Changes since cp-24.04.0-1-10: --- 0 files changed ---
help.git: Changes to 'refs/tags/libreoffice-24.2.4.1'
Tag 'libreoffice-24.2.4.1' created by Christian Lohmaier at 2024-05-21 19:32 + Tag libreoffice-24.2.4.1 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmZM9r4ACgkQ9DSh76/u rqODgw/7B1Sz61JzCNbUdpVA25HyFPr+1KsDOpKdt1XHfJxs9fKBtCErkuuRe+8s cTu67IpuSjclHVeHmmZJh54PpSFU98y9YyBIIZV6PCSQfc2XYS24XMwSSBQmUPZU iTz/B5BlelbcebeLWr8ADtfsj2OxKs2jOhEm91Gh0eCiN7ynXBnwwnQ1PzFK9bCg eSOfX07UonBvhClGlliexQ5UO7RLjcjJrSrtS5qwe2jlbGOlN6wmaAHnu+0S2IF2 8MFngnlc5HBG2dcZyitoQsZeylYKiYXiJcMESJ3G+cgwxiBl+QAYOzYQAjEZhrz+ PSx+xOD4FRwk5XZbhwb5rBbH0o9esW2ZbmImfPHCORhr+6hF4UYslvK6KN9BWcLF avSfyR4Qapx+m1CT9xQCwYdr8ZXf6qnfs7Fpmyt7PTrLFN8sC+Ibk/pikMudxK0B Zy7jpAoz/0CRwsEFh4cRDVmKuRLaRLIE8zEtQjFDSl1v6vHvEGVcNZN5t49xEsyI UzHc9ot/1G7cWncti4ePxBTPM8Fk7l/jUd8a5gQc3ddTDiVCDsGGQjMTsET8xwZN 4VAc1STWvnsYvR7BHIYa1Z9t1WYrDGHztfxcrL2quPK1LPlvhazxS9e81njNNa7y Wd61M7ohiBwsi6pL3HP6r+cXsGpHR2r1T3Ap2wk5LOfwFI8wyRk= =Bf/9 -END PGP SIGNATURE- Changes since co-24.04-branch-point-15: --- 0 files changed ---
dictionaries.git: Changes to 'refs/tags/libreoffice-24.2.4.1'
Tag 'libreoffice-24.2.4.1' created by Christian Lohmaier at 2024-05-21 19:32 + Tag libreoffice-24.2.4.1 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmZM9rsACgkQ9DSh76/u rqMTHg//fKbqOU7Gk9CyUhQaYIPxg/q+Wo1Ak7sI6Q39pJWsCCAKu6TDEDgcJHN4 e5tQ5pgayt6dxUyl1QBZ8pxQ71SuBByIRNV/JFbKtOuK/i0mT92aZepiHEuye+vs +rZ78UK+aDPgRBjbu2k6CtBpmDalGXl+CaU8xCG4UFuaSqiErx+EIERA3f9DiCqm fbB3Uw/JUVTEJnhNNJC60GJzCnGfn1RUWscsJfVmHxODL3Q5YCJbVzVN4kog2aPA gZo/BZihp9JfRKg1NL/HH9CdA4Z5QOHggGnox+x3GLOpSZOvJwOdgERq2s8m0RjO 1lG8aebrSESxLPy1GI3veYwvvBpVbUVKvMvhmg3OkGis9XtSXF+jfWs6ysDXq6Nh za/1Bi/tRviqTTIIh9O9AkD59diTR5SntjMBO1iDGa+MaaNx1fgARm1cXB2CU+V2 +ySMckS1D4X3xEk7UlZh636aCsmGb9GZ67r2fA01sRMfLjBA6YwHCKL80ljijuuk nOBCS9XkL5GVROU1FAhv2BqZHoXighkMLPPdF1eL16CCNKUbheSYZLSV+Il9tCEm LhY5R28PowpRlyZXW10VsINbdEmwP5Vw3QXrbNOFlU1gAp3BPDzdvGzQ1xiN4urK 7ITA9nOTY4dkLO0HonEorhGeKN0Jaxn7ux+Q6jD4D5ihmF2sr3I= =/oB+ -END PGP SIGNATURE- Changes since cp-24.04.1-2-5: --- 0 files changed ---
core.git: Changes to 'refs/tags/libreoffice-24.2.4.1'
Tag 'libreoffice-24.2.4.1' created by Christian Lohmaier at 2024-05-21 19:32 + Tag libreoffice-24.2.4.1 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmZM9r4ACgkQ9DSh76/u rqNA9RAA0nvF7TZQ4RPhnuMJXIKHwhrVdPwXLsho9eqxdWVOIajlSKWeVybl02Dp 7HVDSsdf5T3NyMKLJUFoFcGos032UkYuuZrflB7g/t71QzJZ5zYuIJ2jHhsugvcl Hy4S1qlXg4v1Dz82WJ84eeYKBzWei2g3RnmwvnZECxJKfNAGeS21bN+xRbFGkham sHddwXwobzjNU8FFzYHG0pG04WUqUtkiNK2QsqPsb8alVPTRxv4DfR1qa36gmPO+ OvlPJd31s1gdMQCAxGjhycxo2Tx9MXfXuVURjsxRcpjx0XdSkr3YA2jwACJ1D8FW 6eAzb+CUsI+8GVIFuhgkW3BQMwDDJ+1TXoX8qPvNbQgpGBd+TFmn7H8f1SU530QF ZcoXgQVxpMHkdOgXFHggd+NdrNDBtZa0AftWX52EieYboJsXaN7L9y624MgJIGiF Nz+2rjA9POFVxRQIR5o/7EbrejVPASLq6322u3rQ+yIuxa534vU0ynJlm34t6kys UYI6hsD6AmhC0A1/6m+qXgWQNQuq6/fVv4H5T02PL/lz+hNgRW4cZmlJEFSwPnvq Pt8oyajieiexsWdqsxCSX+oPxKaOtqvuaa2UBJN3tQm2tQHGTVM0y/0seecCVCPB 0XYzbbTLXcMRimMIMuAaonnYUWOgxcRQ4mWUxJDKQLLxDKXHZJY= =cimD -END PGP SIGNATURE- Changes since co-24.04-branch-point-572: --- 0 files changed ---
core.git: Branch 'libreoffice-24-2-4' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a7fbc89b67189455afaf5681f33db07daf06c28f Author: Christian Lohmaier AuthorDate: Tue May 21 21:32:40 2024 +0200 Commit: Christian Lohmaier CommitDate: Tue May 21 21:32:40 2024 +0200 bump product version to 24.2.4.1.0+ Change-Id: If9eeaf1eda12619f68d468927a6ba275a05e60e9 diff --git a/configure.ac b/configure.ac index a435fdc89a1e..8fc5f88de3c1 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[24.2.4.0.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[24.2.4.1.0+],[],[],[http://documentfoundation.org/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
core.git: Branch 'libreoffice-24-2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bbf052d967d2c7e920a58e47d3351dc7d3a61121 Author: Christian Lohmaier AuthorDate: Tue May 21 21:30:01 2024 +0200 Commit: Christian Lohmaier CommitDate: Tue May 21 21:30:01 2024 +0200 bump product version to 24.2.5.0.0+ Change-Id: I5885efdf31ee6b8121e098b2fb7024f1c0b9dee4 diff --git a/configure.ac b/configure.ac index a435fdc89a1e..79373cd08b8d 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[24.2.4.0.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[24.2.5.0.0+],[],[],[http://documentfoundation.org/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
core.git: Changes to 'libreoffice-24-2-4'
New branch 'libreoffice-24-2-4' available with the following commits: commit 44988e22d7e035f4d6c32edf068512bb06e52f4a Author: Christian Lohmaier Date: Tue May 21 21:29:22 2024 +0200 Branch libreoffice-24-2-4 This is 'libreoffice-24-2-4' - the stable branch for the 24.2.4 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 24.2.x release, please use the 'libreoffice-24-2' branch. If you want to build something cool, unstable, and risky, use master.
translations.git: Changes to 'libreoffice-24-2-4'
New branch 'libreoffice-24-2-4' available with the following commits: commit 788f33aa5169aa152f1628a8007e0cd3aa7d2ea2 Author: Christian Lohmaier Date: Tue May 21 21:29:05 2024 +0200 Branch libreoffice-24-2-4 This is 'libreoffice-24-2-4' - the stable branch for the 24.2.4 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 24.2.x release, please use the 'libreoffice-24-2' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: Ic114b70832c57c1f3e7de0740423eef9aef8aaba
help.git: Changes to 'libreoffice-24-2-4'
New branch 'libreoffice-24-2-4' available with the following commits: commit 9428eb8af362dfb31d0b2285734bf34af41a5d84 Author: Christian Lohmaier Date: Tue May 21 21:29:05 2024 +0200 Branch libreoffice-24-2-4 This is 'libreoffice-24-2-4' - the stable branch for the 24.2.4 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 24.2.x release, please use the 'libreoffice-24-2' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I6d693e6cac1747e20011b143e8c9cf9f3cadb5cd
dictionaries.git: Changes to 'libreoffice-24-2-4'
New branch 'libreoffice-24-2-4' available with the following commits: commit 60391ddd98f7d3b209bf4a2b0509dbbff81a5fbc Author: Christian Lohmaier Date: Tue May 21 21:29:05 2024 +0200 Branch libreoffice-24-2-4 This is 'libreoffice-24-2-4' - the stable branch for the 24.2.4 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 24.2.x release, please use the 'libreoffice-24-2' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I7c64976d624edbde4138c6abf8de5a3b4471d40c
core.git: Branch 'libreoffice-24-2' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit df5c3afef80d99213e48f5d78228b684e69216ee Author: Christian Lohmaier AuthorDate: Tue May 21 21:23:07 2024 +0200 Commit: Gerrit Code Review CommitDate: Tue May 21 21:23:07 2024 +0200 Update git submodules * Update translations from branch 'libreoffice-24-2' to 5569d097c4619640613e373a9d494e380ecf564e - update translations for 24.2.4 rc1 and force-fix errors using pocheck Change-Id: I33b8c9512615cb5d058159e40785d20255b645df diff --git a/translations b/translations index 64792214d2d8..5569d097c461 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 64792214d2d89afc019f94ca29ff7a2c2a17ab39 +Subproject commit 5569d097c4619640613e373a9d494e380ecf564e
translations.git: Branch 'libreoffice-24-2' - source/ab source/an source/ast source/bg source/ca source/cs source/da source/de source/es source/fa source/fi source/gl source/gug source/he source/hsb s
source/ab/connectivity/messages.po |6 source/an/cui/messages.po |5 source/an/officecfg/registry/data/org/openoffice/Office/UI.po |8 source/an/reportdesign/messages.po |6 source/an/sc/messages.po | 57 source/an/sw/messages.po | 35 source/ast/connectivity/messages.po |4 source/ast/cui/messages.po | 10 source/ast/editeng/messages.po |4 source/ast/extensions/messages.po | 12 source/ast/extras/source/autocorr/emoji.po | 43 source/ast/filter/messages.po |8 source/ast/helpcontent2/source/text/sbasic/guide.po |6 source/ast/helpcontent2/source/text/sbasic/shared.po | 18 source/ast/helpcontent2/source/text/sbasic/shared/02.po |6 source/ast/helpcontent2/source/text/sbasic/shared/03.po |4 source/ast/helpcontent2/source/text/scalc/00.po | 10 source/ast/helpcontent2/source/text/scalc/01.po | 10 source/ast/helpcontent2/source/text/scalc/04.po |4 source/ast/helpcontent2/source/text/scalc/guide.po |6 source/ast/helpcontent2/source/text/sdatabase.po |8 source/ast/helpcontent2/source/text/shared.po | 12 source/ast/helpcontent2/source/text/shared/00.po | 58 source/ast/helpcontent2/source/text/shared/01.po | 14 source/ast/helpcontent2/source/text/shared/02.po | 16 source/ast/helpcontent2/source/text/shared/06.po |4 source/ast/helpcontent2/source/text/shared/autopi.po |4 source/ast/helpcontent2/source/text/shared/guide.po |6 source/ast/helpcontent2/source/text/shared/optionen.po |4 source/ast/helpcontent2/source/text/simpress/00.po |8 source/ast/helpcontent2/source/text/swriter.po |4 source/ast/helpcontent2/source/text/swriter/00.po | 40 source/ast/helpcontent2/source/text/swriter/01.po | 12 source/ast/helpcontent2/source/text/swriter/02.po |4 source/ast/helpcontent2/source/text/swriter/guide.po |4 source/ast/helpcontent2/source/text/swriter/librelogo.po |4 source/ast/helpcontent2/source/text/swriter/menu.po | 10 source/ast/officecfg/registry/data/org/openoffice/Office/UI.po | 18 source/ast/sc/messages.po | 10 source/ast/sd/messages.po | 10 source/ast/sw/messages.po | 10 source/ast/wizards/source/resources.po |4 source/bg/cui/messages.po |4 source/bg/helpcontent2/source/auxiliary.po |8 source/bg/helpcontent2/source/text/sbasic/shared/03.po | 26 source/bg/helpcontent2/source/text/scalc.po |4 source/bg/helpcontent2/source/text/scalc/00.po | 20 source/bg/helpcontent2/source/text/scalc/01.po | 114 source/bg/helpcontent2/source/text/scalc/04.po |6 source/bg/helpcontent2/source/text/scalc/guide.po | 116 source/bg/helpcontent2/source/text/shared/00.po |4 source/bg/helpcontent2/source/text/shared/01.po |6 source/bg/helpcontent2/source/text/shared/optionen.po |8 source/bg/helpcontent2/source/text/simpress/01.po |4 source/bg/officecfg/registry/data/org/openoffice/Office/UI.po | 20 source/bg/sc/messages.po | 88
translations.git: Changes to 'refs/tags/cp-24.04.3-1'
Tag 'cp-24.04.3-1' created by Andras Timar at 2024-05-21 14:43 + cp-24.04.3-1 Changes since cp-24.04.1-2-1: --- 0 files changed ---
translations.git: Changes to 'refs/tags/libreoffice-24.8.0.0.alpha1'
Tag 'libreoffice-24.8.0.0.alpha1' created by Christian Lohmaier at 2024-05-14 17:38 + Tag libreoffice-24.8.0.0.alpha1 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmZDoXkACgkQ9DSh76/u rqOryg//byaBxnOqm4H2bEYmXiClrvMRqeJ55RC/NPsG4ppmvEjtvF3VSQ/iBawy idIWmxgZfPQFc8Xe6Ql8BKCnBaE9vATV03GGeFY90AqgmTrcdQkXWgujgHhW2fVE 9ZUD710X8cO5vKOtB4+3AWFbQi2XnQ+AtHSOmzYSN8yAoghiNtYs8uz8DCUB5pGg bOtWAP7svPeV9i7/VetGEZu6qGqrW4QE+xyyTj6flZ75uaNqjPh//ZzaEV4/HfTM KQ1Vx9edPOXryvCWXMUJYK+ZtOlqVTRmNV3ZyJFpkHxpp/ogJEclmxreiQbt/cVe SsdxK+68gshqGQL0/0n55VIkNP6MyyFIpvx6twy/rlDAfSu9wbrVDdxdq8FrAT7J a0SgCdPXSRCcKY+g14uWjWuhQ3qhtK3QOZj5IayoKE+N0Q+A6K4gywWxwkXuKF4J WSFjbVkjL1r2mZKFbNyrY1qZFGIaGUu6tRlpfpwDyYAuPHJzfnLmxt4iiYXmeUR2 f54llKFcIWfm5FWXBJhecd/+hspy6M6n1jN0lFtOJ27tXXo7c+x7HIxnZH7/Yr3S e1OrXjUdZF6CRmWI0vulUmffCksIPjo64muX8v/Uw04yFhtgM6tImUVSrtAAWvSW BlSnG6VEL+ijsxm62cpC71OScFEQae8Nwd6u4lYkR2yZsH/9ez8= =HWrU -END PGP SIGNATURE- Changes since libreoffice-24-2-branch-point-26: --- 0 files changed ---
dictionaries.git: Changes to 'refs/tags/libreoffice-24.8.0.0.alpha1'
Tag 'libreoffice-24.8.0.0.alpha1' created by Christian Lohmaier at 2024-05-14 17:37 + Tag libreoffice-24.8.0.0.alpha1 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmZDoXYACgkQ9DSh76/u rqOiAg//ZHkdHcDnMnftNM/uIUgCNaoo4sgWTXtPbspBHWmIRjqY7JTxDsMWGpuF DBXKz2FNdDPwBDRD/gMffXuJkJxqjYuO/0G/ESC8cF812JH2HXJlusXb+nM4YE1i LV8SGw8unt6fINFWYcOATf8mwLjo3ENI7ZbUhK1fKQi9HiV11wo1R4+rneu98Dfm MnI3+YPcyCkrg9hGuGz3AoLEt81qx1ys7oRMBAaCG2izM6BfG9HfMcdxbNDwkoTO mmFYlZkmnmjEduxhD7oz4BchZ/Q1O7S/XYb+a3yzRsl34d5n0kiWQIbLoPK46Mmm 4hf0nzYIhHtPe8+8QSOX6acLC2fIyj1aq0rKiELo7Ni61JxcV4tkbrHvU3UGBQnb lzElvAUUMLtgtEcgFrPS31UDMNIcheAe+UG800iocaV02jKq5K8NMGeWKXnFH+Kl N+W95J5c1LW65K9AkJCQrg1yRig6+ODcpceZMV4sEvUn4wWDw//dTtDQsuUxB8qg Z1ttOFpYfoCiHbP5giEcNEv5CibNRmRznLbFTkUvoc1sJherzWgMwPxi1o5yJq4P r5mKjFz+tzL58fcDOkyHvbJU2jKpQnehtj83tnszXBEqL4ju5iGnM9OH8khS5nIt kXtnxQsgvY24RYGcFooJHMsqE8nrihKXUDuyCuaQ4YmgCoO6hSE= =FQJH -END PGP SIGNATURE- Changes since libreoffice-24-2-branch-point-11: --- 0 files changed ---
help.git: Changes to 'refs/tags/libreoffice-24.8.0.0.alpha1'
Tag 'libreoffice-24.8.0.0.alpha1' created by Christian Lohmaier at 2024-05-14 17:38 + Tag libreoffice-24.8.0.0.alpha1 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmZDoXkACgkQ9DSh76/u rqP9ng//TZDIRc4h6CzwrE7rRdwRihr+r5zw1HoudrB/wwozt3CdroK2CQhJ/ZlC NQvA4UWbtfzb1OgRkaNo8OTv+MDOwovdMfDHYQidxo7nmtBNWIXHSGg48BFNl1QG KqJXfyghBI/Gquim9yGpUkxOP3d/+Mk9+zTF1XRxsKFtw1pc4ktTPVhFrjK232Du 5Kmq/b+8h/TrfCTqwxHZVsLZDyAdHmq1NgPn0igPHt1HPLisyWkLwGcpcIeDV6E0 SRLOu6RDJIB4A+7hJyRFUTRCIJu35dw1rrMqVblEUWvGAlR9ojfPTRN8zQjDhlwx 5EozwJAaKcEYt/OieZPdUwErhlJsxMjocuK0JnzK3NsT1xsn/Nx9WY404RX/dTXl HhVO0vZakJAszLPv6inHWCdcZs1bYaMhAPtTXEqGibPest3Ld+EySsRuCCeiPpk0 ip+mqcoSB3nQ2LnJ6U5Y2SrP1a8bNmgMxAWrSxf5qebiX8OqqwPVUjMMJ3RTlVPx VQki63Xi57g3N43ewsiR9C1Rfezgp+rc+07xgCm3VazuFgc6FXITCJ6AaxBDAbS9 xCV19sNNOGfe4D0BApAVaGclQOz3lIjE2RhHkxQpD6k/8mIOuwVQ57cu24zy8vQ9 7kwXMVPMwkegO68w2eCHGAvbcRLJ5i18l1J8t1BtvuVzqJGU6Uc= =zm+a -END PGP SIGNATURE- Changes since libreoffice-24-2-branch-point-230: --- 0 files changed ---
core.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f6c9cb470e2786ada58b7ba401975375239b610b Author: Christian Lohmaier AuthorDate: Tue May 14 19:38:30 2024 +0200 Commit: Christian Lohmaier CommitDate: Tue May 14 19:38:30 2024 +0200 bump product version to 24.8.0.0.alpha1+ Change-Id: I96d168560db02ea3cad2eb3e428e1d17bc8d10d6 diff --git a/configure.ac b/configure.ac index b27504e56dac..815900fc21ea 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[24.8.0.0.alpha0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[24.8.0.0.alpha1+],[],[],[http://documentfoundation.org/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
core.git: Changes to 'refs/tags/libreoffice-24.8.0.0.alpha1'
Tag 'libreoffice-24.8.0.0.alpha1' created by Christian Lohmaier at 2024-05-14 17:38 + Tag libreoffice-24.8.0.0.alpha1 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmZDoXkACgkQ9DSh76/u rqPxLQ//b3eKJgH8lr7yHgN+92dGLsHHZ9Nl4d591S0aGo/Owy62vD/FrW5BNudL Y6direc/hVsCJspjRCckpT+nehEesLQ5O0r2jCdomsplnz6zTZo8+r9Ql9l/jByZ kIqDAFS7YJYtLkWorTbOvwQzVtN+498YYE5iTZINrG1P/Wd8gclpySUkG2QOkCLA lAr3GFRrbLmbLt8jQ27pbjIVqQUZk1S7+N7G73iTNP4PKGhRSjCPidG71ojUc4Qj wBKKOZvc1j2Rr96Wwg5d33CqJ9rvjz2eN6HDw+nX7Y4zdwNk2efjUY2dJihkx+xW zQJmZawD5ZMxZadSxb8LK1whqmUaMEuc75whSATDXDSERgXf5kor4ahDoctuRovW 5asbL7Yl323keG6wyKFy5nZZYvd6njrCZosF0keVBF7FNxQCcfchLi3H1b4nSGhd 8Xphl+dbPj4Hc2NEpk/ZR1wNR6+Y1dl4AMWP6r0ID5peSk94dwWkkcB2HaasMdHp lE4VhYsify2jvsQb61tI7r1Yb1odhGh/rD9rVwk0RqHXLl3HJfK6HH2w5QKAkidK 9ZY1eD/wSaCb4RMZwZHdUPDI/CI3zbpIgMxPFL50+yCmdXY+ML8CjQLGUJvwfvx5 Z7P/eFAOhSTvGGzJNUCtFtd6R1aJkogyoAmRTYNvYO5i6ts3HtE= =577j -END PGP SIGNATURE- Changes since libreoffice-24-2-branch-point-4447: --- 0 files changed ---
core.git: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0a2d308343314423fa60188a54c289cef44e43a3 Author: Christian Lohmaier AuthorDate: Tue May 14 19:31:56 2024 +0200 Commit: Gerrit Code Review CommitDate: Tue May 14 19:31:56 2024 +0200 Update git submodules * Update translations from branch 'master' to fa6c5405a7696a8b954d555a8373058fb4853bd1 - update translations for master and force-fix errors using pocheck Change-Id: I40dc7118de79bc8c73cc06ead82fdf936e132ad3 diff --git a/translations b/translations index b824b552da5c..fa6c5405a769 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit b824b552da5c054dd35568e86266afd1cf539441 +Subproject commit fa6c5405a7696a8b954d555a8373058fb4853bd1
core.git: config_host.mk.in
config_host.mk.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 51a970b8b0c8f8d5e8d33cd50c88930be3a653d8 Author: Christian Lohmaier AuthorDate: Wed May 8 14:35:11 2024 +0200 Commit: Christian Lohmaier CommitDate: Fri May 10 18:21:55 2024 +0200 make sure KEEP_AWAKE_CMD gets only evaluated once if using deferred evaluation then the creation of targets via $(call gb_Top_GbuildModuleRules,foo) would result in it getting processed over 900 times, and on windows spawning a shell with the two ps and awk command that takes 5 minutes. If future commands need to be run when the rule is run, then an alternative is to escape the variable in the define for the gb_Top_GbuildModuleRules macro via double-$ → $$(KEEP_AWAKE_CMD) - but I cannot think of any method where that should be necessary Change-Id: I126e4d317bd77f359ca9f39adf00cc88846af281 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167351 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/config_host.mk.in b/config_host.mk.in index 3ffe88380180..fe1fb546a6d1 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -790,7 +790,7 @@ include $(BUILDDIR)/config_$(gb_Side)_lang.mk # does use some of the variables defined above include @SRC_ROOT@/download.lst -KEEP_AWAKE_CMD=@KEEP_AWAKE_CMD@ +KEEP_AWAKE_CMD:=@KEEP_AWAKE_CMD@ # used for WSL-as-helper-builds where the build runs from within git-bash/MSYS that otherwise would # mess with anything that looks like a path (starts with a /) but cannot be resolved to a target
translations.git: Changes to 'refs/tags/libreoffice-7.6.7.2'
Tag 'libreoffice-7.6.7.2' created by Christian Lohmaier at 2024-05-07 17:55 + Tag libreoffice-7.6.7.2 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmY6aw0ACgkQ9DSh76/u rqMyuA/9E1LwMh39ZQwWBvjU1o+hNdPsCtQPA8vrsxwCGvefu9aqykLlyUWaFuPY FctsgFIpkmaNIOUFT0wRjEQCr1wb5ZTkQuV8j0xvxvIO5qKIssN/sbZzFC0J9cJ0 UKxChKOanQ8gRiiWmEpTiKmmiiaZiZrsZobFQMFhs0IEzdZR/x4FNjDIOuyopbJJ MViGdFKLU+xEXoOvShwvkzUnmoepVe5a4H+EfZZcyuCJCB4dfXX99Onzfoo7Iv0x 8VyVgzif2yVQ4JEdj1slcvB/1G8NsVA6HLJIjjQW11y+g58i8bUrLqhBYaEzAYNA fqJ2mCPUFFLwrDHS8bXrJ0w2bnjqTZoOfQOR7EsfSiEkKXMN1dYF+SM8x/X7MPme U/hNQLMzY3flexqjNNvGUTnbXsqtAzrwD9jRQxmCmLRF+8LnjBP9G25Wm2HdS2C4 fyIfsPeKLw4HMa/oQnTotNkDveRkaGyOOnA7towMko7XcXEpjHERXPT+oa+9u9T3 +Iww22Wr+44QCe323friRqbYAEUOa7w29rMW83cvhIhbDlIZ60o3Gg9MKfZrWYu9 qzXoKTiNPDh0RcDJ9+yBC3b3otBt1qwAGWjFoAs0nUGsoppLc75aK0Gyiu73b/yN kzIvT1wqta6/eFwar6VZV1ZAr0eijwk913uIznVkrB4MqlkLuGA= =L0m6 -END PGP SIGNATURE- Changes since libreoffice-7-6-branch-point-35: --- 0 files changed ---
help.git: Changes to 'refs/tags/libreoffice-7.6.7.2'
Tag 'libreoffice-7.6.7.2' created by Christian Lohmaier at 2024-05-07 17:55 + Tag libreoffice-7.6.7.2 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmY6aw0ACgkQ9DSh76/u rqNH4g//bxJJRFpSasRjZKFM9dC6Fls/Gk/MBcbuctHVjBJU/oLQkY3ryUVWG1cD pzrtxU+rCZHlqGpJLGfZw7V1K8WCouTpxwUjN9AOfphqYt0ayCwu52hi2Z2cxTPv XQYNwjbtc+cawnQLyyxx0qFQtOoW1+6Xg4rMy5XYzchoQPxqQw5A+xXF9jbFpjPx FttEiloUOJ0CEj25oY/iYzPHGNibn6DF9zkrHQZj27MkKXSUZZo+OICEZjCf1iIW cHlEe/hk88YiwpuTbldFmWmaB6modCmKqHFkiXBEM9YMj29oLQ81e0Fwa0yyAfAc EFpHWOUykyu+RDORnyDqnnPXkxma/OLmc+JkusATpUXVEdISM07X2ikcdnrGQA2C aC92qxPcNb1h8JAdfx0c+qYBU0VLcVYY65/+mpory6OggArbeyMmPuKYTTh1PC4w QHKrf7A3K9Hf+9pOpNnKw8HSG8Hk8cNztmQljBUPkhPa2gBE6oN+hTNKz5EJuNDF elroMfWVwD5h70p9rxFeF9YQJPBL1pB/TQHw1M8zMDIVaENnS8F23KlJzslix0Zd x8x6CJ32N7r/VHZGk3QIMgn4OntFfhX0dZ7i5m52Sj7Px3DAtLq+J+MGoCYFFd/9 o9d052soDb34iEt1PRfIvpdzjnYvRONPXAV38D2iOEq+LxQSuHA= =SOBh -END PGP SIGNATURE- Changes since libreoffice-7-6-branch-point-37: --- 0 files changed ---
dictionaries.git: Changes to 'refs/tags/libreoffice-7.6.7.2'
Tag 'libreoffice-7.6.7.2' created by Christian Lohmaier at 2024-05-07 17:55 + Tag libreoffice-7.6.7.2 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmY6awoACgkQ9DSh76/u rqOuzBAAl5YgYHgUbyXiNhvz+B2O7VYcENrEJJpkQgogC8xHnNQ2VABsXyJ1teRd PbeLf3e+J08/ginYEYTGFmWHRJILDqkEl1giXQSMTbVeVU9f7dp2ONTRp6R2qkos DMkPR2MzMrA34Ln8AgBVBQRB4cEDlVFqduWX8x/Zomesi6lw5PwrSydpa16wfNfL xW+ZWDL9MiURtwqgB6SqWy9TbCe8UDYvIdpA3wV3WbtlDMczJ9RxpjxhoDuvWvVF gLncOQyRNmbMAETyww6zNRAJWF8MHVXzfjeWQbG2fBoxVmyYq89XpyvLnNQO+Eu5 +vFrG8xvdrwizFdHgVcMDIw4Ob8/jHmj5FGfMVwr/hIsK09AjFAWHpplYGWgYSZ5 Xvc5M24GQhOtnLlrObUZ4U+NeXyRap2V6OlV2NQIMqvbjFVJhfcKabuu1uZefWd4 zEhZngY+k4HyJEf5RS50XfOW3CAZVgyP8ZRmh04Ts/E94GrfvQqF4TvG/rW6ESUi 0zrnoiJrv/x6s4CWDBXsuQwsr+zR4P1w9cM6BstAr3EhYVZbR/DUKGTRj8VylVsG eoW9HCDnQaRDpihpVjEM5H+NvqrWHdu/+0sQpgQntOx0R/r5zGGn2dniAdZbeBEZ RZiZxJLN8PWDDKfLECYIK3b+tnlnusb/SkmZbXBjgXNCuGgoLzM= =JZus -END PGP SIGNATURE- Changes since libreoffice-7-6-branch-point-9: --- 0 files changed ---
core.git: Changes to 'refs/tags/libreoffice-7.6.7.2'
Tag 'libreoffice-7.6.7.2' created by Christian Lohmaier at 2024-05-07 17:55 + Tag libreoffice-7.6.7.2 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmY6aw0ACgkQ9DSh76/u rqNeeg//ai2fGoYlbnkQp0eORGo+iV5LnEJiia5uqU1Y4gPrt5e5HrzPYb8zeg7n V39TTgTGfiTNP11+xS2L9jReH8zm+hhqvlsjcPTqBntOv2kVMwSc4/aaGYNQzn0d 8Bf2BZgo/Vc2ZyTm+BzQe+H+IY2a1hwslSgn9LlYM8EzAopwkAWPlKAsShU5C9iV 90XN1QT9DAFd4f+pkuyDAttOG0kXmO9WLjzj7leC3JH1wcRkhzUR5QZLTJB2erHq Cw5VlN5N42f/gM765+tWFj0X7aTrYgmbMlB1S4GufdBmYKE2gdEpxCQlrBqTMl/P G4gdoxzAqsBqmdmbt5KcnHdI6125P5HvVVeu56r2lSP4+jlkoRbZGqBfReklmEzk iWrx6a16WgNEW5jXC8WQMiwvjFV/NSpWOtJVt1vWfEKFkcE/ks2o2f0YnxclEANy vCEmer/qV4jpuyEBTDyADZ63SzhKrFBznUsfcOKrJ+gPZ56nbkCnVcT3ZqBOoCVT lof+lAbg4oXTLwmNbKSQ887OxD0W6Bf5Ez9fHUJtJe5UeKCx3PzStOmKlze//90q OnpsNxELxCrtl+XB1YwnpGffKXvVJ1kdnp5fG/etl7jE2dgLh64aMegahDoLAiCK lOPeQIhxClY2Cn05UxeFYH1lv275vbf1gQw/glP6sGFSvcMAp0g= =m/8w -END PGP SIGNATURE- Changes since libreoffice-7-6-branch-point-1342: --- 0 files changed ---
core.git: Branch 'libreoffice-7-6-7' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 480669aeffdc481c18ae7180a38d5062cf44e6bf Author: Christian Lohmaier AuthorDate: Tue May 7 19:55:45 2024 +0200 Commit: Christian Lohmaier CommitDate: Tue May 7 19:55:45 2024 +0200 bump product version to 7.6.7.2.0+ Change-Id: I0911f9096a7f883b6758e12991674e51a4854253 diff --git a/configure.ac b/configure.ac index 555486903c06..af66ab54cdd6 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[7.6.7.1.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[7.6.7.2.0+],[],[],[http://documentfoundation.org/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
core.git: Branch 'libreoffice-7-6-7' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2b3b0b061502510a9ac39dfb413d055f8cf0b68e Author: Christian Lohmaier AuthorDate: Tue May 7 19:42:58 2024 +0200 Commit: Gerrit Code Review CommitDate: Tue May 7 19:42:58 2024 +0200 Update git submodules * Update translations from branch 'libreoffice-7-6-7' to 8999e292deb14538ab51b298d0ceca0cc863553b - update translations for 7.6.7 rc2 and force-fix errors using pocheck Change-Id: If3cf78a036f5575eb3f433e414dda1c39a6fdaf8 (cherry picked from commit d0bb46f277349b8b379b46edd2d56b67496b6cb8) diff --git a/translations b/translations index 6c5d82ebf2be..8999e292deb1 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 6c5d82ebf2be560ac8678088ab4b0a27951d8c60 +Subproject commit 8999e292deb14538ab51b298d0ceca0cc863553b
translations.git: Branch 'libreoffice-7-6-7' - source/ab source/an source/ast source/bg source/ca source/da source/de source/es source/fi source/gug source/hr source/hsb source/it source/ja source/ka
source/ab/connectivity/messages.po |6 source/ab/filter/messages.po |8 source/an/cui/messages.po |8 source/an/reportdesign/messages.po |6 source/an/sw/messages.po |4 source/ast/connectivity/messages.po |4 source/ast/cui/messages.po | 18 source/ast/dbaccess/messages.po |8 source/ast/extensions/messages.po | 51 source/ast/extras/source/autocorr/emoji.po | 182 source/ast/filter/messages.po |6 source/ast/helpcontent2/source/text/sbasic/shared.po |8 source/ast/helpcontent2/source/text/sbasic/shared/03.po |4 source/ast/helpcontent2/source/text/scalc/00.po | 12 source/ast/helpcontent2/source/text/scalc/01.po | 34 source/ast/helpcontent2/source/text/scalc/04.po |4 source/ast/helpcontent2/source/text/scalc/guide.po | 14 source/ast/helpcontent2/source/text/sdatabase.po | 30 source/ast/helpcontent2/source/text/sdraw/00.po |8 source/ast/helpcontent2/source/text/shared.po |6 source/ast/helpcontent2/source/text/shared/00.po | 12 source/ast/helpcontent2/source/text/shared/01.po | 44 source/ast/helpcontent2/source/text/shared/02.po |4 source/ast/helpcontent2/source/text/shared/04.po |6 source/ast/helpcontent2/source/text/shared/06.po |4 source/ast/helpcontent2/source/text/shared/autopi.po | 10 source/ast/helpcontent2/source/text/shared/guide.po | 14 source/ast/helpcontent2/source/text/simpress.po |4 source/ast/helpcontent2/source/text/simpress/00.po |4 source/ast/helpcontent2/source/text/simpress/01.po |4 source/ast/helpcontent2/source/text/simpress/guide.po |6 source/ast/helpcontent2/source/text/smath/00.po |4 source/ast/helpcontent2/source/text/swriter.po |4 source/ast/helpcontent2/source/text/swriter/00.po |6 source/ast/helpcontent2/source/text/swriter/01.po |4 source/ast/helpcontent2/source/text/swriter/guide.po |4 source/ast/helpcontent2/source/text/swriter/menu.po |8 source/ast/officecfg/registry/data/org/openoffice/Office/UI.po | 43 source/ast/reportdesign/messages.po |6 source/ast/sc/messages.po | 13 source/ast/sd/messages.po |5 source/ast/svx/messages.po |8 source/ast/wizards/source/resources.po |6 source/bg/cui/messages.po |6 source/bg/helpcontent2/source/text/sbasic/shared.po |4 source/bg/helpcontent2/source/text/scalc/00.po |4 source/bg/helpcontent2/source/text/scalc/01.po |6 source/bg/helpcontent2/source/text/scalc/guide.po | 14 source/bg/helpcontent2/source/text/shared/02.po |4 source/bg/helpcontent2/source/text/shared/04.po | 12 source/bg/helpcontent2/source/text/shared/optionen.po |8 source/bg/sc/messages.po | 18 source/bg/sw/messages.po | 10 source/bg/xmlsecurity/messages.po | 12 source/ca/connectivity/messages.po | 10 source/ca/dbaccess/messages.po |4
core.git: Branch 'libreoffice-7-6' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d42003bbab268f8ea4e0da40326d0f26c72a3939 Author: Christian Lohmaier AuthorDate: Tue May 7 19:40:56 2024 +0200 Commit: Gerrit Code Review CommitDate: Tue May 7 19:40:56 2024 +0200 Update git submodules * Update translations from branch 'libreoffice-7-6' to d0bb46f277349b8b379b46edd2d56b67496b6cb8 - update translations for 7.6.7 rc2 and force-fix errors using pocheck Change-Id: If3cf78a036f5575eb3f433e414dda1c39a6fdaf8 diff --git a/translations b/translations index f33641b61868..d0bb46f27734 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit f33641b618682a4cac0c330f341a80bbdfbf0a02 +Subproject commit d0bb46f277349b8b379b46edd2d56b67496b6cb8
translations.git: Branch 'libreoffice-7-6' - source/ab source/an source/ast source/bg source/ca source/da source/de source/es source/fi source/gug source/hr source/hsb source/it source/ja source/ka so
source/ab/connectivity/messages.po |6 source/ab/filter/messages.po |8 source/an/cui/messages.po |8 source/an/reportdesign/messages.po |6 source/an/sw/messages.po |4 source/ast/connectivity/messages.po |4 source/ast/cui/messages.po | 18 source/ast/dbaccess/messages.po |8 source/ast/extensions/messages.po | 51 source/ast/extras/source/autocorr/emoji.po | 182 source/ast/filter/messages.po |6 source/ast/helpcontent2/source/text/sbasic/shared.po |8 source/ast/helpcontent2/source/text/sbasic/shared/03.po |4 source/ast/helpcontent2/source/text/scalc/00.po | 12 source/ast/helpcontent2/source/text/scalc/01.po | 34 source/ast/helpcontent2/source/text/scalc/04.po |4 source/ast/helpcontent2/source/text/scalc/guide.po | 14 source/ast/helpcontent2/source/text/sdatabase.po | 30 source/ast/helpcontent2/source/text/sdraw/00.po |8 source/ast/helpcontent2/source/text/shared.po |6 source/ast/helpcontent2/source/text/shared/00.po | 12 source/ast/helpcontent2/source/text/shared/01.po | 44 source/ast/helpcontent2/source/text/shared/02.po |4 source/ast/helpcontent2/source/text/shared/04.po |6 source/ast/helpcontent2/source/text/shared/06.po |4 source/ast/helpcontent2/source/text/shared/autopi.po | 10 source/ast/helpcontent2/source/text/shared/guide.po | 14 source/ast/helpcontent2/source/text/simpress.po |4 source/ast/helpcontent2/source/text/simpress/00.po |4 source/ast/helpcontent2/source/text/simpress/01.po |4 source/ast/helpcontent2/source/text/simpress/guide.po |6 source/ast/helpcontent2/source/text/smath/00.po |4 source/ast/helpcontent2/source/text/swriter.po |4 source/ast/helpcontent2/source/text/swriter/00.po |6 source/ast/helpcontent2/source/text/swriter/01.po |4 source/ast/helpcontent2/source/text/swriter/guide.po |4 source/ast/helpcontent2/source/text/swriter/menu.po |8 source/ast/officecfg/registry/data/org/openoffice/Office/UI.po | 43 source/ast/reportdesign/messages.po |6 source/ast/sc/messages.po | 13 source/ast/sd/messages.po |5 source/ast/svx/messages.po |8 source/ast/wizards/source/resources.po |6 source/bg/cui/messages.po |6 source/bg/helpcontent2/source/text/sbasic/shared.po |4 source/bg/helpcontent2/source/text/scalc/00.po |4 source/bg/helpcontent2/source/text/scalc/01.po |6 source/bg/helpcontent2/source/text/scalc/guide.po | 14 source/bg/helpcontent2/source/text/shared/02.po |4 source/bg/helpcontent2/source/text/shared/04.po | 12 source/bg/helpcontent2/source/text/shared/optionen.po |8 source/bg/sc/messages.po | 18 source/bg/sw/messages.po | 10 source/bg/xmlsecurity/messages.po | 12 source/ca/connectivity/messages.po | 10 source/ca/dbaccess/messages.po |4
core.git: Branch 'libreoffice-7-6-7' - readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 2026 ++-- 1 file changed, 1023 insertions(+), 1003 deletions(-) New commits: commit 4963c0c2a287b63e4cd92cbd441c7fcd336fa7ec Author: Christian Lohmaier AuthorDate: Tue May 7 19:20:07 2024 +0200 Commit: Christian Lohmaier CommitDate: Tue May 7 19:23:23 2024 +0200 update credits Change-Id: Ibdf64d7605c81e9006c1637a85a4a539993dffa6 (cherry picked from commit 6b62ff0eaf499eb8c2ed4af3413757f38bc97dcb) (cherry picked from commit 1c3ae1f56fd04e954c5a6fc59bd6337dfc7ee8ea) diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index ec7d2eba89a9..c3d752e2232c 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,10 +1,10 @@ http://www.w3.org/TR/css3-text/; xmlns:grddl="http://www.w3.org/2003/g/data-view#; xmlns:xhtml="http://www.w3.org/1999/xhtml; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xmlns:xsd="http://www.w3.org/2001/XMLSchema; xmlns:xforms="http://www.w3.org/2002/xforms; xmlns:dom="http://www.w3.org/2001/xml-events; xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML; xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office; xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooow="http://openoffice.org/2004/writer; xmlns:xlink="http://www.w3.org/1999/xlink; xmlns:drawooo="http://openoffice.org/2010/draw; xmlns:oooc="http://openoffice.org/2004/calc; xmlns:dc="http://purl.org/dc/elements/1.1/; xmlns:c alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:tableooo="http://openoffice.org/2009/table; xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:rpt="http://openoffice.org/2005/report; xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:officeooo="http://openoffice.org/2009/office; xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns: meta:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/24.2.2.2$Linux_X86_64 LibreOffice_project/d56cc158d8a96260b836f100ef4b4ef25d6f1a012012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/24.2.2.2$Linux_X86_64 LibreOffice_project/d56cc158d8a96260b836f100ef4b4ef25d6f1a012012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 635 + 2360 501 55167 26963 @@ -16,9 +16,9 @@ 3623 3434 501 - 635 + 2360 55667 - 27596 + 29321 0 0 false @@ -146,7 +146,7 @@ false true - 13427930 + 13478728 true false false @@ -176,7 +176,7 @@ - + @@ -370,7 +370,7 @@ - + @@ -381,12 +381,12 @@ - - - + + + @@ -448,24 +448,24 @@ - + - + - + - + - + - + @@ -1163,20 +1163,20 @@ Credits -1970 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2024-04-25 17:14:16. +1971 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2024-05-07 16:01:41. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 - + Ruediger TimmCommits: 82464Joined: 2000-10-10 - Caolán McNamaraCommits: 35359Joined: 2000-10-10 + Caolán McNamaraCommits: 35426Joined: 2000-10-10 Kurt ZenkerCommits: 31752Joined: 2000-09-25 @@
core.git: Branch 'libreoffice-7-6' - readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 2026 ++-- 1 file changed, 1023 insertions(+), 1003 deletions(-) New commits: commit 1c3ae1f56fd04e954c5a6fc59bd6337dfc7ee8ea Author: Christian Lohmaier AuthorDate: Tue May 7 19:20:07 2024 +0200 Commit: Christian Lohmaier CommitDate: Tue May 7 19:21:55 2024 +0200 update credits Change-Id: Ibdf64d7605c81e9006c1637a85a4a539993dffa6 (cherry picked from commit 6b62ff0eaf499eb8c2ed4af3413757f38bc97dcb) diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index ec7d2eba89a9..c3d752e2232c 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,10 +1,10 @@ http://www.w3.org/TR/css3-text/; xmlns:grddl="http://www.w3.org/2003/g/data-view#; xmlns:xhtml="http://www.w3.org/1999/xhtml; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xmlns:xsd="http://www.w3.org/2001/XMLSchema; xmlns:xforms="http://www.w3.org/2002/xforms; xmlns:dom="http://www.w3.org/2001/xml-events; xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML; xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office; xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooow="http://openoffice.org/2004/writer; xmlns:xlink="http://www.w3.org/1999/xlink; xmlns:drawooo="http://openoffice.org/2010/draw; xmlns:oooc="http://openoffice.org/2004/calc; xmlns:dc="http://purl.org/dc/elements/1.1/; xmlns:c alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:tableooo="http://openoffice.org/2009/table; xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:rpt="http://openoffice.org/2005/report; xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:officeooo="http://openoffice.org/2009/office; xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns: meta:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/24.2.2.2$Linux_X86_64 LibreOffice_project/d56cc158d8a96260b836f100ef4b4ef25d6f1a012012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/24.2.2.2$Linux_X86_64 LibreOffice_project/d56cc158d8a96260b836f100ef4b4ef25d6f1a012012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 635 + 2360 501 55167 26963 @@ -16,9 +16,9 @@ 3623 3434 501 - 635 + 2360 55667 - 27596 + 29321 0 0 false @@ -146,7 +146,7 @@ false true - 13427930 + 13478728 true false false @@ -176,7 +176,7 @@ - + @@ -370,7 +370,7 @@ - + @@ -381,12 +381,12 @@ - - - + + + @@ -448,24 +448,24 @@ - + - + - + - + - + - + @@ -1163,20 +1163,20 @@ Credits -1970 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2024-04-25 17:14:16. +1971 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2024-05-07 16:01:41. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 - + Ruediger TimmCommits: 82464Joined: 2000-10-10 - Caolán McNamaraCommits: 35359Joined: 2000-10-10 + Caolán McNamaraCommits: 35426Joined: 2000-10-10 Kurt ZenkerCommits: 31752Joined: 2000-09-25 @@ -1193,15 +1193,15 @@ Vladimir GlazunovCommits: 25434Joined:
core.git: Branch 'libreoffice-24-2' - readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 2026 ++-- 1 file changed, 1023 insertions(+), 1003 deletions(-) New commits: commit 54586d9de58d4b971ef976bcce0df957141b0a50 Author: Christian Lohmaier AuthorDate: Tue May 7 19:20:07 2024 +0200 Commit: Christian Lohmaier CommitDate: Tue May 7 19:21:23 2024 +0200 update credits Change-Id: Ibdf64d7605c81e9006c1637a85a4a539993dffa6 (cherry picked from commit 6b62ff0eaf499eb8c2ed4af3413757f38bc97dcb) diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index ec7d2eba89a9..c3d752e2232c 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,10 +1,10 @@ http://www.w3.org/TR/css3-text/; xmlns:grddl="http://www.w3.org/2003/g/data-view#; xmlns:xhtml="http://www.w3.org/1999/xhtml; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xmlns:xsd="http://www.w3.org/2001/XMLSchema; xmlns:xforms="http://www.w3.org/2002/xforms; xmlns:dom="http://www.w3.org/2001/xml-events; xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML; xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office; xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooow="http://openoffice.org/2004/writer; xmlns:xlink="http://www.w3.org/1999/xlink; xmlns:drawooo="http://openoffice.org/2010/draw; xmlns:oooc="http://openoffice.org/2004/calc; xmlns:dc="http://purl.org/dc/elements/1.1/; xmlns:c alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:tableooo="http://openoffice.org/2009/table; xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:rpt="http://openoffice.org/2005/report; xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:officeooo="http://openoffice.org/2009/office; xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns: meta:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/24.2.2.2$Linux_X86_64 LibreOffice_project/d56cc158d8a96260b836f100ef4b4ef25d6f1a012012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/24.2.2.2$Linux_X86_64 LibreOffice_project/d56cc158d8a96260b836f100ef4b4ef25d6f1a012012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 635 + 2360 501 55167 26963 @@ -16,9 +16,9 @@ 3623 3434 501 - 635 + 2360 55667 - 27596 + 29321 0 0 false @@ -146,7 +146,7 @@ false true - 13427930 + 13478728 true false false @@ -176,7 +176,7 @@ - + @@ -370,7 +370,7 @@ - + @@ -381,12 +381,12 @@ - - - + + + @@ -448,24 +448,24 @@ - + - + - + - + - + - + @@ -1163,20 +1163,20 @@ Credits -1970 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2024-04-25 17:14:16. +1971 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2024-05-07 16:01:41. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 - + Ruediger TimmCommits: 82464Joined: 2000-10-10 - Caolán McNamaraCommits: 35359Joined: 2000-10-10 + Caolán McNamaraCommits: 35426Joined: 2000-10-10 Kurt ZenkerCommits: 31752Joined: 2000-09-25 @@ -1193,15 +1193,15 @@ Vladimir GlazunovCommits: 25434Joined:
core.git: readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 2026 ++-- 1 file changed, 1023 insertions(+), 1003 deletions(-) New commits: commit 6b62ff0eaf499eb8c2ed4af3413757f38bc97dcb Author: Christian Lohmaier AuthorDate: Tue May 7 19:20:07 2024 +0200 Commit: Christian Lohmaier CommitDate: Tue May 7 19:20:16 2024 +0200 update credits Change-Id: Ibdf64d7605c81e9006c1637a85a4a539993dffa6 diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index ec7d2eba89a9..c3d752e2232c 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,10 +1,10 @@ http://www.w3.org/TR/css3-text/; xmlns:grddl="http://www.w3.org/2003/g/data-view#; xmlns:xhtml="http://www.w3.org/1999/xhtml; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xmlns:xsd="http://www.w3.org/2001/XMLSchema; xmlns:xforms="http://www.w3.org/2002/xforms; xmlns:dom="http://www.w3.org/2001/xml-events; xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML; xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office; xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooow="http://openoffice.org/2004/writer; xmlns:xlink="http://www.w3.org/1999/xlink; xmlns:drawooo="http://openoffice.org/2010/draw; xmlns:oooc="http://openoffice.org/2004/calc; xmlns:dc="http://purl.org/dc/elements/1.1/; xmlns:c alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:tableooo="http://openoffice.org/2009/table; xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:rpt="http://openoffice.org/2005/report; xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:officeooo="http://openoffice.org/2009/office; xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns: meta:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/24.2.2.2$Linux_X86_64 LibreOffice_project/d56cc158d8a96260b836f100ef4b4ef25d6f1a012012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/24.2.2.2$Linux_X86_64 LibreOffice_project/d56cc158d8a96260b836f100ef4b4ef25d6f1a012012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 635 + 2360 501 55167 26963 @@ -16,9 +16,9 @@ 3623 3434 501 - 635 + 2360 55667 - 27596 + 29321 0 0 false @@ -146,7 +146,7 @@ false true - 13427930 + 13478728 true false false @@ -176,7 +176,7 @@ - + @@ -370,7 +370,7 @@ - + @@ -381,12 +381,12 @@ - - - + + + @@ -448,24 +448,24 @@ - + - + - + - + - + - + @@ -1163,20 +1163,20 @@ Credits -1970 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2024-04-25 17:14:16. +1971 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2024-05-07 16:01:41. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 - + Ruediger TimmCommits: 82464Joined: 2000-10-10 - Caolán McNamaraCommits: 35359Joined: 2000-10-10 + Caolán McNamaraCommits: 35426Joined: 2000-10-10 Kurt ZenkerCommits: 31752Joined: 2000-09-25 @@ -1193,15 +1193,15 @@ Vladimir GlazunovCommits: 25434Joined: 2000-12-04 - Stephan BergmannCommits: 21158Joined:
core.git: configure.ac odk/CustomTarget_doxygen.mk
configure.ac| 18 -- odk/CustomTarget_doxygen.mk |8 2 files changed, 20 insertions(+), 6 deletions(-) New commits: commit 83d3f9b819ee23efa314953fc2fde4412d90a60b Author: Christian Lohmaier AuthorDate: Tue May 7 14:19:50 2024 +0200 Commit: Christian Lohmaier CommitDate: Tue May 7 17:08:44 2024 +0200 use windows doxygen in wsl-as-helper case basically reverts f7fe6a0bed2c2aee19535a26181a2edfb103e587 avoiding the penalty for accessing files in the windows-realm from within the wsl-container significantly accelerates the doc-generation Change-Id: I95af905bda7225a9c1924a41e952656dffbfbc0b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167279 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/configure.ac b/configure.ac index e04f4a846642..5954533a7f1b 100644 --- a/configure.ac +++ b/configure.ac @@ -9488,8 +9488,9 @@ else fi else AC_MSG_CHECKING([for doxygen]) -DOXYGEN=$with_doxygen -AC_MSG_RESULT([$DOXYGEN]) +PathFormat "$with_doxygen" +DOXYGEN="$formatted_path_unix" +AC_MSG_RESULT([$formatted_path]) fi if test -n "$DOXYGEN"; then DOXYGEN_VERSION=`$DOXYGEN --version 2>/dev/null` @@ -9498,6 +9499,19 @@ else AC_MSG_ERROR([found doxygen is too old; need at least version 1.8.4 or specify --without-doxygen]) fi fi +if test -n "$WSL_ONLY_AS_HELPER"; then +dnl what really should be tested is whether it is doxygen from windows-realm +dnl i.e. one that runs on the windows-side and deals with windows-pathnames +dnl using doxygen from wsl container would be possible, but there's a performance +dnl penalty when accessing the files outside the container +AC_MSG_CHECKING([whether doxygen is a windows executable]) +if $(file "$DOXYGEN" | grep -q "PE32"); then +AC_MSG_RESULT([yes]) +else +AC_MSG_RESULT([no]) +AC_MSG_ERROR([please provide a path to a windows version of doxygen or use --without-doxygen]) +fi +fi fi fi AC_SUBST([DOXYGEN]) diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk index 42132387457b..03b43c0c7180 100644 --- a/odk/CustomTarget_doxygen.mk +++ b/odk/CustomTarget_doxygen.mk @@ -22,8 +22,8 @@ odk_cpp_INCFILELIST := com/sun/star/uno/Any.h \ com/sun/star/uno/Type.h \ com/sun/star/uno/Type.hxx -# Cygwin Doxygen needs unix paths, wsl-as-helper needs paths into windows-realm -odk_cygwin_path = $(if $(MSYSTEM),$(call gb_Helper_wsl_path,$(1)),$(call gb_Helper_cyg_path,$(1))) +# Cygwin Doxygen needs unix paths, wsl-as-helper works in windows-realm +odk_cygwin_path = $(if $(MSYSTEM),$(1),$(call gb_Helper_cyg_path,$(1))) odk_cpp_PREFIX := $(call odk_cygwin_path,$(INSTDIR)/$(SDKDIRNAME)/include/) odk_cpp_DOXY_INPUT := $(call odk_cygwin_path,$(SRCDIR)/odk/docs/cpp/main.dox \ $(SRCDIR)/include/sal/log-areas.dox \ @@ -57,7 +57,7 @@ $(gb_CustomTarget_workdir)/odk/docs/cpp/doxygen.log : \ $(call gb_Package_get_target,odk_headers_generated) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),GEN,1) $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),GEN) - rm -rf $(odk_cpp_DOXY_WORKDIR)/ && $(call gb_Helper_wsl_path,$(WSL) $(DOXYGEN) $<) > $@ + rm -rf $(odk_cpp_DOXY_WORKDIR)/ && $(DOXYGEN) $< > $@ $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),GEN) $(eval $(call gb_CustomTarget_register_targets,odk/docs,\ @@ -98,7 +98,7 @@ $(gb_CustomTarget_workdir)/odk/docs/idl/doxygen.log : \ $(SRCDIR)/odk/docs/idl/main.dox $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),GEN,1) $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),GEN) - rm -rf $(odk_idl_DOXY_WORKDIR)/ && $(call gb_Helper_wsl_path,$(WSL) $(DOXYGEN) $<) > $@ + rm -rf $(odk_idl_DOXY_WORKDIR)/ && $(DOXYGEN) $< > $@ $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),GEN) # vim: set noet sw=4 ts=4:
core.git: external/argon2 external/boost external/box2d external/breakpad external/cairo external/clucene external/curl external/dtoa external/epoxy external/expat external/firebird external/fontconfi
RepositoryExternal.mk | 380 +- external/IAccessible2/ExternalProject_IAccessible2.mk |2 external/argon2/ExternalProject_argon2.mk |4 external/boost/StaticLibrary_boost_locale.mk |2 external/box2d/StaticLibrary_box2d.mk |4 external/breakpad/StaticLibrary_breakpad.mk |4 external/cairo/ExternalProject_cairo.mk |8 external/clucene/Library_clucene.mk |8 external/curl/ExternalProject_curl.mk |2 external/dtoa/StaticLibrary_dtoa.mk |2 external/epoxy/Library_epoxy.mk |4 external/expat/StaticLibrary_expat.mk |2 external/expat/StaticLibrary_expat_x64.mk |2 external/firebird/ExternalProject_firebird.mk | 22 external/fontconfig/ExternalProject_fontconfig.mk |2 external/freetype/ExternalProject_freetype.mk |2 external/gpgmepp/Library_gpgmepp.mk | 14 external/graphite/StaticLibrary_graphite.mk |4 external/harfbuzz/ExternalProject_harfbuzz.mk |2 external/jfreereport/ExternalProject_jfreereport_flow_engine.mk | 12 external/jfreereport/ExternalProject_jfreereport_liblayout.mk | 18 external/libcmis/StaticLibrary_libcmis.mk |4 external/libetonyek/Library_etonyek.mk|6 external/libffi/ExternalProject_libffi.mk |6 external/libjpeg-turbo/StaticLibrary_libjpeg-turbo.mk |6 external/liblangtag/ExternalProject_liblangtag.mk |4 external/libmwaw/Library_mwaw.mk |2 external/libodfgen/Library_odfgen.mk |2 external/liborcus/Library_orcus-parser.mk |4 external/liborcus/Library_orcus.mk|4 external/librevenge/Library_revenge.mk|2 external/libstaroffice/Library_staroffice.mk |4 external/libtiff/ExternalProject_libtiff.mk | 10 external/libwpd/Library_wpd.mk|4 external/libwpg/Library_wpg.mk|2 external/libwps/Library_wps.mk|4 external/libxslt/ExternalProject_libxslt.mk |4 external/lxml/ExternalProject_lxml.mk | 14 external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk |4 external/mdnsresponder/StaticLibrary_mDNSResponder.mk |2 external/nss/ExternalProject_nss.mk |4 external/onlineupdate/CustomTarget_generated.mk |2 external/onlineupdate/Executable_mar.mk |8 external/onlineupdate/Executable_mbsdiff.mk |4 external/onlineupdate/Executable_test_updater_dialog.mk | 14 external/onlineupdate/Executable_update_service.mk| 22 external/onlineupdate/Executable_updater.mk | 24 external/onlineupdate/Library_install_updateservice.mk|2 external/onlineupdate/StaticLibrary_libmar.mk |6 external/onlineupdate/StaticLibrary_libmarverify.mk |4 external/onlineupdate/StaticLibrary_updatehelper.mk | 16 external/onlineupdate/WinResTarget_updater.mk |8 external/openldap/ExternalProject_openldap.mk |6 external/pdfium/Library_pdfium.mk | 12 external/postgresql/ExternalProject_postgresql.mk | 12 external/python3/ExternalProject_python3.mk | 26 external/python3/GeneratedPackage_python3.mk |2 external/redland/ExternalProject_raptor.mk|2 external/redland/ExternalProject_rasqal.mk|6 external/redland/ExternalProject_redland.mk |8 external/redland/Library_raptor.mk|2 external/redland/Library_rasqal.mk|6 external/redland/Library_rdf.mk |2 external/rhino/ExternalProject_rhino.mk | 34 external/skia/Library_skia.mk |8 external/xmlsec/ExternalProject_xmlsec.mk | 10
core.git: solenv/gbuild
solenv/gbuild/TargetLocations.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6efe3a7a83bf5e110cbe84c225ca4f0a6364a906 Author: Christian Lohmaier AuthorDate: Sat May 4 14:30:50 2024 +0200 Commit: Christian Lohmaier CommitDate: Sat May 4 16:28:40 2024 +0200 turn gb_HelpTranslatePartTarget_get_workdir into error separate commit since that macro is used in helpcontent submodule Change-Id: I2525b03eadf75b108499701f7f576634619cbf1b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167123 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index f36a036106a7..dc659c1e4b4d 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -98,7 +98,7 @@ gb_HelpTarget_get_workdir = $(error please use plain gb_HelpTarget_workdir) gb_HelpTarget_workdir := $(WORKDIR)/HelpTarget gb_HelpTranslatePartTarget_get_target = $(WORKDIR)/HelpTranslatePartTarget/$(1)/done gb_HelpTranslatePartTarget_get_translated_target = $(WORKDIR)/HelpTranslatePartTarget/$(1)/$(2).xhp -gb_HelpTranslatePartTarget_get_workdir = $(WORKDIR)/HelpTranslatePartTarget/$(1) +gb_HelpTranslatePartTarget_get_workdir = $(error please use plain gb_HelpTranslatePartTarget_workdir instead) gb_HelpTranslatePartTarget_workdir := $(WORKDIR)/HelpTranslatePartTarget gb_HelpTranslateTarget_get_target = $(WORKDIR)/HelpTranslateTarget/$(1).done gb_HelpTreeTarget_get_target = $(WORKDIR)/HelpTreeTarget/$(1).tree
help.git: CustomTarget_html.mk
CustomTarget_html.mk | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) New commits: commit 5873436e54097facb9c435dc00cef6fc7194b108 Author: Christian Lohmaier AuthorDate: Sat May 4 14:35:31 2024 +0200 Commit: Christian Lohmaier CommitDate: Sat May 4 16:28:15 2024 +0200 makefile simplification: replace $(call gb_HelpTranslatePartTarget_get_workdir,foo) helpcontent2 portion Change-Id: I2e10bf8bf4cb39fa3a8f9a2c3eb8f22d8632560c Reviewed-on: https://gerrit.libreoffice.org/c/help/+/167124 Reviewed-by: Christian Lohmaier Tested-by: Jenkins diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk index 9b583f68c7..d105f119ad 100644 --- a/CustomTarget_html.mk +++ b/CustomTarget_html.mk @@ -65,7 +65,7 @@ ifeq ($(HELP_OMINDEX_PAGE),TRUE) define html_gen_xaptpl_dep $(gb_CustomTarget_workdir)/helpcontent2/help3xsl/$(1)/xap_tpl : \ - $(if $(filter en-US,$(1)),$(SRCDIR),$(call gb_HelpTranslatePartTarget_get_workdir,$(1)))/helpcontent2/source/text/shared/help/browserhelp.xhp + $(if $(filter en-US,$(1)),$(SRCDIR),$(gb_HelpTranslatePartTarget_workdir)/$(1))/helpcontent2/source/text/shared/help/browserhelp.xhp endef @@ -84,7 +84,7 @@ $(gb_CustomTarget_workdir)/helpcontent2/help3xsl/%/xap_tpl : \ --stringparam productversion "$(PRODUCTVERSION)" \ -o $@ \ $(SRCDIR)/helpcontent2/help3xsl/xap_templ_query.xsl \ - $(if $(filter en-US,$*),$(SRCDIR),$(call gb_HelpTranslatePartTarget_get_workdir,$*))/helpcontent2/source/text/shared/help/browserhelp.xhp \ + $(if $(filter en-US,$*),$(SRCDIR),$(gb_HelpTranslatePartTarget_workdir)/$*)/helpcontent2/source/text/shared/help/browserhelp.xhp \ ) $(call gb_Trace_EndRange,$*/$(@F),XSL) @@ -94,7 +94,7 @@ endif define html_gen_noscript_dep $(gb_CustomTarget_workdir)/helpcontent2/help3xsl/$(1)/noscript.html : \ - $(if $(filter en-US,$(1)),$(SRCDIR),$(call gb_HelpTranslatePartTarget_get_workdir,$(1)))/helpcontent2/source/text/shared/help/browserhelp.xhp + $(if $(filter en-US,$(1)),$(SRCDIR),$(gb_HelpTranslatePartTarget_workdir)/$(1))/helpcontent2/source/text/shared/help/browserhelp.xhp endef @@ -114,7 +114,7 @@ $(gb_CustomTarget_workdir)/helpcontent2/help3xsl/%/noscript.html : \ --stringparam productversion "$(PRODUCTVERSION)" \ -o $@ \ $(SRCDIR)/helpcontent2/help3xsl/noscript.xsl \ - $(if $(filter en-US,$*),$(SRCDIR),$(call gb_HelpTranslatePartTarget_get_workdir,$*))/helpcontent2/source/text/shared/help/browserhelp.xhp \ + $(if $(filter en-US,$*),$(SRCDIR),$(gb_HelpTranslatePartTarget_workdir)/$*)/helpcontent2/source/text/shared/help/browserhelp.xhp \ ) $(call gb_Trace_EndRange,$*/$(@F),XSL) @@ -126,7 +126,7 @@ $(gb_CustomTarget_workdir)/helpcontent2/help3xsl/languages.js : \ define html_gen_langnames_js_dep $(gb_CustomTarget_workdir)/helpcontent2/help3xsl/$(1)/langnames.js : \ - $(if $(filter en-US,$(1)),$(SRCDIR),$(call gb_HelpTranslatePartTarget_get_workdir,$(1)))/helpcontent2/source/text/shared/help/browserhelp.xhp + $(if $(filter en-US,$(1)),$(SRCDIR),$(gb_HelpTranslatePartTarget_workdir)/$(1))/helpcontent2/source/text/shared/help/browserhelp.xhp endef @@ -222,13 +222,13 @@ $(gb_CustomTarget_workdir)/helpcontent2/help3xsl/%/html.text : \ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XSL,1) $(call gb_Trace_StartRange,$*/$(@F),XSL) rm -rf $(dir $@)text && mkdir -p $(dir $@)text && cd $(dir $@)text && mkdir -p $(sort $(subst helpcontent2/source/text/,,$(dir $(gb_html_allhelpfiles \ - && cd $(if $(filter en-US,$*),$(SRCDIR),$(call gb_HelpTranslatePartTarget_get_workdir,$*)) \ + && cd $(if $(filter en-US,$*),$(SRCDIR),$(gb_HelpTranslatePartTarget_workdir)/$*) \ && RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),$(addsuffix $(WHITESPACE)dummyIgnoreCRinEOL$(NEWLINE),$(subst helpcontent2/source/,,$(gb_html_allhelpfiles \ && while read xhp dummy; do \ $(call gb_ExternalExecutable_get_command,xsltproc) \ --stringparam Language $* \ --stringparam local $(if $(HELP_ONLINE),'no','yes') \ - --stringparam root $(if $(filter en-US,$*),$(SRCDIR),$(call gb_HelpTranslatePartTarget_get_workdir,$*))/helpcontent2/source/ \ + --stringparam root $(if $(filter en-US,$*),$(SRCDIR),$(gb_HelpTranslatePartTarget_workdir)/$*)/helpcontent2/source/ \ --stringparam productname "$(gb_PRODUCTNAME_HTML)" \ --stringparam productversion "$(PRODUCTVERSION)" \ --stringparam xapian $(if $(filter TRUE, $(HELP_OMINDEX_PAGE)),'yes','no') \ @@ -287,7 +287,7 @@ $(gb_CustomTarget_workdir)/helpcontent2/help3xsl/%/bookmarks.part : \ $(call gb_Output_announce,$(subst
core.git: 2 commits - helpcontent2 solenv/gbuild
helpcontent2 |2 +-
solenv/gbuild/HelpTarget.mk |8
solenv/gbuild/TargetLocations.mk |1 +
3 files changed, 6 insertions(+), 5 deletions(-)
New commits:
commit a3d55b67b0c44aa135aad6447ba8a03c5aa7936a
Author: Christian Lohmaier
AuthorDate: Sat May 4 16:28:15 2024 +0200
Commit: Gerrit Code Review
CommitDate: Sat May 4 16:28:15 2024 +0200
Update git submodules
* Update helpcontent2 from branch 'master'
to 5873436e54097facb9c435dc00cef6fc7194b108
- makefile simplification: replace $(call
gb_HelpTranslatePartTarget_get_workdir,foo)
helpcontent2 portion
Change-Id: I2e10bf8bf4cb39fa3a8f9a2c3eb8f22d8632560c
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/167124
Reviewed-by: Christian Lohmaier
Tested-by: Jenkins
diff --git a/helpcontent2 b/helpcontent2
index e8b21ab24434..5873436e5409 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit e8b21ab244345cea0a1d0b9190a8729ff3ea47b1
+Subproject commit 5873436e54097facb9c435dc00cef6fc7194b108
commit 52fc9164940a7e778cf4b03a984f7259bd92f9fa
Author: Christian Lohmaier
AuthorDate: Sat May 4 14:29:17 2024 +0200
Commit: Christian Lohmaier
CommitDate: Sat May 4 16:28:03 2024 +0200
makefile simplification: replace $(call
gb_HelpTranslatePartTarget_get_workdir,foo)
…by a simple/static $(gb_HelpTranslatePartTarget_workdir)/foo
see also 0c4c84a14b01c71c76a9c45a7f26aec4d64f3e4f
Change-Id: I2525b03eadf75b108499701f7f576634619ccf1b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167122
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier
diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk
index aa114d373b0b..2a629fcbd129 100644
--- a/solenv/gbuild/HelpTarget.mk
+++ b/solenv/gbuild/HelpTarget.mk
@@ -45,14 +45,14 @@ $(call gb_Helper_abbreviate_dirs, \
-l $(HELP_LANG) \
-mi $${HELPFILES} \
-m $${POFILES} \
- -o $(call gb_HelpTranslatePartTarget_get_workdir,$(2))
&& \
+ -o $(gb_HelpTranslatePartTarget_workdir)/$(2) && \
rm -f $${POFILES} \
, \
$(gb_HelpTranslatePartTarget_COMMAND) \
-l $(HELP_LANG) \
-mi $${HELPFILES} \
-m \
- -o $(call gb_HelpTranslatePartTarget_get_workdir,$(2)) \
+ -o $(gb_HelpTranslatePartTarget_workdir)/$(2) \
) \
) && \
touch $@ && \
@@ -83,7 +83,7 @@ $(call gb_HelpTranslatePartTarget_get_target,$(1)) : POFILES
:= $(3)
$(call gb_HelpTranslatePartTarget_get_target,$(1)) :
$(gb_Module_CURRENTMAKEFILE)
$(call gb_HelpTranslatePartTarget_get_target,$(1)) : $(3)
$(call gb_HelpTranslatePartTarget_get_target,$(1)) :| $(dir $(call
gb_HelpTranslatePartTarget_get_target,$(1))).dir
-$(call gb_HelpTranslatePartTarget_get_target,$(1)) :| $(call
gb_HelpTranslatePartTarget_get_workdir,$(1))/.dir
+$(call gb_HelpTranslatePartTarget_get_target,$(1)) :|
$(gb_HelpTranslatePartTarget_workdir)/$(1)/.dir
endef
@@ -99,7 +99,7 @@ endef
gb_HelpTranslateTarget__get_lang = $(lastword $(subst /, ,$(1)))
gb_HelpTranslateTarget__get_partname = $(call
gb_HelpTranslateTarget__get_lang,$(1))/$(patsubst %/,%,$(2))
-gb_HelpTranslateTarget__get_part_workdir = $(call
gb_HelpTranslatePartTarget_get_workdir,$(call
gb_HelpTranslateTarget__get_partname,$(1),$(2)))
+gb_HelpTranslateTarget__get_part_workdir =
$(gb_HelpTranslatePartTarget_workdir)/$(call
gb_HelpTranslateTarget__get_partname,$(1),$(2))
gb_HelpTranslateTarget_get_translated_target = $(call
gb_HelpTranslatePartTarget_get_translated_target,$(call
gb_HelpTranslateTarget__get_partname,$(1),$(dir $(2))),$(notdir $(2)))
gb_HelpTranslateTarget__get_any_translated_target = $(abspath $(call
gb_HelpTranslatePartTarget_get_translated_target,,$(1)))
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index f59b3da126f9..f36a036106a7 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -99,6 +99,7 @@ gb_HelpTarget_workdir := $(WORKDIR)/HelpTarget
gb_HelpTranslatePartTarget_get_target =
$(WORKDIR)/HelpTranslatePartTarget/$(1)/done
gb_HelpTranslatePartTarget_get_translated_target =
$(WORKDIR)/HelpTranslatePartTarget/$(1)/$(2).xhp
gb_HelpTranslatePartTarget_get_workdir =
$(WORKDIR)/HelpTranslatePartTarget/$(1)
+gb_HelpTranslatePartTarget_workdir := $(WORKDIR)/HelpTranslatePartTarget
gb_HelpTranslateTarget_get_target = $(WORKDIR)/HelpTranslateTarget/$(1).done
gb_HelpTreeTarget_get_target = $(WORKDIR)/HelpTreeTarget/$(1).tree
gb_InstallModule_get_filelist = $(call
gb_InstallModuleTarget_get_filelist,$(1))
core.git: 3 commits - solenv/gbuild
solenv/gbuild/Extension.mk | 49 ++- solenv/gbuild/Gallery.mk | 32 - solenv/gbuild/HelpTarget.mk | 10 +++ solenv/gbuild/TargetLocations.mk |9 --- 4 files changed, 50 insertions(+), 50 deletions(-) New commits: commit c8a145afbff81d4c19c2346870eb005c775862b1 Author: Christian Lohmaier AuthorDate: Sat May 4 14:17:41 2024 +0200 Commit: Christian Lohmaier CommitDate: Sat May 4 16:27:56 2024 +0200 makefile simplification: replace $(call gb_HelpTarget_get_workdir,foo) …by a simple/static $(gb_HelpTarget_workdir)/foo see also 0c4c84a14b01c71c76a9c45a7f26aec4d64f3e4f Change-Id: Ibe4ce564b021158f3b1800fad96bdeee88792a97 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167121 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk index 98baa661e908..aa114d373b0b 100644 --- a/solenv/gbuild/HelpTarget.mk +++ b/solenv/gbuild/HelpTarget.mk @@ -377,7 +377,7 @@ endef # gb_HelpLinkTarget_set_indexed target indexfiles define gb_HelpLinkTarget_set_indexed $(call gb_HelpLinkTarget_get_target,$(1)) : HELP_INDEXED := $(2) -$(addprefix $(call gb_HelpTarget_get_workdir,$(1))/,$(2)) : $(call gb_HelpIndexTarget_get_target,$(1)) +$(addprefix $(gb_HelpTarget_workdir)/$(1)/,$(2)) : $(call gb_HelpIndexTarget_get_target,$(1)) endef @@ -407,7 +407,7 @@ endef define gb_HelpLinkTarget_add_renamed_file $(call gb_HelpLinkTarget_get_target,$(1)) : HELP_EXTRA_ADD_FILES += $(strip $(2)),$(strip $(3)) $(call gb_HelpLinkTarget_get_target,$(1)) : $(3) -$(call gb_HelpTarget_get_workdir,$(1))/$(2) : $(call gb_HelpLinkTarget_get_target,$(1)) +$(gb_HelpTarget_workdir)/$(1)/$(2) : $(call gb_HelpLinkTarget_get_target,$(1)) touch $$@ endef @@ -582,7 +582,7 @@ endif $(call gb_HelpTarget_get_linked_target,$*) \ $(call gb_HelpTarget_get_target,$*) \ $(call gb_HelpTarget_get_translation_target,$*) \ - $(call gb_HelpTarget_get_workdir,$*) \ + $(gb_HelpTarget_workdir)/$* \ ) gb_HelpTarget_get_packagename = HelpTarget/$(1) @@ -599,7 +599,7 @@ $(call gb_HelpTarget_get_target,$(1)) : HELP_LANG := $(3) $(call gb_HelpTarget_get_translation_target,$(1)) : HELP_FILES := $(call gb_HelpTarget_get_translation_target,$(1)) : $(gb_Module_CURRENTMAKEFILE) -$(call gb_HelpTarget__HelpTarget_impl,$(1),$(2),$(3),$(call gb_HelpTarget_get_workdir,$(1)),$(call gb_HelpTarget_get_packagename,$(1))) +$(call gb_HelpTarget__HelpTarget_impl,$(1),$(2),$(3),$(gb_HelpTarget_workdir)/$(1),$(call gb_HelpTarget_get_packagename,$(1))) endef @@ -617,7 +617,7 @@ endif $(call gb_HelpTarget_get_linked_target,$(1)) : $(call gb_HelpTarget_get_translation_target,$(1)) ifeq ($(ENABLE_HTMLHELP),) $(call gb_HelpLinkTarget_get_target,$(1)) : $(call gb_HelpTarget_get_linked_target,$(1)) -$(call gb_HelpLinkTarget_get_target,$(1)) :| $(call gb_HelpTarget_get_workdir,$(1))/.dir +$(call gb_HelpLinkTarget_get_target,$(1)) :| $(gb_HelpTarget_workdir)/$(1)/.dir $(call gb_HelpTarget_get_target,$(1)) : $(call gb_HelpLinkTarget_get_target,$(1)) $(call gb_Package_get_preparation_target,$(5)) : $(call gb_HelpTarget_get_target,$(1)) endif diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 553c127a1781..f59b3da126f9 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -94,7 +94,8 @@ gb_HelpTarget_get_filelist = $(WORKDIR)/HelpTarget/$(1).filelist gb_HelpTarget_get_linked_target = $(WORKDIR)/HelpTarget/$(1).translate gb_HelpTarget_get_target = $(WORKDIR)/HelpTarget/$(1).zip gb_HelpTarget_get_translation_target = $(call gb_HelpTarget_get_filelist,$(1)) -gb_HelpTarget_get_workdir = $(WORKDIR)/HelpTarget/$(1) +gb_HelpTarget_get_workdir = $(error please use plain gb_HelpTarget_workdir) +gb_HelpTarget_workdir := $(WORKDIR)/HelpTarget gb_HelpTranslatePartTarget_get_target = $(WORKDIR)/HelpTranslatePartTarget/$(1)/done gb_HelpTranslatePartTarget_get_translated_target = $(WORKDIR)/HelpTranslatePartTarget/$(1)/$(2).xhp gb_HelpTranslatePartTarget_get_workdir = $(WORKDIR)/HelpTranslatePartTarget/$(1) commit ee5eb3dac8c90a49de88475cf2d0de9d8a93e912 Author: Christian Lohmaier AuthorDate: Sat May 4 14:08:02 2024 +0200 Commit: Christian Lohmaier CommitDate: Sat May 4 16:27:49 2024 +0200 makefile simplification: replace $(call gb_Galley_get_workdir,foo) …by a simple/static $(gb_Gallery_workdir)/foo see also 0c4c84a14b01c71c76a9c45a7f26aec4d64f3e4f Change-Id: Iaa2ab218b329a15c7bf2ea528e2612a3a6b44f6c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167120 Reviewed-by: Christian Lohmaier Tested-by: Jenkins diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk index 3d3fa2092edc..ec7a791351fb 100644
core.git: solenv/gbuild
solenv/gbuild/TargetLocations.mk |4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) New commits: commit 83c2ef7c78d1453cc0419fd27a8c1418f90c12a3 Author: Christian Lohmaier AuthorDate: Thu May 2 11:31:59 2024 +0200 Commit: Christian Lohmaier CommitDate: Fri May 3 16:07:04 2024 +0200 turn gb_CustomTarget_get_workdir into error and remove old _repo_targets separate commit since help submodule also uses the macro. actually turn it into make error to prevent reintroducing it the repo_target ones are from way back when the whole repo was split up in many different ones and not used for many years, no point in having those as errors Change-Id: I9fd42529d08ea7859b33f8570936f06039cfa184 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167006 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 1db26abd9e4e..725390a8feed 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -55,9 +55,8 @@ gb_ComponentTarget_get_target_for_build = $(WORKDIR_FOR_BUILD)/ComponentTarget/$ gb_Configuration_get_preparation_target = $(WORKDIR)/Configuration/$(1).prepared gb_CppunitTest_get_target = $(WORKDIR)/CppunitTest/$(1).test gb_CustomPackage_get_target = $(WORKDIR)/CustomPackage/$(1).filelist -gb_CustomTarget_get_repo_target = $(WORKDIR)/CustomTarget/$(2)_$(1).done gb_CustomTarget_get_target = $(WORKDIR)/CustomTarget/$(1).done -gb_CustomTarget_get_workdir = $(WORKDIR)/CustomTarget/$(1) +gb_CustomTarget_get_workdir = $(error please use plain gb_CustomTarget_workdir instead) gb_CustomTarget_workdir := $(WORKDIR)/CustomTarget gb_DescriptionTranslateTarget_get_target = $(WORKDIR)/DescriptionTranslateTarget/$(1).xml gb_Dictionary_get_target = $(WORKDIR)/Dictionary/$(1).done @@ -109,7 +108,6 @@ gb_InternalUnoApi_get_target = $(WORKDIR)/InternalUnoApi/$(1).done gb_Jar_get_target = $(call gb_Jar_get_install_target,$(1)) gb_Jar_get_classsetname = Jar/$(1) gb_JavaClassSet_get_classdir = $(WORKDIR)/JavaClassSet/$(1) -gb_JavaClassSet_get_repo_target = $(WORKDIR)/JavaClassSet/$(2)/$(1).done gb_JavaClassSet_get_target = $(WORKDIR)/JavaClassSet/$(1)/done gb_JunitTest_get_classsetname = JunitTest/$(1) gb_JunitTest_get_target = $(WORKDIR)/JunitTest/$(1)/done
core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9c4e0578eead433de2b38f2a464b402c09432ecd Author: Christian Lohmaier AuthorDate: Fri May 3 16:06:40 2024 +0200 Commit: Gerrit Code Review CommitDate: Fri May 3 16:06:40 2024 +0200 Update git submodules * Update helpcontent2 from branch 'master' to e8b21ab244345cea0a1d0b9190a8729ff3ea47b1 - makefile simplification: replace $(call gb_CustomTarget_get_workdir,foo) helpcontent2 portion Change-Id: I2e10bf8bf4cb39fa3a8f9a2c3eb8f22d8636560c Reviewed-on: https://gerrit.libreoffice.org/c/help/+/167007 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/helpcontent2 b/helpcontent2 index d5d56e1d29b6..e8b21ab24434 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit d5d56e1d29b65749978ae5e9801531200477761b +Subproject commit e8b21ab244345cea0a1d0b9190a8729ff3ea47b1
help.git: AllLangPackage_html_lang.mk CustomTarget_html.mk CustomTarget_imagelist.mk GeneratedPackage_html_lang_generated.mk Package_helpimages.mk Package_html_dynamic.mk
AllLangPackage_html_lang.mk |2 CustomTarget_html.mk| 72 CustomTarget_imagelist.mk |6 +- GeneratedPackage_html_lang_generated.mk |2 Package_helpimages.mk |2 Package_html_dynamic.mk |2 6 files changed, 43 insertions(+), 43 deletions(-) New commits: commit e8b21ab244345cea0a1d0b9190a8729ff3ea47b1 Author: Christian Lohmaier AuthorDate: Thu May 2 11:35:10 2024 +0200 Commit: Christian Lohmaier CommitDate: Fri May 3 16:06:39 2024 +0200 makefile simplification: replace $(call gb_CustomTarget_get_workdir,foo) helpcontent2 portion Change-Id: I2e10bf8bf4cb39fa3a8f9a2c3eb8f22d8636560c Reviewed-on: https://gerrit.libreoffice.org/c/help/+/167007 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/AllLangPackage_html_lang.mk b/AllLangPackage_html_lang.mk index 63fe21ba65..a0ae5f5a7b 100644 --- a/AllLangPackage_html_lang.mk +++ b/AllLangPackage_html_lang.mk @@ -7,7 +7,7 @@ # # file, You can obtain one at http://mozilla.org/MPL/2.0/. # # # -$(eval $(call gb_AllLangPackage_AllLangPackage,helpcontent2_html_lang,$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl))) +$(eval $(call gb_AllLangPackage_AllLangPackage,helpcontent2_html_lang,$(gb_CustomTarget_workdir)/helpcontent2/help3xsl)) $(eval $(call gb_AllLangPackage_use_customtarget,helpcontent2_html_lang,helpcontent2/help3xsl)) diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk index a3a9cec55f..9b583f68c7 100644 --- a/CustomTarget_html.mk +++ b/CustomTarget_html.mk @@ -43,7 +43,7 @@ $(eval $(call gb_CustomTarget_register_targets,helpcontent2/help3xsl,\ # trailing space for Windows so that xargs doesn't interpret the final CR (that # win-make adds as the newline character) as part of the last filename -$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/hid2file.js : \ +$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/hid2file.js : \ $(SRCDIR)/helpcontent2/help3xsl/generate_hid2file.xsl \ $(foreach module,$(html_TEXT_MODULES),$(call gb_AllLangHelp_get_helpfiles_target,$(module))) \ $(SRCDIR)/helpcontent2/CustomTarget_html.mk \ @@ -64,14 +64,14 @@ $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/hid2file.js : \ ifeq ($(HELP_OMINDEX_PAGE),TRUE) define html_gen_xaptpl_dep -$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(1)/xap_tpl : \ +$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/$(1)/xap_tpl : \ $(if $(filter en-US,$(1)),$(SRCDIR),$(call gb_HelpTranslatePartTarget_get_workdir,$(1)))/helpcontent2/source/text/shared/help/browserhelp.xhp endef $(eval $(foreach lang,$(gb_HELP_LANGS),$(call html_gen_xaptpl_dep,$(lang -$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/xap_tpl : \ +$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/%/xap_tpl : \ $(SRCDIR)/helpcontent2/help3xsl/xap_templ_query.xsl \ $(SRCDIR)/helpcontent2/CustomTarget_html.mk \ | $(call gb_ExternalExecutable_get_dependencies,xsltproc) @@ -93,14 +93,14 @@ endif # Create noscript.html, when browser has no javascript enabled define html_gen_noscript_dep -$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(1)/noscript.html : \ +$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/$(1)/noscript.html : \ $(if $(filter en-US,$(1)),$(SRCDIR),$(call gb_HelpTranslatePartTarget_get_workdir,$(1)))/helpcontent2/source/text/shared/help/browserhelp.xhp endef $(eval $(foreach lang,$(gb_HELP_LANGS),$(call html_gen_noscript_dep,$(lang -$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/noscript.html : \ +$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/%/noscript.html : \ $(SRCDIR)/helpcontent2/help3xsl/noscript.xsl \ $(SRCDIR)/helpcontent2/help3xsl/brand.xsl \ $(SRCDIR)/helpcontent2/CustomTarget_html.mk \ @@ -120,12 +120,12 @@ $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/noscript.html : \ # set of installed languages - has to be language independent -$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/languages.js : \ +$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/languages.js : \ $(SRCDIR)/helpcontent2/CustomTarget_html.mk printf 'var languagesSet = new Set([%s]); ' "$(subst $(WHITESPACE),$(COMMA) ,$(patsubst %,'%',$(gb_HELP_LANGS)))" > $@ define html_gen_langnames_js_dep -$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(1)/langnames.js : \ +$(gb_CustomTarget_workdir)/helpcontent2/help3xsl/$(1)/langnames.js : \ $(if $(filter en-US,$(1)),$(SRCDIR),$(call gb_HelpTranslatePartTarget_get_workdir,$(1)))/helpcontent2/source/text/shared/help/browserhelp.xhp endef @@ -133,7 +133,7 @@ endef $(eval $(foreach lang,$(gb_HELP_LANGS),$(call html_gen_langnames_js_dep,$(lang # names of the languages - has to be translated, ie. per language -$(call
core.git: android/CustomTarget_lo_android.mk bridges/CustomTarget_gcc3_linux_arm.mk bridges/Library_cpp_uno.mk cli_ure/CustomTarget_cli_ure_assemblies.mk desktop/CustomTarget_desktop_unopackages_insta
android/CustomTarget_lo_android.mk |2 bridges/CustomTarget_gcc3_linux_arm.mk | 12 - bridges/Library_cpp_uno.mk |4 cli_ure/CustomTarget_cli_ure_assemblies.mk | 18 - desktop/CustomTarget_desktop_unopackages_install.mk |6 desktop/CustomTarget_soffice.mk |6 desktop/Executable_soffice_bin.mk |8 desktop/GeneratedPackage_desktop_unopackages_install.mk |2 desktop/Package_soffice_sh.mk |2 editeng/CustomTarget_generated.mk |2 extensions/CustomTarget_automationtest.mk |2 extensions/CustomTarget_so_activex_idl.mk |2 extensions/CustomTarget_so_activex_x64.mk | 16 - external/onlineupdate/CustomTarget_generated.mk |2 extras/AllLangPackage_autotextshare.mk |2 extras/CustomTarget_autocorr.mk | 12 - extras/CustomTarget_autotextshare.mk| 16 - extras/CustomTarget_autotextuser.mk | 12 - extras/CustomTarget_gallsystem.mk |6 extras/CustomTarget_glade.mk|2 extras/CustomTarget_opensymbol.mk |4 extras/CustomTarget_templates.mk| 30 +-- extras/CustomTarget_tplpresnt.mk| 20 +- extras/CustomTarget_tplwizard.mk| 32 +-- extras/Package_autocorr.mk |2 extras/Package_autotextuser.mk |2 extras/Package_fonts.mk |2 extras/Package_gallsystemstr.mk |2 extras/Package_glade.mk |2 extras/Package_resource_fonts.mk|2 extras/Package_templates.mk |2 extras/Package_tplpresnt.mk |2 extras/Package_tplwizard.mk |2 filter/CustomTarget_svg.mk |2 i18npool/CustomTarget_breakiterator.mk |2 i18npool/CustomTarget_collator.mk |2 i18npool/CustomTarget_indexentry.mk |6 i18npool/CustomTarget_localedata.mk |8 i18npool/CustomTarget_textconversion.mk |6 i18npool/Library_i18npool.mk| 12 - instsetoo_native/CustomTarget_install.mk| 46 ++-- instsetoo_native/CustomTarget_setup.mk | 38 ++-- instsetoo_native/Package_setup.mk |2 instsetoo_native/Package_setup_ure.mk |2 jvmfwk/CustomTarget_jreproperties.mk|6 jvmfwk/CustomTarget_jvmfwk_jvmfwk3_ini.mk |2 jvmfwk/Package_jreproperties.mk |2 jvmfwk/Package_jvmfwk_jvmfwk3_ini.mk|2 librelogo/CustomTarget_librelogo.mk |2 librelogo/Package_librelogo_properties.mk |2 odk/CustomTarget_allheaders.mk |2 odk/CustomTarget_check.mk |4 odk/CustomTarget_classes.mk |2 odk/CustomTarget_config_win.mk |2 odk/CustomTarget_doxygen.mk | 16 - odk/CustomTarget_html.mk|2 odk/CustomTarget_javadoc.mk | 12 - odk/CustomTarget_settings.mk|2 odk/GeneratedPackage_odk_doxygen.mk |2 odk/GeneratedPackage_odk_javadoc.mk |2 odk/GeneratedPackage_uno_loader_classes.mk |2 odk/Package_config_win.mk |2 odk/Package_html.mk |2 odk/Package_settings_generated.mk |2 odk/Package_share_readme.mk |2 odk/build-examples_common.mk| 16 - officecfg/CustomTarget_registry.mk |6 oox/CustomTarget_generated.mk |2 oox/Package_generated.mk|2 postprocess/CustomTarget_check_dynamic_objects.mk |2 postprocess/CustomTarget_components.mk |2 postprocess/CustomTarget_fontconfig.mk |8 postprocess/CustomTarget_images.mk |2 postprocess/CustomTarget_registry.mk| 36 +-- postprocess/CustomTarget_signing.mk |4 postprocess/Package_fontconfig.mk |2
core.git: Branch 'libreoffice-24-2' - android/source
android/source/res/values-ab/strings.xml |2 android/source/res/values-ast/strings.xml| 121 +++ android/source/res/values-ca/strings.xml | 121 +++ android/source/res/values-cs/strings.xml | 121 +++ android/source/res/values-cy/strings.xml | 121 +++ android/source/res/values-de/strings.xml | 40 +--- android/source/res/values-dsb/strings.xml| 121 +++ android/source/res/values-el/strings.xml | 121 +++ android/source/res/values-es/strings.xml | 121 +++ android/source/res/values-eu/strings.xml | 121 +++ android/source/res/values-fa/strings.xml | 121 +++ android/source/res/values-fi/strings.xml |2 android/source/res/values-fr/strings.xml | 121 +++ android/source/res/values-gl/strings.xml | 121 +++ android/source/res/values-hsb/strings.xml| 121 +++ android/source/res/values-hu/strings.xml | 121 +++ android/source/res/values-hy/strings.xml | 121 +++ android/source/res/values-ia/strings.xml | 78 + android/source/res/values-in/strings.xml | 91 android/source/res/values-is/strings.xml | 121 +++ android/source/res/values-it/strings.xml | 121 +++ android/source/res/values-ja/strings.xml |2 android/source/res/values-kk/strings.xml |2 android/source/res/values-ne/strings.xml | 23 + android/source/res/values-nl/strings.xml | 121 +++ android/source/res/values-pa/strings.xml | 118 ++ android/source/res/values-pl/strings.xml | 121 +++ android/source/res/values-pt-rBR/strings.xml | 121 +++ android/source/res/values-pt/strings.xml | 121 +++ android/source/res/values-sk/strings.xml | 22 android/source/res/values-sl/strings.xml | 121 +++ android/source/res/values-tr/strings.xml | 44 ++--- android/source/res/values-uk/strings.xml | 121 +++ android/source/res/values-zh-rTW/strings.xml | 121 +++ 34 files changed, 3141 insertions(+), 66 deletions(-) New commits: commit 8b80b3daf5db792d86c0caf379ca010750cebba6 Author: Christian Lohmaier AuthorDate: Thu May 2 13:47:55 2024 +0200 Commit: Christian Lohmaier CommitDate: Thu May 2 13:47:55 2024 +0200 seed 24-2 branch with android translations Change-Id: Ib5f9e545d4dbef998ed8b7a3ffbea5e7e4c0a9d3 diff --git a/android/source/res/values-ab/strings.xml b/android/source/res/values-ab/strings.xml new file mode 100644 index ..a6b3daec9354 --- /dev/null +++ b/android/source/res/values-ab/strings.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/android/source/res/values-ast/strings.xml b/android/source/res/values-ast/strings.xml new file mode 100644 index ..27e9d06bd131 --- /dev/null +++ b/android/source/res/values-ast/strings.xml @@ -0,0 +1,121 @@ + + +Amosar la llicencia +Documentu de testu nuevu +Dibuxu nuevu +ensin títulu +Esbilla\'l ficheru que quies abrir +Ficheros recién +Tolos ficheros +Axustes +Amosar el tecláu +Refacer +NON +Desaniciar +Anubrir +Amosar +Fueya +Esti ficheru ye namái de llectura. +Presentación nueva +Fueya de cálculu nueva +Tocante a +Guardar +Guetar +Desfacer +Páxina +Configuración del visor del LibreOffice +Versión: %1$sbrIdentificador de la construción: a href=https://hub.libreoffice.org/git-core/%2$s%2$s/a; +El Visor del LibreOffice ye un visor de documentos basáu nel LibreOffice. +https://www.libreoffice.org +Esta versión fornióla $VENDOR. +Visor del LibreOffice +Xenerales +Mou esperimental +Mou de desendolcu +Guardar como… +Guardando’l documentu… +Nun se pudo guardar el documentu. +¿Quies guardar el documentu enantes de zarralu\? +GUARDAR +Encaboxar +Amosar l\'avisu +Política de privacidá +Crear un ficheru nuevu +Atopar siguiente +Atopar anterior +iconu de ficheru +Activa\'l mou d\'edición esperimental. Úsalu baxo la to responsabilidá. +Activar mou de desendolcu, nel que se puen unviar ordes d\'UNO dientro de l\'app. Úsalu baxo la to responsabilidá. +Partes +Activar el formatu +Unviar orde UNO +Guardar completu +Contraseña +Presentación de diapositives +Ametar diapositiva +Atrás +Inxertar +Llargor óptimu +Axustar el llargor +
core.git: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b19c1cf7fa65386de7eb0eeea8068899cdcfb877 Author: Christian Lohmaier AuthorDate: Tue Apr 30 15:03:36 2024 +0200 Commit: Gerrit Code Review CommitDate: Tue Apr 30 15:03:36 2024 +0200 Update git submodules * Update translations from branch 'master' to 7e1ef25c4f7bb14013f6e68e04c1205785967dad - update translations for master and force-fix errors using pocheck Change-Id: I2067aadd5d6dad3a13b142a80b099c86aa4f2211 diff --git a/translations b/translations index b2b2c286fed6..7e1ef25c4f7b 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit b2b2c286fed6e5116acc819a44c69214af3f993b +Subproject commit 7e1ef25c4f7bb14013f6e68e04c1205785967dad
translations.git: Changes to 'refs/tags/libreoffice-24.2.3.2'
Tag 'libreoffice-24.2.3.2' created by Christian Lohmaier at 2024-04-29 18:46 + Tag libreoffice-24.2.3.2 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmYv6vkACgkQ9DSh76/u rqNyrRAAmW2Cnqt+fvcyXc7yGyz5xxMJEN3hwRWhJEAlEWVPd2PRU6SEPwQLbNZr P5hvUiucL3P0nWp+cjrIvZGCNZw1+fGEeHXS/H3yNkrfH2bjsB3vF17qONFzv9rj lBneiw9P/WrIP7O2gP7snpfAUGqXpFohuwUXBE8Nvi+1Ve4YBxK1oTj/DOCxNUKO GPXdDSa4QrzwipTzQ/SxWU37Z9vvkh4tY54MVsp6bXyIXf1HJKGUEltwJldpdaMa tYMtOKtl6aubYARbFJZelWSHC9xrKk/1YXGKhXKknpq7A1+1lg7ZXgJ5acPVfRjx Y2JGLmO2Oga6JoNeFDhWuDM2MfogbIkVXF+sCVKXiLPpOp7Cdw94DPbCkV22ySCv SR6yhSxKJlnTDCejj97wxSZJjtOZGLYio8hkZcEE8kuPllNnIRSagLFmlRfPz/Ii FvvaEPiBKhImbw+Zky5nhPIQrVjERp3en7byzHGprQ10zQbSrIGKX/+AbjgTRrLf qUMXWi17JABAOw83n7EmipzTSxdINK9ZocY8XlCAC1wsP5NBCKKC9GcHfC06eZlu 3ZfGDM0jYK/nAU9Y0mWBk73O9K+kf8Xy9h8ONvFMdOhi2BFSsNU26WRFie83ZKVM /HYhRJV/jvvT7L4nHUewezma/OxXY02TKURhNR59XkqcEmUbG1M= =+z+5 -END PGP SIGNATURE- Changes since cp-24.04.0-1-9: --- 0 files changed ---
help.git: Changes to 'refs/tags/libreoffice-24.2.3.2'
Tag 'libreoffice-24.2.3.2' created by Christian Lohmaier at 2024-04-29 18:46 + Tag libreoffice-24.2.3.2 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmYv6vkACgkQ9DSh76/u rqMUag//c8RlmiZ664uDe9Y2ZG4qBpLO1o5H8b1LMWHkm2WHFb2eTpYfFkhqrm3O LGBD6uVi59FM2Bk9fRF7Q4o1RnplNZoaOAGCWZ0vT7TL+JsMHKtxUh793DS19SD+ yd5FoGvPl4j5Qf7y7vuTcgk6Hspsllu4RvDWGE65Sb/HROATmveG2bQf61B/lABS mj8Gu05QyKVFCsBWn0MzdAATSX1h1u1Xh9XzX3RILN9GtCvuu7U7M9cDcCP5yH03 NhkrqzGijwTreP2Fmga1b8GKBgHDL7VJmPdb1xjdJuIWrdlXkdprdaHkFsJMXPzu nIXQkTztBUbBMbklsaYn0MSyLoTkQ/HemNWIOHB1zk/F9Q+J0l9tyfmOTtGpksxg fZNraRZfj4/dnYSLWwe+fGf8p2eToFYXg0ZMzI52rbGDSc5IS762mAxJcMe8zULG X23qOeZ0FTorASS3xhqhDK1V+zcT3q8kr78vrsSdCh4aoFefgeZrd0uBf739J4sl u9JYndati9fGRzVkoqtKZOhQflFhZ5rs0UhMK9qOz+RjBGnVC0nkYIgSahXKGteE ycc0rpRO6JVTC5HNnihAfU5SVB9eK2mTBU1IIpIB5rrkUd5gBKFU03VQO3vqlZpz sW1JwYPom+TtY7opwbKSttF6zxcfbNixmQ+qanBgZg0tkV1fQNI= =SfY+ -END PGP SIGNATURE- Changes since co-24.04-branch-point-14: --- 0 files changed ---
dictionaries.git: Changes to 'refs/tags/libreoffice-24.2.3.2'
Tag 'libreoffice-24.2.3.2' created by Christian Lohmaier at 2024-04-29 18:46 + Tag libreoffice-24.2.3.2 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmYv6vYACgkQ9DSh76/u rqOz0xAAt8HmkOV15ukFpVSAxrsWB/6gJViCo8aP22EfYRZNwwHP2GjqrVp4yQUE VjRMT/U04ShrgbE9uKt9pKZEPcmXs6ruKCOM7ynkwiF9/Y4JqIzQF4m19nDEKX9J hdxzcOWK+SDNM1a+yRPvEESUJE4zdhnrnOUzUoZLZeVnKf9KVqspoHZps/Ng1NAQ z8gqWahehllBGQXlD8nvg6NGm7aNjrG6a/7IgX3GdNRBBotdULxVWef9v88kxExP bfLNh3HUWrdmg0/yofqWtoMyFN9v2XiVWrvMCjVrQ4BjKkpBC6RtB1xV8uCxf122 2YBZW2/wke2oPtMg+r3oEE9dSZFbZQHVAjVkYy4ag6+yow2+FTVjuVkZ0tr0dkyq xmhjITuAdtA4d0GJ+2iBWmLofeRzJ2hc8AZudJpxzY36lB3FgFOYeRQ/aAPbrmwa MTYpndFIlzdGJ42620yynd038i2icyDdmyM08UkEJAfRthcX3cVJxstyDANImwYB krvfbhZHZtivq+s6srrmHa2pe36H4C1/dWSCepXU/pfMwfmIqPaKCRxXTcfHD04m o0VUBZyxwAU1lN5itZ6spITXIdG1/n+wReuIZKgkzMB/M6X8BIgKpFMBHkdn2DjO C0o0XnHVT7aGYVnsmnmiT08K6BIMWzp1KMKZdAshmkwkoRckiTQ= =R0de -END PGP SIGNATURE- Changes since cp-24.04.1-2-1: --- 0 files changed ---
core.git: Branch 'libreoffice-24-2-3' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 89ce85eddedeeaed893f29661df65e4c8aceccdf Author: Christian Lohmaier AuthorDate: Mon Apr 29 20:46:48 2024 +0200 Commit: Christian Lohmaier CommitDate: Mon Apr 29 20:46:48 2024 +0200 bump product version to 24.2.3.2.0+ Change-Id: Idab0cf1697395a44f959954c23b17f145100ca29 diff --git a/configure.ac b/configure.ac index 5872d2973f79..a765953454f7 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[24.2.3.1.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[24.2.3.2.0+],[],[],[http://documentfoundation.org/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
core.git: Changes to 'refs/tags/libreoffice-24.2.3.2'
Tag 'libreoffice-24.2.3.2' created by Christian Lohmaier at 2024-04-29 18:46 + Tag libreoffice-24.2.3.2 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmYv6vkACgkQ9DSh76/u rqOHiA//Zwf+pYyAM+5UkNRISlj+33c/b+pp2sYVqRodIBr04TZwgkDRoka02PY1 mpYZMesgraKfD6JxvmrbygjAXT70I+u3sgdDqk5iw4IWCAlndgJb9unzWhxO/TMN FQfja/6dJP3ACFm+MaSvUHyvzKJxZ1eBnpVXZ444Rt1eEAMYTMdaQsY04q9XsHOs o0ZFZbdA3lBfwP32dQ05Du/X6h9FgpADBIPigKy3PdOasJ+rAvlivI68Lz583mUa o9+MZ8E/zEXAfKjzFB/gSBmV7pww4Cx57GxYhNoq7V470NIsfQhSPHsyCtslyo3f UCbJSpP5UxVxeHSl6gPvIAFaAqaMOqpx6lV8OBnNbW88R7AgZzkO9+Igj6pp9f0R Dkv20Gsr6QYFJpJ4Ihp38SQSSu9h6/rjVGgsIydLwLU3gVZZrFVRFwRJXYddRsPW pOW79/BQE2KcviSGKEEMnupMknduMZZjSAdG8+hvoDrNLAivYzrECPsEdyORDPUE rzjk9rAvugy/q6rI5933W0slia4a1PPM7dR/Ms4DQgBoMqR74YG/qFeAEUjxswdI lzDW+SxVw0lzD6bQf+RcfyVLoJjgPxYRjqw2a+wuGbw1vymtyXuYiEO15f7khhkX l553sirBMedhNXtrh1y3xBziQUGtzd9ZI49VMe6i6K46pUwBSe8= =fT6w -END PGP SIGNATURE- Changes since co-24.04-branch-point-439: --- 0 files changed ---
core.git: Branch 'libreoffice-24-2-3' - readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 3327 ++-- 1 file changed, 1712 insertions(+), 1615 deletions(-) New commits: commit ab4fd05c26289147ac1cab686a93a84fda85be5f Author: Christian Lohmaier AuthorDate: Mon Apr 29 20:36:41 2024 +0200 Commit: Christian Lohmaier CommitDate: Mon Apr 29 20:42:10 2024 +0200 update credits Change-Id: I92481956d041c4a5077aa7a56af2df3ab72fd9bf (cherry picked from commit e729fec8a9e73e9d013cb634d4bcbd8c43be4200) (cherry picked from commit 6b20b3abc70c210ae52ecde24076ad08c4594fe0) diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index e08695d232b5..ec7d2eba89a9 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,10 +1,10 @@ http://www.w3.org/TR/css3-text/; xmlns:grddl="http://www.w3.org/2003/g/data-view#; xmlns:xhtml="http://www.w3.org/1999/xhtml; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xmlns:xsd="http://www.w3.org/2001/XMLSchema; xmlns:xforms="http://www.w3.org/2002/xforms; xmlns:dom="http://www.w3.org/2001/xml-events; xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML; xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office; xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooow="http://openoffice.org/2004/writer; xmlns:xlink="http://www.w3.org/1999/xlink; xmlns:drawooo="http://openoffice.org/2010/draw; xmlns:oooc="http://openoffice.org/2004/calc; xmlns:dc="http://purl.org/dc/elements/1.1/; xmlns:c alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:tableooo="http://openoffice.org/2009/table; xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:rpt="http://openoffice.org/2005/report; xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:officeooo="http://openoffice.org/2009/office; xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns: meta:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/24.2.1.2$Linux_X86_64 LibreOffice_project/db4def46b0453cc22e2d0305797cf981b68ef5ac2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/24.2.2.2$Linux_X86_64 LibreOffice_project/d56cc158d8a96260b836f100ef4b4ef25d6f1a012012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 2519 + 635 501 55167 26963 @@ -16,9 +16,9 @@ 3623 3434 501 - 2519 + 635 55667 - 29480 + 27596 0 0 false @@ -146,7 +146,7 @@ false true - 13298901 + 13427930 true false false @@ -176,7 +176,7 @@ - + @@ -373,23 +373,20 @@ - + - + - + - + - - - @@ -451,24 +448,24 @@ - + - + - + - + - + @@ -1166,7 +1163,7 @@ Credits -1948 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2024-03-18 19:52:02. +1970 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2024-04-25 17:14:16. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 @@ -1179,7 +1176,7 @@ Ruediger TimmCommits: 82464Joined: 2000-10-10 - Caolán McNamaraCommits: 35252Joined: 2000-10-10 + Caolán McNamaraCommits: 35359Joined: 2000-10-10 Kurt ZenkerCommits: 31752Joined: 2000-09-25 @@ -1196,15 +1193,15 @@
core.git: Branch 'libreoffice-24-2' - readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 3327 ++-- 1 file changed, 1712 insertions(+), 1615 deletions(-) New commits: commit 6b20b3abc70c210ae52ecde24076ad08c4594fe0 Author: Christian Lohmaier AuthorDate: Mon Apr 29 20:36:41 2024 +0200 Commit: Christian Lohmaier CommitDate: Mon Apr 29 20:41:10 2024 +0200 update credits Change-Id: I92481956d041c4a5077aa7a56af2df3ab72fd9bf (cherry picked from commit e729fec8a9e73e9d013cb634d4bcbd8c43be4200) diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index e08695d232b5..ec7d2eba89a9 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,10 +1,10 @@ http://www.w3.org/TR/css3-text/; xmlns:grddl="http://www.w3.org/2003/g/data-view#; xmlns:xhtml="http://www.w3.org/1999/xhtml; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xmlns:xsd="http://www.w3.org/2001/XMLSchema; xmlns:xforms="http://www.w3.org/2002/xforms; xmlns:dom="http://www.w3.org/2001/xml-events; xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML; xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office; xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooow="http://openoffice.org/2004/writer; xmlns:xlink="http://www.w3.org/1999/xlink; xmlns:drawooo="http://openoffice.org/2010/draw; xmlns:oooc="http://openoffice.org/2004/calc; xmlns:dc="http://purl.org/dc/elements/1.1/; xmlns:c alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:tableooo="http://openoffice.org/2009/table; xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:rpt="http://openoffice.org/2005/report; xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:officeooo="http://openoffice.org/2009/office; xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns: meta:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/24.2.1.2$Linux_X86_64 LibreOffice_project/db4def46b0453cc22e2d0305797cf981b68ef5ac2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/24.2.2.2$Linux_X86_64 LibreOffice_project/d56cc158d8a96260b836f100ef4b4ef25d6f1a012012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 2519 + 635 501 55167 26963 @@ -16,9 +16,9 @@ 3623 3434 501 - 2519 + 635 55667 - 29480 + 27596 0 0 false @@ -146,7 +146,7 @@ false true - 13298901 + 13427930 true false false @@ -176,7 +176,7 @@ - + @@ -373,23 +373,20 @@ - + - + - + - + - - - @@ -451,24 +448,24 @@ - + - + - + - + - + @@ -1166,7 +1163,7 @@ Credits -1948 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2024-03-18 19:52:02. +1970 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2024-04-25 17:14:16. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 @@ -1179,7 +1176,7 @@ Ruediger TimmCommits: 82464Joined: 2000-10-10 - Caolán McNamaraCommits: 35252Joined: 2000-10-10 + Caolán McNamaraCommits: 35359Joined: 2000-10-10 Kurt ZenkerCommits: 31752Joined: 2000-09-25 @@ -1196,15 +1193,15 @@ Vladimir GlazunovCommits: 25434Joined: 2000-12-04 -
core.git: Branch 'libreoffice-7-6-7' - readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 3327 ++-- 1 file changed, 1712 insertions(+), 1615 deletions(-) New commits: commit 7ed1bd0ab67b053cb8c748f9b7388bafc64b89e1 Author: Christian Lohmaier AuthorDate: Mon Apr 29 20:36:41 2024 +0200 Commit: Christian Lohmaier CommitDate: Mon Apr 29 20:40:26 2024 +0200 update credits Change-Id: I92481956d041c4a5077aa7a56af2df3ab72fd9bf (cherry picked from commit e729fec8a9e73e9d013cb634d4bcbd8c43be4200) (cherry picked from commit 83a33814da4c4335e5054389e1a5acaccf95377d) diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index e08695d232b5..ec7d2eba89a9 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,10 +1,10 @@ http://www.w3.org/TR/css3-text/; xmlns:grddl="http://www.w3.org/2003/g/data-view#; xmlns:xhtml="http://www.w3.org/1999/xhtml; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xmlns:xsd="http://www.w3.org/2001/XMLSchema; xmlns:xforms="http://www.w3.org/2002/xforms; xmlns:dom="http://www.w3.org/2001/xml-events; xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML; xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office; xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooow="http://openoffice.org/2004/writer; xmlns:xlink="http://www.w3.org/1999/xlink; xmlns:drawooo="http://openoffice.org/2010/draw; xmlns:oooc="http://openoffice.org/2004/calc; xmlns:dc="http://purl.org/dc/elements/1.1/; xmlns:c alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:tableooo="http://openoffice.org/2009/table; xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:rpt="http://openoffice.org/2005/report; xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:officeooo="http://openoffice.org/2009/office; xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns: meta:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/24.2.1.2$Linux_X86_64 LibreOffice_project/db4def46b0453cc22e2d0305797cf981b68ef5ac2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/24.2.2.2$Linux_X86_64 LibreOffice_project/d56cc158d8a96260b836f100ef4b4ef25d6f1a012012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 2519 + 635 501 55167 26963 @@ -16,9 +16,9 @@ 3623 3434 501 - 2519 + 635 55667 - 29480 + 27596 0 0 false @@ -146,7 +146,7 @@ false true - 13298901 + 13427930 true false false @@ -176,7 +176,7 @@ - + @@ -373,23 +373,20 @@ - + - + - + - + - - - @@ -451,24 +448,24 @@ - + - + - + - + - + @@ -1166,7 +1163,7 @@ Credits -1948 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2024-03-18 19:52:02. +1970 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2024-04-25 17:14:16. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 @@ -1179,7 +1176,7 @@ Ruediger TimmCommits: 82464Joined: 2000-10-10 - Caolán McNamaraCommits: 35252Joined: 2000-10-10 + Caolán McNamaraCommits: 35359Joined: 2000-10-10 Kurt ZenkerCommits: 31752Joined: 2000-09-25 @@ -1196,15 +1193,15 @@
core.git: Branch 'libreoffice-7-6' - readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 3327 ++-- 1 file changed, 1712 insertions(+), 1615 deletions(-) New commits: commit 83a33814da4c4335e5054389e1a5acaccf95377d Author: Christian Lohmaier AuthorDate: Mon Apr 29 20:36:41 2024 +0200 Commit: Christian Lohmaier CommitDate: Mon Apr 29 20:39:36 2024 +0200 update credits Change-Id: I92481956d041c4a5077aa7a56af2df3ab72fd9bf (cherry picked from commit e729fec8a9e73e9d013cb634d4bcbd8c43be4200) diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index e08695d232b5..ec7d2eba89a9 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,10 +1,10 @@ http://www.w3.org/TR/css3-text/; xmlns:grddl="http://www.w3.org/2003/g/data-view#; xmlns:xhtml="http://www.w3.org/1999/xhtml; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xmlns:xsd="http://www.w3.org/2001/XMLSchema; xmlns:xforms="http://www.w3.org/2002/xforms; xmlns:dom="http://www.w3.org/2001/xml-events; xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML; xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office; xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooow="http://openoffice.org/2004/writer; xmlns:xlink="http://www.w3.org/1999/xlink; xmlns:drawooo="http://openoffice.org/2010/draw; xmlns:oooc="http://openoffice.org/2004/calc; xmlns:dc="http://purl.org/dc/elements/1.1/; xmlns:c alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:tableooo="http://openoffice.org/2009/table; xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:rpt="http://openoffice.org/2005/report; xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:officeooo="http://openoffice.org/2009/office; xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns: meta:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/24.2.1.2$Linux_X86_64 LibreOffice_project/db4def46b0453cc22e2d0305797cf981b68ef5ac2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/24.2.2.2$Linux_X86_64 LibreOffice_project/d56cc158d8a96260b836f100ef4b4ef25d6f1a012012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 2519 + 635 501 55167 26963 @@ -16,9 +16,9 @@ 3623 3434 501 - 2519 + 635 55667 - 29480 + 27596 0 0 false @@ -146,7 +146,7 @@ false true - 13298901 + 13427930 true false false @@ -176,7 +176,7 @@ - + @@ -373,23 +373,20 @@ - + - + - + - + - - - @@ -451,24 +448,24 @@ - + - + - + - + - + @@ -1166,7 +1163,7 @@ Credits -1948 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2024-03-18 19:52:02. +1970 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2024-04-25 17:14:16. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 @@ -1179,7 +1176,7 @@ Ruediger TimmCommits: 82464Joined: 2000-10-10 - Caolán McNamaraCommits: 35252Joined: 2000-10-10 + Caolán McNamaraCommits: 35359Joined: 2000-10-10 Kurt ZenkerCommits: 31752Joined: 2000-09-25 @@ -1196,15 +1193,15 @@ Vladimir GlazunovCommits: 25434Joined: 2000-12-04 -
core.git: readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 3327 ++-- 1 file changed, 1712 insertions(+), 1615 deletions(-) New commits: commit e729fec8a9e73e9d013cb634d4bcbd8c43be4200 Author: Christian Lohmaier AuthorDate: Mon Apr 29 20:36:41 2024 +0200 Commit: Christian Lohmaier CommitDate: Mon Apr 29 20:38:43 2024 +0200 update credits Change-Id: I92481956d041c4a5077aa7a56af2df3ab72fd9bf diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index e08695d232b5..ec7d2eba89a9 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,10 +1,10 @@ http://www.w3.org/TR/css3-text/; xmlns:grddl="http://www.w3.org/2003/g/data-view#; xmlns:xhtml="http://www.w3.org/1999/xhtml; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xmlns:xsd="http://www.w3.org/2001/XMLSchema; xmlns:xforms="http://www.w3.org/2002/xforms; xmlns:dom="http://www.w3.org/2001/xml-events; xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML; xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office; xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooow="http://openoffice.org/2004/writer; xmlns:xlink="http://www.w3.org/1999/xlink; xmlns:drawooo="http://openoffice.org/2010/draw; xmlns:oooc="http://openoffice.org/2004/calc; xmlns:dc="http://purl.org/dc/elements/1.1/; xmlns:c alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:tableooo="http://openoffice.org/2009/table; xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:rpt="http://openoffice.org/2005/report; xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:officeooo="http://openoffice.org/2009/office; xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns: meta:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/24.2.1.2$Linux_X86_64 LibreOffice_project/db4def46b0453cc22e2d0305797cf981b68ef5ac2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/24.2.2.2$Linux_X86_64 LibreOffice_project/d56cc158d8a96260b836f100ef4b4ef25d6f1a012012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 2519 + 635 501 55167 26963 @@ -16,9 +16,9 @@ 3623 3434 501 - 2519 + 635 55667 - 29480 + 27596 0 0 false @@ -146,7 +146,7 @@ false true - 13298901 + 13427930 true false false @@ -176,7 +176,7 @@ - + @@ -373,23 +373,20 @@ - + - + - + - + - - - @@ -451,24 +448,24 @@ - + - + - + - + - + @@ -1166,7 +1163,7 @@ Credits -1948 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2024-03-18 19:52:02. +1970 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2024-04-25 17:14:16. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 @@ -1179,7 +1176,7 @@ Ruediger TimmCommits: 82464Joined: 2000-10-10 - Caolán McNamaraCommits: 35252Joined: 2000-10-10 + Caolán McNamaraCommits: 35359Joined: 2000-10-10 Kurt ZenkerCommits: 31752Joined: 2000-09-25 @@ -1196,15 +1193,15 @@ Vladimir GlazunovCommits: 25434Joined: 2000-12-04 - Stephan BergmannCommits: 21081Joined: 2000-10-04 + Stephan
core.git: Branch 'libreoffice-24-2-3' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f185f1fb1ce949f0ebe16eb23f7b76e90020e8cb Author: Christian Lohmaier AuthorDate: Mon Apr 29 20:18:59 2024 +0200 Commit: Gerrit Code Review CommitDate: Mon Apr 29 20:18:59 2024 +0200 Update git submodules * Update translations from branch 'libreoffice-24-2-3' to abc5b4da9d1c382d8f76eec58b3c6b0ba17f92bd - update translations for 24.2.3 rc2 and force-fix errors using pocheck Change-Id: Ia1b6ca2a6abad23632aafb021c8bba19a20e1a7b (cherry picked from commit 64792214d2d89afc019f94ca29ff7a2c2a17ab39) diff --git a/translations b/translations index 3edeb8ea2ff2..abc5b4da9d1c 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 3edeb8ea2ff253535180e0fd61245b68096a8804 +Subproject commit abc5b4da9d1c382d8f76eec58b3c6b0ba17f92bd
translations.git: Branch 'libreoffice-24-2-3' - source/ab source/an source/ast source/bg source/ca source/cs source/da source/de source/dsb source/es source/fi source/fr source/gl source/gug source/hr
source/ab/filter/messages.po |8 source/ab/svx/messages.po | 10 source/an/cui/messages.po | 18 source/an/officecfg/registry/data/org/openoffice/Office/UI.po |4 source/an/reportdesign/messages.po |6 source/an/sd/messages.po |8 source/an/shell/source/win32/shlxthandler/res.po |8 source/an/sw/messages.po |4 source/ast/chart2/messages.po |8 source/ast/cui/messages.po | 23 source/ast/dbaccess/messages.po|8 source/ast/extensions/messages.po | 49 source/ast/extras/source/autocorr/emoji.po | 178 - source/ast/filter/messages.po |4 source/ast/helpcontent2/source/text/sbasic/guide.po|8 source/ast/helpcontent2/source/text/sbasic/shared.po |8 source/ast/helpcontent2/source/text/sbasic/shared/03.po|4 source/ast/helpcontent2/source/text/scalc/00.po| 44 source/ast/helpcontent2/source/text/scalc/01.po| 46 source/ast/helpcontent2/source/text/scalc/guide.po | 12 source/ast/helpcontent2/source/text/sdatabase.po | 24 source/ast/helpcontent2/source/text/sdraw/00.po|8 source/ast/helpcontent2/source/text/sdraw/guide.po |4 source/ast/helpcontent2/source/text/shared/00.po | 18 source/ast/helpcontent2/source/text/shared/01.po | 64 source/ast/helpcontent2/source/text/shared/02.po |8 source/ast/helpcontent2/source/text/shared/04.po | 14 source/ast/helpcontent2/source/text/shared/autopi.po | 10 source/ast/helpcontent2/source/text/shared/guide.po| 16 source/ast/helpcontent2/source/text/shared/menu.po | 20 source/ast/helpcontent2/source/text/shared/optionen.po |6 source/ast/helpcontent2/source/text/simpress.po|4 source/ast/helpcontent2/source/text/simpress/00.po |8 source/ast/helpcontent2/source/text/simpress/01.po |4 source/ast/helpcontent2/source/text/simpress/guide.po |6 source/ast/helpcontent2/source/text/smath/00.po|4 source/ast/helpcontent2/source/text/swriter/00.po |6 source/ast/helpcontent2/source/text/swriter/02.po |6 source/ast/helpcontent2/source/text/swriter/librelogo.po |4 source/ast/officecfg/registry/data/org/openoffice/Office/UI.po | 71 source/ast/reportdesign/messages.po|6 source/ast/sc/messages.po | 17 source/ast/sd/messages.po |7 source/ast/svx/messages.po | 22 source/ast/sw/messages.po |9 source/ast/wizards/source/resources.po |8 source/bg/cui/messages.po |6 source/bg/framework/messages.po|8 source/bg/helpcontent2/source/text/sbasic/shared.po|4 source/bg/helpcontent2/source/text/scalc/guide.po | 10 source/bg/helpcontent2/source/text/shared/02.po|4 source/bg/helpcontent2/source/text/shared/04.po|8 source/bg/helpcontent2/source/text/shared/menu.po | 12 source/bg/helpcontent2/source/text/shared/optionen.po |8 source/bg/helpcontent2/source/text/swriter/00.po | 446 ++-- source/bg/helpcontent2/source/text/swriter/01.po | 344 +-- source/bg/helpcontent2/source/text/swriter/02.po | 122 - source/bg/officecfg/registry/data/org/openoffice/Office/UI.po |4 source/bg/sc/messages.po | 12 source/bg/sfx2/messages.po |8 source/bg/sw/messages.po |8 source/bg/xmlsecurity/messages.po | 12 source/ca/connectivity/messages.po | 10 source/ca/cui/messages.po |6 source/ca/dbaccess/messages.po |6
core.git: Branch 'libreoffice-24-2' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 32921f8ae0aea6d724a80974f2b213c799175ab5 Author: Christian Lohmaier AuthorDate: Mon Apr 29 20:15:20 2024 +0200 Commit: Gerrit Code Review CommitDate: Mon Apr 29 20:15:20 2024 +0200 Update git submodules * Update translations from branch 'libreoffice-24-2' to 64792214d2d89afc019f94ca29ff7a2c2a17ab39 - update translations for 24.2.3 rc2 and force-fix errors using pocheck Change-Id: Ia1b6ca2a6abad23632aafb021c8bba19a20e1a7b diff --git a/translations b/translations index 3e215b586e92..64792214d2d8 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 3e215b586e927288b92725d456b4dd7fd54dee85 +Subproject commit 64792214d2d89afc019f94ca29ff7a2c2a17ab39
translations.git: Branch 'libreoffice-24-2' - source/ab source/an source/ast source/bg source/ca source/cs source/da source/de source/dsb source/es source/fi source/fr source/gl source/gug source/hr s
source/ab/filter/messages.po |8 source/ab/svx/messages.po | 10 source/an/cui/messages.po | 18 source/an/officecfg/registry/data/org/openoffice/Office/UI.po |4 source/an/reportdesign/messages.po |6 source/an/sd/messages.po |8 source/an/shell/source/win32/shlxthandler/res.po |8 source/an/sw/messages.po |4 source/ast/chart2/messages.po |8 source/ast/cui/messages.po | 23 source/ast/dbaccess/messages.po|8 source/ast/extensions/messages.po | 49 source/ast/extras/source/autocorr/emoji.po | 178 - source/ast/filter/messages.po |4 source/ast/helpcontent2/source/text/sbasic/guide.po|8 source/ast/helpcontent2/source/text/sbasic/shared.po |8 source/ast/helpcontent2/source/text/sbasic/shared/03.po|4 source/ast/helpcontent2/source/text/scalc/00.po| 44 source/ast/helpcontent2/source/text/scalc/01.po| 46 source/ast/helpcontent2/source/text/scalc/guide.po | 12 source/ast/helpcontent2/source/text/sdatabase.po | 24 source/ast/helpcontent2/source/text/sdraw/00.po|8 source/ast/helpcontent2/source/text/sdraw/guide.po |4 source/ast/helpcontent2/source/text/shared/00.po | 18 source/ast/helpcontent2/source/text/shared/01.po | 64 source/ast/helpcontent2/source/text/shared/02.po |8 source/ast/helpcontent2/source/text/shared/04.po | 14 source/ast/helpcontent2/source/text/shared/autopi.po | 10 source/ast/helpcontent2/source/text/shared/guide.po| 16 source/ast/helpcontent2/source/text/shared/menu.po | 20 source/ast/helpcontent2/source/text/shared/optionen.po |6 source/ast/helpcontent2/source/text/simpress.po|4 source/ast/helpcontent2/source/text/simpress/00.po |8 source/ast/helpcontent2/source/text/simpress/01.po |4 source/ast/helpcontent2/source/text/simpress/guide.po |6 source/ast/helpcontent2/source/text/smath/00.po|4 source/ast/helpcontent2/source/text/swriter/00.po |6 source/ast/helpcontent2/source/text/swriter/02.po |6 source/ast/helpcontent2/source/text/swriter/librelogo.po |4 source/ast/officecfg/registry/data/org/openoffice/Office/UI.po | 71 source/ast/reportdesign/messages.po|6 source/ast/sc/messages.po | 17 source/ast/sd/messages.po |7 source/ast/svx/messages.po | 22 source/ast/sw/messages.po |9 source/ast/wizards/source/resources.po |8 source/bg/cui/messages.po |6 source/bg/framework/messages.po|8 source/bg/helpcontent2/source/text/sbasic/shared.po|4 source/bg/helpcontent2/source/text/scalc/guide.po | 10 source/bg/helpcontent2/source/text/shared/02.po|4 source/bg/helpcontent2/source/text/shared/04.po|8 source/bg/helpcontent2/source/text/shared/menu.po | 12 source/bg/helpcontent2/source/text/shared/optionen.po |8 source/bg/helpcontent2/source/text/swriter/00.po | 446 ++-- source/bg/helpcontent2/source/text/swriter/01.po | 344 +-- source/bg/helpcontent2/source/text/swriter/02.po | 122 - source/bg/officecfg/registry/data/org/openoffice/Office/UI.po |4 source/bg/sc/messages.po | 12 source/bg/sfx2/messages.po |8 source/bg/sw/messages.po |8 source/bg/xmlsecurity/messages.po | 12 source/ca/connectivity/messages.po | 10 source/ca/cui/messages.po |6 source/ca/dbaccess/messages.po |6
core.git: config_host.mk.in configure.ac
config_host.mk.in |6 +++--- configure.ac | 12 +++- 2 files changed, 10 insertions(+), 8 deletions(-) New commits: commit 9d7548dafb44c1f0af82771a597db1404659af66 Author: Christian Lohmaier AuthorDate: Fri Apr 26 13:03:49 2024 +0200 Commit: Christian Lohmaier CommitDate: Sat Apr 27 10:16:39 2024 +0200 fix some hardcoded use of wsl.exe and fix some typos Change-Id: I6152ee61913638f828eeb201ecb26312de5f8572 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166737 Reviewed-by: Christian Lohmaier Tested-by: Jenkins diff --git a/config_host.mk.in b/config_host.mk.in index 70d73f0a32f5..3ffe88380180 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -792,8 +792,8 @@ include @SRC_ROOT@/download.lst KEEP_AWAKE_CMD=@KEEP_AWAKE_CMD@ -# prep for WSL-as-helper-builds where build runs from within git-bash/MSYS that would otherwise -# messes with anything that looks like a path (starts with /) but it cannot resolve +# used for WSL-as-helper-builds where the build runs from within git-bash/MSYS that otherwise would +# mess with anything that looks like a path (starts with a /) but cannot be resolved to a target export MSYS_NO_PATHCONV=1 STRAWBERRY_PERL=@STRAWBERRY_PERL@ -WSL=@WSL@ \ No newline at end of file +WSL=@WSL@ diff --git a/configure.ac b/configure.ac index 1650686382ef..e04f4a846642 100644 --- a/configure.ac +++ b/configure.ac @@ -337,7 +337,8 @@ if test -n "$WSL_DISTRO_NAME" && $(echo $PATH |grep -q mingw64); then STRAWBERRY_PERL="$formatted_path/perl/bin/perl.exe" AC_ARG_WITH([wsl-command], [AS_HELP_STRING([--with-wsl-command], -[Specify your wsl distro command if it isn't the default/the one used with just wsl.exe])], +[Specify your wsl distro command if it isn't the default/the one used with just wsl.exe – + for example: wsl.exe -d MyDistro -u NonDefaultUser])], [], [with_wsl_command="wsl.exe"]) WSL="$with_wsl_command" @@ -15468,10 +15469,11 @@ if test -n "$WSL_ONLY_AS_HELPER"; then PERL="perl.exe" # use flex, gperf and nasm from wsl-container # if using absolute path, would need to use double-leading slash for the msys path mangling -FLEX="wsl.exe $FLEX" -NASM="wsl.exe $NASM" -# some externals (libebook) checks with AC_PATH_PROGS, and that requires argument to begin with slash... -GPERF="/c/Windows/system32/wsl.exe gperf" +FLEX="$WSL $FLEX" +NASM="$WSL $NASM" +# some externals (libebook) check for it with AC_PATH_PROGS, and that only accepts overrides +# with an absolute path/requires the value to begin with a slash +GPERF="/c/Windows/system32/$WSL gperf" # append strawberry tools dir to PATH (for e.g. windres, ar) LO_PATH="$LO_PATH:$STRAWBERRY_TOOLS" # temp-dir needs to be in windows realm, hardcode for now
core.git: config_host.mk.in configure.ac Makefile.in
Makefile.in | 16 config_host.mk.in |2 ++ configure.ac | 41 + 3 files changed, 51 insertions(+), 8 deletions(-) New commits: commit f5c3ec505b83a20d272a66305bca565e9ff38b04 Author: Christian Lohmaier AuthorDate: Fri Apr 26 14:49:59 2024 +0200 Commit: Christian Lohmaier CommitDate: Fri Apr 26 23:10:22 2024 +0200 add --with-keep-awake switch to prevent going into sleep/suspend if used defaults to Awake for Windows and caffeinate for macOS Change-Id: I35f41bf1fb63af05ce2ec1a7f4d7b50b310536a3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166743 Reviewed-by: Christian Lohmaier Tested-by: Jenkins diff --git a/Makefile.in b/Makefile.in index f55e92c94405..ac3e8aafb529 100644 --- a/Makefile.in +++ b/Makefile.in @@ -91,19 +91,19 @@ define gb_Top_GbuildModuleRules .PHONY: $(1).allbuild $(1).buildall $(1).allcheck $(1).checkall $(1): bootstrap fetch - cd $(SRCDIR)/$(2) && $$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) + $(KEEP_AWAKE_CMD) cd $(SRCDIR)/$(2) && $$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) $(1).build $(1).check $(1).coverage $(foreach target,$(gb_Top_MODULE_CHECK_TARGETS),$(1).$(target)): bootstrap fetch - cd $(SRCDIR)/$(2) && $$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) $$(patsubst $(1).%,%,$$@) + $(KEEP_AWAKE_CMD) cd $(SRCDIR)/$(2) && $$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) $$(patsubst $(1).%,%,$$@) $(1).clean $(1).showdeliverables: cd $(SRCDIR)/$(2) && $$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) $$(patsubst $(1).%,%,$$@) $(1).allbuild $(1).buildall: bootstrap fetch - $$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $(WORKDIR)/Module/$(1) + $(KEEP_AWAKE_CMD) $$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $(WORKDIR)/Module/$(1) $(1).allcheck $(1).checkall: bootstrap fetch - $$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $(WORKDIR)/Module/$(1) $(WORKDIR)/Module/check/$(1) $(WORKDIR)/Module/slowcheck/$(1) + $(KEEP_AWAKE_CMD) $$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $(WORKDIR)/Module/$(1) $(WORKDIR)/Module/check/$(1) $(WORKDIR)/Module/slowcheck/$(1) $(1).all: @echo "'make $(1).all' was renamed to 'make $(1).allcheck' (or use 'make $(1).allbuild' to build without unit tests)" @@ -170,10 +170,10 @@ gbuild_TARGETS := AllLangHelp \ # build a generic gbuild target $(foreach target,$(gbuild_TARGETS),$(target)_% $(foreach module,$(gbuild_modules),$(target)_$(module)/%)) UIConfig_modules/% %.genpatch: bootstrap fetch - $(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $@ + $(KEEP_AWAKE_CMD) $(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $@ $(gbuild_TARGETS): - $(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $@ + $(KEEP_AWAKE_CMD) $(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $@ # # Clean @@ -291,9 +291,9 @@ bootstrap: check-if-root compilerplugins # build: bootstrap fetch $(if $(CROSS_COMPILING),cross-toolset,install-gdb-printers) \ $(if $(filter check,$(MAKECMDGOALS)),$(if $(COMPILER_PLUGINS),$(if $(LODE_HOME),clang-format-check))) - $(MAKE) $(PARALLELISM_OPTION) $(IWYU_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $(build_goal) + $(KEEP_AWAKE_CMD) $(MAKE) $(PARALLELISM_OPTION) $(IWYU_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $(build_goal) ifeq ($(OS),iOS) - $(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) ios + $(KEEP_AWAKE_CMD) $(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) ios endif build-non-l10n-only build-l10n-only check debugrun translations packageinfo coverage $(gb_Top_MODULE_CHECK_TARGETS): build diff --git a/config_host.mk.in b/config_host.mk.in index 1d5480bacf61..70d73f0a32f5 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -790,6 +790,8 @@ include $(BUILDDIR)/config_$(gb_Side)_lang.mk # does use some of the variables defined above include @SRC_ROOT@/download.lst +KEEP_AWAKE_CMD=@KEEP_AWAKE_CMD@ + # prep for WSL-as-helper-builds where build runs from within git-bash/MSYS that would otherwise # messes with anything that looks like a path (starts with /) but it cannot resolve export MSYS_NO_PATHCONV=1 diff --git a/configure.ac b/configure.ac index 4263116f894b..1650686382ef 100644 --- a/configure.ac +++ b/configure.ac @@ -2810,6 +2810,13 @@ AC_ARG_WITH(gtk3-build, [(Windows-only) In order to build GtkTiledViewer on Windows, pass the path to a GTK3 build, like '--with-gtk3-build=C:/gtk-build/gtk/x64/release'.])) +AC_ARG_WITH(keep-awake, +AS_HELP_STRING([--with-keep-awake], +[command to prefix make with in order to prevent the system from going to sleep/suspend + while
core.git: solenv/gbuild
solenv/gbuild/Trace.mk |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a1e5496e4daf469840d5bcc31fede4d4d66aebfe
Author: Christian Lohmaier
AuthorDate: Fri Apr 26 14:53:17 2024 +0200
Commit: Christian Lohmaier
CommitDate: Fri Apr 26 21:44:23 2024 +0200
gbuild trace: disable flock for wsl-as-helper case
Change-Id: Ie5db3fcc6fccedb214aec472852d8d82813fb984
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166744
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier
diff --git a/solenv/gbuild/Trace.mk b/solenv/gbuild/Trace.mk
index a92f842e1dec..d1cba301469e 100644
--- a/solenv/gbuild/Trace.mk
+++ b/solenv/gbuild/Trace.mk
@@ -37,7 +37,7 @@ ifneq ($(gb_TRACE),)
gb_Trace_Timestamp := $(if $(filter MACOSX,$(OS)),$$(date
+%s)0,$$(date +%s%N))
# macOS also doesn't provide flock, so skip that part on mac
# The (flock;cat) part is to minimize lock time.
-gb_Trace_Flock := $(if $(filter MACOSX,$(OS)),,| ( flock 1; cat ))
+gb_Trace_Flock := $(if $(MSYSTEM)$(filter MACOSX,$(OS)),,| ( flock 1; cat ))
# call gb_Trace_AddMark,marktype,detail,type,extra
define gb_Trace__AddMark
echo "{\"name\": \"$(3)\", \"ph\": \"$(1)\", \"pid\": 1, \"tid\": 1, \"ts\":
$(gb_Trace_Timestamp),\"args\":{\"message\":\"[$(3)]: $(2)\"}},"
$(gb_Trace_Flock) >>$(gb_TRACE)
core.git: filter/Configuration_filter.mk
filter/Configuration_filter.mk | 24 ++--
1 file changed, 6 insertions(+), 18 deletions(-)
New commits:
commit aabf18d56194405b28afcd814c41bbba73f5e9b9
Author: Christian Lohmaier
AuthorDate: Sun Apr 21 22:15:14 2024 +0200
Commit: Christian Lohmaier
CommitDate: Fri Apr 26 15:02:37 2024 +0200
Configuration_filter.mk: create RESPONSEFILEs using gb_var2file
using echo ... | sed won't help with command-line limits and doing the
simple substitution by make saves spawning a few sed processes
Change-Id: I4ee81d26b3df18ebf82140f00c823cb7543cac1d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166411
Reviewed-by: Christian Lohmaier
Tested-by: Jenkins
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index b2d3b09689f0..42ebab575cd3 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -39,9 +39,7 @@ $(call gb_XcuFilterTypesTarget_get_target,%) :
$(filter_MERGE_TARGET)
$(call gb_Trace_StartRange,$*,FIT)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && \
- RESPONSEFILE=`$(gb_MKTEMP)` && \
- echo "items=$(basename $(notdir $(filter %.xcu,$^)))" \
- | sed "s/ /$(COMMA)/g" > $${RESPONSEFILE} && \
+ RESPONSEFILE=$(call gb_var2file,$(shell
$(gb_MKTEMP)),items=$(subst $(WHITESPACE),$(COMMA),$(basename $(notdir $(filter
%.xcu,$^) && \
$(filter_MERGE) tempdir=$(TMPDIR) \
share_subdir_name=$(LIBO_SHARE_FOLDER) \
fragmentsdir=$(dir $(firstword $(filter %.xcu,$^))).. \
@@ -82,9 +80,7 @@ $(call gb_XcuFilterFiltersTarget_get_target,%) :
$(filter_MERGE_TARGET)
$(call gb_Trace_StartRange,$*,FIF)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && \
- RESPONSEFILE=`$(gb_MKTEMP)` && \
- echo "items=$(basename $(notdir $(filter %.xcu,$^)))" \
- | sed "s/ /$(COMMA)/g" > $${RESPONSEFILE} && \
+ RESPONSEFILE=$(call gb_var2file,$(shell
$(gb_MKTEMP)),items=$(subst $(WHITESPACE),$(COMMA),$(basename $(notdir $(filter
%.xcu,$^) && \
$(filter_MERGE) tempdir=$(TMPDIR) \
share_subdir_name=$(LIBO_SHARE_FOLDER) \
fragmentsdir=$(dir $(firstword $(filter %.xcu,$^))).. \
@@ -115,12 +111,8 @@ $(call gb_XcuFilterOthersTarget_get_target,%) :
$(filter_MERGE_TARGET)
$(call gb_Trace_StartRange,$*,FIO)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && \
- RESPONSEFILE=`$(gb_MKTEMP)` && \
- RESPONSEFILE2=`$(gb_MKTEMP)` && \
- echo "items=$(strip $(foreach xcu,$(filter %.xcu,$^),$(if
$(filter frameloaders,$(notdir $(patsubst %/,%,$(dir $(xcu),$(basename
$(notdir $(xcu),)" \
- | sed "s/ /$(COMMA)/g" > $${RESPONSEFILE} && \
- echo "items=$(strip $(foreach xcu,$(filter %.xcu,$^),$(if
$(filter contenthandlers,$(notdir $(patsubst %/,%,$(dir $(xcu),$(basename
$(notdir $(xcu),)" \
- | sed "s/ /$(COMMA)/g" > $${RESPONSEFILE2} && \
+ RESPONSEFILE=$(call gb_var2file,$(shell
$(gb_MKTEMP)),items=$(subst $(WHITESPACE),$(COMMA),$(strip $(foreach
xcu,$(filter %.xcu,$^),$(if $(filter frameloaders,$(notdir $(patsubst
%/,%,$(dir $(xcu),$(basename $(notdir $(xcu),))) && \
+ RESPONSEFILE2=$(call gb_var2file,$(shell
$(gb_MKTEMP)),items=$(subst $(WHITESPACE),$(COMMA),$(strip $(foreach
xcu,$(filter %.xcu,$^),$(if $(filter contenthandlers,$(notdir $(patsubst
%/,%,$(dir $(xcu),$(basename $(notdir $(xcu),))) && \
$(filter_MERGE) tempdir=$(TMPDIR) \
share_subdir_name=$(LIBO_SHARE_FOLDER) \
fragmentsdir=$(dir $(firstword $(filter %.xcu,$^))).. \
@@ -151,9 +143,7 @@ $(call gb_XcuFilterInternalTarget_get_target,%) :
$(filter_MERGE_TARGET)
$(call gb_Trace_StartRange,$*,FII)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && \
- RESPONSEFILE=`$(gb_MKTEMP)` && \
- echo "items=$(basename $(notdir $(filter %.xcu,$^)))" \
- | sed "s/ /$(COMMA)/g" > $${RESPONSEFILE} && \
+ RESPONSEFILE=$(call gb_var2file,$(shell
$(gb_MKTEMP)),items=$(subst $(WHITESPACE),$(COMMA),$(basename $(notdir $(filter
%.xcu,$^) && \
$(filter_MERGE) tempdir=$(TMPDIR) \
share_subdir_name=$(LIBO_SHARE_FOLDER) \
fragmentsdir=$(dir $(firstword $(filter %.xcu,$^))).. \
@@ -199,9 +189,7 @@ $(filter_XcuFilterUiTarget) : $(filter_MERGE_TARGET)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),FIU)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && \
-
core.git: 2 commits - external/gpgmepp external/icu external/libassuan external/openssl
external/gpgmepp/ExternalProject_gpgmepp.mk |2 +-
external/icu/ExternalProject_icu.mk |2 +-
external/libassuan/ExternalProject_libassuan.mk |2 +-
external/openssl/ExternalProject_openssl.mk |3 ++-
4 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 84c80da9751c2d89655b0cfdda2f7ad581d1b15e
Author: Christian Lohmaier
AuthorDate: Fri Apr 19 11:39:58 2024 +0200
Commit: Christian Lohmaier
CommitDate: Fri Apr 26 14:02:29 2024 +0200
use strawberry perl in wsl-as-helper case for openssl
it needs modules that are not available in git-bash perl, and strawberry
perl is already used as a way to get windres and similar utilities
Might want to revisit that to streamline the dependencies
Change-Id: Ieb1c83831292677e9930d376d9d71283c6a1140e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166342
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier
diff --git a/external/openssl/ExternalProject_openssl.mk
b/external/openssl/ExternalProject_openssl.mk
index 048158700f84..910c957484c4 100644
--- a/external/openssl/ExternalProject_openssl.mk
+++ b/external/openssl/ExternalProject_openssl.mk
@@ -62,11 +62,12 @@ OPENSSL_PLATFORM := \
ifeq ($(COM),MSC)
$(eval $(call gb_ExternalProject_use_nmake,openssl,build))
+$(call gb_ExternalProject_get_state_target,openssl,build): export PERL:=$(if
$(MSYSTEM),$(STRAWBERRY_PERL),$(shell cygpath -m $(PERL)))
+
$(call gb_ExternalProject_get_state_target,openssl,build):
$(call gb_Trace_StartRange,openssl,EXTERNAL)
$(call gb_ExternalProject_run,build,\
CONFIGURE_INSIST=1 $(PERL) Configure $(OPENSSL_PLATFORM)
no-tests no-multilib \
- && export PERL="$(shell cygpath -w $(PERL))" \
&& nmake -f makefile \
$(if $(call
gb_Module__symbols_enabled,openssl),DEBUG_FLAGS_VALUE="$(gb_DEBUGINFO_FLAGS)") \
)
commit b77bcf2838e2ab233c61cff8237f2847bd910dcb
Author: Christian Lohmaier
AuthorDate: Wed Aug 2 14:55:44 2023 +0200
Commit: Christian Lohmaier
CommitDate: Fri Apr 26 14:02:20 2024 +0200
run autoconf/autoreconf via wsl in wsl-as-helper case
Change-Id: I9bcdfe352fd378e1bf09e15b8d8f7dcea82c0b5e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166341
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier
diff --git a/external/gpgmepp/ExternalProject_gpgmepp.mk
b/external/gpgmepp/ExternalProject_gpgmepp.mk
index a58717fe3adb..d2733bf21b49 100644
--- a/external/gpgmepp/ExternalProject_gpgmepp.mk
+++ b/external/gpgmepp/ExternalProject_gpgmepp.mk
@@ -25,7 +25,7 @@ $(call gb_ExternalProject_get_state_target,gpgmepp,build):
$(call gb_Executable_
$(call gb_Trace_StartRange,gpgmepp,EXTERNAL)
$(call gb_ExternalProject_run,build, \
$(gb_WIN_GPG_cross_setup_exports) \
- && autoreconf \
+ && $(WSL) autoreconf \
&& $(gb_RUN_CONFIGURE) ./configure \
$(gb_CONFIGURE_PLATFORMS) \
--disable-shared \
diff --git a/external/icu/ExternalProject_icu.mk
b/external/icu/ExternalProject_icu.mk
index 5388eee58983..cd4bc99ab1a3 100644
--- a/external/icu/ExternalProject_icu.mk
+++ b/external/icu/ExternalProject_icu.mk
@@ -20,7 +20,7 @@ ifeq ($(OS),WNT)
$(call gb_ExternalProject_get_state_target,icu,build) :
$(call gb_Trace_StartRange,icu,EXTERNAL)
$(call gb_ExternalProject_run,build,\
- autoconf -f \
+ $(WSL) autoconf -f \
&& export LIB="$(ILIB)" PYTHONWARNINGS="default" \
gb_ICU_XFLAGS="-FS $(SOLARINC) $(gb_DEBUGINFO_FLAGS)
$(if $(MSVC_USE_DEBUG_RUNTIME),-MDd,-MD -Gy)" \
&& CFLAGS="$${gb_ICU_XFLAGS}" CPPFLAGS="$(SOLARINC)"
CXXFLAGS="$${gb_ICU_XFLAGS}" \
diff --git a/external/libassuan/ExternalProject_libassuan.mk
b/external/libassuan/ExternalProject_libassuan.mk
index 9b972a55fc27..d73935b212e4 100644
--- a/external/libassuan/ExternalProject_libassuan.mk
+++ b/external/libassuan/ExternalProject_libassuan.mk
@@ -25,7 +25,7 @@ $(call gb_ExternalProject_get_state_target,libassuan,build):
$(call gb_Executabl
$(call gb_Trace_StartRange,libassuan,EXTERNAL)
$(call gb_ExternalProject_run,build,\
$(gb_WIN_GPG_cross_setup_exports) \
- && autoreconf \
+ && $(WSL) autoreconf \
&& $(gb_RUN_CONFIGURE) ./configure \
--enable-static \
--disable-shared \
core.git: 2 commits - odk/CustomTarget_doxygen.mk solenv/gbuild
odk/CustomTarget_doxygen.mk | 36 solenv/gbuild/LinkTarget.mk |7 ++ solenv/gbuild/platform/com_MSC_class.mk |3 -- 3 files changed, 22 insertions(+), 24 deletions(-) New commits: commit d5897420b0df5222ef87dce60668df902a5e279a Author: Christian Lohmaier AuthorDate: Wed Aug 2 16:19:19 2023 +0200 Commit: Christian Lohmaier CommitDate: Fri Apr 26 14:02:11 2024 +0200 run bison, flex and nasm via wsl in wsl-as-helper case Change-Id: Ic3e82b72605cd0b5458bd31ab5ff5285adb3db75 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166340 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index f4d15f411516..e054cffb4c85 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -499,9 +499,8 @@ endef # gb_LexTarget__command(scanner-file, stem-for-message, done-pseudo-target, source-target) define gb_LexTarget__command -$(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(3)) && \ - $(FLEX) $(T_LEXFLAGS) -o$(4) $(1) && touch $(3) ) + $(call gb_Helper_wsl_path,$(FLEX) $(T_LEXFLAGS) -o$(4) $(1)) && touch $(3) endef @@ -647,8 +646,8 @@ $(call gb_GenNasmObject_get_target,%) : $(call gb_Trace_StartRange,$*,ASM) test -f $(call gb_GenNasmObject_get_source,$*) || (echo "Missing generated source file $(call gb_GenNasmObject_get_source,$*)" && false) mkdir -p $(dir $@) $(dir $(call gb_GenNasmObject_get_dep_target,$*)) && cd $(SRCDIR) && \ - $(NASM) $(T_NASMFLAGS) $(T_NASMFLAGS_APPEND) -I$(dir $(call gb_GenNasmObject_get_source,$*)) \ - $(call gb_GenNasmObject_get_source,$*) -o $@ && \ + $(call gb_Helper_wsl_path,$(NASM) $(T_NASMFLAGS) $(T_NASMFLAGS_APPEND) -I$(dir $(call gb_GenNasmObject_get_source,$*)) \ + $(call gb_GenNasmObject_get_source,$*) -o $@) && \ echo "$@ : $(call gb_GenNasmObject_get_source,$*)" > $(call gb_GenNasmObject_get_dep_target,$*) $(call gb_Trace_EndRange,$*,ASM) diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 7e6b5e8d3b57..5424da11d75c 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -26,9 +26,8 @@ endef define gb_YaccTarget__command $(call gb_Output_announce,$(2),$(true),YAC,3) -$(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(3)) && \ - $(BISON) $(T_YACCFLAGS) --defines=$(4) -o $(5) $(1) && touch $(3) ) + $(call gb_Helper_wsl_path,$(WSL) $(BISON) $(T_YACCFLAGS) --defines=$(4) -o $(5) $(1)) && touch $(3) endef commit f7fe6a0bed2c2aee19535a26181a2edfb103e587 Author: Christian Lohmaier AuthorDate: Tue Jul 11 16:48:24 2023 +0200 Commit: Christian Lohmaier CommitDate: Fri Apr 26 14:02:00 2024 +0200 run doxygen via wsl in wsl-as-helper case Change-Id: I534bcc8b07aea1637a3aea01cd1c5da998833a4f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166339 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk index a693adebde34..cc848699d73b 100644 --- a/odk/CustomTarget_doxygen.mk +++ b/odk/CustomTarget_doxygen.mk @@ -22,13 +22,13 @@ odk_cpp_INCFILELIST := com/sun/star/uno/Any.h \ com/sun/star/uno/Type.h \ com/sun/star/uno/Type.hxx -# Cygwin Doxygen needs unix paths -odk_cygwin_path = $(if $(filter WNT,$(OS)),$(shell cygpath -u $(1)),$(1)) -odk_cpp_PREFIX := $(INSTDIR)/$(SDKDIRNAME)/include/ -odk_cpp_DOXY_INPUT := $(SRCDIR)/odk/docs/cpp/main.dox \ +# Cygwin Doxygen needs unix paths, wsl-as-helper needs paths into windows-realm +odk_cygwin_path = $(if $(MSYSTEM),$(call gb_Helper_wsl_path,$(1)),$(call gb_Helper_cyg_path,$(1))) +odk_cpp_PREFIX := $(call odk_cygwin_path,$(INSTDIR)/$(SDKDIRNAME)/include/) +odk_cpp_DOXY_INPUT := $(call odk_cygwin_path,$(SRCDIR)/odk/docs/cpp/main.dox \ $(SRCDIR)/include/sal/log-areas.dox \ - $(addprefix $(odk_cpp_PREFIX),$(odk_cpp_INCDIRLIST) $(odk_cpp_INCFILELIST)) -odk_cpp_DOXY_WORKDIR := $(call gb_CustomTarget_get_workdir,odk/docs/cpp)/ref + $(addprefix $(odk_cpp_PREFIX),$(odk_cpp_INCDIRLIST) $(odk_cpp_INCFILELIST))) +odk_cpp_DOXY_WORKDIR := $(call odk_cygwin_path,$(call gb_CustomTarget_get_workdir,odk/docs/cpp)/ref) $(eval $(call gb_CustomTarget_register_targets,odk/docs,\ cpp/Doxyfile \ @@ -40,12 +40,12 @@ $(call gb_CustomTarget_get_workdir,odk/docs)/cpp/Doxyfile : \ $(gb_Module_CURRENTMAKEFILE) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1) $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),SED) - sed -e 's!^INPUT = %$$!INPUT = $(call odk_cygwin_path,$(odk_cpp_DOXY_INPUT))!' \ - -e 's!^OUTPUT_DIRECTORY = %$$!OUTPUT_DIRECTORY = $(call odk_cygwin_path,$(odk_cpp_DOXY_WORKDIR))!' \ + sed -e
core.git: 2 commits - config_host.mk.in configure.ac external/liblangtag Makefile.in solenv/bin solenv/gbuild
Makefile.in | 10 +
config_host.mk.in |4
configure.ac | 123 +++---
external/liblangtag/UnpackedTarball_liblangtag.mk |2
solenv/bin/shortpath.cmd |1
solenv/gbuild/Helper.mk | 36 ++
solenv/gbuild/UnpackedTarball.mk |2
solenv/gbuild/platform/com_MSC_defs.mk|8 -
8 files changed, 164 insertions(+), 22 deletions(-)
New commits:
commit 9c6eece2c427473fafb41d9b5ee66e93363ecc8f
Author: Christian Lohmaier
AuthorDate: Tue Jul 11 18:37:29 2023 +0200
Commit: Christian Lohmaier
CommitDate: Fri Apr 26 14:01:36 2024 +0200
extracting tarballs that call helpers to uncompress require unix-style paths
Change-Id: I528e343fb5b22194b4639649fbfc04c0583f77c7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166336
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier
diff --git a/external/liblangtag/UnpackedTarball_liblangtag.mk
b/external/liblangtag/UnpackedTarball_liblangtag.mk
index 16b9ea999f71..40102052a79c 100644
--- a/external/liblangtag/UnpackedTarball_liblangtag.mk
+++ b/external/liblangtag/UnpackedTarball_liblangtag.mk
@@ -12,7 +12,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,liblangtag))
$(eval $(call
gb_UnpackedTarball_set_tarball,liblangtag,$(LIBLANGTAG_TARBALL),,liblangtag))
$(eval $(call gb_UnpackedTarball_set_pre_action,liblangtag,\
- $(GNUTAR) -x -j -f
$(gb_UnpackedTarget_TARFILE_LOCATION)/$(LANGTAGREG_TARBALL) \
+ $(GNUTAR) -x -j -f $(call
gb_Helper_cyg_path,$(gb_UnpackedTarget_TARFILE_LOCATION)/$(LANGTAGREG_TARBALL))
\
))
$(eval $(call gb_UnpackedTarball_update_autoconf_configs,liblangtag))
diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index fb574f6a95f1..4419dd172870 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -24,7 +24,7 @@ $(GNUTAR) \
$(3) \
-C $(UNPACKED_DIR) \
$(STRIP_COMPONENTS)=$(UNPACKED_STRIP_COMPONENTS) \
- -f $(UNPACKED_TARBALL)
+ -f $(call gb_Helper_cyg_path,$(UNPACKED_TARBALL))
endef
define gb_UnpackedTarget__command_unzip
commit 4c86718e78c6b18c84774e48ca025694364c251a
Author: Christian Lohmaier
AuthorDate: Thu Apr 18 12:45:01 2024 +0200
Commit: Christian Lohmaier
CommitDate: Fri Apr 26 14:01:26 2024 +0200
initial support for running autogen.sh inside wsl from git-bash
Change-Id: I4272ea817a48880fd4206d6c73add7ccb8c4f6c5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166335
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier
diff --git a/Makefile.in b/Makefile.in
index ab7090ee1e77..f55e92c94405 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -38,6 +38,11 @@ Makefile $(BUILDDIR)/Makefile: $(BUILDDIR)/config_host.mk
$(BUILDDIR)/config_hos
@touch $@
# run configure in an environment not polluted by config_host.mk
+ifneq ($(MSYSTEM),)
+WSL:=@WSL@
+# wsl needs unix-style path into windows realm
+$(BUILDDIR)/config_host.mk : SRCDIR:=/$(shell $(WSL) wslpath -u $(SRCDIR))
+endif
$(BUILDDIR)/config_host.mk : $(wildcard \
$(SRCDIR)/autogen.sh \
$(SRCDIR)/config_host.mk.in \
@@ -51,9 +56,8 @@ $(BUILDDIR)/config_host.mk : $(wildcard \
$(BUILDDIR)/autogen.input \
$(BUILDDIR)/autogen.lastrun \
) \
- $(shell . $(SRCDIR)/bin/get_config_variables JAVA_HOME && \
- if test -n "$${JAVA_HOME}" -a ! -d "$${JAVA_HOME}/bin";
then echo force-restart; fi)
- sh -c $(SRCDIR)/autogen.sh
+ $(shell if test -n '$(JAVA_HOME)' -a ! -d '$(JAVA_HOME)'; then
echo force-restart; fi)
+ sh -c "$(if $(MSYSTEM),$(WSL) )$(SRCDIR)/autogen.sh"
else # MAKE_RESTARTS
diff --git a/config_host.mk.in b/config_host.mk.in
index c1cd96717707..1d5480bacf61 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -792,4 +792,6 @@ include @SRC_ROOT@/download.lst
# prep for WSL-as-helper-builds where build runs from within git-bash/MSYS
that would otherwise
# messes with anything that looks like a path (starts with /) but it cannot
resolve
-export MSYS_NO_PATHCONV=1
\ No newline at end of file
+export MSYS_NO_PATHCONV=1
+STRAWBERRY_PERL=@STRAWBERRY_PERL@
+WSL=@WSL@
\ No newline at end of file
diff --git a/configure.ac b/configure.ac
index 46430707a313..cf14c248e948 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,6 +41,7 @@ SCPDEFS=""
GIT_NEEDED_SUBMODULES=""
LO_PATH= # used by path_munge to construct a PATH variable
+
FilterLibs()
{
# Return value: $filteredlibs
@@ -191,6 +192,19 @@ PathFormat()
# But Cygwin can
formatted_path_unix="$formatted_path"
fi
+if test -n "$WSL_ONLY_AS_HELPER"; then
+# if already in unix format, switch to windows format to create
shortened path
core.git: 2 commits - cli_ure/CustomTarget_cli_ure_assemblies.mk configure.ac editeng/CustomTarget_generated.mk filter/CustomTarget_svg.mk solenv/gbuild sw/CustomTarget_generated.mk
cli_ure/CustomTarget_cli_ure_assemblies.mk | 43 ++--- configure.ac | 15 ++ editeng/CustomTarget_generated.mk |5 +-- filter/CustomTarget_svg.mk |3 -- solenv/gbuild/CustomTarget.mk |2 - sw/CustomTarget_generated.mk |3 -- 6 files changed, 30 insertions(+), 41 deletions(-) New commits: commit f618f08cc310f20e2888cf4e5e99cfeb8fbd15b7 Author: Christian Lohmaier AuthorDate: Sun Apr 21 21:50:55 2024 +0200 Commit: Christian Lohmaier CommitDate: Fri Apr 26 14:01:19 2024 +0200 simplify some sed rules/statements and use proper quoting make removes partially built targets in case the rule exits with non-zero status, so creating a temp file and moving it is not necessary also use single quotes for cases where characters might be interpreted by the shell Also combine multiple sed calls into a single call of sed with multiple expressions and replace additional "grep -v foo" with corresponding sed delete command Change-Id: Iff7e3b962175e347e5ed100a87c96fbaeef39985 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166410 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/cli_ure/CustomTarget_cli_ure_assemblies.mk b/cli_ure/CustomTarget_cli_ure_assemblies.mk index 260a52b25fec..266df95f2706 100644 --- a/cli_ure/CustomTarget_cli_ure_assemblies.mk +++ b/cli_ure/CustomTarget_cli_ure_assemblies.mk @@ -19,37 +19,24 @@ $(call gb_CustomTarget_get_target,cli_ure/source) : \ $(call gb_CustomTarget_get_workdir,cli_ure/source)/ure/assembly.cs $(call gb_CustomTarget_get_workdir,cli_ure/source)/basetypes/assembly.cs : \ - $(SRCDIR)/cli_ure/source/basetypes/assembly.cs \ - $(SRCDIR)/cli_ure/version/version.txt \ - $(cli_ure_source_MAKEFILE) \ - | $(call gb_CustomTarget_get_workdir,cli_ure/source)/basetypes/.dir +$(SRCDIR)/cli_ure/source/basetypes/assembly.cs \ +$(SRCDIR)/cli_ure/version/version.txt \ +$(cli_ure_source_MAKEFILE) \ +| $(call gb_CustomTarget_get_workdir,cli_ure/source)/basetypes/.dir + sed -e "s/@CLI_BASETYPES_NEW_VERSION@/$(CLI_BASETYPES_NEW_VERSION)/g" $< > $@ $(call gb_CustomTarget_get_workdir,cli_ure/source)/native/assembly.cxx : \ - $(SRCDIR)/cli_ure/source/native/assembly.cxx \ - $(SRCDIR)/cli_ure/version/version.txt \ - $(cli_ure_source_MAKEFILE) \ - | $(call gb_CustomTarget_get_workdir,cli_ure/source)/native/.dir +$(SRCDIR)/cli_ure/source/native/assembly.cxx \ +$(SRCDIR)/cli_ure/version/version.txt \ +$(cli_ure_source_MAKEFILE) \ +| $(call gb_CustomTarget_get_workdir,cli_ure/source)/native/.dir + sed -e "s/@CLI_CPPUHELPER_NEW_VERSION@/$(CLI_CPPUHELPER_NEW_VERSION)/g" $< > $@ $(call gb_CustomTarget_get_workdir,cli_ure/source)/ure/assembly.cs : \ - $(SRCDIR)/cli_ure/source/ure/assembly.cs \ - $(SRCDIR)/cli_ure/version/version.txt \ - $(cli_ure_source_MAKEFILE) \ - | $(call gb_CustomTarget_get_workdir,cli_ure/source)/ure/.dir - -$(call gb_CustomTarget_get_workdir,cli_ure/source)/basetypes/assembly.cs : - sed -e "s/@CLI_BASETYPES_NEW_VERSION@/$(CLI_BASETYPES_NEW_VERSION)/g" \ - < $< > $@.tmp && \ - mv $@.tmp $@ - -# TODO use macros for this -$(call gb_CustomTarget_get_workdir,cli_ure/source)/native/assembly.cxx : - sed -e "s/@CLI_CPPUHELPER_NEW_VERSION@/$(CLI_CPPUHELPER_NEW_VERSION)/g" \ - < $< > $@.tmp && \ - mv $@.tmp $@ - -$(call gb_CustomTarget_get_workdir,cli_ure/source)/ure/assembly.cs : - sed -e "s/@CLI_URE_NEW_VERSION@/$(CLI_URE_NEW_VERSION)/g" \ - < $< > $@.tmp && \ - mv $@.tmp $@ +$(SRCDIR)/cli_ure/source/ure/assembly.cs \ +$(SRCDIR)/cli_ure/version/version.txt \ +$(cli_ure_source_MAKEFILE) \ +| $(call gb_CustomTarget_get_workdir,cli_ure/source)/ure/.dir + sed -e "s/@CLI_URE_NEW_VERSION@/$(CLI_URE_NEW_VERSION)/g" $< > $@ # vim: set noet sw=4 ts=4: diff --git a/editeng/CustomTarget_generated.mk b/editeng/CustomTarget_generated.mk index 77fb4f7bf383..8f05f6ccb23b 100644 --- a/editeng/CustomTarget_generated.mk +++ b/editeng/CustomTarget_generated.mk @@ -19,9 +19,8 @@ $(editeng_INC)/tokens.hxx $(editeng_INC)/tokens.gperf : $(editeng_SRC)/tokens.tx $(call gb_ExternalExecutable_get_command,python) $(editeng_PY) $(editeng_SRC)/tokens.txt $(editeng_INC)/tokens.gperf $(editeng_INC)/tokens.cxx : $(editeng_INC)/tokens.gperf - $(GPERF) --compare-strncmp --readonly-tables --output-file=$(editeng_INC)/tokens.cxx $(editeng_INC)/tokens.gperf - sed -i $(if $(filter MACOSX,$(OS_FOR_BUILD)),'') -e "s/(char\*)0/(char\*)0, XML_TOKEN_INVALID/g" $(editeng_INC)/tokens.cxx - sed -i $(if $(filter MACOSX,$(OS_FOR_BUILD)),'') -e "/^#line/d" $(editeng_INC)/tokens.cxx + $(GPERF)
core.git: 2 commits - configure.ac
configure.ac | 118 +--
1 file changed, 59 insertions(+), 59 deletions(-)
New commits:
commit d9d976cd0ab0b52647e562d5c9cc3e492f71ee5d
Author: Christian Lohmaier
AuthorDate: Thu Apr 18 12:56:50 2024 +0200
Commit: Christian Lohmaier
CommitDate: Fri Apr 26 14:01:00 2024 +0200
use unix paths for dir tests and prefer PathFormat…
over manual cygpath calls. Since PathFormat checks whether the path is
8.3 compatible/in case of spaces or other incompatible characters remove
some superfluous checks
also drop a workaround for VS2017 (minimum requried version is 2019)
Change-Id: I2d098cf323c96862c06acf7605abacbefe8a35ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166333
Reviewed-by: Christian Lohmaier
Tested-by: Jenkins
diff --git a/configure.ac b/configure.ac
index 7aa526693862..554ccc8bc683 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4142,7 +4142,8 @@ win_get_env_from_vsdevcmdbat()
{
local WRAPPERBATCHFILEPATH="`mktemp -t wrpXX.bat`"
printf '@set VSCMD_SKIP_SENDTELEMETRY=1
' > $WRAPPERBATCHFILEPATH
-printf '@call "%s/../Common7/Tools/VsDevCmd.bat" /no_logo
' "$(cygpath -w $VC_PRODUCT_DIR)" >> $WRAPPERBATCHFILEPATH
+PathFormat "$VC_PRODUCT_DIR"
+printf '@call "%s/../Common7/Tools/VsDevCmd.bat" /no_logo
' "$formatted_path" >> $WRAPPERBATCHFILEPATH
# use 'echo.%ENV%' syntax (instead of 'echo %ENV%') to avoid outputting
"ECHO is off." in case when ENV is empty or a space
printf '@setlocal
@echo.%%%s%%
@endlocal
' "$1" >> $WRAPPERBATCHFILEPATH
local result
@@ -4177,7 +4178,7 @@ find_ucrt()
ide_env_file="${ide_env_dir}VsDevCmd.bat"
if test -f "$ide_env_file"; then
PathFormat "$(win_get_env_from_vsdevcmdbat UniversalCRTSdkDir)"
-UCRTSDKDIR=$formatted_path
+UCRTSDKDIR=$formatted_path_unix
UCRTVERSION=$(win_get_env_from_vsdevcmdbat UCRTVersion)
dnl Hack needed at least by tml:
if test "$UCRTVERSION" = 10.0.15063.0 \
@@ -4371,9 +4372,9 @@ if test "$_os" = "WINNT"; then
fi
# Find the version of devenv.exe
-# MSVC 2017 devenv does not start properly from a DOS 8.3 path
-DEVENV=$(cygpath -lm "$VC_PRODUCT_DIR/../Common7/IDE/devenv.exe")
-DEVENV_unix=$(cygpath -u "$DEVENV")
+PathFormat "$VC_PRODUCT_DIR/../Common7/IDE/devenv.exe"
+DEVENV="$formatted_path"
+DEVENV_unix="$formatted_path_unix"
if test ! -e "$DEVENV_unix"; then
AC_MSG_WARN([No devenv.exe found - this is expected for VC++ Build
Tools])
fi
@@ -4398,11 +4399,10 @@ if test "$_os" = "WINNT"; then
# Remove /cl.exe from CC case insensitive
AC_MSG_NOTICE([found Visual C++ $vcyear])
-main_include_dir=`cygpath -d -m "$COMPATH/Include"`
-CPPFLAGS="$CPPFLAGS -I$main_include_dir"
-
PathFormat "$COMPATH"
-COMPATH=`win_short_path_for_make "$formatted_path"`
+COMPATH="$formatted_path"
+COMPATH_unix="$formatted_path_unix"
+CPPFLAGS="$CPPFLAGS -I$COMPATH/Include"
VCVER=$vcnumwithdot
VCTOOLSET=$vctoolset
@@ -6733,15 +6733,10 @@ find_winsdk_version()
winsdkbinsubdir="$regvalue".0
winsdklibsubdir=$winsdkbinsubdir
local tmppath="$winsdktest\Include\$winsdklibsubdir"
-local tmppath_unix=$(cygpath -u "$tmppath")
+PathFormat "$tmppath"
+local tmppath_unix=$formatted_path_unix
# test exist the SDK path
-if test -d "$tmppath_unix"; then
- # when path is convertible to a short path then path is okay
- cygpath -d "$tmppath" >/dev/null 2>&1
- if test $? -ne 0; then
- AC_MSG_ERROR([Windows SDK doesn't have a 8.3 name, see
NtfsDisable8dot3NameCreation])
- fi
-else
+if test ! -d "$tmppath_unix"; then
AC_MSG_ERROR([The Windows SDK not found, check the
installation])
fi
fi
@@ -6847,8 +6842,8 @@ if test "$_os" = "WINNT"; then
# normalize if found
if test -n "$WINDOWS_SDK_HOME"; then
-WINDOWS_SDK_HOME=`cygpath -d "$WINDOWS_SDK_HOME"`
-WINDOWS_SDK_HOME=`cygpath -u "$WINDOWS_SDK_HOME"`
+PathFormat "$WINDOWS_SDK_HOME"
+WINDOWS_SDK_HOME=$formatted_path_unix
fi
WINDOWS_SDK_LIB_SUBDIR=$winsdklibsubdir
@@ -6916,9 +6911,9 @@ the Windows SDK are installed.])
WINDOWS_SDK_HOME_unix="$formatted_path_unix"
if test "$build_os" = "cygwin" -o "$build_os" = "wsl"; then
SOLARINC="$SOLARINC -I$WINDOWS_SDK_HOME/include -I$COMPATH/Include"
-if test -d "$WINDOWS_SDK_HOME/include/um"; then
+if test -d "$WINDOWS_SDK_HOME_unix/include/um"; then
SOLARINC="$SOLARINC
core.git: 2 commits - config_host.mk.in external/beanshell external/hsqldb external/java_websocket external/jfreereport external/libcdr external/libebook external/libepubgen external/libfreehand exter
config_host.mk.in |4 +
external/beanshell/ExternalProject_beanshell.mk |2
external/hsqldb/ExternalProject_hsqldb.mk |2
external/java_websocket/ExternalProject_java_websocket.mk |2
external/jfreereport/ExternalProject_jfreereport_flow_engine.mk |2
external/jfreereport/ExternalProject_jfreereport_flute.mk |2
external/jfreereport/ExternalProject_jfreereport_libbase.mk |2
external/jfreereport/ExternalProject_jfreereport_libfonts.mk |2
external/jfreereport/ExternalProject_jfreereport_libformula.mk|2
external/jfreereport/ExternalProject_jfreereport_liblayout.mk |2
external/jfreereport/ExternalProject_jfreereport_libloader.mk |2
external/jfreereport/ExternalProject_jfreereport_librepository.mk |2
external/jfreereport/ExternalProject_jfreereport_libserializer.mk |2
external/jfreereport/ExternalProject_jfreereport_libxml.mk|2
external/jfreereport/ExternalProject_jfreereport_sac.mk |2
external/libcdr/ExternalProject_libcdr.mk |2
external/libebook/ExternalProject_libebook.mk |2
external/libepubgen/ExternalProject_libepubgen.mk |2
external/libfreehand/ExternalProject_libfreehand.mk |2
external/liblangtag/ExternalProject_liblangtag.mk |2
external/libqxp/ExternalProject_libqxp.mk |2
external/libvisio/ExternalProject_libvisio.mk |2
external/libzmf/ExternalProject_libzmf.mk |2
solenv/bin/modules/installer.pm |2
solenv/bin/modules/installer/control.pm |4 +
solenv/bin/modules/installer/globals.pm |2
solenv/bin/modules/installer/parameter.pm |1
solenv/bin/modules/installer/windows/msiglobal.pm | 21
+-
28 files changed, 43 insertions(+), 35 deletions(-)
New commits:
commit a97d983b501b28a2b5a9387efb6206b50097ffa1
Author: Christian Lohmaier
AuthorDate: Fri Apr 19 14:54:12 2024 +0200
Commit: Christian Lohmaier
CommitDate: Fri Apr 26 14:00:43 2024 +0200
don't throw away command output when packaging installsets
and adjust installer to work with MSWin-style perl (like strawberry
perl)
Change-Id: I9305c7cb6ef72560bbf77626f113f3ee439b3ef3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166331
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index 8c5c275adb91..5f9214e09e88 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -580,8 +580,6 @@ sub run {
installer::scriptitems::changing_name_of_language_dependent_keys($filesinproductlanguageresolvedarrayref);
-if ( $installer::globals::iswin and $^O =~ /MSWin/i ) {
installer::converter::convert_slash_to_backslash($filesinproductlanguageresolvedarrayref);
}
-
$filesinproductlanguageresolvedarrayref =
installer::scriptitems::remove_non_existent_languages_in_productlists($filesinproductlanguageresolvedarrayref,
$languagestringref, "Name", "file");
installer::scriptitems::get_Destination_Directory_For_Item_From_Directorylist($filesinproductlanguageresolvedarrayref,
$dirsinproductarrayref);
diff --git a/solenv/bin/modules/installer/control.pm
b/solenv/bin/modules/installer/control.pm
index d126e917b57f..4faff4f39b9f 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -87,6 +87,8 @@ sub check_system_path
map { my $dir = qx{cygpath -m "$_"}; chomp($dir); $dir
}
split /\Q$local_pathseparator\E\s*/, $pathvariable;
$local_pathseparator = ';';
+} elsif ( $^O =~ /MSWin/i ) {
+$local_pathseparator = ';';
}
my $patharrayref =
installer::converter::convert_stringlist_into_array(\$pathvariable,
$local_pathseparator);
@@ -96,7 +98,7 @@ sub check_system_path
if (($installer::globals::iswin) && ($installer::globals::iswindowsbuild))
{
-@needed_files_in_path = ("zip.exe", "msiinfo.exe", "msidb.exe",
"uuidgen", "makecab.exe", "msitran.exe", "expand.exe");
+@needed_files_in_path = ("msiinfo.exe", "msidb.exe", "uuidgen.exe",
"makecab.exe", "msitran.exe", "expand.exe");
}
elsif ($installer::globals::iswin)
{
diff --git a/solenv/bin/modules/installer/globals.pm
b/solenv/bin/modules/installer/globals.pm
index 045d9d6afde9..0dc148a9155a 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -265,7 +265,7 @@ BEGIN
@installer::globals::removedirs = ();
core.git: postprocess/CustomTarget_registry.mk
postprocess/CustomTarget_registry.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit dac6cbd2155ca47d9152fbcc523f52aee6386832 Author: Christian Lohmaier AuthorDate: Thu Apr 25 17:14:16 2024 +0200 Commit: Julien Nabet CommitDate: Thu Apr 25 21:49:11 2024 +0200 fix mismatching gb_Trace_StartRange and gb_Trace_EndRage Change-Id: Ie4da22b05bf9219da811778bfb892e3d6c9de6c4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166636 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index 8a503e39862a..f4ee8e4f2791 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -607,7 +607,7 @@ $(call gb_XcdTarget_get_target,registry_%.xcd) : \ $(SRCDIR)/solenv/bin/removereportbuilder.xslt - ) \ > $@ \ ) - $(call gb_Trace_EndRange,$*,XCD) + $(call gb_Trace_EndRange,registry_$*,XCD) $(call gb_XcdTarget_get_target,%.xcd) : \ | $(call gb_ExternalExecutable_get_dependencies,xsltproc)
