summaryrefslogtreecommitdiff
path: root/solenv
AgeCommit message (Collapse)Author
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)
2018-03-15Collabora Office brandingAndras Timar
(cherry picked from commit c276d5ba1491dc237812cdf3d877a4ecec2ee1dc) (cherry picked from commit c085f9176bda7bad0234d0087ff87f27086fc333) Change-Id: I9e79c07aa3cbb70076d9bab07294062df4be02c6
2018-03-15Collabora Office EULAAndras Timar
Conflicts: readlicense_oo/Package_files.mk (cherry picked from commit 2e8f1c8598c34a5cf0779f23fe66091115fa0fc6) (cherry picked from commit 63f4de72939a506c04d7f1b274e9c8fa09c4bb25) Change-Id: Ia380db465f5094216cb36526f6cc178043376356
2018-02-28Merge upstream fixes into solenv/flatpak-manifest.inStephan Bergmann
* <https://github.com/flathub/org.libreoffice.LibreOffice/commit/ f5d97291e302d98c217c955c52b255795d4d4cad> "Bump runtime-version to org.gnome.Platform 3.26" * <https://github.com/flathub/org.libreoffice.LibreOffice/commit/ 7d69e505165d4bbf5fa0b34b5fb2cbff9dfaf9bd> "For now, bundle gst-libav to be able to play mp4 videos in impress" Change-Id: I1924d84be7fe577e302b0c1b8c7e2971e8583d73 (cherry picked from commit 756c9f2317605e39d9cb058e650962acd2d81739) Reviewed-on: https://gerrit.libreoffice.org/50492 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2018-02-23Merge "Enable device=dri to fix opengl crashes" into flatpak-manifest.inStephan Bergmann
...from <https://github.com/flathub/org.libreoffice.LibreOffice/pull/18/commits/ 637788fa1d9fc6514467a4a193e5cf32f696b400> "Enable device=dri to fix opengl crashes" Change-Id: Ic989bfb3e46057dc2fd20d2cd6f17d5733338642 (cherry picked from commit e3166f4034c3997134c679872d6ce66c8abe16c6) Reviewed-on: https://gerrit.libreoffice.org/50225 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2018-02-22solenv: Update gb_PackageInfo_emit_l10n_for_one_langRico Tzschichholz
Add cjk_*, ctl_* and ctlseqcheck_$LANG.xcd files to install list Change-Id: I2c56cf2af3cc444cb7075740a981b6954950e5f5 Reviewed-on: https://gerrit.libreoffice.org/50181 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
2018-02-21CppunitTest_xmlsecurity_signing failed in sanitizer buildsStephan Bergmann
...because external/gpgmepp spawns /usr/bin/gpgconf (and later on /usr/bin/ggp2, /usr/bin/gpgsm) which all depend on libgpg-error.so.0, so due to CppunitTest's LD_LIBRARY_PATH will pick up instdir/program/libgpg-error.so.0, which fails due to > /usr/bin/gpgconf: symbol lookup error: /data/sbergman/lo-san/core/instdir/program/libgpg-error.so.0: undefined symbol: __asan_option_detect_stack_use_after_return The easiest fix appears to be, when running sanitizers on Linux, to hack gpgmepp's _gpgme_io_spawn to set LD_LIBRARY_PATH back to its original state. (When it was originally unset, it will now be set but null, but that should not make a difference.) This requires EXTRA_ENV_VARS to be set earlier in CppunitTest.mk, so setting LIBO_LD_PATH doesn't use the LD_LIBRARY_PATH value set in gb_CppunitTest_CPPTESTPRECOMMAND. The backtrace of the first, originally failing call to _gpgme_io_spawn during CppunitTest_xmlsecurity_signing: > #0 0x00007fffe1f354dc in _gpgme_io_spawn (path=0x1 <error: Cannot access memory at address 0x1>, argv=0x7ffff2fbd4e0, flags=0, fd_list=0x9, atfork=0x4e, atforkvalue=0x7ffff2fbd4e0, r_pid=0x7ffff2fbd4e0) at posix-io.c:433 > #1 0x00007fffe1f41971 in read_gpgconf_dirs (pgmname=0x6110002f8e00 "/usr/bin/gpgconf", components=0) at dirinfo.c:206 > #2 0x00007fffe1f3fa29 in get_gpgconf_item (what=12) at dirinfo.c:284 > #3 0x00007fffe1f4073e in _gpgme_get_default_gpg_name () at dirinfo.c:370 > #4 0x00007fffe1e87093 in engine_get_file_name (proto=GPGME_PROTOCOL_OpenPGP) at engine.c:79 > #5 0x00007fffe1e84e89 in gpgme_get_engine_info (info=0x7ffff2a06160) at engine.c:230 > #6 0x00007fffe1e845ef in gpgme_engine_check_version (proto=GPGME_PROTOCOL_OpenPGP) at engine.c:144 > #7 0x00007fffe634e7d9 in GpgME::checkEngine(GpgME::Protocol) (proto=GpgME::OpenPGP) at context.cpp:1610 > #8 0x00007fff8df3fd49 in SecurityEnvironmentGpg::SecurityEnvironmentGpg() (this=0x6060005825c0) at xmlsecurity/source/gpg/SecurityEnvironment.cxx:30 > #9 0x00007fff8df5755e in SEInitializerGpg::createSecurityContext(rtl::OUString const&) (this=0x606000582560) at xmlsecurity/source/gpg/SEInitializer.cxx:45 > #10 0x00007fff8df57bb3 in non-virtual thunk to SEInitializerGpg::createSecurityContext(rtl::OUString const&) () at include/rtl/stringutils.hxx:170 > #11 0x00007fffab66de90 in DocumentSignatureManager::init() (this=0x7ffff2fbb020) at xmlsecurity/source/helper/documentsignaturemanager.cxx:78 > #12 0x00007fffab498504 in DocumentDigitalSignatures::ImplVerifySignatures(com::sun::star::uno::Reference<com::sun::star::embed::XStorage> const&, com::sun::star::uno::Reference<com::sun::star::io::XInputStream> const&, DocumentSignatureMode) (this=0x6080001aaf20, rxStorage=uno::Reference to (OStorage *) 0x60d0003a4c48, xSignStream=empty uno::Reference, eMode=DocumentSignatureMode::Content) at xmlsecurity/source/component/documentdigitalsignatures.cxx:264 > #13 0x00007fffab497f8b in DocumentDigitalSignatures::verifyDocumentContentSignatures(com::sun::star::uno::Reference<com::sun::star::embed::XStorage> const&, com::sun::star::uno::Reference<com::sun::star::io::XInputStream> const&) (this=0x6080001aaf20, rxStorage=uno::Reference to (OStorage *) 0x60d0003a4c48, xSignInStream=empty uno::Reference) at xmlsecurity/source/component/documentdigitalsignatures.cxx:127 > #14 0x00007fffab49c35b in non-virtual thunk to DocumentDigitalSignatures::verifyDocumentContentSignatures(com::sun::star::uno::Reference<com::sun::star::embed::XStorage> const&, com::sun::star::uno::Reference<com::sun::star::io::XInputStream> const&) () at include/cppu/unotype.hxx:136 > #15 0x00007fffafc062a3 in SfxObjectShell::ImplAnalyzeSignature(bool, com::sun::star::uno::Reference<com::sun::star::security::XDocumentDigitalSignatures> const&) (this=0x61100021c7c0, bScriptingContent=false, xSigner=empty uno::Reference) at sfx2/source/doc/objserv.cxx:1293 > #16 0x00007fffafc074b1 in SfxObjectShell::ImplGetSignatureState(bool) (this=0x61100021c7c0, bScriptingContent=false) at sfx2/source/doc/objserv.cxx:1322 > #17 0x00007fffafc0383d in SfxObjectShell::GetDocumentSignatureState() (this=0x61100021c7c0) at sfx2/source/doc/objserv.cxx:1485 > #18 0x00007fffafbb323c in SfxObjectShell::CheckForBrokenDocSignatures_Impl() (this=0x61100021c7c0) at sfx2/source/doc/objmisc.cxx:981 > #19 0x00007fffafbb2da4 in SfxObjectShell::CheckSecurityOnLoading_Impl() (this=0x61100021c7c0) at sfx2/source/doc/objmisc.cxx:931 > #20 0x00007fffafbb95cf in SfxObjectShell::FinishedLoading(SfxLoadedFlags) (this=0x61100021c7c0, nFlags=SfxLoadedFlags::ALL) at sfx2/source/doc/objmisc.cxx:1079 > #21 0x00007fff716a9185 in SwDocShell::LoadingFinished() (this=0x61100021c7c0) at sw/source/uibase/app/docsh.cxx:1153 > #22 0x00007fff71759ada in SwDocShell::Load(SfxMedium&) (this=0x61100021c7c0, rMedium=...) at sw/source/uibase/app/docshini.cxx:581 > #23 0x00007fffafc2bd9a in SfxObjectShell::LoadOwnFormat(SfxMedium&) (this=0x61100021c7c0, rMedium=...) at sfx2/source/doc/objstor.cxx:2971 > #24 0x00007fffafc3128c in SfxObjectShell::DoLoad(SfxMedium*) (this=0x61100021c7c0, pMed=0x60300083dac0) at sfx2/source/doc/objstor.cxx:714 > #25 0x00007fffafdd88d8 in SfxBaseModel::load(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) (this=0x6190000fb0b0, seqArguments=uno::Sequence of length 13 = {...}) at sfx2/source/doc/sfxbasemodel.cxx:1788 > #26 0x00007fffb049a98a in (anonymous namespace)::SfxFrameLoader_Impl::load(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&, com::sun::star::uno::Reference<com::sun::star::frame::XFrame> const&) (this=0x6060004aaec0, rArgs=uno::Sequence of length 11 = {...}, _rTargetFrame=uno::Reference to ((anonymous namespace)::Frame *) 0x6160000c63f0) at sfx2/source/view/frmload.cxx:693 > #27 0x00007fff82d6a7ee in framework::LoadEnv::impl_loadContent() (this=0x7ffff2fe3040) at framework/source/loadenv/loadenv.cxx:1105 > #28 0x00007fff82d5aa6b in framework::LoadEnv::startLoading() (this=0x7ffff2fe3040) at framework/source/loadenv/loadenv.cxx:374 > #29 0x00007fff82d56633 in framework::LoadEnv::loadComponentFromURL(com::sun::star::uno::Reference<com::sun::star::frame::XComponentLoader> const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, rtl::OUString const&, rtl::OUString const&, int, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) (xLoader=uno::Reference to (framework::Desktop *) 0x6160000153f8, xContext=uno::Reference to (cppu::ComponentContext *) 0x611000002b10, sURL="file:///xmlsecurity/qa/unit/signing/data/goodGPG.odt", sTarget="_default", nFlags=0, lArgs=uno::Sequence of length 2 = {...}) at framework/source/loadenv/loadenv.cxx:160 > #30 0x00007fff82ec93f0 in framework::Desktop::loadComponentFromURL(rtl::OUString const&, rtl::OUString const&, int, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) (this=0x616000015380, sURL="file:///xmlsecurity/qa/unit/signing/data/goodGPG.odt", sTargetFrameName="_default", nSearchFlags=0, lArguments=uno::Sequence of length 2 = {...}) at framework/source/services/desktop.cxx:618 > #31 0x00007fff82ec95eb in non-virtual thunk to framework::Desktop::loadComponentFromURL(rtl::OUString const&, rtl::OUString const&, int, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) () at include/rtl/stringutils.hxx:170 > #32 0x00007fffabe3097d in unotest::MacrosTest::loadFromDesktop(rtl::OUString const&, rtl::OUString const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) (this=0x60c000035e48, rURL="file:///xmlsecurity/qa/unit/signing/data/goodGPG.odt", rDocService="com.sun.star.text.TextDocument", rExtraArgs=empty uno::Sequence) at unotest/source/cpp/macros_test.cxx:50 > #33 0x00007fffb2ba9d2a in SigningTest::createDoc(rtl::OUString const&) (this=0x60c000035e00, rURL="file:///xmlsecurity/qa/unit/signing/data/goodGPG.odt") at xmlsecurity/qa/unit/signing/signing.cxx:204 > #34 0x00007fffb2bd1532 in SigningTest::testODFGoodGPG() (this=0x60c000035e00) at xmlsecurity/qa/unit/signing/signing.cxx:690 > #35 0x00007fffb2c304fd in std::__invoke_impl<void, void (SigningTest::*&)(), SigningTest*&>(std::__invoke_memfun_deref, void (SigningTest::*&)(), SigningTest*&) (__f=@0x6030001f0480: (void (SigningTest::*)(SigningTest * const)) 0x7fffb2bd0d80 <SigningTest::testODFGoodGPG()>, __t=@0x6030001f0490: 0x60c000035e00) at /usr/lib/gcc/x86_64-redhat-linux/7/../../../../include/c++/7/bits/invoke.h:73 > #36 0x00007fffb2c300e0 in std::__invoke<void (SigningTest::*&)(), SigningTest*&>(void (SigningTest::*&)(), SigningTest*&) (__fn=@0x6030001f0480: (void (SigningTest::*)(SigningTest * const)) 0x7fffb2bd0d80 <SigningTest::testODFGoodGPG()>, __args=@0x6030001f0490: 0x60c000035e00) at /usr/lib/gcc/x86_64-redhat-linux/7/../../../../include/c++/7/bits/invoke.h:95 > #37 0x00007fffb2c2ff2f in std::_Bind<void (SigningTest::*(SigningTest*))()>::__call<void, , 0ul>(std::tuple<>&&, std::_Index_tuple<0ul>) (this=0x6030001f0480, __args=...) at /usr/lib/gcc/x86_64-redhat-linux/7/../../../../include/c++/7/functional:467 > #38 0x00007fffb2c2fb23 in std::_Bind<void (SigningTest::*(SigningTest*))()>::operator()<, void>() (this=0x6030001f0480) at /usr/lib/gcc/x86_64-redhat-linux/7/../../../../include/c++/7/functional:549 > #39 0x00007fffb2c2e8d1 in std::_Function_handler<void (), std::_Bind<void (SigningTest::*(SigningTest*))()> >::_M_invoke(std::_Any_data const&) (__functor=...) at /usr/lib/gcc/x86_64-redhat-linux/7/../../../../include/c++/7/bits/std_function.h:316 > #40 0x00007fffb2c30b1c in std::function<void ()>::operator()() const (this=0x608000083660) at /usr/lib/gcc/x86_64-redhat-linux/7/../../../../include/c++/7/bits/std_function.h:706 > #41 0x00007fffb2c2db41 in CppUnit::TestCaller<SigningTest>::runTest() (this=0x608000083620) at workdir/UnpackedTarball/cppunit/include/cppunit/TestCaller.h:175 > #42 0x00007ffff78fc159 in CppUnit::TestCaseMethodFunctor::operator()() const (this=0x7ffff2e9c0d0) at TestCase.cpp:32 > #43 0x00007fffdc3cc8e3 in (anonymous namespace)::Protector::protect(CppUnit::Functor const&, CppUnit::ProtectorContext const&) (this=0x602000019910, functor=...) at test/source/vclbootstrapprotector.cxx:48 > #44 0x00007ffff78ccf96 in CppUnit::ProtectorChain::ProtectFunctor::operator()() const (this=0x6030002189e0) at ProtectorChain.cpp:20 > #45 0x00007fffe8938ab3 in (anonymous namespace)::Prot::protect(CppUnit::Functor const&, CppUnit::ProtectorContext const&) (this=0x6020000003f0, functor=...) at unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx:89 > #46 0x00007ffff78ccf96 in CppUnit::ProtectorChain::ProtectFunctor::operator()() const (this=0x603000218a10) at ProtectorChain.cpp:20 > #47 0x00007fffebc1e492 in (anonymous namespace)::Prot::protect(CppUnit::Functor const&, CppUnit::ProtectorContext const&) (this=0x602000000250, functor=..., context=...) at unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx:63 > #48 0x00007ffff78ccf96 in CppUnit::ProtectorChain::ProtectFunctor::operator()() const (this=0x603000218a40) at ProtectorChain.cpp:20 > #49 0x00007ffff7863084 in CppUnit::DefaultProtector::protect(CppUnit::Functor const&, CppUnit::ProtectorContext const&) (this=0x602000000150, functor=..., context=...) at DefaultProtector.cpp:15 > #50 0x00007ffff78ccf96 in CppUnit::ProtectorChain::ProtectFunctor::operator()() const (this=0x603000218a70) at ProtectorChain.cpp:20 > #51 0x00007ffff78c68f5 in CppUnit::ProtectorChain::protect(CppUnit::Functor const&, CppUnit::ProtectorContext const&) (this=0x60b000000510, functor=..., context=...) at ProtectorChain.cpp:86 > #52 0x00007ffff795e259 in CppUnit::TestResult::protect(CppUnit::Functor const&, CppUnit::Test*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) (this=0x7ffff2f000a0, functor=..., test=0x608000083620, shortDescription="") at TestResult.cpp:182 > #53 0x00007ffff78fa785 in CppUnit::TestCase::run(CppUnit::TestResult*) (this=0x608000083620, result=0x7ffff2f000a0) at TestCase.cpp:91 > #54 0x00007ffff798c2fe in CppUnit::TestRunner::WrappingSuite::run(CppUnit::TestResult*) (this=0x608000081820, result=0x7ffff2f000a0) at TestRunner.cpp:47 > #55 0x00007ffff795ccdf in CppUnit::TestResult::runTest(CppUnit::Test*) (this=0x7ffff2f000a0, test=0x608000081820) at TestResult.cpp:149 > #56 0x00007ffff798d23f in CppUnit::TestRunner::run(CppUnit::TestResult&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) (this=0x7ffff2f4db00, controller=..., testPath="") at TestRunner.cpp:96 > #57 0x000000000052e3a9 in (anonymous namespace)::ProtectedFixtureFunctor::run() const (this=0x7ffff2f00350) at sal/cppunittester/cppunittester.cxx:319 > #58 0x000000000052ae38 in sal_main() () at sal/cppunittester/cppunittester.cxx:469 > #59 0x0000000000529e2c in main(int, char**) (argc=23, argv=0x7fffffff2798) at sal/cppunittester/cppunittester.cxx:376 Reviewed-on: https://gerrit.libreoffice.org/46249 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit d15f042abd5a1093984a0c8380837145f38c4efc) Make --disable-runtime-optimizations not fail when LIBO_LD_PATH is unset ...outside of CppunitTest_xmlsecurity_signing (cherry picked from commit 1553cc326c5eb98b658e2202630ba0f0217c0ae4) Change-Id: I386a3b316c78344c2449568894c0f03ba39b1bf0 Reviewed-on: https://gerrit.libreoffice.org/50058 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
2018-02-13solenv: Fix gb_MoTarget_get_install_target argumentRico Tzschichholz
This fixes l10n-*.files generation of packageinfo and makes "install-packages-l10n-*" targets work again. Change-Id: Ib4d726f1079360cade8d5f398b1f5144d6693152 Reviewed-on: https://gerrit.libreoffice.org/49527 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-02-12Work around i386 kernel vs. JVM bug for now by disabling all tests on i386Stephan Bergmann
<https://bugzilla.redhat.com/show_bug.cgi?id=1468436> "Libreoffice Writer crashing with segmentation fault in libjvm.so _expand_stack_to when wiki plugin installed" still hits various machines (e.g., my local 4.14.16-300.fc27.x86_64 as well as 3.10.0-693.11.6.el7.x86_64 flathub-builder-pdx1, see <https://flathub.org/builds/#/builders/3/builds/1790>), causing --arch=i386 builds to fail tests that instantiate a JVM in-process, e.g. CppunitTest_dbaccess_RowSetClones with SIGSEGV at > #0 _expand_stack_to (bottom=0xff605fff <error: Cannot access memory at address 0xff605fff>, bottom@entry=0xff605000 <error: Cannot access memory at address 0xff605000>) at /run/build/java/hotspot/src/os/linux/vm/os_linux.cpp:608 > #1 0xed207564 in os::Linux::manually_expand_stack (t=0x58314800, addr=0xff605000 <error: Cannot access memory at address 0xff605000>) at /run/build/java/hotspot/src/os/linux/vm/os_linux.cpp:621 > #2 0xed211d5b in os::create_attached_thread (thread=0x58314800) at /run/build/java/hotspot/src/os/linux/vm/os_linux.cpp:839 > #3 os::create_main_thread (thread=0x58314800) at /run/build/java/hotspot/src/os/linux/vm/os_linux.cpp:789 > #4 0xed36d8a7 in Thread::set_as_starting_thread (this=0x58314800) at /run/build/java/hotspot/src/share/vm/runtime/thread.cpp:941 > #5 Threads::create_vm (args=0xffdf0810, canTryAgain=0xffdf068f) at /run/build/java/hotspot/src/share/vm/runtime/thread.cpp:3614 > #6 0xecfc5081 in JNI_CreateJavaVM_inner (args=0xffdf0810, penv=0xffdf0a84, vm=0xffdf0798) at /run/build/java/hotspot/src/share/vm/prims/jni.cpp:3937 > #7 JNI_CreateJavaVM (vm=0xffdf0798, penv=0xffdf0a84, args=0xffdf0810) at /run/build/java/hotspot/src/share/vm/prims/jni.cpp:4032 > #8 0xf32b5397 in jfw_plugin_startJavaVirtualMachine(JavaInfo const*, JavaVMOption const*, long, JavaVM_**, JNIEnv_**) () from /run/build/libreoffice/instdir/program/libjvmfwklo.so ... Disabling tests leads to successful builds, but using Java functionality in the LO flatpak on affected machines (where the above bug or similar for other Linux distros is not yet fixed) will still crash, of course. Users of the LO flatpak will need to seek a fixed kernel (or there will need to be an update of org.freedesktop.Sdk.Extension.openjdk9 and a rebuild of the LO flatpak, if it turns out that a fix will need to be applied to OpenJDK instead of the kernel). This workaround can be removed again once no Flathub build machines are affected by the bug any longer. (`uname -i`, reporting "i386", appears to be more appropriate for this check than `uname -m`, which might probably report other tokens besides "i686".) Change-Id: I6e4b01d1df5aff5ac31847fd56285506af003f4b (cherry picked from commit 9cf2616c5e709b595eeee6ab88dacdfad2003f98) Reviewed-on: https://gerrit.libreoffice.org/49605 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2018-02-12Include <release> in Flatpak appdata.xmlStephan Bergmann
...fixing <https://github.com/flathub/org.libreoffice.LibreOffice/issues/13> "No version information". This is only minimal release information (cf. <https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html# tag-releases>), but is what is available directly in the build without additional manual input. Lack of either a date or timestamp attribute causes a failure "org.libreoffice.LibreOffice.desktop: AppData problem: attribute-missing : <release> has no timestamp", so include the current date in ISO 8601 format to silence that. It is assumed that the LIBO_VERSION_* variables will only contain numeric values, so don't need to be encoded when included in an XML attribute. Change-Id: I442a01d5093ab2621897685c3bc1eeda4ee08fa9 (cherry picked from commit 6e004cce495713164778d035e00a39b5465b1c55) Reviewed-on: https://gerrit.libreoffice.org/49589 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2018-02-09solenv/flatpak-manifest.in: Merge in building with GCC 7Stephan Bergmann
This merges in * <https://github.com/flathub/org.libreoffice.LibreOffice/commit/ d1ca6fbdac7f0adcfd813ac5556d6ad979924232> "switch to gcc7", * <https://github.com/flathub/org.libreoffice.LibreOffice/commit/ 687e79514c12bb8c6fd7dfd93f1e4fb84fc6af54> "Copy org.freedesktop.Sdk.Extension.gcc7 libs into app", and * <https://github.com/flathub/org.libreoffice.LibreOffice/commit/ 41b361bf4973b0981f834fe58b3f808b0ca81634> "Use `cp -d` to preserve symlinks", which should allow to build on 32-bit arm once <https://github.com/flathub/org.freedesktop.Sdk.Extension.openjdk9/issues/4> "ARM version" is fixed. Those had been reverted again on flathub with <https://github.com/flathub/ org.libreoffice.LibreOffice/commit/1168072d19f358ffacc783aa83773789c6eafb99> "Revert 'Gcc7' again, for now" because it had apeared back then that using GCC 7 caused the build to fail on aarch64. This has meanwhile been tracked down to be an issue with PDFium instead, see ffc134445ef7e935d18d816626f64e65b4cdbca6 "--disable-pdfium for Linux aarch64 Flatpak build". Change-Id: I594d38ecfdf7dbd78b91af04b9f3f3e86987b8e5 (cherry picked from commit f3062fd2e39819bcb1e8bbb76355cc50d7257652) Reviewed-on: https://gerrit.libreoffice.org/49515 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2018-02-09--disable-pdfium for Linux aarch64 Flatpak buildStephan Bergmann
At least current PDFium master <https://pdfium.googlesource.com/pdfium/+/ 026717cb667cf0c7215cf55daf794d69752fc900/third_party/base/allocator/ partition_allocator/page_allocator.h#33> still hard-codes the assumption that "All Blink-supported systems have 4096 sized system pages". On Linux aarch64 machines with 64K page size (as reported by `getconf PAGE_SIZE`, e.g., on Flathub worker <https://flathub.org/builds/#/workers/18> "gnome-aarch64-1"), that causes LO's CppunitTest_svtools_graphic to fail with SIGABRT, when pdfium::base::SetSystemPagesInaccessible (workdir/UnpackedTarball/pdfium/ third_party/base/allocator/partition_allocator/page_allocator.cpp) causes an mprotect to fail in a pattern like > mmap(0x1051200000, 2097152, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x1051200000 > mprotect(0x1051200000, 4096, PROT_NONE) = 0 > mprotect(0x1051202000, 8192, PROT_NONE) = -1 EINVAL (Invalid argument) The loss of functionality caused by --disable-pdfium is assumed to be acceptable ("used for insert->image and selecting a pdf I believe", according to caolan on IRC), and e.g. Fedora disables it for all arches since <https://src.fedoraproject.org/rpms/libreoffice/c/ 1f6713e951de6aa9af43a9bd92ed011edf0c6fe9> "update to 5.4.0 alpha1". Change-Id: I39385c332ddd6a2a3a221f0d0577181709944313 (cherry picked from commit ffc134445ef7e935d18d816626f64e65b4cdbca6) Reviewed-on: https://gerrit.libreoffice.org/49514 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2018-02-09solenv/flatpak-manifest.in: Disable debug information again, for nowStephan Bergmann
Merge in <https://github.com/flathub/org.libreoffice.LibreOffice/commit/ c6831b215070415a32669fbe63adfc4c36b5f568> "Disable debug information again, for now", to bring repos back in sync. If we want to keep this permanently, --enable-symbols should instead be dropped from distro-configs/LibreOfficeFlatpak.conf. Change-Id: I656d77a446deecbc41ab25f05af7187dc544126c (cherry picked from commit 02248e9e191f798f96218a0c4d281f99e15bea31) Reviewed-on: https://gerrit.libreoffice.org/49513 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2018-02-09Use sha256 instead of sha512Stephan Bergmann
...as the latter is apparently a recent addition to flatpak-manifest that some Flathub workers (like <https://flathub.org/builds/#/workers/16> "arm-3") still do not support, causing "module libreoffice: Sha256 not specified" failures. <http://ant.apache.org/bindownload.cgi> and <https://archive.apache.org/dist/ant/binaries/> do not provide SHA-256 values, so computed it locally. Change-Id: Iee664402f26c9ab428624a4a7933db310efd71b1 (cherry picked from commit a5ce8f010d996fb156ab747a07077c4ab7e8c9f4) Reviewed-on: https://gerrit.libreoffice.org/49512 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2018-02-09Use stable URL for apache-ant downloadStephan Bergmann
as proposed by <http://mail-archives.apache.org/mod_mbox/ant-user/201802.mbox/ %3c001b01d3a101$eadd7ea0$c0987be0$@de%3e> "AW: Stable link to apache-ant-*-bin.tar.xz?" (but using https instead of http) Change-Id: I6f1a5d06c4f2f6ad1861a5c0bda3341f13c8899a (cherry picked from commit ea89bd3fdd475fda72e852c687f6ce81b610df47) Reviewed-on: https://gerrit.libreoffice.org/49511 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2018-02-09Adapt solenv/flatpak-manifest.in to apache-ant-1.10.2Stephan Bergmann
...that apparently made the URL for apache-ant-1.10.1 become 404. (Again, the sha512 for the new version is as given at <http://ant.apache.org/bindownload.cgi>.) (Asked at <http://mail-archives.apache.org/mod_mbox/ant-user/201802.mbox/ %3C039da509-898d-53f5-4c35-ecfa6b6bef18%40redhat.com%3E> "Stable link to apache-ant-*-bin.tar.xz?" whether there's any better link that I could use, to avoid having to constantly track the latest revision of Ant here.) Change-Id: Ic13732d172ade9337f006d4495f066fdd52302a1 (cherry picked from commit d9796b91fec23990e494efcce373a2f0944f294a) Reviewed-on: https://gerrit.libreoffice.org/49479 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2018-01-24Adapt solenv/flatpak-manifest.inStephan Bergmann
...to libreoffice-6-0 26c4a36cad9aca8e07abcbfeddf744ae112a4bc0 "tdf#113532 Add Arabic fonts into default installation" (picking the relevant parts of master cf1dcd1475a22f10c35105a59e6d02dc342ccb16 "Adapt solenv/flatpak-manifest.in to recent download.lst changes and recently added fonts") Change-Id: I126a1695733f7ac70f83f37debd47251989657d5 Reviewed-on: https://gerrit.libreoffice.org/48508 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2018-01-09upload libpagemaker 0.0.4David Tardon
Change-Id: Idc4b7eaa3331ee3831f7d27ca66663e23c30b8c9 Reviewed-on: https://gerrit.libreoffice.org/47615 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 3164e193c2bd1b224231caab3b9306d5f10d9f85) Reviewed-on: https://gerrit.libreoffice.org/47678 Reviewed-by: Michael Stahl <mstahl@redhat.com>
2018-01-09Let flatpak-builder build .Debug extensionStephan Bergmann
Includes a revert of 58891d589bd8da700f135b098dd50833277c65dc "Add distro-pack- install-strip target to be used by dev-tools' flatpak/build.sh". Change-Id: Ie2ba18bc13471b46e8d5f41868bae5aee17ff25f Reviewed-on: https://gerrit.libreoffice.org/47599 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 0ba869fc5c13a29599fda7eb976b2e7959706e04) Reviewed-on: https://gerrit.libreoffice.org/47618 Reviewed-by: Michael Stahl <mstahl@redhat.com>
2018-01-09gcc-wrappers: recognise -ggdb.* in addition to -g as debug flagMichael Stahl
Firebird uses -ggdb. This causes it to have 2 PDB files, however this isn't sufficient to make BinScope happy, more investigation needed. (cherry picked from commit d6b91568d22b9019ddf098f3c3072de25eb1c268) gcc-wrappers: always pass -debug to linker ... like gbuild does; this causes a PDB file to be created, which is required by BinScope. Stops complaints about firebird's DLLs, which are apparently the only DLLs linked with gcc-wrapper. (cherry picked from commit 471b844915cc3d7036cb0fd88b40eeb049f5b54d) Change-Id: I5286964586eaffea36790ab7a7ca2df75d85f068 Reviewed-on: https://gerrit.libreoffice.org/47586 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-01-09gbuild: MSVC: invoke MSASM with /safesehMichael Stahl
BinScope complains that the sblo.dll lacks SAFESEH flag. Change-Id: If2b4b6592eac37542c3e2745d90a8e432b8da2e2 (cherry picked from commit e8f2ca76037eed4c10c9851682c7f6856c7fb0de) Reviewed-on: https://gerrit.libreoffice.org/47585 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-01-08tdf#108580: integrate vc_redist.exe into MSIMike Kaganski
... in InstallUISequense. Use --with-vcredist-dir to point to a directory with vc_redist.x64.exe and/or vc_redist.x86.exe. Use --without-vcredist-dir (or --with-vcredist-dir=no) if you don't want to ship it as part of installer and want to silence the configure warning. VCRedist 2015 version 14.0.24215.1 is available at https://www.microsoft.com/en-us/download/details.aspx?id=53840 Since VisualStudio 2015, VC redist merge module that we used before started to work differently: it installs the UCRT only on WinXP, but not on later OSes (Vista to 8.1) which may lack the UCRT (Win10 has it out of the box). The merge module only installs VCRuntime on those systems, which still leaves us with "api-ms-*.dll is missing" problem. (https://blogs.msdn.microsoft.com/vcblog/2015/03/03/introducing-the-universal-crt/ gives more information on VCRedist refactoring background.) Since commit 71d9a61302e65fe091cf70c13fa72b3df09b7e3a, we use a workaround described at the page mentioned above as "App-local deployment of the Universal CRT". We just copy all UCRT DLLs to LibreOffice/program. This has a drawback though, that our UCRT is not updated by Windows Update, so users would rely on LibreOffice updates in case of some vulnerabilities in UCRT (and they could even not realize they have that problem). MS recommends to install UCRT using EXEs they provide from their site. The EXEs install both VCRuntimes and UCRTs, along with required patches, for all Windows versions (Windows XP through Windows 10, where they only install VCRuntimes); the installed libraries are managed by system's update mechanism. But those EXEs cannot be used in MSI custom actions inside InstallExecuteSequence, because they use MSI themselves. So this patch integrates the vc_redist.xXX.exe into MSI binary table, and uses custom action to run the EXE after ExecuteAction in InstallUISequence. This will show the user a VCRedist install window after the main LibreOffice installation finishes; no user interaction is required (except for one additional UAC request), and errors are ignored. Since this installation takes care of both VCRuntime and UCRT, we can ultimately drop both the app-local workaround, and vcredist merge module (so VCRuntime would also be updated by system). The former is done here: this reverts commit 71d9a61302e65fe091cf70c13fa72b3df09b7e3a. This approach has its drawback: if one wants to use unattended installation (without UI; one example is deployment using ActiveDirectory GPO), then InstallUISequence is not run, and so VCRedist isn't installed. In this case, one should install VCRedist separately. Supposedly this should not be huge problem, because this is the case for many existing applications that need separate VCRedist deployment in these scenarios, and unattended installation is advanced stuff that requires prepared user. A notice would be required in release notes and FAQ, though. Change-Id: Ia6a16be60af8a08f41ea7c3dbd457d8f89006006 Reviewed-on: https://gerrit.libreoffice.org/46356 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 61b1d631331551b43bc7d619be33bfbfeff7cad6) Reviewed-on: https://gerrit.libreoffice.org/47603 Tested-by: Jenkins <ci@libreoffice.org>
2018-01-08upload libabw 0.1.2David Tardon
Change-Id: I972ff9e0dbb73f6a38c886e1acd03cc4d62da2ec Reviewed-on: https://gerrit.libreoffice.org/47251 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit f04ad5673a9de1eda94ed3ae5719d8b761da80bb) Reviewed-on: https://gerrit.libreoffice.org/47487 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2018-01-07upload libe-book 0.1.3David Tardon
Change-Id: I8862e7f4d2dcb007295028b9ec7be04e58ebafd3 Reviewed-on: https://gerrit.libreoffice.org/47264 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 86994e1c25bb5a2d0f97d17328457fa6dfd2f288) Reviewed-on: https://gerrit.libreoffice.org/47483 Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2018-01-04Add JVM support to FlatpakStephan Bergmann
...fixing <https://github.com/flathub/org.libreoffice.LibreOffice/issues/5> "Add JRE-based components". It appeared to be easiest to install the Ant build-time dependency to /run/build/libreoffice/ant, instead of making it into a flatpak-builder module of its own. (The sha512 is as given at <http://ant.apache.org/bindownload.cgi>.) To avoid further dependencies, configure --without-export-validation and --without-junit, only affecting build-time checks (and the amount of checks thus affected by a plain `make` should be small). Reviewed-on: https://gerrit.libreoffice.org/47322 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 22effe2b8edf46539bde34497c6ac3201d70f5ed) Conflicts: solenv/flatpak-manifest.in Change-Id: I5b67c37f168533f9dc7ade11c7c4e2c42814b942 Reviewed-on: https://gerrit.libreoffice.org/47401 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2018-01-04Adapt solenv/flatpak-manifest.in to recent download.lst changesStephan Bergmann
...and recently added fonts (similar to cf1dcd1475a22f10c35105a59e6d02dc342ccb16 "Adapt solenv/flatpak-manifest.in to recent download.lst changes" on master) Change-Id: I7a66118354ff2f7fb7f3b936a7909ff40910edd6 Reviewed-on: https://gerrit.libreoffice.org/47392 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2017-12-04Honor GTK theming in LO flatpakStephan Bergmann
...according to alexlarson, for now (until "eventually we'll have a sane dconf in the sandbox") apps need to specify --filesystem=xdg-run/dconf, --filesystem=~/.config/dconf:ro, --talk-name=ca.desrt.dconf, --env=DCONF_USER_CONFIG_DIR=.config/dconf (where the first two are irrelevant for LO due to its --filesystem=host). This fixes <https://github.com/flathub/org.libreoffice.LibreOffice/issues/4> "Libreoffice flatpak is not respecting user theme". Change-Id: If5ed33e1b524bfa877b89f052c6067398b5600a3 (cherry picked from commit 12ba14c6bee1c773e4500f79a90a07f871cf3feb) Reviewed-on: https://gerrit.libreoffice.org/45806 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2017-12-01Move loplugin:fpcomparison to store/Stephan Bergmann
...after bc4e8de8eea1ccebda479c8e2db2f3c6dfff60d2 "Silence new loplugin:fpcomparison for now": > Nov 30 08:33:16 <sberg> noelgrandin, thoughts on whether fpcomparison is actually worth it, seeing the loooooooong blacklist there? > Nov 30 08:34:11 <noelgrandin> sberg, that's wasn't my idea, can't remember who came up with it. vmiklos was that you? > Nov 30 08:34:36 <noelgrandin> sberg, the original commit message was "Find code that compares floating point values with == or != > Nov 30 08:34:36 <noelgrandin> It should rather use rtl::math::approxEqual" > Nov 30 08:34:45 <noelgrandin> so in theory the replacement should be fairly manual > Nov 30 08:34:48 <vmiklos> i don't think so :) > Nov 30 08:35:15 <noelgrandin> might have been moggi, but he's not around so.... just disable it > Nov 30 08:36:19 <sberg> noelgrandin, yeah, in theory; in practice, I guess there's also cases where x==1.0 is what you want exactly (given x tends not to be a computed value after all, but some literal that's being passed around) > Nov 30 08:36:33 <sberg> noelgrandin, yeah, I'll disable it then Change-Id: I35f5328efa0ec02d9be837c12efab2b03a3dae52 Reviewed-on: https://gerrit.libreoffice.org/45550 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit bf59f89d8818f62b03acaf7820e1a9560a388252) Reviewed-on: https://gerrit.libreoffice.org/45658 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2017-11-30upload libwps 0.4.8David Tardon
Change-Id: Ib285c227cd935987311be40df3745316943a54e0 Reviewed-on: https://gerrit.libreoffice.org/45331 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 8d0e8d5d291cbb98de6964eab2f629a405c7e813) Signed-off-by: David Tardon <dtardon@redhat.com>
2017-11-28DBus permissions missing from LO flatpakStephan Bergmann
...after 243d743dae127fe11ecd7f807121da8815af8f01 "solenv/flatpak-manifest.in: incorporate upstream sandboxing improvements", causing <https://github.com/flathub/org.libreoffice.LibreOffice/issues/3> "Doesn't open files in network shares". Change-Id: I15d7a170b3ffaf6092ff4d2fe4e93b1dcfd32b0b (cherry picked from commit 95fbb490e68b044226518a88a109de7ae1c89731) Reviewed-on: https://gerrit.libreoffice.org/45413 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-11-28Turns out SdiTarget needs the extended SOLARINC after allStephan Bergmann
After fbfe55e58c4b14f86cbb2c7b822f727e5b2e4a66 "There appears to be no need for -I. in SOLARINC", on Windows, e.g. workdir/Dep/SdiTarget/basctl/sdi/basslots.d now contains basslots.sdi without a path, because the call to osl::File::searchFileURL in SvIdlParser::ReadInclude (idl/source/prj/parser.cxx) is done with rBase.GetPath() no longer containing the basctl/sdi/ source dir, so searchFileURL silently returns "basslots.sdi" unmodified. (The non-Windows implementation in sal/osl/unx/file_url.cxx appears to also check CWD, so doesn't suffer from this regression.) Change-Id: I51802192cfe112f810b193a77d14787d965c2761 Reviewed-on: https://gerrit.libreoffice.org/45323 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 445288f073f3c462669f02f3307ef9009ea0f594) Reviewed-on: https://gerrit.libreoffice.org/45347 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-11-24gbuild: handle GENCXXCLROBJECTS in gbuildtojsonMichael Stahl
Change-Id: Ib5808a715e4ba0e0a5d9eea8260ea72fd85ccda2
2017-11-24tdf#113787: gbuild: fix the version of cli_cppuhelper assemblyMichael Stahl
There is one usage of gb_Library_add_generated_cxxclrobjects in the entire repo, and regrettably generated C++/CLR objects weren't actually implemented in the new build system, so the assembly.cxx with its generated version number was simply ignored.
2017-11-24tdf#113787: always require version file with config for CLI assembliesMichael Stahl
The CliUnoApi_oootypes does not use the same version file as everything else, so pass that in as a parameter.
2017-11-24gbuild: CliAssembly: clean everythingMichael Stahl
Change-Id: Ieaef37a8af808c9b1b981b4363e4dabfb4816457
2017-11-23ios: blacklist newly pushed non-formatted filesMiklos Vajna
Commit ed885a3cdbfc4b4d194d40508a29334b9780858f (iOS, do not use different C compilers, 2017-11-23) was pushed directly and clang-format wasn't used locally, either -- so just blacklist these new files. Change-Id: Id6e39e68ac112494139e982ebcf7c32531184ec2
2017-11-23move preventduplicateinteraction from framework to sfx2 consumerCaolán McNamara
Change-Id: I1388a88ba20b5cde65cd1d88694775b071a0dff6 Reviewed-on: https://gerrit.libreoffice.org/45099 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-11-23loplugin:simplifybool for negation of comparison operatorNoel Grandin
Change-Id: Ie56daf560185274754afbc7a09c432b5c2793791 Reviewed-on: https://gerrit.libreoffice.org/45068 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-11-22iOS, changed debugger from to lldbjan Iversen
gdb2 does not work well when using a swift based frontend. changing to default debugger but only for iOS. Change-Id: Iae0df85b9db4b3dfaf9fbc0e42848c52f3685a48
2017-11-22RTF filter: drop now redundant astyle.optionsMiklos Vajna
I (tried to) keep the RTF filter style consistent locally with astyle in the past, but now that's redundant when we have an enforcing clang-format mechanism in place. So drop the astyle config and switch to clang-format in the RTF filter case. To minimize backport pain, do this shortly before the libreoffice-6-0 branch-off. Change-Id: I708dbeb0b5ad2afacc90029ee5abba9495f4601f
2017-11-21clang-format fixesMiklos Vajna
Hopefully the last such commit, now that the in-gerrit verification is in place and also a warning is printed locally for those who push directly. Change-Id: Ib80cbca0b29dc7f71cbb182a38ad6839a659ff41 Reviewed-on: https://gerrit.libreoffice.org/45002 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2017-11-21Fix typosAndrea Gelmini
Change-Id: Ifd95ada4477d7d21ffbadd355226f91f2a2371e1 Reviewed-on: https://gerrit.libreoffice.org/45004 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jens Carl <j.carl43@gmx.de>
generated by cgit (git 2.34.1) at 2024-06-20 13:39:34 +0000