summaryrefslogtreecommitdiff
path: root/solenv
AgeCommit message (Collapse)AuthorFilesLines
2020-06-04Print out the guessed executable name that is actually passed to the debuggerStephan Bergmann2-8/+8
...to avoid confusion, when the log reads e.g. [...] > It looks like /home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/instdir/program/soffice.bin generated /home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/workdir/UITest/calc_demo/done.core/core.10572 [...] > Core was generated by `/home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/instdir/program/python.'. [...] (<https://ci.libreoffice.org/job/lo_tb_master_linux_dbg/29831/>). Change-Id: I59f544c6739329620064315c2a54c21e29865b68 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95480 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-06-03enable backtraces for unit tests on macosNoel Grandin2-0/+53
Change-Id: I4f07e1e7b35bccc217d78662a45ac5eaf5865ee7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95394 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-06-03tdf#133569 rework the SwCommentRuler buttonJan-Marek Glogowski1-1/+0
The original design was planned in tdf#38246 and documented as: https://wiki.documentfoundation.org/Design/Whiteboards/Comments_Ruler_Control This patch includes the following changes: * use the correct highlight colors * use a down-pointing arrow for expanse with a stable position, like some tree view implementations * left-align the label in RTL for better us- / read-ability * dynamic sized arrow for HiDPI: * draw arrow using a polygon * calculate arrow size and padding based on font size * drop almost all constant values * fix the instable, mouse-over tooltip -> just show it always While at it, I found clang-format just added some minimal, additional changes, so I removed the file from the blacklist and included these. Change-Id: I6e0bade387639eae6bdaaf7960b2fe44c73adf65 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/75421 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org> Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
2020-06-02bump to libnumbertext 1.0.6László Németh1-3/+3
Fixes in various languages, also word transliteration support in Old Hungarian (renamed to hu_Hung.sor). Change-Id: I2eed60142273b8c353304a5b714f4e4bde5af1b7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95302 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2020-05-29add some libs to libmergedNoel Grandin1-0/+8
another small chunk of libs shared by calc/write/impress, doing this in stages in case anything goes wrong. Change-Id: Ie0628e9abd6a78eb3882dcd2030cb5dbcc5490f3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95098 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-05-29xmloff: create XMLAutoTextEventExport instances with an uno constructorMiklos Vajna1-0/+1
See tdf#74608 for motivation. Change-Id: I068b45302d200ccbde082a748a110324bbbbbaec Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95065 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-05-27tdf#133331: Added explicit type casts to resolve -fpermissive errorsMichael Warner1-5/+5
Change-Id: Id3dcceeddb35e3712d52ddf940eab82dab6a6da9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94746 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-05-27tdf#131572 Add java 9 module info for unoloader.jarSamuel Mehrbrodt1-0/+1
Add a java module named "org.libreoffice.unoloader" for this jar. Require this module from org.libreoffice.uno (libreoffice.jar has unoloader.jar in its classpath, so add the same dependency to the modules) Change-Id: I7471d65ac7a0d2c6a11c002027a21f0c441dd1f2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94419 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2020-05-27tdf#131572 Add java 9 module info for libreoffice.jarSamuel Mehrbrodt3-5/+49
Add a java module named "org.libreoffice.uno" for this jar. This needs to be compiled with Java 9. But since we want to keep b/c with Java 8, the rest of the jar has to be compiled with Java 8. This bumps the *build* requirement to Java 9 while keeping the *runtime* requirement at Java 8. The gbuild JavaClassSet class is changed to invoke javac twice, where the 2nd invocation compiles with --release 9 and a --patch-modules argument so that it finds the results of the first invocation and also the javamaker generated files in CustomTargets. Change-Id: I888f5dbe097cc37136e68db5919939877c981862 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91105 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2020-05-27Revert "bloaty: use -ffunction-sections and --gc-sections for linking"Noel Grandin1-3/+1
This reverts commit bd39ec554f90badccfb26c843fd0d43237f1b622. Reason for revert: For -ffunction-sections and -fdata-sections, <https://gcc.gnu.org/onlinedocs/gcc-10.1.0/gcc/Optimize-Options.html#Optimize-Options> warns: "Only use these options when there are significant benefits from doing so. When you specify these options, the assembler and linker create larger object and executable files and are also slower. These options affect code generation. They prevent optimizations by the compiler and assembler using relative locations inside a translation unit since the locations are unknown until link time. An example of such an optimization is relaxing calls to short call instructions." Change-Id: I84225ca94de9afff23bdd2913c77095d5d26f7ee Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94950 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-05-27bloaty: use -ffunction-sections and --gc-sections for linkingNoel Grandin1-1/+3
strips out 3+ megabytes of duplicate functions (which originate in the generated UNO header files) Change-Id: I69ba5f478b2b062e2b05516bbaa2d18fa8312aa6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94868 Tested-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-05-26Drop -I$(dir $(2)) also from gb_*Object__tool_commandStephan Bergmann1-5/+0
...after ecbaf980625a9e7b06abe91c7c70e78f6ad469a7 "-I$(dir $(3)) in gb_CObject__command_pattern is no longer needed" and f218f8f6c8c587d2d78679f935093329f145fede "-I$(dir $(3)) in gb_CObject__command_pattern is no longer needed" had already dropped it from plain gb_CObject__command_pattern. (0349c738da5970d9f0fc10d7cf4d7b766ce10e13 "support for compiler rewriters" had created gb_*Object__tool_command at a time when plain gb_*Object__command still contained those -I arguments, so had presumably just copied them over without a specific additional need to have them in the tool_command variants; and ecbaf980625a9e7b06abe91c7c70e78f6ad469a7 and f218f8f6c8c587d2d78679f935093329f145fede then just failed to also remove them from the tool_command variants.) Presence of the -I arguments in the tool_command variants caused e.g. `make COMPILER_PLUGIN_TOOL=fakebool` to fail with > sw/source/filter/ww8/ww8par.cxx:97:10: error: replace <...> include form with "..." for inclusion of a source file next to the current source file, sw/source/filter/ww8/../../core/inc/DocumentRedlineManager.hxx [loplugin:includeform] > #include <../../core/inc/DocumentRedlineManager.hxx> > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Change-Id: I7ef513507375dcee5d88db53cef58433f7f68e36 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94867 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-05-26use -Xclang -debug-info-kind=constructor if availableLuboš Luňák1-0/+4
The option, available since Clang10, emits debuginfo for classes with explicit ctors only together with the ctor, which avoids redundant debuginfo for such classes, noticeably saving both build time and disk space. https://reviews.llvm.org/D72427 I've been using this for quite some time, without problems. Change-Id: I24e5339f983cb8d8990185436dd63e00f0d3ce60 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94756 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2020-05-25Revert "tdf#104017 DOC export: be less aggressive with merging page styles"Justin Luth1-0/+1
This reverts LO 6.3.4 commit 5d1709a7c4184eb31cfc4c2d3acadff3a4a68189, which tdf#133334 shows is wrong. How this made it past QA is a mystery to me. There should be lots of examples. Change-Id: I17be6e4bab44057f4535d4728825e12d068b65d2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94782 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-05-25[MS-OFFCRYPTO] convert oox implementation into UNO serviceVasily Melenchuk1-0/+1
To permit pluggable crypto services, abstract existing implementation behind an XPackageEncryption API. Previous code already had two halfway-polymorphic classes (agile and standard 2007 engine), so we're not adding much additional layers. As MS crypto always uses OLE storage to wrap content into one single file, current implementation passes all substorage names down into XPackageEncryption APi, so different downstream implementations (e.g. for MS RMS, or Azure AIP) are possible. Because OleStorage classes are internal to LibO core, access is provided via XInput/XOutput stream API function. Change-Id: Icc32a4e0ce215090c3b739f1dcaa0654b36b7f08 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/84436 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-05-25clang-format sc with under 5-percent lines of changeMuhammet Kara1-40/+0
Files which could become clang-format conformant with under 5-percent lines of change relative to the total count of lines in the file are found by using bin/find-clang-format.py, and fixed with /opt/lo/bin/clang-format -i <path-of-the-file> There will be follow-up patches to fix all 'under-5-percent' files. Change-Id: I2d37d9c94116d2823f9a21024bdb7ff1a6207d5d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94744 Tested-by: Jenkins Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
2020-05-25Correct commentsTor Lillqvist1-5/+2
The --enable-canonical-installation-tree-structure option is gone. We always use a "canonical" app bundle structure (with MacOS, Frameworks, Library, and Resources) on macOS since 6492c8576e0393f7ee548cd938e84c80e8d37127 in 2014. Change-Id: I6cbd3c5141aba643bc05bfa7d4de1e7d73a14112 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94761 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-05-24Remove clang-format conformant files from the blacklistMuhammet Kara1-4/+0
Change-Id: I48afc12427e25424b275c1f0d0484ec300948b3d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94743 Tested-by: Jenkins Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
2020-05-23nospin hack no longer in useCaolán McNamara2-3/+3
Change-Id: Ib855c429ac936f9b7bb219ad4729f99b0625ec37 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94734 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-05-22xmloff: create XMLMetaExportOOO instances with an uno constructorMiklos Vajna1-0/+1
See tdf#74608 for motivation. Change-Id: Ie3bed67b736ea3a3c8071336594bcbe54c6618a5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94651 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-05-20move ComboBox to toolkit-only headersCaolán McNamara1-1/+1
Change-Id: If5f0ab1fba8fa7302b7c0e8d2b25761ab64c97e1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94143 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-05-20writerfilter: clang-format these filesMiklos Vajna1-10/+0
I added these files more or less recently and they have long lines. Use clang-format to break at a sane column limit. (And I now promise I won't remove more files from the clang-format blacklist for a while.) Change-Id: I7eae945defe67fa19c4bd9f4789d7918bb45bf9a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94585 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2020-05-19oox, svx, sw, xmlsecurity: clang-format these filesMiklos Vajna1-11/+0
I added these files more or less recently and they have long lines. Use clang-format to break at a sane column limit. Change-Id: Id4ef832e4843fc81f4a497385e49ccb835a7197f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94503 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2020-05-19don't hardcode /usr/bin/python3 in android scriptsChristian Lohmaier1-1/+1
Change-Id: Id26422e8398da7674d5da22df97a03bee0b0b189
2020-05-18comphelper, drawinglayer, framework, starmath: clang-format these filesMiklos Vajna1-5/+0
I added these files more or less recently and they have long lines. Use clang-format to break at a sane column limit. Change-Id: Id608fffbbc0673c9bc350dd696cb0a31906840d3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94423 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2020-05-15xmloff: create SchXMLExport_Content instances with an uno constructorMiklos Vajna1-0/+1
See tdf#74608 for motivation. Change-Id: I49f00c08635e571d75e5190d55cbe1f279566797 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94255 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-05-14move SvxMetricField inside svxCaolán McNamara1-0/+1
Change-Id: I5036cfa89f25fe53e538191b8a65cb4414e87bdc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94201 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-05-13Include the language code in the volume name of a langpack dmgTor Lillqvist1-1/+1
Makes it easier to see which is which in Finder if you have several mounted. Change-Id: I6e1f5cfc4db3ed6595ba14e515080b5ecc0ad688 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94120 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-05-13ENABLE_DBGUTIL=TRUE implies ENABLE_DEBUG=TRUEStephan Bergmann1-1/+1
Change-Id: I709561ba910ff2274a40e578412ecd7040886959 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94144 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-05-13The dmg needs more space also in the ENABLE_DEBUG caseTor Lillqvist1-1/+1
(Not something that is used when actually building for distribution, sure, but when testing.) Change-Id: I67410a8cd9627c5a2c19f58df4529a44e488c961 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94119 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-05-13Remove some code that was commented-out ten years agoTor Lillqvist1-3/+2
Change-Id: Iead0a7e770a5533e3fe4585f76e343f0039328fd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94105 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-05-13external: update pdfium to 4137Miklos Vajna1-3/+3
Change-Id: Ib7c12461e04fa97bf55ee967e8d6c9bcf92fdf4a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94078 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-05-12weld help browserCaolán McNamara2-5/+3
Change-Id: Ibd8dcc10c4403731953e2e46db4ae8f89ebc7e4d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93216 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-05-12Rename attributes to reflect that they represent different effectsMike Kaganski1-6/+6
... not only shadow. In preparation to add soft edge effect (tdf#49247). Change-Id: Ia5b17fff00e1c2d7f717179687dbd44410795a71 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94007 Tested-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2020-05-12fix shebangRene Engelhard1-1/+1
$ ./solenv/bin/version.py 7.0.0 File "./solenv/bin/version.py", line 39 print('error updating %s: %s' % (filename, err), file=sys.stderr) ^ SyntaxError: invalid syntax Change-Id: I034e5b9abab1a555d8749eb5dd2349bfe90e4092 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93839 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-05-10new loplugin:simplifypointertoboolNoel Grandin1-0/+1
Change-Id: Iff68e8f379614a6ab6a6e0d1bad18e70bc76d76a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91907 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-05-09remove vclmetafileprocessor2d.{cxx,hxx} from clang-format blacklistTomaž Vajngerl1-2/+0
Change-Id: I53f7660a22ed66ab7d50370d871f9d10d1bedc10 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93825 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2020-05-09dl: move {Eps,FillHatch,PointArray}Primitive2D to global includeTomaž Vajngerl1-3/+3
Change-Id: I85c10cb957f5065d964863360ca03355c87b7980 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93821 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2020-05-08split button.hxx into toolkit-only pieceCaolán McNamara1-0/+1
Change-Id: I792efb417504a3b55043ff4fc3fd3597a9b953f4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93678 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-05-08sw: remove now unused SwBlinkPortionMiklos Vajna1-2/+0
Change-Id: If2ae13219f7907eb2b2a66a38bcd636dd64dfe3a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93676 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-05-07fix macOS codesigning when using a separate builddirChristian Lohmaier2-2/+2
88453fd13a653963b394b8f865ff104b5545f137 changed the hardened_runtime.xcent to a generated file Change-Id: I54b927d1990835bb902f62e03d51b0e70735269c
2020-05-07no longer force -arch:SSE on WindowsLuboš Luňák1-5/+5
SSE2 has been pretty much a requirement for running Windows since about 2018, so there should be ~nobody needing this. https://lists.freedesktop.org/archives/libreoffice/2020-May/085029.html Change-Id: I579eb92c18e42c57aa1421b889cfa7997b84915f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93558 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2020-05-06Move all public Java classes to libreoffice.jarSamuel Mehrbrodt2-2/+2
This moves the classes from juh.jar and ridl.jar to libreoffice.jar The goal is to have one single jar (and Java module, will be added later) which developers can include to work with LO. juh.jar and ridl.jar are kept as basically empty jars with libreoffice.jar on its classpath to keep backwards compatibility. This is a continuation of ae855bf48163ff64d94cfc34aff8e37abdb5518d and a preparation to have Java 9 module support. Change-Id: Ifbbfb97f60373d14256e62ae3122913bd17d5bbb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91930 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-05-05Disable -Wstringop-overflow in --enable-optimized builds with GCCStephan Bergmann1-0/+3
This reverts commit e287fde52fb9de5bdf1d00c8a3fbfcca7db9892c "Silence bogus -Wstringop-overflow with GCC trunk towards GCC 10", as that workaround, which happened to work for some revisions of GCC trunk towards GCC 10, no longer works for GCC 10 release candidates, see <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92893#c9> "[10 Regression] Unhelpful -Wstringop-overflow warning for a trailing one-element array". (Using -Wstringop-overflow=1 instead of the -Wstringop-overflow=2 default would have still caused bogus warnings, requiring -Wno-stringop-overflow.) Change-Id: I9b7342748c18da32f509b4a0e0653aede8447657 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93499 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-05-04remove helperwrongspellrenderer.{cxx,hxx} from clang-format blacklistTomaž Vajngerl1-2/+0
Change-Id: Ib0b1f389189012ab27dd061481737ac6a6a1a84e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93388 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2020-05-04remove vclhelperbufferdevice.{cxx,hxx} from clang-format blacklistTomaž Vajngerl1-2/+0
Change-Id: I0ab6572ab700756322f96b982f7faeb6d8dc9fb6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93362 Tested-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2020-05-02remove vclpixelprocessor2d.cxx from clang-format blacklistTomaž Vajngerl1-1/+0
Change-Id: I03ad72d0754cb8c180f4eab0e8040c3dab533ef9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93321 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2020-05-02remove vclprocessor2d.cxx from clang-format blacklistTomaž Vajngerl1-1/+0
Change-Id: I359dfb0fe6fdf88e9c8141186a770c4cde777161 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93320 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2020-05-01Restructure solenv/bin/assemble-flatpak.shStephan Bergmann4-97/+169
...so that parts of it can be reused by the Flatpak build done from Fedora RPMs (see <https://src.fedoraproject.org/flatpaks/libreoffice>). The reused parts are split out into solenv/bin/assemble-flatpak-*.sh files. (I can't remember any specific reason why I added the <releases> section to the Flathub org.libreoffice.LibreOffice.appdata.xml; maybe just because the file format allows for it and it appeared easy to generate the section when writing the file. For the Fedora LO RPMs, none of the existing appdata.xml files contained such a section, and generating one for the Fedora Flatpak case would require obtaining values for those LIBO_VERSION_* variables, so I just added a switch to solenv/bin/assemble-flatpak-appdata-step1.sh allowing not to write that section at all. Splitting solenv/bin/assemble-flatpak-appdata.sh in two steps is necessary because the Fedora Flatpak case wants to replace the screenshots in the first part of the generated org.libreoffice.LibreOffice.appdata.xml, but not in the appended original appdata.xml files, so needs to hook in between those two steps.) Change-Id: Ic527f3d88ccbee85e86dad3569b8e73776adf273 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93260 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-05-01Adapt solenv/flatpak-manifest.in to 8b9c26218cb2c9526f69b40ff6f72ce757a464c2Stephan Bergmann1-3/+3
..."external: update libxmlsec to 1.2.30" Change-Id: I53eb2b0a2e83b081e273d73ca785afdb6af4bd19 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93259 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>