summaryrefslogtreecommitdiff
path: root/solenv
AgeCommit message (Collapse)Author
2024-07-12Merge tag 'libreoffice-24.2.5.2' into feature/cib_contract49cThorsten Behrens
Tag libreoffice-24.2.5.2 Change-Id: I351787f986a445eec887dfac353a880f9c5b67e4
2024-07-10Adapt flatpak build to upstream changesStephan Bergmann
<https://github.com/flathub/org.libreoffice.LibreOffice/commit/4bed50e14d9d106093b027bc8bb780023fb42b55> "gvfs: Update gvfs-1.54.1.tar.xz to 1.54.2 (#295)" <https://github.com/flathub/org.libreoffice.LibreOffice/commit/88a0d0718a9ddcd75a0842b5173e6d6ecd4d3bde> "--enable-ext-nlpsolver (#297)" Change-Id: Ie39c22c2611a31a8e2a82ae200b7a3836393dff3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170177 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de> (cherry picked from commit 6b80e0554e4b11f9c1eb955c2d26445bc6855371) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170122 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 2d8b7797d5e99531ebfbbe99c0095782c3b03558) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170231 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2024-06-29Adapt flatpak build to upstream changesStephan Bergmann
<https://github.com/flathub/org.libreoffice.LibreOffice/commit/09d348eefc7d1367073ee4a95513b48f799700f0> "krb5: Update krb5-1.21.2.tar.gz to 1.21.3 (#294)" Change-Id: If99afd812eca43258398d79c1a7c009988d374e8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169695 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de> (cherry picked from commit 80715756c6bd44f24dd6270ccb646f690861901a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169727 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2024-06-07Merge tag 'libreoffice-24.2.4.2' into HEADThorsten Behrens
Tag libreoffice-24.2.4.2 Change-Id: Ic8eb6fa69fd24d643e67cda579025a295a5f49b0
2024-06-06Adapt flatpak build to upstream changesStephan Bergmann
<https://github.com/flathub/org.libreoffice.LibreOffice/commit/84d2c9ed4f9644e5afa385ec3ef345a43a3a8525> "Update gvfs-1.54.0.tar.xz to 1.54.1 (#291)" Change-Id: Ifeeecca84d4e01f0abe05dc8c6ead65dbedd3da7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168483 Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de> Tested-by: Jenkins (cherry picked from commit 5b6340d3df48b266843fad276e638c309b02e6e5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168441 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2024-05-10gbuild: don't create empty services.rdb on "make postprocess"Michael Stahl
Since commit db3a61cd958f4a70417929cf8e1fa9bfd0bfe5a3 "make postprocess.clea; make postprocess" will result in an empty services.rdb, because the components are added in makefiles in other modules. Detect the problem and tell the user to run top-level make. Change-Id: Iab1a15efa5a4c9bb3e90e44f82a9510dff724c80 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167354 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Tested-by: Jenkins (cherry picked from commit baaeca870f5c8ae40d33eff2b530bd4b3670ee45) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167453 Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2024-04-30clean up after removal of patched rhinoRene Engelhard
Change-Id: I193fd0c10d297555faa7a832718dbd6cd929a406 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165762 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
2024-04-11Adapt flatpak build to upstream changesStephan Bergmann
<https://github.com/flathub/org.libreoffice.LibreOffice/commit/29463ebd29eb10ba7891c87bd699047e5e13deb7> "Merge pull request #288 from EliasTheGrandMasterOfMistakes/EliasTheGrandMasterOfMistakes-patch-2: Update JDK, GVFS and ANT" Change-Id: I021ddb9ca6b1fbec6cfe22784a9d023db2fa737c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165920 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de> (cherry picked from commit 82c17b61e05b9373ab1100f9c72156d655e0a866) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165930 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2024-03-05Allow building with Java 8Fridrich Štrba
Change-Id: Ib1af1a98993aabb8a03f4ef19d8da4d9a71fdbc0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164226 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 4267c7124876b9213b3169a55731d260c8c63f7c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164233 Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Reviewed-by: Hossein <hossein@libreoffice.org> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2024-02-29Try to appease Flathub linterStephan Bergmann
...which caused a recent <https://buildbot.flathub.org/#/builders/33/builds/12708> test build to fail with > { > "errors": [ > "appstream-failed-validation" > ], > "warnings": [ > "appstream-screenshot-missing-caption" > ], > "appstream": [ > "E: org.libreoffice.LibreOffice.desktop:~: desktop-app-launchable-omitted" > ], > "message": "Please consult the documentation at https://docs.flathub.org/docs/for-app-authors/linter" > } Change-Id: I3655d3985c70780e5980bec2d4753120fb302f1a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164134 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de> (cherry picked from commit beccfbbb7e896266be3c6c1a9dddaf68fd33ae9e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164117 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2024-02-01tdf#159128 UI: Open Security settings option directlyBalazs Varga
Open Security Option Setting page directly from Security pop up warning infobar. Follow up of 1f440348eb0892fd2c9597806d87b5fe9d60d49a (tdf#157482 UI: Turn Security Warnings popup windows into infobars) cherry-pick from commit: 2c16ea16b305dc546164e28cf6b212ebccc44ec4 Change-Id: Iac116677801bdb13a9680bcfdf532ec3d874ce0e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162393 Tested-by: Jenkins Reviewed-by: Balazs Varga <balazs.varga.extern@allotropia.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162491 Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2024-01-23Create MAR updates from msi rather than from archiveStephan Bergmann
...as the former is more convenient for release engineering (see the discussion in the comments at <https://gerrit.libreoffice.org/c/core/+/162157/1#message-8d7ebbcc64a87ee8e4a073ae1a05e3b74f5a3d6a> "Also enable --with-package-format=archive for LibreOfficeWin64.conf"). Instead of ONLINEUPDATE_MAR_OLDARCHIVE and ONLINEUPDATE_MAR_OLDMETADATA make variables, the create-partial-info target now only needs an ONLINEUPDATE_MAR_OLDMSI make variable. TODO: There are two issues when comparing the content of msi files (extracted with msiexec /a), which the old code comparing the content of archives had tried to somewhat (but not fully) address with the metadata files that I had invented (and now reverted): For one, msiexec /a also extracts content that would normally be installed somewhere else in the system (e.g., it extracts Fonts, System, and System64 directories). Differences in those directories will cause a MAR update to create those directories in the installation directory, rather than to update the corresponding files in their actual locations. For another, optional components are not recognized as such, but their content must be added to the MAR file as add/patch-if, not as plain add/patch. To work around that, for now *all* files are added as add/patch-if, conditional on the files themselves. Thus, addition of files will cause a MAR update to miss them. (As they now exclusively operate on msi files, the create-update-info and create-partial-info targets are no longer meaningful for non-Windows platforms, so drop the non-Windows bin/update/create_full_mar_for_languages.py part.) Change-Id: Ifb55b5e7d1a201b4f50a27cb449a634b96c2e29b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162399 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de> (cherry picked from commit 1dd40d6f488c46a0946ea773cb7a741f34bbb49f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162374 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2024-01-15Flatpak: Work around patched libpng in org.freedesktop.SdkStephan Bergmann
see <https://github.com/flathub/org.libreoffice.LibreOffice/pull/268/commits/7c79189f674c7cc88f0ab2790d8d198f4a855182> "Work around patched libpng in org.freedesktop.Sdk": ...which carries <https://gitlab.com/freedesktop-sdk/freedesktop-sdk/-/commit/873b28450476c434a3f6fa86cb1874b11968a479> "elements/base/libpng.bst: Add support for animated PNGs", thus handles "acTL" chunks by itself, thus doesn't call the LibreOffice handle_unknown_chunk function (in vcl/source/filter/png/PngImageReader.cxx) for such chunks, thus never sets APNGInfo::mbIsApng to true, so causes CppunitTest_vcl_png_test to fail with > PngFilterTest.cxx:382:Assertion > Test name: PngFilterTest::testApng > assertion failed > - Expression: aGraphic.IsAnimated() (<https://buildbot.flathub.org/#/builders/6/builds/92958>) since <https://git.libreoffice.org/core/+/bf944e33569e4a1d6236a54671b7320cdc6ffaf6%5E%21> "tdf#104877 Add basic APNG format support". The patch appears to originate from <https://sourceforge.net/projects/libpng-apng/>, and it might be possible to adapt the LibreOffice code to also work with such a patched libpng (whose png.h defines PNG_APGN_SUPPORTED). However, for now just use LibreOffice's own external/libpng instead of the patched one. Change-Id: Ib67056d11dfa6456920a18216a3b2bbec45f3662 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162112 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de> (cherry picked from commit 223bfa24cdeee2ed45ff8d9ab7bb0b92eb8af587) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162107 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2024-01-12Adapt Flatpak build to new external/argon2co-24.04-branch-pointStephan Bergmann
Change-Id: I584956151b036e1ba781439205a76f579f32c064 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161955 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de> (cherry picked from commit 2b1a4f6309437128077c33e27262c052a408b9ba) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161990 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2024-01-12Update solenv/flatpak-manifest.inStephan Bergmann
* Incorporate <https://github.com/flathub/org.libreoffice.LibreOffice/commit/d9e2f088aafe41c3c9cc4af14e935777dba794c1> "Update gvfs-1.52.1.tar.xz to 1.52.2 (#272)" Change-Id: I95bee83408caab8e27eae978068f8ec4e87a9c12 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161956 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de> (cherry picked from commit 2a12e2e6593cdd7b8b9978a6aec6910a92600cf3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161943 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2024-01-11Make create-update-info handle conditional contentStephan Bergmann
That make target operates on an archive, but generates data to be applied to an msi installation, so suffers from any mismatch between archive and msi install sets. Two such mismatches, at least on Windows, are: 1 Files that msi will install outside the LibreOffice installation itself (but which for an archive install set are included under LibreOffice/). This covers (at least) .Net assemblies and associated files that are installed in the GAC (scp2 styles ASSEMBLY and ASSIGNCOMPONENT) and fonts (scp2 style FONT). 2 Files that msi will only install conditionally. This covers optional components (many of which in scp2 are assigned to gid_Module_Optional_... modules) and user interface languages (which in scp2 are assigned to gid_Module_Langpack_... modules). The approach taken here is to create a workdir/installation/LibreOffice/archive/install/metadata file while building an archive install set, and to record any files matching 1 (as "skip" lines) or 2 (as "cond" lines). Then, the create-update-info target uses that metadata file to act accordingly on those files: 1 Files from "skip" lines are simply removed for now from the extracted archive that is passed to Mozilla's make_full_update.sh script. (TODO: That means that changes to such files will not be updated with the MAR update mechanism. This would apparently need some extra processing during the MAR update.) 2 Files from "cond" lines shall be recorded as add-if in the mar file manifest. Mozilla's make_full_update.sh script already has support for emitting add-if vs. plain add, but only for files under distribution/extensions/, which doesn't match our needs. So we generate from the metadata file an ifs file that we pass into the make_full_update.sh script, and patch that script to also take that ifs file into account. (Each line in the ifs file is of the form "testfile" "file" which works as long as none of the pathnames contains double quote characters. The Mozilla script code appears to be confused about the arguments to make_add_instruction(), where this ifs file will be needed: There are calls to make_add_instruction() with two or three arguments across make_full_update.sh and make_incremental_update.sh, but make_add_instruction() checks $1, $2, and $4 (but not $3), so leave that mess alone and pass the ifs file as a global IFSFILE variable instead.) The mar file manifest `add-if "testfile" "file"` adds "file" only if "testfile" is already present, and those two can be different files. TODO: However, for simplicity, for now I always use "file" also as the "testfile" (so that an add-if file only gets updated if it was already present). That avoids having to identify a specific "key file" for each optional component and for each user interface language, where that key file would be used as the add-if testfile. But on the other hand, it means that if an optional component or a user interface language will bring along a completely new file in the future, we will not install that file during a MAR update. What obviously remains to be done is to properly assign each add-if file to a specific key file. (And the current way of identifying add-if files by gid_Module_... names appears to be too simplistic too. For example, there are some gid_Module_Optional_... that are installed unconditionally for msi; but it should be harmless that those files are recorded as add-if rather than as plain add.) Change-Id: I2fdeed92604f3a2d8a0b500b9e3fa421cfb6a9cc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161917 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de> (cherry picked from commit 3f71ca906b86e551205acecc3ce7b7a5595e2ecc) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161869 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2024-01-10add Armenian (hy) language packChristian Lohmaier
Change-Id: Iaaa598cacb354140be422f4df256183ac0d91b2e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161890 Reviewed-by: Sophie Gautier <sophi@libreoffice.org> Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit fde0c9097110e1d53bf65ebb6b5ba5e4308178dc) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161858 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2024-01-05Don't mess with UserInstallation setting of --with-package-format=archiveStephan Bergmann
Ever since 9043c50f5e284f00a7eadeab5a3add0417c32227 "INTEGRATION: CWS native62 (1.68.8); FILE MERGED" and its "2006/09/15 14:51:02 is 1.68.8.2: #i67179# new user dir for all simple-package installation sets" archive installation sets had set the UserInstallation bootstrap variable to $ORIGIN/../... instead of the normal $SYSUSERCONFIG/... that is used for other installation set formats. However, I see no good reason for that, and it interferes with my current work of making the --enable-online-update-mar `make create-update-info` work again (which builds a mar file from an archive installation set, so contained a boostrap ini-file with an unexpected UserInstallation value). (I don't know about the "installed" installation set format, which also messes with the UserInstallation setting, so I left that alone.) Change-Id: I3bd1e00771a4149922c3ce4e4d187abd3889b4ea Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161650 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de> (cherry picked from commit 512cc9e8d2be9cdcce0792e44461d0e8ce8c775f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161637
2024-01-02Hard-code --with-online-update-mar-channel=LOOnlineUpdaterStephan Bergmann
(An upcoming change will add an instset/update-settings.ini file containing that value, but using a GeneratedPackage for a single file instead of a directory seems unsupported, so it will use the hard-coded value and a plain Package instead.) Change-Id: I12ffef4db71ce36be9096df674588b39c660e4de Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161545 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de> (cherry picked from commit 6910b1e3511701de5f0541fcaa98babf530f55ce) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161556
2024-01-02Fix Windows path separatorStephan Bergmann
...broken since 84ef6d82546b044990f4efd57e51e29c6c6565c8 "Build external lxml if not provided by system" Change-Id: Ie76c32a1d3094e6d98db7d50195571ae31c0ada6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161536 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de> (cherry picked from commit 661f06a3c7f1a395d38981958e5ea72a85040a30) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161554
2023-12-15Turn onlineupdate into external/onlineupdateStephan Bergmann
...and update to latest Mozilla sources. Originally, this was a non-external onlineupdate module (plus correspsonding top-level include/onlineupdate/ directory) that apparently contained sources originally copied from Mozilla and subsequently modified in-place (plus, mixed in, presumably some sources that were not copied from Mozilla but were our own inventions). To clean up this mess, this has been turned into a proper external/onlineupdate module with a tarball containing the pristine external Mozilla sources. The sources for the onlineupdate-c003be8b9727672e7d30972983b375f4c200233f.tar.xz tarball are taken, somewhat arbitrarily, from a recent <https://github.com/mozilla/gecko-dev/commit/c003be8b9727672e7d30972983b375f4c200233f> ("Bug 1867784 - Force reflow all kids in the last column balancing reflow. r=layout-reviewers,dholbert") trunk state, by running `external/onlineupdate/generate-sources.sh ~/github.com/mozilla/gecko-dev` on a Fedora 39 machine. The layout of the tarball still mostly follows the old onlineupdate/ layout, even if that deviates heavily from the actual source layout at <https://github.com/mozilla/gecko-dev/>. (And some files, which apparently are not needed, anyway, lacked sources, see the "Missing source for" in external/onlineupdate/generate-sources.sh. And win_dirent.h/.cpp has meanwhile been superseded by updateutils_win.h/.cpp.) Merely newly included source files are laid out in the tarball according to the actual source layout. Any LO-specific modifications are made via patch files (rather than modifying the sources inline, as was done in the past): external/onlineupdate/lo.patch contains whatever modifications are needed to adapt the functionality, while external/onlineupdate/gtk3deprecated.patch fixes > workdir/UnpackedTarball/onlineupdate/onlineupdate/source/update/updater/progressui_gtk.cpp:97:21: error: use of undeclared identifier 'gtk_vbox_new'; did you mean 'gtk_box_new'? > 97 | GtkWidget* vbox = gtk_vbox_new(TRUE, 6); > | ^~~~~~~~~~~~ > | gtk_box_new to not use the deprecated gtk_vbox_new, which is hidden because we include -DGTK_DISABLE_DEPRECATED in our GTK3_CFLAGS as per our configure.ac. On Windows, the definition of __BYTE_ORDER__ etc. is needed because workdir/UnpackedTarball/onlineupdate/include/mozilla/ says "Our supported compilers provide architecture-independent macros for this", but MSVC doesn't actually, so define here what would implicitly be defined by GCC. Similarly, on Windows -U_WIN32_WINNT is needed to undo -D_WIN32_WINNT=0x0601 in solenv/gbuild/platform/windows.mk, which would cause > workdir\UnpackedTarball\onlineupdate\include\mozilla/WinHeaderOnlyUtils.h(537): error C2065: 'FILE_ID_INFO': undeclared identifier etc., despite the #include <windws.h> there. Curiously, the original gb_CustomTarget_CustomTarget,onlineupdate/generated from onlineupdate/CustomTarget_generated.mk had to be renamed to gb_CustomTarget_CustomTarget,external/onlineupdate/generated when the file was moved to external/onlineupdate/CustomTarget_generated.mk, as otherwise a top-level `make CustomTarget_onlineupdate/generated` would have failed with "No rule to make target..." Also, as there is no gb_CustomTarget_use_unpacked, its effect has been poorly mimicked for now in external/onlineupdate/CustomTarget_generated.mk. Similarly, as there is no gb_WinResTarget_use_unpacked, its effect has been poorly mimicked for now in external/onlineupdate/WinResTarget_updater.mk. The original onlineupdate/workben/test_dialog.cxx, which is actually code written by us, has been moved to external/onlineupdate/workben/test_dialog.cxx. The original onlineupdate/qa/ sources (which were apparently not used during the build) have been preserved for now as external/onlineupdate/qa/, for documentation purposes. The original onlineupdate/astyle.options (which was apparently not used during the build) has been removed. Change-Id: I5ea606202e7837269e7b128e45af2f0b8c277f9e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160492 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de> (cherry picked from commit 90255d8931af23e3b81a0d921699632bf323af29) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160804
2023-12-14tdf#158576 Show warning when cert is not yet/no longer validSamuel Mehrbrodt
Change-Id: I4f517a5e2b33d508d1a501323c4d97dc025edfbc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160566 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> (cherry picked from commit 69814fc26fe21a258cf32fca021945f5bc69f59c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160751 Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2023-12-13Split --with-update-config=... into many --with-online-update-mar-...=...Stephan Bergmann
...and allow each of them to be left off, for debug purposes, even if that may render the resulting --enable-online-update-mar feature non-functional. This change tracked each item that was potentially read from the --with-update-config ini file, and turned each of them into a new --with-online-update-mar-... option. The only exception and remaining TODO is bin/update/upload_build_config.py (called from Makefile.gbuild). distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf (which might well be dead) set --with-update-config=~/updater.ini with an ini file of unknown content. So that no items are silently missing if we ever resurrect that distro-config, I set all of the new options to =TODO there for now. Change-Id: I17a13e0d190a868436bac10c1b0a6675d8c704c0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160622 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de> (cherry picked from commit e88bb8f6be937aeb951f1a64b4ff4e8c7e1280cc) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160636
2023-12-07simplify and modernise ScopedBitmapAccessNoel Grandin
(*) Make all of it use a "Scoped" paradigm (*) pass by value, no need to allocate on heap (*) make all of the construction go via the *Access constructors, instead of it being some via the constructors and some via the Acquire*Access methods. (*) take the Bitmap& by const& in the constructor, so we can avoid doing const_cast in random places. Change-Id: Ie03a9145c0965980ee8df9a89b8714a425e18f74 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160293 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-12-01move the SfxItemPoolCache to sc/Noel Grandin
and rename it to ScItemPoolCache, since its only use is to handle ScPatternAttr objects Change-Id: I68a2dd5f47fcf902f9df552e1a1767d5061d85d5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160162 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-11-30Use "set logging enabled on/off" instead of deprecated "set logging on/off"Julien Nabet
With GNU gdb (Debian 13.2-1) 13.2, I noticed this trace on console when using --backtrace Warning: 'set logging on', an alias for the command 'set logging enabled', is deprecated. Use 'set logging enabled on'. Change-Id: Ic03911ea94aff57dee8f594744147302ef01a1ed Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160143 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2023-11-25Update solenv/flatpak-manifest.inStephan Bergmann
* Incorporate <https://github.com/flathub/org.libreoffice.LibreOffice/commit/e8d48d8a15c9069dd420eac9f651f81fb377567b> "Update runtime to 23.08" * Adapt to recent FONT_NOTO_* change * Adapt to 3d5cafbe1727a95a54eb4a65d98d6d79ec46f0c8 "tdf#157518: external: bundle zxcvbn-c" Change-Id: Ia956a35c99f487b56a0f58bb591bea366faddbce Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159926 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
2023-11-25Simplify UITest's custom configuration handlingMike Kaganski
Change-Id: I20d7d3a17b3a0ca817ee5acdab77f51983852078 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159898 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2023-11-25tdf#156243 Fix off-by-one bug for autocorrectMatt K
This change removes the "-1" from the code that applies the autocorrection so that the entire string to be autocorrected is replaced, instead of leaving off the last character. Also, the starting character of the string is preserved (i.e. non-bold if changing to bold) by adding 1 to the start position; this is for the case when the user cancels the autocorrect dialog. Change-Id: Ibe500a1ba0ca5b12ec9c918b51353074b8dd12ec Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154685 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2023-11-22Drop a redundant CR cleanupMike Kaganski
Commit 77779166569da389de44075b3d03413b353046a4 (Remove stray CR from input, 2017-03-09) had introducing the removal of CR from CRLF generated by MSVC's cl.exe -showIncludes. Then, commit e9b9a456221b4b0660f90efa1ee092ea00c2c728 (gbuild: strip away unexpected CR char at the end of Windows filenames, 2017-07-26) added a replacement doing the same, but using a literal CR instead of "\r". It had in its commit message: > seen with 2013 on libreoffice-5-2, but there is no > indication that 2015 on master would be different libreoffice-5-3-branch-point was tagged on 2016-11-23 (commit 4136757b4e51c4e6f7cb4132c95538a7f831ef2c), so the 5-2 branch did not contain the former change, and so the premise that "master would be no different" was likely incorrect. Change-Id: If992eb826c5d6c2868c9bd706ae51847fe69eda7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159754 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2023-11-17Don't reuse --unit values across (sequential, even) systemd-run invocationsStephan Bergmann
At least some old versions of systemd-run apparently have occasional issues when sequential invocations reuse the same --unit value, as <https://ci.libreoffice.org/job/lo_ubsan/2982/> now (i.e., after the machine was updated to auto-detect --with-coredumpctl) failed with > [build CUT] basctl_dialogs_test > LO_TEST_LOCALE=de > Running scope as unit: -home-tdf-lode-jenkins-workspace-lo_ubsan-workdir-CppunitTest-basctl_dialogs_test.test:20231117013657:704127.scope [...] > LO_TEST_LOCALE=en-US > Running scope as unit: -home-tdf-lode-jenkins-workspace-lo_ubsan-workdir-CppunitTest-basctl_dialogs_test.test:20231117013657:704127.scope [...] > LO_TEST_LOCALE=fi > Failed to start transient scope unit: Unit -home-tdf-lode-jenkins-workspace-lo_ubsan-workdir-CppunitTest-basctl_dialogs_test.test:20231117013657:704127.scope already exists. Change-Id: If009e26231228bec739637e4140be90c0b86d6b2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159569 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-11-16tdf#146386 remove references to FTP UCP codeMichael Stahl
Change-Id: I85f83c3d83f3de59a929ed053e0e92bb10bdcc5b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159498 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2023-11-16Format optaboutconfig with clang-formatSamuel Mehrbrodt
Change-Id: Ia696e096f972fe722920238c3710d20a3f03b221 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159374 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>
2023-11-15tdf#157518: enforce password policy on sfx2/ui/password.uiSarper Akdemir
Change-Id: I115b5b05ed82f2f900bcd70ec4f52c7f749544e7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159443 Tested-by: Jenkins Reviewed-by: Sarper Akdemir <sarper.akdemir.extern@allotropia.de>
2023-11-10Improve error logging in remove_Files_Without_SourcedirectoryMike Kaganski
Change-Id: I7ed7c08bd57bb5d1b11bc7c029decd571a6758f5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159236 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2023-11-09enable unchecked lint for our java codeNoel Grandin
and annotate where necessary, mostly just suppressing the warnings Change-Id: I8e39d797cde6c7c3f4e3e1bd93a128965ecec81d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159205 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-11-09gbuild: remove not needed gb_UITest_use_oneprocessMiklos Vajna
It's the default. If one wants to opt out, gb_UITest_avoid_oneprocess should be used. Change-Id: I52433b20f63c06abf8cb15b8bd26da845ecee00c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159185 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2023-11-09tdf#157431 Show description for expert config itemsSamuel Mehrbrodt
Change-Id: I7d0257c2e06ed384f90ca3b51a6d2549044f2cf3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157148 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>
2023-11-08new loplugin:fieldcastNoel Grandin
new plugin to look for class fields that are always cast to some subtype, which indicates that they should probably just be declared to be that subtype. Perform one of the suggested improvements in xmlsecurity/ Change-Id: Ia68df422c37f05cbcf9c02ba5d0853f8eca4f120 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159063 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-11-07specify the reason for listing zxcvbn-c among build toolsSarper Akdemir
Change-Id: I814cebc6e8ca4815c055ed6f524bfebf08611ccc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159017 Tested-by: Jenkins Reviewed-by: Sarper Akdemir <sarper.akdemir.extern@allotropia.de>
2023-11-06add --with-system-zxcvbnRene Engelhard
Change-Id: I9a90585d8eb498861a6ef4752ab85dcff8eeaab6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158674 Tested-by: René Engelhard <rene@debian.org> Reviewed-by: René Engelhard <rene@debian.org>
2023-11-05Fix typoAndrea Gelmini
Change-Id: Ie41ca6c56bf44b04bd2d65b6cb64594d66295f24 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158951 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2023-11-05Fix typoAndrea Gelmini
Change-Id: I84186bee245a95a74e92c974ca94bb81c31ee1ac Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158950 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2023-11-05limit parallelism during msi packaging stage to avoid cscript failuresChristian Lohmaier
with high parallelism there's a high risk of running into random failures when calling WiLangId.vbs via cscript. The limiter doesn't use make's jobserver since it is too easy to deadlock the build since all jobs are started at once, consuming all slots, but in addition all wait for an additional slot that never is made available because all jobs are blocked waiting.... All jobs being started at once and all jobs getting started from that point on getting put under the limiter's control makes this simple approach with separate grab/release calls possible. If they were spread out the semaphore wouldn't be available (gets closed/removed as soon as nothing waits for it anymore) Change-Id: I345f2904a1d7e8989720722415fb51282ab3b05b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158886 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2023-11-03gbuildtojson: announce every targetMike Kaganski
vs-ide-integration takes tens of minutes on my system; and most of the time, it didn't output anything to the terminal. Every target handled by gbuildtojson takes ~2 s; with more than 870 targets, it makes sense to show the progress to avoid making an impression of a hang. The "GBJ" abbreviation (for "gbuildtojson") was not used in the output before. Change-Id: I71ab3ae59d1034f47140aad0dab6ed170140acb3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158846 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2023-11-02VS IDE integration: enable Python pretty printers when debugging a WSL buildMike Kaganski
See https://learn.microsoft.com/en-us/cpp/linux/deploy-run-and-debug-your-linux-project#debug-with-attach-to-process Change-Id: I16d50ebe5f087518de1953ea1f9aad4180714cc7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158789 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2023-11-02tdf#158038 fix opening pdf files in appstore ver (sandbox issue w/ helper tool)Christian Lohmaier
https://developer.apple.com/documentation/xcode/embedding-a-helper-tool-in-a-sandboxed-app "Adding other entitlements to the tool can cause problems. If the tool immediately crashes with a code signing error when your app runs the tool, check that the tool is signed with just these two entitlements: com.apple.security.app-sandbox and com.apple.security.inherit." This is indeed what happened.. Change-Id: Id03948c03b7d453aae4ca58719f582576e30a16f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158790 Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2023-10-30tdf#157518: external: bundle zxcvbn-cSarper Akdemir
Integrates zxcvbn-c as a static library. zxcvbn-c is C/C++ implementation of https://dropbox.tech/security/zxcvbn-realistic-password-strength-estimation. This is the first step for introducing a password strength meter. Some example projects that utilize zxcvbn-c are KeepassXC, monero-gui. ExternalProject_zxcvbn-c takes care of the dictionary node generation bits resulting in the dict-src.h Then StaticLibrary_zxcvbn-c depends on ExternalProject_zxcvbn-c and uses the generated bits and the zxcvbn-c source to compile the library. It should be possible to get rid of dictionary node generation bit with a patch that includes a constant dict-src.h that's what monero-gui does for example. But this might also obfuscate what dict-src.h is. Right now the dictionary that is included with zxcvbn-c only targets English, so that might be something to improve upon. Change-Id: Ic2b0a558cff341114d69fbdc257979a28bf5c865 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157565 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Tested-by: Jenkins Reviewed-by: Sarper Akdemir <sarper.akdemir.extern@allotropia.de>
2023-10-27At least use the oldest available -std:c++14 for MSVC gb_CXX03FLAGSStephan Bergmann
...if we don't have a proper -std:c++03 available Change-Id: Iffef738be486b402a2b6af1a2761eb905ac4ddf2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158550 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-10-27vcl: move textlayout.cxx from gdi to text directoryChris Sherlock
Change-Id: Ia8efd1d984c94b4fa6d77759fa8c8ec8834ac140 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157415 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>