summaryrefslogtreecommitdiff
path: root/solenv
AgeCommit message (Collapse)Author
2021-04-13external: update pdfium to handle redact annotationsMiklos Vajna
external: update pdfium to 4203 (cherry picked from commit 4488be8a9279be0bd0aebd476589a49d2b95da6e) Update one mention of pdfium-4137.tar.bz2 ...left behind by 4488be8a9279be0bd0aebd476589a49d2b95da6e "external: update pdfium to 4203" (cherry picked from commit ba4b3d5f7a0fe8d0d985e98897e041d59093d8b0) external: update pdfium to 4260 (cherry picked from commit f19381e46930bb496e7331754843920933fb4be2) external: update pdfium to 4306 (cherry picked from commit fe531957e3dcd42927cf15ab31d04473433d81f9) Conflicts: include/vcl/pdf/PDFAnnotationSubType.hxx Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105913 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit b4f50e78e9cd391964128bd0d1446d4dca110cef) Change-Id: Ic10cf99fa412f8f0b3475e82d0a1839a7f04bd08
2021-03-29postgresql: upgrade to release 13.1Michael Stahl
Fixes CVE-2020-25694, plus a bunch more CVE that don't look relevant. * --with-krb5 no longer exists, neither does --disable-shared * remove internal-zlib.patch.1: zlib is only used by pg_* tools / contrib/pgcrypto * remove postgresql-libs-leak.patch: some relic from pre-gbuild times, not clear what the point is for static libs * remove postgresql-9.2.1-libreoffice.patch: another dmake .mk file relic, and the win32 nmake build system was removed * add postgres-msvc-build.patch.1 to fix Cygwin perl and openssl * on WNT, libpq.dll is now built, no longer static lib postgresql: fix mistake in RepositoryExternal.mk Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109640 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 234833f7823a1424b62c93e145f0cfe2c6b6efd5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109698 Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> (cherry picked from commit 1362bf7fa2957d34a7cef18dd95ede22cc42787f) Change-Id: Ic0232a28801b2f604d9f4e33d5621ae3362defaa
2021-03-26mariadb: upgrade to release 3.1.8Michael Stahl
Fixes CVE-2018-3081 CVE-2020-2574 CVE-2020-2752 CVE-2020-2922 CVE-2020-13249 Remove obsolete patches: * mariadb-msvc.patch.1 * mariadb-swap.patch * mariadb-inline.patch.1 * mariadb-CONC-104.patch.1 Don't build anything from plugins/ in the hope that it's not needed. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96466 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit fe041bbc343ee08c6e901f63985d55a90da71c8b) mariadb: forgot to adapt flatpak-manifest.in mariadb: the "pvio_socket" plugin turns out to be important ... otherwise can't connect to a TCP socket. (regression from fe041bbc343ee08c6e901f63985d55a90da71c8b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96536 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 82a1650683df7d5c1769dfd68a26a4d071f1a546) Change-Id: I1c8633866b7108a8bb22dae0e0dd5f4a44bf5150 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96519 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit 329c83c57989948d16b4e4d646607b93ee407a9e)
2019-05-22Add content_rating to AppData filesStephan Bergmann
At least building on Flathub makes presence of this information a hard requirement now (see <https://blogs.gnome.org/hughsie/2019/03/28/ new-appstream-validation-requirements/> and witness the failed <https://flathub.org/builds/#/builders/32/builds/3597>). The suggested way to calculate that information is via the form at <https://hughsie.github.io/oars/generate.html>, which I filled in as follows (the answers I selected are prefixed with "=>"): > By answering all the questions you can generate AppStream-compatible markup > for the upstream AppData file. > > If the user is able to "enable" NSFW or "adult" content, then this should be > included in the assessment even if it is turned off by default. > > What type of component are you generating content for: => Application that can connect to the Internet > OARS has multiple versions, and the newer versions include more questions > involving specific cultural and religious sensitivities. What version of OARS > metadata do you want to produce: => 1.0 (works with all clients) > Advertising > > Defined as the activity of producing advertisements for commercial products or > services. > > For example, this would include banners showing the Coca-Cola logo shown in a > Soccer game. => None > Gambling > > Defined as taking a risky action in the hope of a desired result. > > For example, this would include spinning a wheel to get in-app credits. => None > In-App Purchases > > Defined as items or points that a user can buy for use within a virtual world > to improve a character or enhance the playing experience. => None > Online Text-only Messaging > > Defined as any messaging system connected to the Internet. => None > Online Audio and Video Messaging > > Defined as any multimedia messaging system connected to the Internet. => None > Contact Details > > Defined as sharing identifiable details with other users to allow out-of-band > communication. => None > Information Sharing > > Defined as sharing information with a legal entity typically used for > advertising or for sending back diagnostic data. > > For example, this would include sending your purchasing history to Amazon. => None > Location Sharing > > Defined as sharing your physical real-time location. > > For example, this would include uploading the GPS co-ordinates of your current > location. NOTE: This does not include heuristic based location services, e.g. > GeoIP and others. => None > The following markup can be pasted into the existing application AppData file. > > <content_rating type="oars-1.0" /> Change-Id: I063484d8031892c20f88999c5a9beeae3666511c Reviewed-on: https://gerrit.libreoffice.org/72581 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 0a13609598138a856e552ca3f35ea2d6fa433865) Reviewed-on: https://gerrit.libreoffice.org/72667 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-05-03Support "Preview in Web Browser" in Flatpak modeStephan Bergmann
...by storing the temporary HTML document in a location that can be accessed by the browser running outside the Flatpak sandbox. This reuses and extends the mechanism already in place for the new HTML-based help in Flatpak mode (see 72b936d70b7eaa6d9f5f911b27e3c955382de967 "Enable --help=html for flatpak"). This fixes <https://github.com/flathub/org.libreoffice.LibreOffice/issues/85> "“Preview in Web Browser” does not work in Flatpak version". Change-Id: I5f73fd89139ffe6b8ab0dc501154b4f054a0ae5c Reviewed-on: https://gerrit.libreoffice.org/71570 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit c61e7b9940cb30800d6f1000727f9cfd5de9fa5e) Reviewed-on: https://gerrit.libreoffice.org/71717 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-04-18Disable OpenCL by default for LO FlatpakStephan Bergmann
...merging <https://github.com/flathub/org.libreoffice.LibreOffice/commit/ 2c72c8b2c9beb4995c5a57b4eedf05f6c7ff248d> "Disable OpenCL by default for LO Flatpak": "This fixes <https://github.com/flathub/org.libreoffice.LibreOffice/issues/82> 'LibreOffice cannot be launched with flatpak in normal mode on ASUS E402YA', where LO was found hanging (for as yet unclear exact reasons) on one machine when OpenCL was enabled. There have been other issues with OpenCL like <https://bugzilla.redhat.com/show_bug.cgi?id=1432468> 'LibreOffice crashes on startup' on Fedora, so for a Flatpak build targeting a wide range of distros, the conservative approach is probably to disable OpenCL by default and have users explicitly enable it instead." Change-Id: I887137d1ceb5d97f007f09cba636c59f197f1bff Reviewed-on: https://gerrit.libreoffice.org/70928 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit db698a94ad52d1fbc387df66845907595615bb4f) Reviewed-on: https://gerrit.libreoffice.org/70931
2019-04-13Adapt solenv/flatpak-manifest.in to recent download.lst changesStephan Bergmann
Reviewed-on: https://gerrit.libreoffice.org/70638 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit bc8b40ecbc140217b9b55a44adce506d724af297) Conflicts: solenv/flatpak-manifest.in Change-Id: I9b8bb016721f35032fe214f977f9463c241084ea Reviewed-on: https://gerrit.libreoffice.org/70649 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-04-11tdf#124503: Support JRE installations with unknown java.vendor propertyStephan Bergmann
After recent additions of 61c4f96d6ae6a80370774e53287edb27cbce8067 "Support AdoptOpenJDK" and 41507db590b24e1b9b45d95cad55c71ba2e4091d "Support Amazon Corretto" to our hard-coded list, there is now reports that at least Debian and Ubuntu tried to distribute versions of OpenJDK with the java.vendor propety set to string like "Debian" or "Ubuntu". Instead of trying to catch up with an ever-growing hard-coded list, it is probably better to stop relying exclusively on such a hard-coded list, and for unknown vendor values, try out whether the SunInfo backend (which supports the "generic" OpenJDK) would be able to handle the given JRE. (For simplicity, assume that any versions of such JREs are supported. Our baseline is Java 6, and there are unlikely any older versions of JREs from unknown vendors out there. If this turns out to be problematic, we could include information about problematic vendors after all, or add a general check that JREs from unknown vendors are at least Java 6.) Many functions in jvmfwk/inc/vendorplugin.hxx that used to take a set of sVendor/sMinVersion/sMaxVerison/arExcludeList paramters had to be revised to take a vendorSettings parameter instead, and VendorSettings::getVersionInformation has been changed to return a boost::optional, so that unknown vendors can be handled gracefully. Change-Id: Ibf915f2ddd59e09b77e2c03be688cac0547b9ac9 Reviewed-on: https://gerrit.libreoffice.org/70460 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 3d27b2fa9c5a03f78e5145377402f8a88e3da1be) Reviewed-on: https://gerrit.libreoffice.org/70586 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-03-04Speed up languagepack installationMichael Schroeder
Reorder the order the filelists are initialized per package. Optimize speed of find_files_for_package: We can simply check if the modules entry is the same as last time. The code uses iterators instead of that C-ish for loops. Create a hash from the packagemodules to speed up the check if a module is included in the hash. Change-Id: I1e8ae394634a527880e08ef8ff333d94d04f49fd Before: 12s per language/package After: <1s per language/package Reviewed-on: https://gerrit.libreoffice.org/68339 Tested-by: Jenkins Reviewed-by: Tomáš Chvátal <tchvatal@suse.cz> (cherry picked from commit 6cf3f1fe4b77347f7b327f28e03941a95b9536b3) Reviewed-on: https://gerrit.libreoffice.org/68352 Reviewed-by: Andras Timar <andras.timar@collabora.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2019-02-14Merge in Flatpak improvementsStephan Bergmann
...from <https://github.com/flathub/org.libreoffice.LibreOffice/>: commit ab8032d1e660db5e77ec7b64ac1d02e27941dfc5 Merge: d1aa013 42b6543 Author: stbergmann <sbergman@redhat.com> Date: Wed Feb 13 10:01:33 2019 +0100 Merge pull request #73 from flathub/fix-quoting fix quoting commit 42b6543ee833e5610465118bbea310ab87807d48 Author: Stephan Bergmann <sbergman@redhat.com> Date: Tue Feb 12 16:34:08 2019 +0100 fix quoting commit d1aa013fb631191174f6eb4d390ad5ea0b68a053 Merge: 35de93f dd48ab6 Author: stbergmann <sbergman@redhat.com> Date: Tue Feb 12 10:33:21 2019 +0100 Merge pull request #69 from flathub/dotty-app-IDs rename sub-app .desktop files so they are strict sub-IDs commit dd48ab67b00859a36c3f40a08112afb6078deecc Author: Robert McQueen <rob@endlessm.com> Date: Fri Jun 1 12:27:05 2018 +0100 rename sub-app .desktop files so they are strict sub-IDs The org.libreoffice.LibreOffice-foo names are not actually sub-IDs of org.libreoffice.LibreOffice which means that Flatpak will not export the additional components in the appstream. Change the - to . so that the sub-apps are correctly within the org.libreoffice.LibreOffice namespace rather than a mere prefix match. Set the X-Flatpak-RenamedFrom list in the .desktop files to include both the original upstream names and the - delimited old IDs that we used previous in the Flatpak. https://github.com/flathub/org.libreoffice.LibreOffice/issues/36 Reviewed-on: https://gerrit.libreoffice.org/67737 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit e69843768707146dcd9c294b2cabe721f37e90ac) ...plus follow-up e31c2c03f9ff06df553e577a1d9149ce75e7ff7f "Move desktop-file-edit calls to assemble-flatpak.sh" Change-Id: I27f9971e2b9297c24904c5095c1091d89d2e7800 Reviewed-on: https://gerrit.libreoffice.org/67804 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Jenkins
2019-02-11Merge in Flatpak improvementsStephan Bergmann
...from <https://github.com/flathub/org.libreoffice.LibreOffice/>: commit 35de93fdcbfc7c7f6972812535e832f1405658cb Merge: b397586 06020ec Author: stbergmann <sbergman@redhat.com> Date: Mon Feb 11 10:18:24 2019 +0100 Merge pull request #70 from Erick555/patch-1 Update gvfs to 1.38.1; apache-ant to 1.10.5 commit 06020ec8be69c8c2d22265c7066c2b838d231400 Author: Erick555 <37542552+Erick555@users.noreply.github.com> Date: Sat Feb 9 21:24:57 2019 +0100 Update apache-ant to 1.10.5 commit 7c0a9d3fcd5988bc955bf5d67aa3249d45727bb4 Author: Erick555 <37542552+Erick555@users.noreply.github.com> Date: Sat Feb 9 21:19:16 2019 +0100 Update gvfs to 1.38.1 * use meson as autotools support was removed. * use same config options as gnome runtime does: https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-30/elements/sdk/gvfs.bst#L17 Change-Id: Ib4314ea49220bcac01fafb600065e41b434c395b Reviewed-on: https://gerrit.libreoffice.org/67672 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 4c6a70cab642fa83faf9344052c7ed1543ea49aa) Reviewed-on: https://gerrit.libreoffice.org/67680 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-01-29Put back missing external/tarballs/ path in solenv/flatpak-manifest.inStephan Bergmann
...that accidentally got lost in 6584a5d9d1bb3e9b00e529358c989e8485071e36 "Upgrade libatomic_ops to latest libatomic_ops-7.6.8.tar.gz" Change-Id: I79823428499efb951761c4d55eb16e154397ce60 Reviewed-on: https://gerrit.libreoffice.org/67081 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 5543f99067a7aa1bc0a52fabe5bc693ec7d6fcbf) Reviewed-on: https://gerrit.libreoffice.org/67094 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2019-01-29Upgrade libatomic_ops to latest libatomic_ops-7.6.8.tar.gzStephan Bergmann
...from <https://github.com/ivmai/libatomic_ops/wiki/Download>. (The md5sum given there is 99128f05e3e3f4e0cd39aa23f23bbe0c.) The old version of external/libatomic_ops failed to build at least when building a Flatpak for aarch64, see <https://flathub.org/builds/#/builders/39/builds/702/steps/5/logs/stdio>: [...] > Making all in src > Making all in atomic_ops > Making all in sysdeps > In file included from atomic_ops_stack.h:32, > from atomic_ops_malloc.c:20: > atomic_ops.h:343:4: error: #error Cannot implement AO_compare_and_swap_full on this architecture. > # error Cannot implement AO_compare_and_swap_full on this architecture. > ^~~~~ > atomic_ops.c:97:1: error: unknown type name ‘AO_TS_t’; did you mean ‘AO_TS_T’? > AO_TS_t AO_locks[AO_HASH_SIZE] = { > ^~~~~~~ > AO_TS_T [...] (cf. <https://github.com/flathub/org.libreoffice.LibreOffice/pull/67/commits/ 48b22dbabc06f1822df74f755096cf0ea5ba2499> "Upgrade libatomic_ops to latest libatomic_ops-7.6.8.tar.gz") Change-Id: Icc040cc47f45f71577995a2ff9c63df97150bdea Reviewed-on: https://gerrit.libreoffice.org/66983 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 6584a5d9d1bb3e9b00e529358c989e8485071e36) Reviewed-on: https://gerrit.libreoffice.org/67006 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-01-28aarch64 and arm need libatomic_opsStephan Bergmann
(cf. LO's configure.ac, needed for external/firebird on non-x86[-64]), but org.freedesktop.Sdk//18.08 apparently doesn't provide it (while org.freedesktop.Sdk//1.6 apparently did) (cf. <https://github.com/flathub/org.libreoffice.LibreOffice/pull/67/commits/ b2762523a4678bedd55c11db232868cbaf9c7bdd> "aarch64 and arm need libatomic_ops") Change-Id: I6eb060251ce85bfd399b72d9c90a93497a3a9029 Reviewed-on: https://gerrit.libreoffice.org/66987 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 273e9694ee3920fed5cdf0da59d88f32a6294a2a) Reviewed-on: https://gerrit.libreoffice.org/67004 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-01-28org.freedesktop.Sdk//18.08 `uname -i` always returns "unknown"Stephan Bergmann
(cf. <https://github.com/flathub/org.libreoffice.LibreOffice/pull/67/commits/ deda15380b436ca8fe62e2ebc1feec8bcb6dd43e> "org.freedesktop.Sdk//18.08 `uname -i` always returns 'unknown'") Change-Id: Id158d769edb07aa09189907d120cb1e9cd8d9b17 Reviewed-on: https://gerrit.libreoffice.org/66985 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit fcc5fc76c33de566cb2d02be541dcbde29d1eb8a) Reviewed-on: https://gerrit.libreoffice.org/67003 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2019-01-17Adapt solenv/flatpak-manifest.in to recent download.lst changesStephan Bergmann
Reviewed-on: https://gerrit.libreoffice.org/66496 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 5e89aad61e143ad6a52291ef7065f5b22e348c85) Conflicts: solenv/flatpak-manifest.in Change-Id: I9400c8fa5b7763debc13274f7e001b6425d8392e Reviewed-on: https://gerrit.libreoffice.org/66524 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Jenkins
2019-01-05upload libetonyek 0.1.9David Tardon
Change-Id: Ib29e1a622e25731731512a695443ac2c530d30c2 Reviewed-on: https://gerrit.libreoffice.org/65701 Tested-by: Jenkins Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit c6e73f3e5bfd5b1cca94f985b5299857d0238ae3) Reviewed-on: https://gerrit.libreoffice.org/65712 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-01-05upload libcdr 0.1.5David Tardon
Change-Id: I01454cc35baf96743bd19e64dd3a7269c58621bf Reviewed-on: https://gerrit.libreoffice.org/65715 Tested-by: Jenkins Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit a8965ebc1b29ba578fc3e9cd6915e85e807d9fd6) Reviewed-on: https://gerrit.libreoffice.org/65726 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-01-05upload libqxp 0.0.2David Tardon
Change-Id: Idda6c0ce0c087a3be2e7fe31999a7d5a6fde4835 Reviewed-on: https://gerrit.libreoffice.org/65725 Tested-by: Jenkins Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 6aaed7c5165ea87c3a263fd9582c97892345120f) Reviewed-on: https://gerrit.libreoffice.org/65735 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-01-05upload libwpd 0.10.3David Tardon
Reviewed-on: https://gerrit.libreoffice.org/65714 Tested-by: Jenkins Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 87742f16e2d3f1c58534508b724268b9ce675c8e) Change-Id: I68e3791f50b95956bfe6aae743978994a5f232b4 Reviewed-on: https://gerrit.libreoffice.org/65719 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-01-05upload libwpg 0.3.3David Tardon
Change-Id: Iac2c3f75eda07b7381e57dba389c9836ab26502f Reviewed-on: https://gerrit.libreoffice.org/65781 Tested-by: Jenkins Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 927c42e080221c833fd418e9cfd6d18acc7d63c0) Reviewed-on: https://gerrit.libreoffice.org/65803 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-01-04upload libcmis 0.5.2David Tardon
Reviewed-on: https://gerrit.libreoffice.org/65646 Tested-by: Jenkins Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit b3c7bf54b56441441f88bf906f6d01cc522ffd3c) Change-Id: I0a7e888af770a332e2fec057507eecebf83621c4 Reviewed-on: https://gerrit.libreoffice.org/65689 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-01-03Update Flatpak to OpenJDK11Stephan Bergmann
see <https://github.com/flathub/org.libreoffice.LibreOffice/issues/57> "OpenJDK 11 is available". Change-Id: Ie24ed7349ca9a4a57c1a8d18d10b29c4a37e259c Reviewed-on: https://gerrit.libreoffice.org/65830 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 5a2f1545134ec25d9bcb5f0d64bc7db8dc5aeb37) Reviewed-on: https://gerrit.libreoffice.org/65831 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2018-12-20Enable --help=html for flatpakStephan Bergmann
To not increase the size of the main org.libreoffice.LibreOffice app further, the plan was to realize this as an org.libreoffice.LibreOffice.Help extension. Ideally, this would be a localized extension, so that, by default, only a relevant subset of the extension would be downloaded and installed. (But see below.) There are multiple technical problems, as discussed at <https://github.com/ flathub/org.libreoffice.LibreOffice/issues/35#issuecomment-447295308> "Add integrated LibreOffice Help offline": * LO can't pass a file URL with query part to xdg-open, so uses a temporary wrapper .html file that redirects to the target URL. But for the flatpak case this wrapper can't be in /tmp (which isn't visible from outside the flatpak sandbox), but is instead stored in a new temp dir under $XDG_CACHE_HOME (which is always set for flatpaks and /is/ visible form the outside) that is removed on LO exit. * The file URL stored in the temp file must be rewritten from the internal path (/app/libreoffice/help/...) to the path as seen outside the flatpak sandbox. While the path for the org.libreoffice.LibreOffice /app is stored in /.flatpak-info, the external path for the org.libreoffice.LibreOffice.Help extension is different and not stored there. So use a hack trying to construct that path from what information is available in /.flatpak-info. * But the help content consists of locale-specific and shared files, and those reference each other with relative links. But a localized flatpak extension cannot contain shared files, it can only contain per-language sub-dirs. And if the shared help files were kept out of the extension, as part of the app itself, the relative paths among these files inside the flatpak sandbox would differ from those outside of it, so would be broken when viewing the content in the external browser. A solution would either (a) need to somehow rewrite the content of all the help files being served from LO to the external browser, or (b) replicate the shared help files in all the extension's per- language sub-dirs (and if some localization uses en-US content as a fallback for only part of its translated content, e.g., in the case of media files, would need to also replicate that en-US content), or (c) use a non-localized extension that always contains the content for all localizations. For now, I chose the third approach. This makes the org.libreoffice.LibreOffice.Help extension relatively large (the current /app/libreoffice/help tree has a size of ca. 100MB), so that I decided to not have it downloaded and installed automatically ("no-autodownload": true in solenv/flatpak-manifest.in). (I checked with Flatpak 1.0.6 that if the extension should be changed to a localized one with the same name in the future, updating from an older version would work. If the old extension was not installed, just the relevant localizations of the new version will be downloaded and installed. If the old extension was installed, the full set of localizations of the new version will be downloaded and installed.) (As also mentioned at <https://github.com/flathub/org.libreoffice.LibreOffice/ issues/35#issuecomment-447295308>: "A second, minor, nuisance is that, for security reasons, an `xdg-open file:///...html` call from a flatpak leads to an intermediate popup dialog letting the user chose which application to use to open the URI, while e.g. an `xdg-open http:///...html` is allowed to go directly to the user's preferred browser. So accessing help content from LO flatpak would present that popup dialog first, forcing the user to select a browser to proceed.") Reviewed-on: https://gerrit.libreoffice.org/65451 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 72b936d70b7eaa6d9f5f911b27e3c955382de967) Change-Id: I35f5a23947dd551dc1b9bff1dd2abd6710073b5f Reviewed-on: https://gerrit.libreoffice.org/65482 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-12-19tdf121374 ooxmlexport: export H/F to default sectionJustin Luth
It wouldn't be terrible to duplicate headers/footers unnecessarily, but it is terrible to have them disappear. If the last SectPr has no idea about the section start, it can't know whether it is continuous or started with a page break. In that case, just ensure that the header and footer are explicitly written out. Change-Id: Iff54ed097b4f8692d7d7764089002b00fbde4f51 Reviewed-on: https://gerrit.libreoffice.org/64821 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/65363
2018-12-18Resolves: tdf#121676 - Update Liberation fonts from new sourceheiko tietze
Liberation updated from 2.00.1 to 2.00.4 and Liberation-Narrow from 1.07.4 to 1.07.6 Change-Id: I295f82d5b8230cdf8b3347491dd71c8689636d94 Reviewed-on: https://gerrit.libreoffice.org/65273 Tested-by: Jenkins Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com> (cherry picked from commit 9eacb42ca081302faa62ac0f8c0af0adfa0e920b) Reviewed-on: https://gerrit.libreoffice.org/65297
2018-12-13weld SwCaptionDialogCaolán McNamara
Change-Id: I5babfbf3489f88c5d6cdeffbd514d86368f04fa9 Reviewed-on: https://gerrit.libreoffice.org/65014 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 72ebf150ab1f35a65de7c99e0227af77bae72be9) Reviewed-on: https://gerrit.libreoffice.org/65078
2018-12-12weld SwCaptionOptPageCaolán McNamara
Change-Id: I3373a39d6d8b39717b7aec69544a9d2957db15d8 Reviewed-on: https://gerrit.libreoffice.org/65043 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-12-11mythes is included in org.freedesktop.Sdk//18.08Stephan Bergmann
Change-Id: I9980f60ebe4cef26348fc26af6b56245260abcca Reviewed-on: https://gerrit.libreoffice.org/64937 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 1b6a0624c5ed6a2ecab18d52c32f6a2bfa09d375) Reviewed-on: https://gerrit.libreoffice.org/64958
2018-12-07Upgrade flatpak to org.freedesktop.Sdk//18.08Stephan Bergmann
...fixing <https://github.com/flathub/org.libreoffice.LibreOffice/issues/54> "Build against org.freedesktop.Platform 18.08" Change-Id: I70448277ce326075435932c75a837bd7be3d4508 (cherry picked from commit 9d6799c116cab67c43893e81904386d90992211e) Reviewed-on: https://gerrit.libreoffice.org/64775 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-12-07Drop obsolete font sources from flatpak manifestStephan Bergmann
...which are no longer used by the LO build since 0ce173b50fd12342979cf3f8f9b2d92267552060 "tdf#103080 Dont package Open Sans and PT_Serif fonts" Change-Id: I9ece7a85fe0003711eb23f332e617b780e6701cd (cherry picked from commit aa3584085d41c242341a810cae05995ea7850389) Reviewed-on: https://gerrit.libreoffice.org/64774 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-12-07Upgrade external/postgresql to postgresql-9.2.24Stephan Bergmann
...which is the latest 9.2.x currently listed at <https://www.postgresql.org/ftp/source/>. 9.2.1 doesn't build against OpenSSL 1.1 which dropped SSL_library_init (cf. <https://wiki.openssl.org/ index.php/Library_Initialization#libssl_Initialization>), and 9.2.24 apparently has that covered. (Ran into this when trying to upgrade the LibreOffice flatpak build to org.freedesktop.Sdk//18.08, which has OpenSSL 1.1.) On Windows, the new tarball as-is fails with > ..\..\port\chklocale.c(214): error C2037: left of 'lc_codepage' specifies undefined struct/union '__crt_locale_data' because at least in Windows Kits/10/Include/10.0.17763.0/ucrt/corecrt.h (included from Windows Kits/10/Include/10.0.17763.0/ucrt/locale.h), the relevant definitions are now > typedef struct __crt_locale_data_public > { > unsigned short const* _locale_pctype; > _Field_range_(1, 2) int _locale_mb_cur_max; > unsigned int _locale_lc_codepage; > } __crt_locale_data_public; > > typedef struct __crt_locale_pointers > { > struct __crt_locale_data* locinfo; > struct __crt_multibyte_data* mbcinfo; > } __crt_locale_pointers; > > typedef __crt_locale_pointers* _locale_t; which presumably has changed from a past state where that lc_codepage member was directly publicly accessible. <https://dev-www.libreoffice.org/src/postgresql-9.2.24.tar.bz2> is a copy of <https://ftp.postgresql.org/pub/source/v9.2.24/postgresql-9.2.24.tar.bz2>; `sha256sum postgresql-9.2.24.tar.bz2` reports the same a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126 as recorded in <https://ftp.postgresql.org/pub/source/v9.2.24/postgresql-9.2.24.tar.bz2.sha256> Change-Id: I196dd93aa03471042efba57ea639e1bb6655de98 Reviewed-on: https://gerrit.libreoffice.org/64730 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit a01ac385ed16fbe4239938c9d31462691707e87b) Reviewed-on: https://gerrit.libreoffice.org/64764
2018-12-07No need to bundle gst-libav in the flatpak any moreStephan Bergmann
756c9f2317605e39d9cb058e650962acd2d81739 "Merge upstream fixes into solenv/flatpak-manifest.in" had introduced it (via <https://github.com/flathub/ org.libreoffice.LibreOffice/commit/7d69e505165d4bbf5fa0b34b5fb2cbff9dfaf9bd> "For now, bundle gst-libav to be able to play mp4 videos in impress" to fix <https://github.com/flathub/org.libreoffice.LibreOffice/issues/20> "Impress don't insert a video" back when the LO flatpak was based on org.gnome.Platform//3.26 which doesn't contain /usr/lib/gstreamer-1.0/libgstlibav.so. (And /app/lib/gstreamer-1.0/libgstlibav.so is apparently the only file that the gst-libav module contributes to the LO flatpak.) When 727bfa2c87db170483c1e4ae895174295b070c77 "Merge in Flatpak improvements" switched the runtime to org.freedesktop.Platform//1.6 (via <https://github.com/flathub/org.libreoffice.LibreOffice/commit/ 7a2393f5fcab8c6938180c4718f2c61acd495528> "port to freedesktop.org 1.6 runtime") it kept the gst-libav module even though org.freedesktop.Platform//1.6 contains /usr/lib/gstreamer-1.0/libgstlibav.so. Lets assume it was kept by accident and can be removed. (At least the scenario from <https://github.com/flathub/ org.libreoffice.LibreOffice/issues/20#issuecomment-368543622> "Impress don't insert a video" still works with this change.) Change-Id: I692d01bfe5882c05d63124db7cdfa6390540e69f Reviewed-on: https://gerrit.libreoffice.org/64703 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 3c015ddfb8096e2b7adc49e3e0ac67c6c0dfd9c0) Reviewed-on: https://gerrit.libreoffice.org/64731
2018-12-06Adapt solenv/flatpak-manifest.in to recent download.lst changesStephan Bergmann
(cherry picked from commit d1a1c9fa49dd24ba9eaee4b865e9ad110e77b13e, adapting the pdfium block, which has only been upgraded to 3550 on libreoffice-6-2) Change-Id: Idffd274a18df14a96e61bf61ba09f837fdbbf9c7 Reviewed-on: https://gerrit.libreoffice.org/64670 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-12-04weld OfaAutoCorrDlgCaolán McNamara
Change-Id: Iba217a2998de57bf963872f9b8c1cf38694eb935 Reviewed-on: https://gerrit.libreoffice.org/64507 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-12-01weld SwGlossaryGroupDlgCaolán McNamara
Change-Id: I142123b474e0e35f6da375977e33d40e0ad39054 Reviewed-on: https://gerrit.libreoffice.org/64395 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-12-01weld OfaAutoCompleteTabPageCaolán McNamara
Change-Id: I84f051fd1dc127663fd510c81addb0fd0cdc2c26 Reviewed-on: https://gerrit.libreoffice.org/64393 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-12-01weld OfaAutocorrExceptPageCaolán McNamara
Change-Id: I735ca7d70045b278d6b885cc2de35bf76885b487 Reviewed-on: https://gerrit.libreoffice.org/64390 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-11-26weld DataSourceTabPageCaolán McNamara
Change-Id: I99b7c2ec397829c2f7ceb7ec18ae24195b9781e2 Reviewed-on: https://gerrit.libreoffice.org/64045 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-11-23weld SwFramePageCaolán McNamara
Change-Id: I12f868611860867df26bd29474aa19189c2b9a96 Reviewed-on: https://gerrit.libreoffice.org/63842 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-11-22weld SwCondCollPageCaolán McNamara
and put back original SvTreeListBox a11y factory use Change-Id: I4ad8ce29d8fed6ec5d44e9a1d641919a89226b79 Reviewed-on: https://gerrit.libreoffice.org/63501 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 47897fdd936d9b6e9ac8cb6110c79352ab080df7) Reviewed-on: https://gerrit.libreoffice.org/63770
2018-11-19weld TreeViewCaolán McNamara
a) use GtkTreeStores for GtkTreeViews b) ironically can't store GtkTreeStore contents in .ui apparently c) set show_expanders for all non-trees and unconverted cases d) on-demand subtrees Change-Id: I3c1036a222daba2c129b1a22ffeb3fe35005ae31 Reviewed-on: https://gerrit.libreoffice.org/63558 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-11-16Resolves: tdf#121246 crash in chart dialogsCaolán McNamara
Change-Id: I3bc720e44f5ea15749e6bc0f0fada3a17a783e23 Reviewed-on: https://gerrit.libreoffice.org/63463 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-11-16new loplugin buriedassignNoel Grandin
Change-Id: If6dd8033daf2103a81c3a7c3a44cf1e38d0a3744 Reviewed-on: https://gerrit.libreoffice.org/63466 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-11-16entirity of writer rebuilding when vcl widget headers changeCaolán McNamara
which seems a bit excessive Change-Id: If0ab5a33bfbbd399e270f3e140c9d44d843985aa Reviewed-on: https://gerrit.libreoffice.org/63422 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-11-16starmath: create XMLOasisMetaImporter instances with an uno constructorMiklos Vajna
Change-Id: Ie48a779958a393b68dea613c3bcc17113165f065 Reviewed-on: https://gerrit.libreoffice.org/63443 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2018-11-15Use C locale in UITestStephan Bergmann
b96180cb9bbec90b0faaf61c78c71bd4f6499e40 "uitest: set en_US.UTF8 for the LibreOffice instance" had made UITest use the en_US.UTF-8 locale (passed from LIBO_LANG to LC_ALL when starting soffice in uitest/libreoffice/connection.py), for unstated reasons. The mail sub-thread starting at <https://lists.freedesktop.org/archives/libreoffice/2018-October/081318.html> "Re: master build problems with en_US.utf8 locale" now argues that support for an en_US.UTF-8 locale in the OS should not be necessary when building LO. While absence of OS-support for en_US.UTF-8 apparently doesn't break the UITests (see <https://lists.freedesktop.org/archives/libreoffice/2018-November/081375.html> "Re: master build problems with en_US.utf8 locale"), it feels better to make these tests not use the en_US.UTF-8 locale at all. At least for me, the tests ran fine when using the C locale instead. Change-Id: I23eb2ce540bb40a7b7d13c2a396e313966f03f6e Reviewed-on: https://gerrit.libreoffice.org/63360 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-11-14Prepare gb_AllLangHelp_add_helpfiles for special bookmark needsStephan Bergmann
...where (according to a request by buovjaga) in instdir/help/*/bookmarks.js, lines mentioning "/shared/explorer/database/" should appear with app:"BASE" instead of app:"SHARED". That change will come in a follow-up commit to the helpcontent2 repo. Change-Id: I7c99e5f89e001d1e507f283d16e2ee264f3ab33a Reviewed-on: https://gerrit.libreoffice.org/63364 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-11-14move fmtfieldCaolán McNamara
Change-Id: Ic3f4388ea2ca92d9e97d4a9e066eea07c7de79e5 Reviewed-on: https://gerrit.libreoffice.org/63363 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-11-13CppunitTest_xmlsecurity_signing: turn on clang-format for this fileMiklos Vajna
This had manual consistent formatting. Recently it was broken, so bring back consisency by using clang-format. (And move the "if conversion fails" comment above CPPUNIT_ASSERT_MESSAGE() to avoid the need for an over-indented comment.) Change-Id: Id6a9231c044d7282c84a21152ffdfdcb8af3690d Reviewed-on: https://gerrit.libreoffice.org/63327 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
generated by cgit (git 2.34.1) at 2024-05-27 11:19:08 +0000