diff --git a/.abf.yml b/.abf.yml index 13f9728..5440609 100644 --- a/.abf.yml +++ b/.abf.yml @@ -8,6 +8,7 @@ sources: 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz: 5c604f102e0716597b3d2659ac3e77f80a02f22d 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip: 1acea86fd399ed7817879d36370d3d1f8b109050 472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt: d2b6a076b40d8d517075e52220ddd8f89f655c8f + 49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf: ad0f4351a484ac9b5422beae749719299bdfcfb8 4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt: bf25bef71f72a4622089c85958bfd6c58d8516a6 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2: 1169780b4a0c515b23b96c913fd9bc52ceb7fb39 53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt: 4fea33622d89c7ac62053e5ee3616cfe504e0f14 @@ -18,14 +19,15 @@ sources: a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt: d831314cf4c74f5afb3b37ee718dd58f981b97a8 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip: 2d49e11b0b711970f494294dc3698f05eb294853 af9314c5972d95a5d6da23ffad818f68-OOOP-gallery-pack-2.8.0.0.zip: c71f095bf032e29ab0afc277fd2718e592ba6ba4 - apache-ant-1.10.5-bin.tar.bz2: 0a8b4cfc3c77bdd270fe1a618465de31e12fdbe5 + apache-ant-1.10.6-bin.tar.bz2: 0c0e0a64a6ad502c8a80f7ef07b9c73a261dbc79 b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt: 27847d6c320297905303ca7d2a45dbd0c492f705 b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt: a476a199de32a32221132c8e77fad96c88616b08 b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2: aa8faa4f9e6721eed9bc6878862d74d0cb23251c b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt: bdec3915c01cd60e20892376aa5e5a0d3980c389 commons-logging-1.2-src.tar.gz: 0a134d01e9aeb09b33f4c7450fb41abb7bed9db6 - libreoffice-6.0.7.3.tar.xz: d4add57e7fb837ae6376bdd418704530e4950aa2 - libreoffice-dictionaries-6.0.7.3.tar.xz: 92bf00132beb22abbb6515b7b0060347203ce08a - libreoffice-help-6.0.7.3.tar.xz: 9ace766d0965cfe7f29d9893c1af5cc852b93db6 - libreoffice-translations-6.0.7.3.tar.xz: b364e99b615190256bfb271407c2ad4c184ffbfa - pdfium-3235.tar.bz2: 10a6525bf0c014556766a19912fa6a80849a9117 + lxml-4.1.1.tgz: 154279bc5939d7099697887ea15c5ca921abeaeb + pdfium-3550.tar.bz2: 04b0116d3fa5eaabea94fed75fc30ae75916c071 + libreoffice-6.2.8.2.tar.xz: a0603d57c1e0f681cf07c37748fb03d6fec126fb + libreoffice-dictionaries-6.2.8.2.tar.xz: a787d7323dc08673cce4bffb4967569d12f4f9bf + libreoffice-help-6.2.8.2.tar.xz: 2499fb7905e26117d04b5f12ec4537bae0244864 + libreoffice-translations-6.2.8.2.tar.xz: 3dcdfe7cc263f6eff9e2b877c02166c21d90051d diff --git a/CVE-2019-9848.patch b/CVE-2019-9848.patch deleted file mode 100644 index 960c5c4..0000000 --- a/CVE-2019-9848.patch +++ /dev/null @@ -1,36 +0,0 @@ -Description: Explictly exclude LibreLogo from XScript usage -Author: Caolán McNamara -Upstream Commit: https://cgit.freedesktop.org/libreoffice/core/commit/?id=cb0024e3668979dfdef44db5aa15ddfaf035e695 -Bug: https://www.libreoffice.org/about-us/security/advisories/cve-2019-9848/ - -diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx -index a5e62da8c..02d79c356 100644 ---- a/sfx2/source/doc/objmisc.cxx -+++ b/sfx2/source/doc/objmisc.cxx -@@ -1347,6 +1347,16 @@ namespace - } - } - -+namespace { -+ -+// don't allow LibreLogo to be used with our mouseover/etc dom-alike events -+bool UnTrustedScript(const OUString& rScriptURL) -+{ -+ return rScriptURL.startsWithIgnoreAsciiCase("vnd.sun.star.script:LibreLogo"); -+} -+ -+} -+ - ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptContext, const OUString& _rScriptURL, - const Sequence< Any >& aParams, Any& aRet, Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam, bool bRaiseError, const css::uno::Any* pCaller ) - { -@@ -1359,6 +1369,9 @@ ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptCon - if ( bIsDocumentScript && !lcl_isScriptAccessAllowed_nothrow( _rxScriptContext ) ) - return ERRCODE_IO_ACCESSDENIED; - -+ if ( UnTrustedScript(_rScriptURL) ) -+ return ERRCODE_IO_ACCESSDENIED; -+ - bool bCaughtException = false; - Any aException; - try diff --git a/CVE-2019-9849.patch b/CVE-2019-9849.patch deleted file mode 100644 index 2221cae..0000000 --- a/CVE-2019-9849.patch +++ /dev/null @@ -1,141 +0,0 @@ -Description: More uses of referer URL with SvxBrushItem -Author: Stephan Bergmann -Upstream Commit: https://cgit.freedesktop.org/libreoffice/core/commit/?id=b518882de8213ef71a8003f95fbdf7689069c06d -Bug: https://www.libreoffice.org/about-us/security/advisories/cve-2019-9849/ - -diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx -index 295eb06fe..185b5bcb4 100644 ---- a/sw/inc/unosett.hxx -+++ b/sw/inc/unosett.hxx -@@ -210,7 +210,7 @@ public: - - static css::uno::Sequence GetPropertiesForNumFormat( - const SwNumFormat& rFormat, OUString const& rCharFormatName, -- OUString const* pHeadingStyleName); -+ OUString const* pHeadingStyleName, OUString const & referer); - static void SetPropertiesToNumFormat( - SwNumFormat & aFormat, - OUString & rCharStyleName, -diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx -index 777165819..b29cee3b5 100644 ---- a/sw/source/core/text/porfld.cxx -+++ b/sw/source/core/text/porfld.cxx -@@ -755,7 +755,7 @@ SwBulletPortion::SwBulletPortion( const sal_Unicode cBullet, - - SwGrfNumPortion::SwGrfNumPortion( - const OUString& rGraphicFollowedBy, -- const SvxBrushItem* pGrfBrush, -+ const SvxBrushItem* pGrfBrush, OUString const & referer, - const SwFormatVertOrient* pGrfOrient, const Size& rGrfSize, - const bool bLft, const bool bCntr, const sal_uInt16 nMinDst, - const bool bLabelAlignmentPosAndSpaceModeActive ) : -@@ -769,7 +769,7 @@ SwGrfNumPortion::SwGrfNumPortion( - if( pGrfBrush ) - { - *pBrush = *pGrfBrush; -- const Graphic* pGraph = pGrfBrush->GetGraphic(); -+ const Graphic* pGraph = pGrfBrush->GetGraphic(referer); - if( pGraph ) - SetAnimated( pGraph->IsAnimated() ); - else -diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx -index 38fc08993..4ecf25e7d 100644 ---- a/sw/source/core/text/porfld.hxx -+++ b/sw/source/core/text/porfld.hxx -@@ -168,6 +168,7 @@ class SwGrfNumPortion : public SwNumberPortion - public: - SwGrfNumPortion( const OUString& rGraphicFollowedBy, - const SvxBrushItem* pGrfBrush, -+ OUString const & referer, - const SwFormatVertOrient* pGrfOrient, - const Size& rGrfSize, - const bool bLeft, -diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx -index 6b2b93886..14e396869 100644 ---- a/sw/source/core/text/txtfld.cxx -+++ b/sw/source/core/text/txtfld.cxx -@@ -52,6 +52,7 @@ - #include - #include - #include -+#include - #include - - static bool lcl_IsInBody( SwFrame const *pFrame ) -@@ -478,8 +479,17 @@ SwNumberPortion *SwTextFormatter::NewNumberPortion( SwTextFormatInfo &rInf ) con - - if( SVX_NUM_BITMAP == rNumFormat.GetNumberingType() ) - { -+ OUString referer; -+ if (auto const sh1 = rInf.GetVsh()) { -+ if (auto const doc = sh1->GetDoc()) { -+ auto const sh2 = doc->GetPersist(); -+ if (sh2 != nullptr && sh2->HasName()) { -+ referer = sh2->GetMedium()->GetName(); -+ } -+ } -+ } - pRet = new SwGrfNumPortion( pTextNd->GetLabelFollowedBy(), -- rNumFormat.GetBrush(), -+ rNumFormat.GetBrush(), referer, - rNumFormat.GetGraphicOrientation(), - rNumFormat.GetGraphicSize(), - bLeft, bCenter, nMinDist, -diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx -index f7376b936..218afbdd9 100644 ---- a/sw/source/core/unocore/unosett.cxx -+++ b/sw/source/core/unocore/unosett.cxx -@@ -57,6 +57,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -1316,13 +1317,21 @@ uno::Sequence SwXNumberingRules::GetNumberingRuleByIndex( - SwStyleNameMapper::FillProgName(sValue, aUString, SwGetPoolIdFromName::TxtColl); - } - -- return GetPropertiesForNumFormat(rFormat, CharStyleName, (pDocShell) ? & aUString : nullptr); -+ OUString referer; -+ if (pDoc != nullptr) { -+ auto const sh = pDoc->GetPersist(); -+ if (sh != nullptr && sh->HasName()) { -+ referer = sh->GetMedium()->GetName(); -+ } -+ } -+ return GetPropertiesForNumFormat( -+ rFormat, CharStyleName, pDocShell ? & aUString : nullptr, referer); - - } - - uno::Sequence SwXNumberingRules::GetPropertiesForNumFormat( - const SwNumFormat& rFormat, OUString const& rCharFormatName, -- OUString const*const pHeadingStyleName) -+ OUString const*const pHeadingStyleName, OUString const & referer) - { - bool bChapterNum = pHeadingStyleName != nullptr; - -@@ -1454,7 +1463,7 @@ uno::Sequence SwXNumberingRules::GetPropertiesForNumFormat - //graphicbitmap - const Graphic* pGraphic = nullptr; - if(pBrush ) -- pGraphic = pBrush->GetGraphic(); -+ pGraphic = pBrush->GetGraphic(referer); - if(pGraphic) - { - uno::Reference xBmp = VCLUnoHelper::CreateBitmap( pGraphic->GetBitmapEx() ); -diff --git a/sw/source/uibase/config/StoredChapterNumbering.cxx b/sw/source/uibase/config/StoredChapterNumbering.cxx -index c575863f0..b972ec5ed 100644 ---- a/sw/source/uibase/config/StoredChapterNumbering.cxx -+++ b/sw/source/uibase/config/StoredChapterNumbering.cxx -@@ -129,7 +129,7 @@ public: - OUString dummy; // pass in empty HeadingStyleName - can't import anyway - uno::Sequence const ret( - SwXNumberingRules::GetPropertiesForNumFormat( -- *pNumFormat, *pCharStyleName, &dummy)); -+ *pNumFormat, *pCharStyleName, &dummy, "")); - return uno::makeAny(ret); - } - diff --git a/CVE-2019-9850_1_2.patch b/CVE-2019-9850_1_2.patch deleted file mode 100644 index 8cf5750..0000000 --- a/CVE-2019-9850_1_2.patch +++ /dev/null @@ -1,206 +0,0 @@ -Description: - expand LibreLogo check to global events - - decode url escape codes and check each path segment - - keep name percent-encoded - - expand pyuno path separators - - construct final url from parsed output -Authors: - Caolán McNamara - - Stephan Bergmann - -diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx -index b51498905..35b3091e4 100644 ---- a/include/sfx2/objsh.hxx -+++ b/include/sfx2/objsh.hxx -@@ -397,6 +397,8 @@ public: - */ - bool AdjustMacroMode(); - -+ static bool UnTrustedScript(const OUString& rScriptURL); -+ - SvKeyValueIterator* GetHeaderAttributes(); - void ClearHeaderAttributesForSourceViewHack(); - void SetHeaderAttributesForSourceViewHack(); -diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx -index 150ffa052..751099d92 100644 ---- a/scripting/source/protocolhandler/scripthandler.cxx -+++ b/scripting/source/protocolhandler/scripthandler.cxx -@@ -47,6 +47,7 @@ - - #include - #include -+#include - #include - - #include -@@ -133,8 +134,12 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification( - { - try - { -- bool bIsDocumentScript = ( aURL.Complete.indexOf( "document" ) !=-1 ); -- // TODO: isn't this somewhat strange? This should be a test for a location=document parameter, shouldn't it? -+ css::uno::Reference urifac( -+ css::uri::UriReferenceFactory::create(m_xContext)); -+ css::uno::Reference uri( -+ urifac->parse(aURL.Complete), css::uno::UNO_QUERY_THROW); -+ auto const loc = uri->getParameter("location"); -+ bool bIsDocumentScript = loc == "document"; - - if ( bIsDocumentScript ) - { -diff --git a/scripting/source/pyprov/pythonscript.py b/scripting/source/pyprov/pythonscript.py -index f5aa21733..316c5012c 100644 ---- a/scripting/source/pyprov/pythonscript.py -+++ b/scripting/source/pyprov/pythonscript.py -@@ -219,10 +219,18 @@ class MyUriHelper: - - # path to the .py file + "$functionname, arguments, etc - xStorageUri = self.m_uriRefFac.parse(scriptURI) -- sStorageUri = xStorageUri.getName().replace( "|", "/" ); -+ # getName will apply url-decoding to the name, so encode back -+ sStorageUri = xStorageUri.getName().replace("%", "%25") -+ sStorageUri = sStorageUri.replace( "|", "/" ) - - # path to the .py file, relative to the base -- sFileUri = sStorageUri[0:sStorageUri.find("$")] -+ funcNameStart = sStorageUri.find("$") -+ if funcNameStart != -1: -+ sFileUri = sStorageUri[0:funcNameStart] -+ sFuncName = sStorageUri[funcNameStart+1:] -+ else: -+ sFileUri = sStorageUri -+ - xFileUri = self.m_uriRefFac.parse(sFileUri) - if not xFileUri: - message = "pythonscript: invalid relative uri '" + sFileUri+ "'" -@@ -239,7 +247,9 @@ class MyUriHelper: - log.debug( message ) - raise RuntimeException( message ) - -- ret = sBaseUri + sStorageUri -+ ret = sAbsScriptUri -+ if funcNameStart != -1: -+ ret = ret + "$" + sFuncName - log.debug( "converting scriptURI="+scriptURI + " to storageURI=" + ret ) - return ret - except UnoException as e: -diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx -index 02d79c356..a508aea86 100644 ---- a/sfx2/source/doc/objmisc.cxx -+++ b/sfx2/source/doc/objmisc.cxx -@@ -41,6 +41,8 @@ - #include - #include - #include -+#include -+#include - #include - - #include -@@ -1347,14 +1349,36 @@ namespace - } - } - --namespace { -- - // don't allow LibreLogo to be used with our mouseover/etc dom-alike events --bool UnTrustedScript(const OUString& rScriptURL) -+bool SfxObjectShell::UnTrustedScript(const OUString& rScriptURL) - { -- return rScriptURL.startsWithIgnoreAsciiCase("vnd.sun.star.script:LibreLogo"); --} -+ if (!rScriptURL.startsWith("vnd.sun.star.script:")) -+ return false; -+ -+ // ensure URL Escape Codes are decoded -+ css::uno::Reference uri( -+ css::uri::UriReferenceFactory::create(comphelper::getProcessComponentContext())->parse(rScriptURL)); -+ css::uno::Reference sfUri(uri, css::uno::UNO_QUERY); -+ -+ if (!sfUri.is()) -+ return false; -+ -+ // pyuno encodes path separator as | -+ OUString sScript = sfUri->getName().replace('|', '/'); - -+ // check if any path portion matches LibreLogo and ban it if it does -+ sal_Int32 nIndex = 0; -+ do -+ { -+ OUString aToken = sScript.getToken(0, '/', nIndex); -+ if (aToken.startsWithIgnoreAsciiCase("LibreLogo")) -+ { -+ return true; -+ } -+ } -+ while (nIndex >= 0); -+ -+ return false; - } - - ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptContext, const OUString& _rScriptURL, -@@ -1363,19 +1387,22 @@ ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptCon - SAL_INFO("sfx", "in CallXScript" ); - ErrCode nErr = ERRCODE_NONE; - -- bool bIsDocumentScript = ( _rScriptURL.indexOf( "location=document" ) >= 0 ); -- // TODO: we should parse the URL, and check whether there is a parameter with this name. -- // Otherwise, we might find too much. -- if ( bIsDocumentScript && !lcl_isScriptAccessAllowed_nothrow( _rxScriptContext ) ) -- return ERRCODE_IO_ACCESSDENIED; -- -- if ( UnTrustedScript(_rScriptURL) ) -- return ERRCODE_IO_ACCESSDENIED; -- - bool bCaughtException = false; - Any aException; - try - { -+ css::uno::Reference urifac( -+ css::uri::UriReferenceFactory::create(comphelper::getProcessComponentContext())); -+ css::uno::Reference uri( -+ urifac->parse(_rScriptURL), css::uno::UNO_QUERY_THROW); -+ auto const loc = uri->getParameter("location"); -+ bool bIsDocumentScript = loc == "document"; -+ if ( bIsDocumentScript && !lcl_isScriptAccessAllowed_nothrow( _rxScriptContext ) ) -+ return ERRCODE_IO_ACCESSDENIED; -+ -+ if ( UnTrustedScript(_rScriptURL) ) -+ return ERRCODE_IO_ACCESSDENIED; -+ - // obtain/create a script provider - Reference< provider::XScriptProvider > xScriptProvider; - Reference< provider::XScriptProviderSupplier > xSPS( _rxScriptContext, UNO_QUERY ); -diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx -index 69076ad01..d18724d74 100644 ---- a/sfx2/source/notify/eventsupplier.cxx -+++ b/sfx2/source/notify/eventsupplier.cxx -@@ -209,18 +209,24 @@ void SfxEvents_Impl::Execute( uno::Any const & aEventData, const document::Docum - else if (aType == "Service" || - aType == "Script") - { -- if ( !aScript.isEmpty() ) -+ bool bAllowed = false; -+ util::URL aURL; -+ if (!aScript.isEmpty()) - { -- SfxViewFrame* pView = pDoc ? -- SfxViewFrame::GetFirst( pDoc ) : -- SfxViewFrame::Current(); -- - uno::Reference < util::XURLTransformer > xTrans( util::URLTransformer::create( ::comphelper::getProcessComponentContext() ) ); - -- util::URL aURL; - aURL.Complete = aScript; - xTrans->parseStrict( aURL ); - -+ bAllowed = !SfxObjectShell::UnTrustedScript(aURL.Complete); -+ } -+ -+ if (bAllowed) -+ { -+ SfxViewFrame* pView = pDoc ? -+ SfxViewFrame::GetFirst( pDoc ) : -+ SfxViewFrame::Current(); -+ - uno::Reference - < frame::XDispatchProvider > xProv; - diff --git a/CVE-2019-9854.patch b/CVE-2019-9854.patch deleted file mode 100644 index 65ec0ae..0000000 --- a/CVE-2019-9854.patch +++ /dev/null @@ -1,34 +0,0 @@ -Description: - an absolute uri is invalid input - - improve check for absolute URI -Authors: - Caolán McNamara - - Stephan Bergmann - -diff --git a/scripting/source/pyprov/pythonscript.py b/scripting/source/pyprov/pythonscript.py -index 316c5012c..c46565949 100644 ---- a/scripting/source/pyprov/pythonscript.py -+++ b/scripting/source/pyprov/pythonscript.py -@@ -237,6 +237,11 @@ class MyUriHelper: - log.debug( message ) - raise RuntimeException( message ) - -+ if not xFileUri.hasRelativePath(): -+ message = "pythonscript: an absolute uri is invalid '" + sFileUri+ "'" -+ log.debug( message ) -+ raise RuntimeException( message ) -+ - # absolute path to the .py file - xAbsScriptUri = self.m_uriRefFac.makeAbsolute(xBaseUri, xFileUri, True, RETAIN) - sAbsScriptUri = xAbsScriptUri.getUriReference() -diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx -index a508aea86..3ec10565b 100644 ---- a/sfx2/source/doc/objmisc.cxx -+++ b/sfx2/source/doc/objmisc.cxx -@@ -1371,7 +1371,7 @@ bool SfxObjectShell::UnTrustedScript(const OUString& rScriptURL) - do - { - OUString aToken = sScript.getToken(0, '/', nIndex); -- if (aToken.startsWithIgnoreAsciiCase("LibreLogo")) -+ if (aToken.startsWithIgnoreAsciiCase("LibreLogo") || aToken.indexOf('~') != -1) - { - return true; - } diff --git a/libreoffice-5.2.1.2-desktop-protocols.patch b/libreoffice-5.2.1.2-desktop-protocols.patch index 144516b..a2b4ce5 100644 --- a/libreoffice-5.2.1.2-desktop-protocols.patch +++ b/libreoffice-5.2.1.2-desktop-protocols.patch @@ -5,8 +5,8 @@ diff -urN libreoffice-5.2.1.2/sysui/desktop/menus/base.desktop libreoffice-5.2.1 Keywords=Data;SQL; InitialPreference=5 StartupWMClass=libreoffice-base --X-KDE-Protocols=file,http,ftp,webdav -+X-KDE-Protocols=file,http,webdav,smb,remote +-X-KDE-Protocols=file,http,ftp,webdav,webdavs ++X-KDE-Protocols=file,http,webdav,smb,remote,webdavs Actions=NewDocument; [Desktop Action NewDocument] @@ -17,8 +17,8 @@ diff -urN libreoffice-5.2.1.2/sysui/desktop/menus/calc.desktop libreoffice-5.2.1 Keywords=Accounting;Stats;OpenDocument Spreadsheet;Chart;Microsoft Excel;Microsoft Works;OpenOffice Calc;ods;xls;xlsx; InitialPreference=5 StartupWMClass=libreoffice-calc --X-KDE-Protocols=file,http,ftp,webdav -+X-KDE-Protocols=file,http,webdav,smb,remote +-X-KDE-Protocols=file,http,ftp,webdav,webdavs ++X-KDE-Protocols=file,http,webdav,smb,remote,webdavs Actions=NewDocument; [Desktop Action NewDocument] @@ -29,8 +29,8 @@ diff -urN libreoffice-5.2.1.2/sysui/desktop/menus/draw.desktop libreoffice-5.2.1 Keywords=Vector;Schema;Diagram;Layout;OpenDocument Graphics;Microsoft Publisher;Microsoft Visio;Corel Draw;cdr;odg;svg;pdf;vsd; InitialPreference=5 StartupWMClass=libreoffice-draw --X-KDE-Protocols=file,http,ftp,webdav -+X-KDE-Protocols=file,http,webdav,smb,remote +-X-KDE-Protocols=file,http,ftp,webdav,webdavs ++X-KDE-Protocols=file,http,webdav,smb,remote,webdavs Actions=NewDocument; [Desktop Action NewDocument] @@ -41,8 +41,8 @@ diff -urN libreoffice-5.2.1.2/sysui/desktop/menus/impress.desktop libreoffice-5. Keywords=Slideshow;Slides;OpenDocument Presentation;Microsoft PowerPoint;Microsoft Works;OpenOffice Impress;odp;ppt;pptx; InitialPreference=5 StartupWMClass=libreoffice-impress --X-KDE-Protocols=file,http,ftp,webdav -+X-KDE-Protocols=file,http,webdav,smb,remote +-X-KDE-Protocols=file,http,ftp,webdav,webdavs ++X-KDE-Protocols=file,http,webdav,smb,remote,webdavs Actions=NewDocument; [Desktop Action NewDocument] @@ -53,20 +53,11 @@ diff -urN libreoffice-5.2.1.2/sysui/desktop/menus/math.desktop libreoffice-5.2.1 Keywords=Equation;OpenDocument Formula;Formula;odf;MathML; InitialPreference=5 StartupWMClass=libreoffice-math --X-KDE-Protocols=file,http,ftp,webdav -+X-KDE-Protocols=file,http,webdav,smb,remote +-X-KDE-Protocols=file,http,ftp,webdav,webdavs ++X-KDE-Protocols=file,http,webdav,smb,remote,webdavs Actions=NewDocument; [Desktop Action NewDocument] -diff -urN libreoffice-5.2.1.2/sysui/desktop/menus/qstart.desktop libreoffice-5.2.1.2-patched/sysui/desktop/menus/qstart.desktop ---- libreoffice-5.2.1.2/sysui/desktop/menus/qstart.desktop 2016-08-25 10:26:36.000000000 +1000 -+++ libreoffice-5.2.1.2-patched/sysui/desktop/menus/qstart.desktop 2016-09-06 12:22:41.354727943 +1000 -@@ -25,4 +25,4 @@ - Name=%PRODUCTNAME Quickstarter - Comment=Hook for quickstarter startup - X-GIO-NoFuse=true --X-KDE-Protocols=file,http,ftp,webdav -+X-KDE-Protocols=file,http,webdav,smb,remote diff -urN libreoffice-5.2.1.2/sysui/desktop/menus/startcenter.desktop libreoffice-5.2.1.2-patched/sysui/desktop/menus/startcenter.desktop --- libreoffice-5.2.1.2/sysui/desktop/menus/startcenter.desktop 2016-08-25 10:26:36.000000000 +1000 +++ libreoffice-5.2.1.2-patched/sysui/desktop/menus/startcenter.desktop 2016-09-06 12:22:41.354727943 +1000 @@ -74,8 +65,8 @@ diff -urN libreoffice-5.2.1.2/sysui/desktop/menus/startcenter.desktop libreoffic StartupNotify=true X-GIO-NoFuse=true StartupWMClass=libreoffice-startcenter --X-KDE-Protocols=file,http,ftp,webdav -+X-KDE-Protocols=file,http,webdav,smb,remote +-X-KDE-Protocols=file,http,ftp,webdav,webdavs ++X-KDE-Protocols=file,http,webdav,smb,remote,webdavs ##Define Actions Actions=Writer;Calc;Impress;Draw;Base;Math; @@ -86,8 +77,8 @@ diff -urN libreoffice-5.2.1.2/sysui/desktop/menus/writer.desktop libreoffice-5.2 Keywords=Text;Letter;Fax;Document;OpenDocument Text;Microsoft Word;Microsoft Works;Lotus WordPro;OpenOffice Writer;CV;odt;doc;docx;rtf; InitialPreference=5 StartupWMClass=libreoffice-writer --X-KDE-Protocols=file,http,ftp,webdav -+X-KDE-Protocols=file,http,webdav,smb,remote +-X-KDE-Protocols=file,http,ftp,webdav,webdavs ++X-KDE-Protocols=file,http,webdav,smb,remote,webdavs Actions=NewDocument; [Desktop Action NewDocument] @@ -98,5 +89,5 @@ diff -urN libreoffice-5.2.1.2/sysui/desktop/menus/xsltfilter.desktop libreoffice NoDisplay=true StartupNotify=true X-GIO-NoFuse=true --X-KDE-Protocols=file,http,ftp,webdav -+X-KDE-Protocols=file,http,webdav,smb,remote +-X-KDE-Protocols=file,http,ftp,webdav,webdavs ++X-KDE-Protocols=file,http,webdav,smb,remote,webdavs diff --git a/libreoffice-5.4.3.1-breeze-fallback-theme.patch b/libreoffice-5.4.3.1-breeze-fallback-theme.patch deleted file mode 100644 index 4cf2c63..0000000 --- a/libreoffice-5.4.3.1-breeze-fallback-theme.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN libreoffice-5.4.3.1/vcl/source/app/IconThemeSelector.cxx libreoffice-5.4.3.1-patched/vcl/source/app/IconThemeSelector.cxx ---- libreoffice-5.4.3.1/vcl/source/app/IconThemeSelector.cxx 2017-10-18 04:42:39.000000000 +1000 -+++ libreoffice-5.4.3.1-patched/vcl/source/app/IconThemeSelector.cxx 2017-11-16 00:25:30.922971263 +1000 -@@ -16,7 +16,7 @@ - - namespace vcl { - --/*static*/ const OUStringLiteral IconThemeSelector::FALLBACK_ICON_THEME_ID("tango"); -+/*static*/ const OUStringLiteral IconThemeSelector::FALLBACK_ICON_THEME_ID("breeze"); - - namespace { - diff --git a/libreoffice-5.3.1.1-desktop-categories.patch b/libreoffice-6.2.8.2-desktop-categories.patch similarity index 70% rename from libreoffice-5.3.1.1-desktop-categories.patch rename to libreoffice-6.2.8.2-desktop-categories.patch index 91c2b8c..417d846 100644 --- a/libreoffice-5.3.1.1-desktop-categories.patch +++ b/libreoffice-6.2.8.2-desktop-categories.patch @@ -1,6 +1,6 @@ -diff -urN libreoffice-5.3.1.1/sysui/desktop/menus/base.desktop libreoffice-5.3.1.1-patched/sysui/desktop/menus/base.desktop ---- libreoffice-5.3.1.1/sysui/desktop/menus/base.desktop 2017-02-20 16:24:34.000000000 +0300 -+++ libreoffice-5.3.1.1-patched/sysui/desktop/menus/base.desktop 2017-03-12 14:41:46.552237494 +0300 +diff -urN libreoffice-6.2.8.2/sysui/desktop/menus/base.desktop libreoffice-6.2.8.2-patched/sysui/desktop/menus/base.desktop +--- libreoffice-6.2.8.2/sysui/desktop/menus/base.desktop 2019-10-10 14:27:52.000000000 +0300 ++++ libreoffice-6.2.8.2-patched/sysui/desktop/menus/base.desktop 2019-10-15 15:22:51.862066911 +0300 @@ -20,7 +20,7 @@ Terminal=false Icon=base @@ -10,9 +10,9 @@ diff -urN libreoffice-5.3.1.1/sysui/desktop/menus/base.desktop libreoffice-5.3.1 Exec=${UNIXBASISROOTNAME} --base %%FILE%% MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base; Name=%PRODUCTNAME Base -diff -Naur libreoffice-5.4.5.1/sysui/desktop/menus/calc.desktop-orig libreoffice-5.4.5.1/sysui/desktop/menus/calc.desktop ---- libreoffice-5.4.5.1/sysui/desktop/menus/calc.desktop-orig 2018-01-30 20:22:07.000000000 +0300 -+++ libreoffice-5.4.5.1/sysui/desktop/menus/calc.desktop 2018-02-12 12:18:52.915474626 +0300 +diff -urN libreoffice-6.2.8.2/sysui/desktop/menus/calc.desktop libreoffice-6.2.8.2-patched/sysui/desktop/menus/calc.desktop +--- libreoffice-6.2.8.2/sysui/desktop/menus/calc.desktop 2019-10-10 14:27:52.000000000 +0300 ++++ libreoffice-6.2.8.2-patched/sysui/desktop/menus/calc.desktop 2019-10-15 15:23:12.905195146 +0300 @@ -20,7 +20,7 @@ Terminal=false Icon=calc @@ -22,9 +22,9 @@ diff -Naur libreoffice-5.4.5.1/sysui/desktop/menus/calc.desktop-orig libreoffice Exec=${UNIXBASISROOTNAME} --calc %%FILE%% MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroEnabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroEnabled.12;application/vnd.ms-excel.sheet.binary.macroEnabled.12;text/csv;application/x-dbf;text/spreadsheet;application/csv;application/excel;application/tab-separated-values;application/vnd.lotus-1-2-3;application/vnd.oasis.opendocument.chart;application/vnd.oasis.opendocument.chart-template;application/x-dbase;application/x-dos_ms_excel;application/x-excel;application/x-msexcel;application/x-ms-excel;application/x-quattropro;application/x-123;text/comma-separated-values;text/tab-separated-values;text/x-comma-separated-values;text/x-csv;application/vnd.oasis.opendocument.spreadsheet-flat-xml;application/vnd.ms-works;application/clarisworks;application/x-iwork-numbers-sffnumbers;application/x-starcalc; Name=%PRODUCTNAME Calc -diff -urN libreoffice-5.3.1.1/sysui/desktop/menus/draw.desktop libreoffice-5.3.1.1-patched/sysui/desktop/menus/draw.desktop ---- libreoffice-5.3.1.1/sysui/desktop/menus/draw.desktop 2017-02-20 16:24:34.000000000 +0300 -+++ libreoffice-5.3.1.1-patched/sysui/desktop/menus/draw.desktop 2017-03-12 14:45:42.671234840 +0300 +diff -urN libreoffice-6.2.8.2/sysui/desktop/menus/draw.desktop libreoffice-6.2.8.2-patched/sysui/desktop/menus/draw.desktop +--- libreoffice-6.2.8.2/sysui/desktop/menus/draw.desktop 2019-10-10 14:27:52.000000000 +0300 ++++ libreoffice-6.2.8.2-patched/sysui/desktop/menus/draw.desktop 2019-10-15 15:23:51.381487406 +0300 @@ -20,7 +20,7 @@ Terminal=false Icon=draw @@ -32,11 +32,11 @@ diff -urN libreoffice-5.3.1.1/sysui/desktop/menus/draw.desktop libreoffice-5.3.1 -Categories=Office;FlowChart;Graphics;2DGraphics;VectorGraphics;X-Red-Hat-Base;X-MandrivaLinux-Office-Drawing; +Categories=Office;FlowChart; Exec=${UNIXBASISROOTNAME} --draw %%FILE%% - MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-flat-xml;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.visio;application/x-wpg;application/vnd.corel-draw;application/vnd.ms-publisher;image/x-freehand;application/clarisworks;application/x-pagemaker;application/pdf;application/x-stardraw; + MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-flat-xml;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.visio;application/x-wpg;application/vnd.corel-draw;application/vnd.ms-publisher;image/x-freehand;application/clarisworks;application/x-pagemaker;application/pdf;application/x-stardraw;image/x-emf;image/x-wmf; Name=%PRODUCTNAME Draw -diff -Naur libreoffice-5.4.5.1/sysui/desktop/menus/impress.desktop-orig libreoffice-5.4.5.1/sysui/desktop/menus/impress.desktop ---- libreoffice-5.4.5.1/sysui/desktop/menus/impress.desktop-orig 2018-01-30 20:22:07.000000000 +0300 -+++ libreoffice-5.4.5.1/sysui/desktop/menus/impress.desktop 2018-02-12 12:25:14.439535365 +0300 +diff -urN libreoffice-6.2.8.2/sysui/desktop/menus/impress.desktop libreoffice-6.2.8.2-patched/sysui/desktop/menus/impress.desktop +--- libreoffice-6.2.8.2/sysui/desktop/menus/impress.desktop 2019-10-10 14:27:52.000000000 +0300 ++++ libreoffice-6.2.8.2-patched/sysui/desktop/menus/impress.desktop 2019-10-15 15:24:15.991248327 +0300 @@ -20,7 +20,7 @@ Terminal=false Icon=impress @@ -46,9 +46,9 @@ diff -Naur libreoffice-5.4.5.1/sysui/desktop/menus/impress.desktop-orig libreoff Exec=${UNIXBASISROOTNAME} --impress %%FILE%% MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroEnabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroEnabled.12;application/vnd.openxmlformats-officedocument.presentationml.slide;application/vnd.openxmlformats-officedocument.presentationml.slideshow;application/vnd.ms-powerpoint.slideshow.macroEnabled.12;application/vnd.oasis.opendocument.presentation-flat-xml;application/x-iwork-keynote-sffkey; Name=%PRODUCTNAME Impress -diff -urN libreoffice-5.3.1.1/sysui/desktop/menus/math.desktop libreoffice-5.3.1.1-patched/sysui/desktop/menus/math.desktop ---- libreoffice-5.3.1.1/sysui/desktop/menus/math.desktop 2017-02-20 16:24:34.000000000 +0300 -+++ libreoffice-5.3.1.1-patched/sysui/desktop/menus/math.desktop 2017-03-12 14:45:15.964235140 +0300 +diff -urN libreoffice-6.2.8.2/sysui/desktop/menus/math.desktop libreoffice-6.2.8.2-patched/sysui/desktop/menus/math.desktop +--- libreoffice-6.2.8.2/sysui/desktop/menus/math.desktop 2019-10-10 14:27:52.000000000 +0300 ++++ libreoffice-6.2.8.2-patched/sysui/desktop/menus/math.desktop 2019-10-15 15:26:38.666534230 +0300 @@ -21,7 +21,7 @@ NoDisplay=false Icon=math @@ -58,9 +58,9 @@ diff -urN libreoffice-5.3.1.1/sysui/desktop/menus/math.desktop libreoffice-5.3.1 Exec=${UNIXBASISROOTNAME} --math %%FILE%% MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.oasis.opendocument.formula-template;text/mathml;application/mathml+xml; Name=%PRODUCTNAME Math -diff -urN libreoffice-5.3.1.1/sysui/desktop/menus/startcenter.desktop libreoffice-5.3.1.1-patched/sysui/desktop/menus/startcenter.desktop ---- libreoffice-5.3.1.1/sysui/desktop/menus/startcenter.desktop 2017-02-20 16:24:34.000000000 +0300 -+++ libreoffice-5.3.1.1-patched/sysui/desktop/menus/startcenter.desktop 2017-03-12 14:46:27.341234338 +0300 +diff -urN libreoffice-6.2.8.2/sysui/desktop/menus/startcenter.desktop libreoffice-6.2.8.2-patched/sysui/desktop/menus/startcenter.desktop +--- libreoffice-6.2.8.2/sysui/desktop/menus/startcenter.desktop 2019-10-10 14:27:52.000000000 +0300 ++++ libreoffice-6.2.8.2-patched/sysui/desktop/menus/startcenter.desktop 2019-10-15 15:27:32.279350728 +0300 @@ -21,7 +21,7 @@ NoDisplay=false Icon=startcenter @@ -70,9 +70,9 @@ diff -urN libreoffice-5.3.1.1/sysui/desktop/menus/startcenter.desktop libreoffic Exec=${UNIXBASISROOTNAME} %%FILE%% MimeType=application/vnd.openofficeorg.extension;x-scheme-handler/vnd.libreoffice.cmis; Name=%PRODUCTNAME -diff -Naur libreoffice-5.4.5.1/sysui/desktop/menus/writer.desktop-orig libreoffice-5.4.5.1/sysui/desktop/menus/writer.desktop ---- libreoffice-5.4.5.1/sysui/desktop/menus/writer.desktop-orig 2018-01-30 20:22:07.000000000 +0300 -+++ libreoffice-5.4.5.1/sysui/desktop/menus/writer.desktop 2018-02-12 12:29:38.212419191 +0300 +diff -urN libreoffice-6.2.8.2/sysui/desktop/menus/writer.desktop libreoffice-6.2.8.2-patched/sysui/desktop/menus/writer.desktop +--- libreoffice-6.2.8.2/sysui/desktop/menus/writer.desktop 2019-10-10 14:27:52.000000000 +0300 ++++ libreoffice-6.2.8.2-patched/sysui/desktop/menus/writer.desktop 2019-10-15 15:27:50.282510723 +0300 @@ -20,7 +20,7 @@ Terminal=false Icon=writer diff --git a/libreoffice.spec b/libreoffice.spec index 48c8a6d..f800c7c 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -19,13 +19,14 @@ %define relurl http://download.documentfoundation.org/libreoffice/src/%{version} %define devurl http://dev-www.libreoffice.org/ooo_external +%define devexurl http://dev-www.libreoffice.org/extern %define srcurl http://dev-www.libreoffice.org/src/ %define oxyurl http://ooo.itc.hu/oxygenoffice/download/libreoffice/ %define distroname ROSA %define ooname libreoffice -%define buildver %{version}.3 +%define buildver %{version}.2 %define ooodir %{_libdir}/libreoffice -%define antver 1.10.5 +%define antver 1.10.6 %define antpath %{_builddir}/libreoffice-%{version}/apache-ant-%{antver} %define ccachedir ~/.ccache-OOo @@ -41,8 +42,8 @@ Summary: Office suite Name: libreoffice Epoch: 1 -Version: 6.0.7 -Release: 8 +Version: 6.2.8 +Release: 1 License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic Group: Office Url: http://www.libreoffice.org @@ -51,16 +52,16 @@ Source0: %{relurl}/%{ooname}-%{buildver}.tar.xz Source1: %{relurl}/%{ooname}-dictionaries-%{buildver}.tar.xz Source2: %{relurl}/%{ooname}-help-%{buildver}.tar.xz Source3: %{relurl}/%{ooname}-translations-%{buildver}.tar.xz -Source4: http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll +Source4: %{devexurl}/185d60944ea767075d27247c3162b3bc-unowinreg.dll # Unused, should be dropped in future package updates Source10: Mandriva-Rosa_Icons.tar.bz2 %if %{javaless} Source20: http://archive.apache.org/dist/ant/binaries/apache-ant-%{antver}-bin.tar.bz2 -Source30: %{devurl}/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip -Source31: %{devurl}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz -Source32: %{devurl}/8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz -Source321: %{devurl}/commons-logging-1.2-src.tar.gz +Source30: %{devurl}/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip +Source31: %{devurl}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz +Source32: %{devurl}/8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz +Source321: %{devurl}/commons-logging-1.2-src.tar.gz %endif Source33: %{devurl}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip Source35: %{devurl}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip @@ -68,7 +69,7 @@ Source36: %{devurl}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip Source37: %{devurl}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip # Extensions -Source49: %{srcurl}pdfium-3235.tar.bz2 +Source49: %{srcurl}pdfium-3550.tar.bz2 Source51: %{srcurl}b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2 Source54: %{oxyurl}b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt Source56: %{srcurl}b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt @@ -83,6 +84,8 @@ Source67: %{oxyurl}b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0 Source68: %{srcurl}4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 Source69: %{srcurl}OpenCOLLADA-master-6509aa13af.tar.bz2 Source70: %{srcurl}1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt +Source71: %{srcurl}lxml-4.1.1.tgz +Source72: %{devexurl}/49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf Source1000: libreoffice.rpmlintrc @@ -92,22 +95,19 @@ Patch51: libreoffice-5.4.0.1-impress-kde-crash-hack.patch # ROSA vendor patch Patch100: libreoffice-4.1-vendor.patch -Patch101: libreoffice-5.3.1.1-desktop-categories.patch +Patch101: libreoffice-6.2.8.2-desktop-categories.patch Patch102: libreoffice-5.2.1.2-desktop-protocols.patch Patch104: libreoffice-5.1.2.2-desktop-startcenter-nomate.patch -# Use breeze icons theme as fallback instead of tango -Patch105: libreoffice-5.4.3.1-breeze-fallback-theme.patch - -Patch110: CVE-2019-9848.patch -Patch111: CVE-2019-9849.patch -Patch112: CVE-2019-9850_1_2.patch -Patch113: CVE-2019-9854.patch BuildRequires: bison BuildRequires: bsh %if %{with ccache} BuildRequires: ccache %endif +%if %{with clang} +BuildRequires: clang +BuildRequires: clang-devel +%endif BuildRequires: desktop-file-utils BuildRequires: doxygen >= 1.8.4 BuildRequires: ed @@ -153,6 +153,7 @@ BuildRequires: openldap-devel BuildRequires: pam-devel BuildRequires: qt4-devel BuildRequires: readline-devel +BuildRequires: systemtap-devel BuildRequires: unixODBC-devel BuildRequires: vigra-devel BuildRequires: gpgmepp-devel @@ -180,19 +181,20 @@ BuildRequires: pkgconfig(icu-le) BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(libabw-0.1) BuildRequires: pkgconfig(libclucene-core) -BuildRequires: pkgconfig(libcmis-0.5) +BuildRequires: pkgconfig(libcmis-0.5) >= 0.5.2 BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libcdr-0.1) BuildRequires: pkgconfig(libe-book-0.1) BuildRequires: pkgconfig(libeot) BuildRequires: pkgconfig(libexttextcat) BuildRequires: pkgconfig(libepubgen-0.1) -BuildRequires: pkgconfig(libixion-0.12) +BuildRequires: pkgconfig(libixion-0.14) BuildRequires: pkgconfig(liblangtag) BuildRequires: pkgconfig(libmspub-0.1) BuildRequires: pkgconfig(libmwaw-0.3) >= 0.3.4 +BuildRequires: pkgconfig(libnumbertext) BuildRequires: pkgconfig(libodfgen-0.1) >= 0.1.0 -BuildRequires: pkgconfig(liborcus-0.13) +BuildRequires: pkgconfig(liborcus-0.14) >= 0.14.1 BuildRequires: pkgconfig(libpagemaker-0.0) BuildRequires: pkgconfig(libpq) BuildRequires: pkgconfig(libqxp-0.0) @@ -208,7 +210,7 @@ BuildRequires: pkgconfig(libwpg-0.3) BuildRequires: pkgconfig(libwps-0.4) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxslt) -BuildRequires: pkgconfig(mdds-1.2) +BuildRequires: pkgconfig(mdds-1.4) >= 1.4.1 BuildRequires: pkgconfig(mythes) BuildRequires: pkgconfig(neon) BuildRequires: pkgconfig(nspr) @@ -227,13 +229,51 @@ BuildRequires: pkgconfig(xaw7) BuildRequires: pkgconfig(xmlsec1) >= 1.2.24 BuildRequires: pkgconfig(xpm) BuildRequires: pkgconfig(xtst) +BuildRequires: pkgconfig(valgrind) BuildRequires: pkgconfig(zlib) +BuildRequires: kf5activities-devel +BuildRequires: kf5completion-devel +BuildRequires: kf5config-devel +BuildRequires: kf5configwidgets-devel +BuildRequires: kf5coreaddons-devel +BuildRequires: kf5crash-devel +BuildRequires: kf5declarative-devel +BuildRequires: kf5doctools-devel +BuildRequires: kf5globalaccel-devel +BuildRequires: kf5i18n-devel +BuildRequires: kf5idletime-devel +BuildRequires: kf5init-devel +BuildRequires: kf5kcmutils-devel +BuildRequires: kf5kio-devel +BuildRequires: kf5newstuff-devel +BuildRequires: kf5notifications-devel +BuildRequires: kf5plasma-devel +BuildRequires: kf5service-devel +BuildRequires: kf5wayland-devel +BuildRequires: kf5widgetsaddons-devel +BuildRequires: kf5windowsystem-devel +BuildRequires: kf5xmlgui-devel +BuildRequires: pkgconfig(Qt5Concurrent) +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5DBus) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Multimedia) +BuildRequires: pkgconfig(Qt5Network) +BuildRequires: pkgconfig(Qt5Qml) +BuildRequires: pkgconfig(Qt5Quick) +BuildRequires: pkgconfig(Qt5QuickWidgets) +BuildRequires: pkgconfig(Qt5Sensors) +BuildRequires: pkgconfig(Qt5Script) +BuildRequires: pkgconfig(Qt5Test) +BuildRequires: pkgconfig(Qt5UiTools) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5X11Extras) %if !%{javaless} BuildRequires: ant BuildRequires: ant-apache-regexp -BuildRequires: apache-commons-codec -BuildRequires: apache-commons-lang -BuildRequires: jakarta-commons-httpclient +#BuildRequires: apache-commons-codec +#BuildRequires: apache-commons-lang +#BuildRequires: jakarta-commons-httpclient BuildRequires: junit BuildRequires: java-1.8.0-openjdk-devel %endif @@ -294,6 +334,7 @@ packages: %files base -f file-lists/base_list.txt %{_mandir}/man1/lobase* %{_iconsdir}/hicolor/scalable/apps/mandriva-rosa-lo-base_72.svg +%dir %{ooodir}/share/xdg %{ooodir}/share/xdg/base.desktop %{_datadir}/appdata/libreoffice-base.appdata.xml @@ -310,6 +351,7 @@ This package contains the spreadsheet component for LibreOffice. %files calc -f file-lists/calc_list.txt %{_mandir}/man1/localc* %{_iconsdir}/hicolor/scalable/apps/mandriva-rosa-lo-calc_72.svg +%dir %{ooodir}/share/xdg %{ooodir}/share/xdg/calc.desktop %{_datadir}/appdata/libreoffice-calc.appdata.xml @@ -320,8 +362,6 @@ Summary: LibreOffice office suite common files Group: Office # Require at least one style to be installed Requires: %{name}-style = %{EVRD} -# But force galaxy style because it was used by default -Requires: %{name}-style-galaxy = %{EVRD} # And breeze too, it should be default for Plasma 5 Requires: %{name}-style-breeze = %{EVRD} Suggests: %{name}-help-en_US = %{EVRD} @@ -388,6 +428,10 @@ Conflicts: %{name}-templates-pt_BR < %{EVRD} Conflicts: %{name}-templates-sv < %{EVRD} Conflicts: %{name}-templates-tr < %{EVRD} Conflicts: %{name}-templates-zh_CN < %{EVRD} +Obsoletes: %{name}-style-galaxy < %{EVRD} +Obsoletes: %{name}-style-oxygen < %{EVRD} +Conflicts: %{name}-style-galaxy < %{EVRD} +Conflicts: %{name}-style-oxygen < %{EVRD} Suggests: noto-sans-fonts Suggests: noto-sans-mono-fonts Suggests: noto-serif-fonts @@ -405,6 +449,7 @@ This package contains the application-independent files of LibreOffice. %{_libdir}/libreoffice/program/services/scriptproviderforbeanshell.rdb %{ooodir}/share/gallery/sg24.* %{ooodir}/share/libreofficekit/handle_*.png +%{_datadir}/appdata/org.libreoffice.kde.metainfo.xml #---------------------------------------------------------------------------- @@ -478,6 +523,7 @@ This package contains the drawing component for LibreOffice. %files draw -f file-lists/draw_list.txt %{_iconsdir}/hicolor/scalable/apps/mandriva-rosa-lo-draw_72.svg %{_mandir}/man1/lodraw* +%dir %{ooodir}/share/xdg %{ooodir}/share/xdg/draw.desktop %{_datadir}/appdata/libreoffice-draw.appdata.xml @@ -495,6 +541,39 @@ This package contains the GNOME VFS support and a GConf backend. #---------------------------------------------------------------------------- +%package gtk3-kde5 +Summary: GTK3-KDE5 Integration for LibreOffice (Widgets, Dialogs, Addressbook) +Group: Office +Requires: %{name}-common = %{EVRD} +Suggests: %{name}-style-breeze = %{EVRD} + +%description gtk3-kde5 +This package contains the KDE5 plugin for drawing LibreOffice widgets with +KDE5/Qt5.x and a KDEish File Picker when running under KDE5. + +%files gtk3-kde5 +%{ooodir}/program/libvclplug_gtk3_kde5lo.so +%{ooodir}/program/lo_kde5filepicker + +#---------------------------------------------------------------------------- + +%package kde5 +Summary: KDE5 Integration for LibreOffice (Widgets, Dialogs, Addressbook) +Group: Office +Requires: %{name}-common = %{EVRD} +Suggests: %{name}-style-breeze = %{EVRD} + +%description kde5 +This package contains the KDE5 plugin for drawing LibreOffice widgets with +KDE5/Qt5.x and a KDEish File Picker when running under KDE5. + +%files kde5 +%{ooodir}/program/libkde5be1lo.so +%{ooodir}/program/libvclplug_kde5lo.so +%{ooodir}/program/libvclplug_qt5lo.so + +#---------------------------------------------------------------------------- + %package impress Summary: LibreOffice office suite - presentation Group: Office @@ -508,27 +587,12 @@ This package contains the presentation component for LibreOffice. %files impress -f file-lists/impress_list.txt %{_iconsdir}/hicolor/scalable/apps/mandriva-rosa-lo-impress_72.svg %{_mandir}/man1/loimpress* +%dir %{ooodir}/share/xdg %{ooodir}/share/xdg/impress.desktop %{_datadir}/appdata/libreoffice-impress.appdata.xml #---------------------------------------------------------------------------- -%package kde4 -Summary: KDE4 Integration for LibreOffice (Widgets, Dialogs, Addressbook) -Group: Office -Requires: %{name}-common = %{EVRD} -Suggests: %{name}-style-breeze = %{EVRD} -Requires: %{name}-style-oxygen = %{EVRD} - -%description kde4 -This package contains the KDE4 plugin for drawing LibreOffice widgets with -KDE4/Qt4.x and a KDEish File Picker when running under KDE4. - -%files kde4 -f file-lists/kde4_list.txt -%{_datadir}/appdata/org.libreoffice.kde.metainfo.xml - -#---------------------------------------------------------------------------- - %package math Summary: LibreOffice office suite - equation editor Group: Office @@ -540,6 +604,7 @@ This package contains the equation editor component for LibreOffice. %files math -f file-lists/math_list.txt %{_iconsdir}/hicolor/scalable/apps/mandriva-rosa-lo-math_72.svg %{_mandir}/man1/lomath* +%dir %{ooodir}/share/xdg %{ooodir}/share/xdg/math.desktop #---------------------------------------------------------------------------- @@ -566,13 +631,13 @@ and sounds. %{ooodir}/share/gallery/flower* %{ooodir}/share/gallery/htmlexpo* %{ooodir}/share/gallery/people* +%{ooodir}/share/gallery/personas* %{ooodir}/share/gallery/sg[0-9]*.* %{ooodir}/share/gallery/sky.* %{ooodir}/share/gallery/sounds* %{ooodir}/share/gallery/symbols* %{ooodir}/share/gallery/transportation* %{ooodir}/share/gallery/txtshapes* -%{ooodir}/share/gallery/www-back* %{ooodir}/share/gallery/www-graf* %exclude %{ooodir}/share/gallery/sg24.* @@ -610,52 +675,6 @@ enabled in the LibreOffice option menu. #---------------------------------------------------------------------------- -%package style-galaxy -Summary: Default symbol style for LibreOffice -Group: Office -Requires: %{name}-common = %{EVRD} -Provides: %{name}-style = %{EVRD} -Conflicts: %{name}-common < 1:4.4.1 - -%description style-galaxy -This package contains the "Galaxy" symbol style from Sun, normally used on -MS Windows (tm) and when not using GNOME or KDE. Needs to be manually enabled -in the LibreOffice option menu. - -%files style-galaxy -%{ooodir}/share/config/images_galaxy.zip - -#---------------------------------------------------------------------------- - -%package style-hicontrast -Summary: Hicontrast symbol style for LibreOffice -Group: Office -Requires: %{name}-common = %{EVRD} -Provides: %{name}-style = %{EVRD} - -%description style-hicontrast -This package contains the "hicontrast" symbol style, needs to be manually -enabled in the LibreOffice option menu. - -%files style-hicontrast -%{ooodir}/share/config/images_hicontrast.zip - -#---------------------------------------------------------------------------- - -%package style-oxygen -Summary: Oxygen symbol style for LibreOffice -Group: Office -Requires: %{name}-common = %{EVRD} -Provides: %{name}-style = %{EVRD} - -%description style-oxygen -This package contains the "oxygen" symbol style, default style for KDE4. - -%files style-oxygen -%{ooodir}/share/config/images_oxygen.zip - -#---------------------------------------------------------------------------- - %package style-sifr Summary: Sifr symbol style for LibreOffice Group: Office @@ -699,6 +718,7 @@ This package contains the word processor component for LibreOffice. %{_iconsdir}/hicolor/scalable/apps/mandriva-rosa-lo-writer_72.svg %{_mandir}/man1/loweb* %{_mandir}/man1/lowriter* +%dir %{ooodir}/share/xdg %{ooodir}/share/xdg/writer.desktop %{_datadir}/appdata/libreoffice-writer.appdata.xml @@ -760,19 +780,6 @@ A LibreOffice extension for style and grammar proofreading. #---------------------------------------------------------------------------- -%package extension-mysql -Summary: MySQL/MariaDB connector for LibreOffice -Group: Office -Requires: %{name}-common = %{EVRD} - -%description extension-mysql -MySQL/MariaDB connector for LibreOffice. - -%files extension-mysql -%{ooodir}/share/extensions/mysql-connector-ooo - -#---------------------------------------------------------------------------- - %package extension-nlpsolver Summary: Solver extension for LibreOffice Calc Group: Office @@ -2942,22 +2949,6 @@ chmod 777 ~/tmp chmod +x bin/unpack-sources %build -export QT4DIR=%{_libdir}/qt4 -%ifarch X86_64 - export QT4INC=/usr/lib/qt4/include -%else - export QT4INC=%{_libdir}/qt4/include -%endif -export QT4LIB=%{_libdir}/qt4/lib - -export KDE4DIR=%{_libdir}/kde4 -%ifarch X86_64 - export KDE4INC=/usr/lib/kde4/include -%else - export KDE4INC=%{_libdir}/kde4/include -%endif -export KDE4LIB=%{_libdir}/kde4/lib - export LC_ALL=en_US.UTF-8 export LANG=en_US @@ -2970,6 +2961,11 @@ export PATH export CCACHE_DIR=%{ccachedir} %endif +%if %{with clang} +%global optflags $(echo %optflags | sed -e 's/-fvar-tracking-assignments//g' -e 's/-frecord-gcc-switches//g' -e 's/-ffat-lto-objects//g') +%clang_gcc_wrapper +export CPP="" +%else %global optflags %optflags -Wstrict-aliasing=0 export ARCH_FLAGS="%{optflags} -fno-omit-frame-pointer -fno-strict-aliasing" export ARCH_FLAGS_CC="%{optflags} -fno-omit-frame-pointer -fno-strict-aliasing" @@ -2978,21 +2974,34 @@ export ARCH_FLAGS_OPT="%{optflags} -O2" # Workaround for abf builds running out of memory export ARCH_FLAGS_CC="$ARCH_FLAGS_CC -g0" export ARCH_FLAGS_CXX="$ARCH_FLAGS_CC -g0" +%endif echo "Configure start at: "`date` >> ooobuildtime.log touch autogen.lastrun + +%if %{with clang} +sed -i \ + -e "s!clang -V!clang -v!g" \ + -e "s!clang -qversion!clang --version!g" \ + configure +%endif + %configure2_5x \ %{?_smp_mflags:--with-parallelism="`getconf _NPROCESSORS_ONLN`"} \ --with-vendor=ROSA \ --with-build-version="ROSA %{buildver}-%{release}" \ - --with-theme="breeze breeze_dark galaxy hicontrast oxygen sifr tango" \ + --with-theme="breeze breeze_dark sifr tango" \ --disable-coinmp \ --disable-fetch-external \ --enable-gstreamer-1.0 \ --disable-gstreamer-0.10 \ --enable-release-build \ - --enable-kde4 \ + --disable-gtk \ + --enable-gtk3 \ + --enable-gtk3-kde5 \ + --enable-kde5 \ + --enable-qt5 \ --disable-firebird-sdbc \ --disable-introspection \ --enable-eot \ @@ -3000,6 +3009,7 @@ touch autogen.lastrun --enable-split-app-modules \ --enable-split-opt-features \ --without-fonts \ + --without-lxml \ --without-junit \ %if %{javaless} --with-ant-home="%{antpath}" \ @@ -3083,6 +3093,9 @@ ln -sf %{SOURCE68} external/tarballs/ ln -sf %{SOURCE69} external/tarballs/ ln -sf %{SOURCE70} external/tarballs/ +cp %{SOURCE71} external/tarballs/ +cp %{SOURCE72} external/tarballs/ + touch external/tarballs/.downloaded # (tpg) silent output to reduce memory and free space @@ -3171,11 +3184,9 @@ sort -u file-lists/sdk_list.txt > file-lists/sdk_list.uniq.sorted.txt sed -i -e 's/\[/?/g;s/\]/?/g' file-lists/sdk*.txt ## styles have their own packages -for i in oxygen galaxy breeze hicontrast tango sifr; do +for i in breeze tango sifr; do sed -i "/^.*images_$i\.zip$/d" file-lists/common_list.txt done -# galaxy style too -sed -i "/^.*images\.zip$/d" file-lists/common_list.txt ## Split help cd file-lists