summaryrefslogtreecommitdiff
path: root/solenv
AgeCommit message (Collapse)Author
2019-02-26added necessary library for pdf export on Android ViewerMert Tumer
(Also needed for printing in the iOS app.) Change-Id: I01413493100fd110175ec85790899a130954c78e Signed-off-by: Mert Tumer <merttumer@outlook.com> Reviewed-on: https://gerrit.libreoffice.org/58688 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2019-01-22postprocess: Some .svg images were missing previously.Jan Holesovsky
Change-Id: I6c42b1f94f6510e42049bc7c7fc040f17e6edae6
2018-12-18Add more missing constructors from chart2/source/chartcore.componentTor Lillqvist
I think it would be better if native-code.py parsed the .component files it is interested in and just copied the constructor names from them to its output? Or are there many cases where it is a carefully manually selected subset of constructors from some .component file that should be put in the generated native-code.h, not all? But even in that case, if some constructor should not be linked in to a mobile app, that could be handled by adding some specific attribute in the .component file. Change-Id: Ib947279610f6755f112d3571512406c5d0cd620d
2018-12-18We need CartesianCoordinateSystem2d for chartsTor Lillqvist
Change-Id: I3edccbe29129f6d60a4ac4627a0ab646e4e42458 (cherry picked from commit 9bc20ed5e4338985d21542403cefaf3141fd481f)
2018-12-10Package separate SVG icon setsJan-Marek Glogowski
This change packages all SVG based icon sets in seperate zip files. It automatically generates the SVGs links.txt from the non-SVG version, if it doesn't exists by 's/\.png/\.svg/g'. Same for the _dark version, but this just copies it. This would also work for a _dark_svg version, if needed. The patch explicitly does't package sifr_svg and tango_svg. Change-Id: I8d7fda42d0ff9a2108ba8406bd4e82af4c54ff0c Reviewed-on: https://gerrit.libreoffice.org/62706 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
2018-12-07Add AnyCompareFactory_get_implementation and...Tor Lillqvist
... com_sun_star_comp_util_OfficeInstallationDirectories. Needed when loading a .ott document. Change-Id: I6074869074b47d2fb679132975520b18659b5c67 (cherry picked from commit f0b83878c2781ab6aa24bd5995155850920f4339)
2018-11-29We need svt, too, in the iOS app, for the image insertion featureTor Lillqvist
Change-Id: I5a656ab159eec44a537fc22da03763913372bc8f
2018-11-08LOK: custom themes: isolate LO internals headers from theme pluginAshod Nakashian
Change-Id: Ic189aecf092b9cffd800e410d2d6e88016c43052
2018-11-06Add function to map custom widget name to its function to native-code.pyTor Lillqvist
Use that function in the dialog builder instead of looking up the function dynamically, which won't work in a Release build as the linker will filter out functions that aren't explicitly referenced. For now this simply uses a manually curated list of custom widgets. I used some command line tools to extract the names of custom widgets used in our .ui files, and then filtered out some I guess (hope) will not be needed in a mobile app. For this to work the custom widgets need to have unique names. Currently that is not the case. Unless I did some mistake, there is just one case of duplicate name, NotebookbarTabControl, which exists both in the sfx and vcl libraries. (I simply filtered out that one, too, for now.) Change-Id: I29bbf6dfef2b3bde03acfc322495d051a7f275a8 Reviewed-on: https://gerrit.libreoffice.org/62946 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2018-10-30Workaround for file name case inconsistencyTor Lillqvist
Change-Id: Ia13dc01f86e51064658d5ad9a996c6bd555cbeef (cherry picked from commit 1d6d1eef3a6c3c14ea88eeeadb0119624bfa8056) Signed-off-by: Michael Meeks <michael.meeks@collabora.com>
2018-10-11tdf#120225 ww8import: keep textform nameJustin Luth
A bookmark cross-reference was trying to access the textform field by name, but an autogenerated __Fieldmark__ name obviously wasn't matching. Change-Id: I1018fecf44fda5d947b214c599f1a405f311e2ee Reviewed-on: https://gerrit.libreoffice.org/61565 Reviewed-by: Justin Luth <justin_luth@sil.org> Tested-by: Justin Luth <justin_luth@sil.org> (cherry picked from commit 4af4a473daf8b2530e6b6f5e49c7f4e3413f8378)
2018-08-30x86 Win MSP build fixAndras Timar
Change-Id: I2580fe0eacd5834047b50f36384ad9ea6c9d0354
2018-08-29[cp] Enable MSP patchingAndras Timar
Change-Id: Ib9059106e224622990823f2a3b790e5899256385
2018-08-28don't need dangling Library_mysqlcppconn.mkCaolán McNamara
Reviewed-on: https://gerrit.libreoffice.org/59607 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 74ef0185b1945d610c591b7ec3cda67e5c857d22) Change-Id: I18fbe9feead3d48d9437cc7372eb1373ffb67c3e
2018-08-28Moving mysqlc into connectivity as a libraryTamas Bunth
Additionally I erased the remains of the old mysql C++ connector. Also update the code where the clang plugins were unhappy after moving the mysqlc module. Remove mysql-cpp-connector external. Change-Id: I771cc7afacf5012fc349afb6b36828fb0fee5a66 Reviewed-on: https://gerrit.libreoffice.org/59200 Tested-by: Jenkins Reviewed-by: Tamás Bunth <btomi96@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/59713 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2018-08-10Adapt solenv/flatpak-manifest.in to recent download.lst changesStephan Bergmann
(cherry picked from commit 5c016d6ae4e59629cfd0b80c631f67cf46e42d3e) Conflicts: solenv/flatpak-manifest.in Change-Id: I7799abe1a6fc9cf79a751d76360ea7ad2face133 Reviewed-on: https://gerrit.libreoffice.org/57981 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit b36c5676a2f2eca8acc440d3bd1a4c5e0b834660)
2018-08-08move helpfiles pattern rule above the plaing get_target oneChristian Lohmaier
as mac's make might pick the one without the dependency on the direcotry when trying to "make" that <module>.helpfiles target Change-Id: I60a55be118bc9a41352dad94326247b02aef1dd6 Reviewed-on: https://gerrit.libreoffice.org/56960 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2018-08-08Missing dependency on directoryStephan Bergmann
Change-Id: Icaf0f54d3487c8286486d265ebb9790f6b9e0910 Reviewed-on: https://gerrit.libreoffice.org/55419 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-08-08(Partially) fix --with-help=html dependencies on .xhp filesStephan Bergmann
There are three rules in helpcontent2/CustomTarget_html.mk that process (with XSLT) all or some of the .xhp files in the helpcontent2/source/text/ tree (for en-US; or their translations in the workdir/HelpTranslatePartTarget/*/helpcontent2/source/text/ trees for other languages). Lists of all those .xhp files are defined in helpcontent2/AllLangHelp_*.mk (with gb_AllLangHelp_add_helpfiles), but the code in helpcontent2/CustomTarget_html.mk used `find` to assemble the relevant lists. That has two issues (at least for the en-US case operating on the untranslated helpcontent2/source/text/ files): For one, if the content of those .xhp files changes, the relevant XSLT processing is not re-run. For another, if .xhp files are added to or removed from the lists in helpcontent2/AllLangHelp_*.mk, the relevant XSLT processeing is not re-run, either. For the processing of translated .xhp files, there were already dependencies on those translated files in place. I assume (but have not really proved it) that those dependencies are already sufficient to cover both of the above issues. That only leaves the en-US case, operating on the untranslated files. The lists of .xhp files as defined in helpcontent2/AllLangHelp_*.mk (with "*" ranging over the various "modules": sbasic, scalc, schart, etc.) are now made available in gb_AllLangHelp_*_HELPFILES variables. The contents of those variables is used instead of `find` to pass the relevant .xhp files to the XSLT processings. (Needing some RESPONSEFILE and `xargs -n 1` boilerplate to feed individual files to the XSL processing without overflowing maximum command line lengths. Also, on Windows, var2file apparently writes CRLF line ends but the CR parts need to be filtered out again, and xargs problems must be worked around similar to df9edbcd2883cec2d0596133131cfbc220dee91f "Work around 'xargs: environment is too large for exec' errors on Windows".) However, those variables apparently cannot be used to specify dependencies for the three XSLT-processing rules. Presumably, the variables do not necessarily have their values assigned yet by the time the rules' dependencies are constructed (depending on the order in which .mk files are read?). So "dummy" gb_AllLangHelp_get_helpfiles_target targets are introduced, which depend on all the relevant .xhp files (and which get constructed during gb_AllLangHelp_add_helpfiles, just like the gb_AllLangHelp_*_HELPFILES variables), and which the XSLT-processing rules in turn depend on. That makes sure that the XSLT-processing rules are re-run when the content of .xhp files changes or when new .xhp files are added. However, the above still fails to re-run the XSLT-processing rules when .xhp files are removed. This is the core part of a commit spanning core and helpcontent2. Change-Id: I0cb5f83097db17fbd7ae8b528418b0ec24bee602 Reviewed-on: https://gerrit.libreoffice.org/55363 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-08-08Remove unused "add individual file to AllLangHelp" commandsStephan Bergmann
Change-Id: I7c5f2dadcbbe543a774f5fbdd52babd25b8b17d1 Reviewed-on: https://gerrit.libreoffice.org/55319 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-08-08Properly handle language-specific parts of --with-help=html media/ sub-treeStephan Bergmann
...that previously ended up in language-independent parts of installation sets. The structure of that media/ tree doesn't allow to directly mis-use the existing AllLangPackage machinery (which expects the language to be encoded in the first pathname segment within the tree; and which is already mis-used for the helpcontent2/AllLangPackage_html_lang.mk parts). So introduce gb_AllLangPackage_add_files_for_lang that allows to specify the language explicitly, independent of where it is encoded in the pathname (if at all). The underlying gb_AllLangPackage_add_file sets a gb_AllLangPackage_ALLDIRS that is used by `make packageinfo`, which may need further fixing by anybody actually using that target; see the mail thread starting at <https://lists.freedesktop.org/archives/libreoffice/2018-May/080242.html> "Broken --with-help=html `make packageinfo`". All files in $(SRCDIR)/helpcontent2/source/media/ must now explicitly be listed in either helpcontent2/Package_html_media.mk (for the language-independent files) or helpcontent2/AllLangPackage_html_media_lang.mk (for the language- specific files). Also note the two TODOs in helpcontent2/AllLangPackage_html_media_lang.mk. What is not quite right yet is that content from helpcontent2/AllLangPackage_html_lang.mk and helpcontent2/AllLangPackage_html_media_lang.mk is ending up in both per-language helpcontent installation sets (as intended, via the instructions in helpcontent2/CustomTarget_html.mk) and per-language languagepack installation sets (which is unintended). This needs to be fixed with a follow-up commit. This is the core part of a commit spanning core and helpcontent2. Change-Id: Ib29e52cf8a3ca7bcd234a8f6919c8eac6157cdbf
2018-08-08allow to build only HTML helpDavid Tardon
Change-Id: I4debf079be228e5ce5fae5f1a153f78800407a59
2018-07-09Revert "Enable MSP patching"Andras Timar
This reverts commit 7e948427b09f4eb13eea812379ddacc01c28ef17.
2018-07-06Take MsiMsp.Exe from Windows SDK 7.1AAndras Timar
Change-Id: I68914ca86fa9cabaac3ce28d9aa870a522cdb2da
2018-06-27Update Flatpak to OpenJDK10Stephan Bergmann
see <https://github.com/flathub/org.libreoffice.LibreOffice/issues/42> "OpenJDK 10 is now available". Change-Id: Iaae9d22d91d984a5c11eee26bd05ab7d328d7a5b Reviewed-on: https://gerrit.libreoffice.org/55422 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 930cb22f75c672c2fa3a4153094df4dd3a71cb7f) Reviewed-on: https://gerrit.libreoffice.org/55429 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit e0287fcde646c1f6377f3ae9babe7b5155780282)
2018-06-27solenv/flatpak-manifest.in: Properly disable debug informationStephan Bergmann
...see 02248e9e191f798f96218a0c4d281f99e15bea31 "solenv/flatpak-manifest.in: Disable debug information again, for now" commit message Reviewed-on: https://gerrit.libreoffice.org/55453 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit a7db7f3ce699a46ce7e9eafdf4388a3213264464) Conflicts: solenv/flatpak-manifest.in Change-Id: I4a9f8c547a50e8a8c83b5f96768949867aa4bb7b Reviewed-on: https://gerrit.libreoffice.org/55464 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 851d90b25db848c36a6887023b7a5877e293004a)
2018-06-27Merge in Flatpak improvementsStephan Bergmann
...from <https://github.com/flathub/org.libreoffice.LibreOffice/>: commit 0242fa00493c0521d75c60cc4987fb8c7f3abeb1 Author: Robert McQueen <rob@endlessm.com> Date: Tue May 15 11:08:30 2018 +0100 add missing share of dconf runtime dir This breaks dconf change notifications, including the GSettings used for Gtk+ themes. Could also cause other weird settings problems. https://github.com/flathub/org.libreoffice.LibreOffice/issues/31 commit 800d0d553fec6bd093f813cb4aa2f10dcbe10aee Author: Stephan Bergmann <sbergman@redhat.com> Date: Thu May 31 18:02:13 2018 +0200 Re-enable GIO support ...that was inadvertently lost when switching from the GNOME to the freedesktop.org runtime. For one, LO configure's --disable-gtk erroneously implied --disable-gio, even under --enable-gtk3. For another, gvfs is missing from the freedesktop.org runtime; the recipe is copied from <https://gitlab.gnome.org/GNOME/gnome-sdk-images/blob/gnome-3-28/ org.gnome.Sdk.json.in#L536>. This hopefully fixes <https://github.com/flathub/org.libreoffice.LibreOffice/issues/41> "Again unable to open files on network shares". Change-Id: Ib0a3680dc4eb2595eb2d8b0bb30c54082651686c Reviewed-on: https://gerrit.libreoffice.org/55431 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 67aaa98600269e6b8fa631146c3649a261369471) Reviewed-on: https://gerrit.libreoffice.org/55439 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 0625358f79cbbc15f4374aec207f516a004c4207)
2018-06-14Enable MSP patchingAndras Timar
(cherry picked from commit ae8938f8848bcce96e21ee207c0226ff0a3cb4a2) Change-Id: I1de9776e161161daf7349be304e05d5bb959f891
2018-06-11Use the same solenv/bin/ooinstall as in the cp-5.3 branchcp-6.0-5Tor Lillqvist
Specifically, pass the correct product name and not a hardcoded "LibreOffice" for the make_installer.pl script's -p option. As such, instsetoo_native/util/openoffice.lst.in hardcodes the product name as "CollaboraOffice" so we could as well do that also in ooinstall. (cherry picked from commit 852ffcae172c8ce1536f847410d94b6fcb486b96) Change-Id: I9b2d84bcc18e21b325960f7057e259daa37234a5 Reviewed-on: https://gerrit.libreoffice.org/55640 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2018-06-11gbuild: suppress -Werror on new GCC 8 warnings for release branchMichael Stahl
Change-Id: I0db765096b6b1a6595057f253884afc2e3fb0178 Reviewed-on: https://gerrit.libreoffice.org/54608 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 1d3a436ddb62065145b696635b4ec5fb4c9be12a)
2018-06-03MSP: add System64 folder pathcp-6.0-3Andras Timar
Change-Id: I5dba3dfb3a68d33608f2c2a7db026063063982ec
2018-06-01tdf#117729 add Frisian (fy) UI langaugeChristian Lohmaier
Change-Id: I46f75e969b1252a95118888507c116f44578dfbd Reviewed-on: https://gerrit.libreoffice.org/54699 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit f8fb04d0af7b1d21b8638e92922d0965e507c5d9) (cherry picked from commit 9bf385b15439f25b89fe7c53a967a0941440226e)
2018-05-17Merge in Flatpak improvementsStephan Bergmann
...from <https://github.com/flathub/org.libreoffice.LibreOffice/>: Author: Stephan Bergmann <sbergman@redhat.com> Date: Mon May 14 16:51:37 2018 +0200 Find flatpak'ed Java installation via JAVA_HOME ...instead of via PATH, so that a JAVA_HOME inherited from the environment doesn't accidentally select a different Java installation. Fixes <https://github.com/flathub/org.libreoffice.LibreOffice/issues/37> "undefined symbol: FT_Done_MM_Var". Change-Id: I2b4c3a55c92f0ef5c5925f0a9909b7b061eedeeb Reviewed-on: https://gerrit.libreoffice.org/54331 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit ef389eb874e29dba91be55acdbe238396687ec54)
2018-05-15Merge in Flatpak improvementsStephan Bergmann
...from <https://github.com/flathub/org.libreoffice.LibreOffice/>: commit 945f6caad87658b1df1e8918bd5f64939058ab7f (origin/desktop-integration) Author: Robert McQueen <rob@endlessm.com> Date: Fri Apr 27 16:54:30 2018 +0100 clean up desktop integration - don't register MIME handler for text/plain (Flatpak appears first in XDG_DATA_DIRS so otherwise we "steal" the default text editor association) - copy the icons app into the theme with both their original libreoffice-* name as well as the org.libreoffice name needed by Flatpak, which fixes the window icons - append the appdata for the separate apps (Base, Draw, etc) to the appdata XML we export for Flatpak, so they are visible in software centers etc Change-Id: Ia086071671b9ff5a8b07c55a822240f9e8fbb8d3 Reviewed-on: https://gerrit.libreoffice.org/54031 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 33af02a486ee911ba68608ec6f4f0b06dd742473)
2018-04-26Install UCRT from MSUs, not using nested VC Redist installMike Kaganski
Using nested install is bad because (1) MS advises against it (though it most possibly doesn't relate to our specific case, when we install the vc redist exe package in UI part, so actually only a single MSI session is active at any time); (2) because it adds some extra interactions (user sees something "unrelated" being installed, which raises concerns; additional admin authentication required); and (3) because it runs in InstallUISequence, thus only installing the UCRT when doing interactive installation (unattended installs, including GPO, need to install UCRT separately). This patch aims to incorporate the original UCRT MSU (Windows Update) packages (https://support.microsoft.com/en-us/help/2999226) available as a zip archive from https://www.microsoft.com/en-us/download/details.aspx?id=48234 - the same as used in VC redists for VS 2015 and 2017. This obsoletes the separate installation of the redist; since we also have the redist as merge module in our MSI, that is enough (and removes redundancy). The MSUs are installed using wusa.exe in a custom action (deferred, non-impersonating). As a small bonus, embedding MSUs instead of redist EXE allows us to shrink the size of installer a little (~10 MB). As deferred custom actions cannot access current installer database, we workaround this by using initial immediate impersonating action to extract the binaries into a temporary location. To ensure that the file gets removed upon completion (both successful and failed), we use an additional cleanup action. Commit 61b1d631331551b43bc7d619be33bfbfeff7cad6 is effectively reverted. This commit also includes changes from commits from master: 8faa1bc61fa8f09365d483364aea2b1c2751b587 1f8a3657216e44796cb94087450552aa977ebdae 378c1576d2890625ebbd18ec9ccff560eeb1619f Change-Id: I1529356fdcc67ff24b232c01ddf8bb3a31bb00bd Reviewed-on: https://gerrit.libreoffice.org/53332 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2018-04-23Adapt solenv/flatpak-manifest.in to recent download.lst changeStephan Bergmann
...58433a8b88537a1a0883d107972de5c5fad59d4a "Upgrade to language-subtag-registry-2018-03-30" Change-Id: Ic58160a56e739d8850566bf67eaed5c981109eb1 (cherry picked from commit 6ea4b982fada0bbca957dfa0729e2c3225c8a460) Reviewed-on: https://gerrit.libreoffice.org/53210 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Jenkins <ci@libreoffice.org> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit d1407aac59f3f218a311452fc7dcb7692fdf5285)
2018-04-23Merge in Flatpak improvementsStephan Bergmann
...from <https://github.com/flathub/org.libreoffice.LibreOffice/>: commit 715fbcfb4e5c51d40387998932984e54639476a1 Author: Robert McQueen <rob@endlessm.com> Date: Tue Apr 17 10:26:32 2018 +0100 edit .desktop files to add X-Endless-Alias with original names Endless OS uses this to update icon grids & taskbar pins if the original files have been removed. (Happy to update this to a more standardised key if a consensus emerges.) Change-Id: I646350090c38d84d1930c5afbec0ee500b60d0fb (cherry picked from commit a161e41439fc6f9093c212a523154e5146bb1502) Reviewed-on: https://gerrit.libreoffice.org/53198 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit e395b177ef34843e6f60e5802d640cb79aa8afae)
2018-04-17tdf#108580 related: Check for SP level of the minimal supported OSMike Kaganski
Currently we support Win7 SP1 and later; so let installer fail on lower SP levels. Change-Id: I807e0a04870b9eeabbfae258d68da4a1156b0408 Reviewed-on: https://gerrit.libreoffice.org/52619 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 79383148bb31bee0c8fae941f6cc0fdd605fb2ea) Reviewed-on: https://gerrit.libreoffice.org/52632 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 158f6e5489d8167299deb53fde433e835019d10a)
2018-04-12Merge in Flatpak improvementsStephan Bergmann
...from <https://github.com/flathub/org.libreoffice.LibreOffice/>: commit 7a2393f5fcab8c6938180c4718f2c61acd495528 Author: Robert McQueen <rob@endlessm.com> Date: Tue Apr 3 10:41:22 2018 +0100 port to freedesktop.org 1.6 runtime Gtk+3/GIO/etc dependencies used by LO in "GNOME" mode are actually included in the freedesktop.org runtime. Try to build against fd.o by downgrading gst-libav (fd.o has gst 1.10 rather than gnome's 1.12), bundling dbus-glib and disable Gtk+ 2. commit 42650da01f270e86bfb40035a9194b23ccf24c4c Author: Robert McQueen <rob@endlessm.com> Date: Tue Apr 3 11:23:27 2018 +0100 fix up LD_LIBRARY_PATH with gcc7 Append to library path rather than resetting it (causes build failures due to overriding /app/lib). commit 3e4c655294c8124cb54e1c651ec4dc1230b8151e Author: Robert McQueen <rob@endlessm.com> Date: Tue Apr 3 11:25:02 2018 +0100 fixup solenv/bin/assemble_flatpak.sh Use mkdir -p to be robust to other modules (ie dbus-glib) creating some of the paths before we do. commit d1d449ffa837b1de876f524494dbce09ec92ce73 Author: Robert McQueen <rob@endlessm.com> Date: Wed Apr 4 15:50:49 2018 +0100 split resource/registry data into Locales extension Move the language-specific data into the /app/share/runtime path which flatpak-builder splits into the Locale extension if we re-enable separate-locales. We symlink the original locations back to these paths, which means we have dangling symlinks depending on which Locale sutpaths are installed. Include Stephan Bergmann's patch from https://gerrit.libreoffice.org/#/c/52381/ to make the configmgr robust to such dangling links. commit ad6674f166c68fb79e19d80950a104a0a33f81dc Author: Robert McQueen <rob@endlessm.com> Date: Wed Apr 4 16:05:28 2018 +0100 make locale split glob more specific This loop will fail if the share/registry/res folder gains any .xcd files which are not named fcfg_langpack_* or registry_* so just to be safe, only glob these files. Change-Id: Icd41d7077b9f308dbb196927715b210328709662 Reviewed-on: https://gerrit.libreoffice.org/52642 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 727bfa2c87db170483c1e4ae895174295b070c77) Reviewed-on: https://gerrit.libreoffice.org/52653 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 14d68eedb534d55cf2df60de38822c9b1678f9d7)
2018-04-12A semicolon missingMike Kaganski
Change-Id: I286aa29c94068b63dfef8cca9707afafc8562a50 Reviewed-on: https://gerrit.libreoffice.org/52371 Reviewed-by: Jean-Baptiste Faure <jbfaure@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 1e3646411507640ab6790eae8796992c036be085)
2018-04-12tdf#116581: also read UTF16-encoded version string from TTFMike Kaganski
Change-Id: I47d8a755450b085be39346615f06cee4f920859f Reviewed-on: https://gerrit.libreoffice.org/51781 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 2367557493c216be5b5e8156ba6493d440a10b0f) Reviewed-on: https://gerrit.libreoffice.org/52327 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit f207ae9c7010b04f8a10554a3c9b62991fe51247)
2018-04-03tdf#115396 fix mode of files installed from externalsDavid Tardon
Change-Id: I608f46235f2e80e74f6900831d13e082b167cfce Reviewed-on: https://gerrit.libreoffice.org/52144 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 4cb868abaf789afe3f2b4bc65454c21c08666a78)
2018-03-26sdk/lib dir missing from Linux installation setsStephan Bergmann
...after cfd2691e5bf398304d7816227b933e53907b6204 "[API CHANGE] Remove salcpprt static library" had removed the sole regular File item from gid_Dir_Lib_Sdk, leaving only Unixlink items. But the solenv/bin/modules/installer.pm code used to only auto-create any directories that contain regular Files. Changed that to also consider Unixlinks in addition to regular Files. And to add insult to injury, the code in solenv/bin/modules/installer/simplepackage.pm creating the actual symlinks represented by the Unixlink items silently does nothing when a symlink cannot be created (because the partent dir is missing). To be fixed in another follow-up commit. Change-Id: Ic7a682a17ac59c789c85c56c825dd623bc59428c (cherry picked from commit f07e2496963baf8f7c0fecc79e7a420544075d98) Reviewed-on: https://gerrit.libreoffice.org/51419 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 10e959e6e35421d802d8f6a3904ff96f36f7124c)
2018-03-25Use Unicode for senddocMike Kaganski
Also removes unused code and unnecessary dependencies from it. Reviewed-on: https://gerrit.libreoffice.org/50444 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit c2f7759e85f3e5cc9f56aaf03eefa0f1ba834734) Change-Id: Ib6de29358098846ca5e7330b10e67a88cfff8a6a
2018-03-25Update LibreOffice.natvisMike Kaganski
Change-Id: I46a976de94508dd2b79c9dcb19d25d307f4c732c Reviewed-on: https://gerrit.libreoffice.org/50067 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit fd20935bb819cb24e71f4f91b97149c35bc5987d)
2018-03-20Improve Natvis display of SwNodeMike Kaganski
Change-Id: Ib1d4b8ed69ab60e9d7fccc6627051500d62c4a49 Reviewed-on: https://gerrit.libreoffice.org/47049 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 5a529d1743c0d0fe2a5317173dcf159da4ae8784)
2018-03-19Add SfxEnumItem to NatvisMike Kaganski
Change-Id: I11177cd99a3d895c7ec94661fa677a0edfcdf9bf Reviewed-on: https://gerrit.libreoffice.org/45536 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 3a6840cecaff91e7f90a2bbeee9c927b37608a78)
2018-03-19Adapt solenv/flatpak-manifest.in to recent download.lst changesStephan Bergmann
(cherry picked from commit bca14a7126a8cea12eecd248ae84e3d07db9609b) Conflicts: solenv/flatpak-manifest.in Change-Id: Id9a41e528e45d60a5429be4c51d58badff200f0a Reviewed-on: https://gerrit.libreoffice.org/51336 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 31441ecfb42a2dfde4ba8fae1f5a004ccf7d16a4)
2018-03-15Collabora Office OS X packagingAndras Timar
- added EULA (sla.r) in special OS X resource fork format - added volume icon which does not work ATM, TODO later - new dmg background image and adjusted .DS_Store - fixes to tolerate space in app bundle name Change-Id: Ia855d7d677136de951c2b9b31ee8d5583475dd41
2018-03-15hack to fix an MSP creation errorAndras Timar
Change-Id: Ifa833d3adfce5dcc247a8c6e2f972c0638e5c05c (cherry picked from commit ded9e51fda12d01e381a5353e6ee412ec89548ff) (cherry picked from commit 07d93f57b99c077d6b3062ddafea56e021122111)
generated by cgit (git 2.34.1) at 2024-06-01 22:46:46 +0000