diff --git a/.abf.yml b/.abf.yml index 13f9728..92dee8b 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,31 +1,29 @@ sources: - 048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip: 885cc4b6c9472d95e2515e777f6018a90657e974 09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt: 42c9235d7f876645ea6553770e7572c1b0b8609a 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip: 7168b0f40aa5c72267899601c116d2348d2f56ec 185d60944ea767075d27247c3162b3bc-unowinreg.dll: 0619ed3a89644bef318df67db12045b2b590585b 1be202fbbbc13f10592a98f70a4a87fb-OOOP-templates-pack-2.9.0.0.zip: 1dd5bd9962e851b5e487b0c2033b5a8951aaefad 1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt: 206a371b46a3d991722b059b5d6f3bb29f1fc48b - 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 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 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip: 8a90669029e107b61953b90ba11545fef586c2ca - 8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz: c78ddd06845e267ba5bec20a38430f66eec3e0e4 + 884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf: d336802a36ed2c87dd243e7c2f1d0542dace5cca Mandriva-Rosa_Icons.tar.bz2: 53448c079fcb3008d1fdec7f95305fe392460c1f OpenCOLLADA-master-6509aa13af.tar.bz2: c4f5760a1d21213dc52e2cf3ad9c0b9112585f36 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.8.1-bin.tar.bz2: 0e0359f04b3d84fed75b3a1ab02cbc415c8864a1 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 + libreoffice-6.3.6.2.tar.xz: 79aa683b98c465ce570652852faead9f973f8d95 + libreoffice-dictionaries-6.3.6.2.tar.xz: 6c2741ecf0d37efc8413ffcd8b7d331b505b64be + libreoffice-help-6.3.6.2.tar.xz: f6f94206dad1038c4369610a90e1727e4266ea80 + libreoffice-translations-6.3.6.2.tar.xz: 52b483e3d868345f7aa9ed187fd8b59d713d24fc + lxml-4.1.1.tgz: 154279bc5939d7099697887ea15c5ca921abeaeb + pdfium-3794.tar.bz2: 41ff3c2291c99db71ddca1873115b7fc0bfb5065 diff --git a/0001-Force-icons-in-menus-in-GTK-3-VCLs.patch b/0001-Force-icons-in-menus-in-GTK-3-VCLs.patch new file mode 100644 index 0000000..9a44c1e --- /dev/null +++ b/0001-Force-icons-in-menus-in-GTK-3-VCLs.patch @@ -0,0 +1,31 @@ +From a1c8189f02ee694f049b2e04b9baffab3fafea22 Mon Sep 17 00:00:00 2001 +From: Mikhail Novosyolov +Date: Sun, 5 Apr 2020 20:53:46 +0300 +Subject: [PATCH] Force icons in menus in GTK+3 VCLs + +By default both IsSystemIconsInMenus and ShowIconsInMenues are true, +but IsSystemIconsInMenus being true forces taking GTK 3 default to not show icons. + +I beleive that icons help people to use menus. +Also, we are migrating users from libreoffice-kde4 to libreoffice-gtk3-kde5, +kde4 did show icons, so we would better keep them on. +--- + officecfg/registry/schema/org/openoffice/Office/Common.xcs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs +index 130726976..4b8c9055d 100644 +--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs ++++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs +@@ -2909,7 +2909,7 @@ + Indicates whether icons in the office menus should + shown/hidden by following the System theme. + +- true ++ false + + + +-- +2.20.1 + diff --git a/6fbfad6b00e8c35346ee59cd32a0d7ccc0d8c19c.patch b/6fbfad6b00e8c35346ee59cd32a0d7ccc0d8c19c.patch new file mode 100644 index 0000000..2f9bd7a --- /dev/null +++ b/6fbfad6b00e8c35346ee59cd32a0d7ccc0d8c19c.patch @@ -0,0 +1,61 @@ +From 6fbfad6b00e8c35346ee59cd32a0d7ccc0d8c19c Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann +Date: Sat, 22 Feb 2020 17:29:15 +0100 +Subject: [PATCH] Adapt o3tl::span to removal of std::span::cbegin et al + + "span::cbegin/cend methods produce +different results than std::[ranges::]cbegin/cend", as implemented now in + "libstdc++: Remove std::span::cbegin +and std::span::cend (LWG 3320)". + +Turns out we only used the removed member functions in o3tl/qa/test-span.cxx. + +Change-Id: I6c73797594b4e0e753a88840033d54961e271df5 +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89261 +Tested-by: Jenkins +Reviewed-by: Stephan Bergmann +--- + include/o3tl/span.hxx | 7 ------- + o3tl/qa/test-span.cxx | 6 ------ + 2 files changed, 13 deletions(-) + +--- libreoffice-6.3.5.2/include/o3tl/span.hxx.orig 2020-04-04 16:27:13.798399505 +0300 ++++ libreoffice-6.3.5.2/include/o3tl/span.hxx 2020-04-04 16:28:05.080888607 +0300 +@@ -60,18 +60,11 @@ + constexpr iterator begin() const noexcept { return data_; } + constexpr iterator end() const noexcept { return begin() + size(); } + +- constexpr const_iterator cbegin() const noexcept { return begin(); } +- constexpr const_iterator cend() const noexcept { return end(); } +- + reverse_iterator rbegin() const noexcept + { return reverse_iterator(end()); } + reverse_iterator rend() const noexcept + { return reverse_iterator(begin()); } + +- constexpr const_reverse_iterator crbegin() const noexcept +- { return rbegin(); } +- constexpr const_reverse_iterator crend() const noexcept { return rend(); } +- + constexpr index_type size() const noexcept { return size_; } + + constexpr reference operator [](index_type pos) const { +--- libreoffice-6.3.5.2/o3tl/qa/test-span.cxx.orig 2020-04-04 16:27:13.802399388 +0300 ++++ libreoffice-6.3.5.2/o3tl/qa/test-span.cxx 2020-04-04 16:30:35.256474807 +0300 +@@ -33,15 +33,9 @@ + CPPUNIT_ASSERT_EQUAL(1, *v.begin()); + CPPUNIT_ASSERT_EQUAL( + o3tl::span::difference_type(3), v.end() - v.begin()); +- CPPUNIT_ASSERT_EQUAL(1, *v.cbegin()); +- CPPUNIT_ASSERT_EQUAL( +- o3tl::span::difference_type(3), v.cend() - v.cbegin()); + CPPUNIT_ASSERT_EQUAL(3, *v.rbegin()); + CPPUNIT_ASSERT_EQUAL( + o3tl::span::difference_type(3), v.rend() - v.rbegin()); +- CPPUNIT_ASSERT_EQUAL(3, *v.crbegin()); +- CPPUNIT_ASSERT_EQUAL( +- o3tl::span::difference_type(3), v.crend() - v.crbegin()); + CPPUNIT_ASSERT_EQUAL(o3tl::span::index_type(3), v.size()); + CPPUNIT_ASSERT(!v.empty()); + CPPUNIT_ASSERT_EQUAL(2, v[1]); 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/gtk3_kde5-priority.patch b/gtk3_kde5-priority.patch new file mode 100644 index 0000000..7a9a1bc --- /dev/null +++ b/gtk3_kde5-priority.patch @@ -0,0 +1,21 @@ +--- libreoffice-6.3.5.2/vcl/source/app/salplug.cxx.orig2 2020-04-04 20:44:52.950045617 +0300 ++++ libreoffice-6.3.5.2/vcl/source/app/salplug.cxx 2020-04-04 20:44:55.713958634 +0300 +@@ -151,12 +151,15 @@ + { + static const char* const pKDEFallbackList[] = + { +-#if ENABLE_KDE5 +- "kde5", +-#endif + #if ENABLE_GTK3_KDE5 ++// prefer gtk3_kde5 over kde5 because of maturity of gtk3 rendering; ++// based on kde4 vcl experience, I don't trust kde5 VCL, ++// and other people wrote about problems in it //mikhailnov + "gtk3_kde5", + #endif ++#if ENABLE_KDE5 ++ "kde5", ++#endif + "gtk3", "gtk", "gen", nullptr + }; + 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.0.1-impress-kde-crash-hack.patch b/libreoffice-5.4.0.1-impress-kde-crash-hack.patch deleted file mode 100644 index ad49979..0000000 --- a/libreoffice-5.4.0.1-impress-kde-crash-hack.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -urN libreoffice-5.4.0.1/vcl/unx/kde4/KDESalGraphics.cxx libreoffice-5.4.0.1-patched/vcl/unx/kde4/KDESalGraphics.cxx ---- libreoffice-5.4.0.1/vcl/unx/kde4/KDESalGraphics.cxx 2017-06-22 13:47:10.000000000 +0300 -+++ libreoffice-5.4.0.1-patched/vcl/unx/kde4/KDESalGraphics.cxx 2017-07-07 20:59:40.651469448 +0300 -@@ -138,8 +138,13 @@ - option->state |= state; - option->rect = image->rect(); - -- QPainter painter(image); -- QApplication::style()->drawComplexControl(element, option, &painter); -+ // Hack: Don't display tiny useless scrollbars -+ // Impress is known to crash when adding effects (segfault is triggered by 15x18 scrollbar) -+ if (!((option->type == QStyleOption::SO_Slider) && ((option->rect.width() * option->rect.height()) < 300))) -+ { -+ QPainter painter(image); -+ QApplication::style()->drawComplexControl(element, option, &painter); -+ } - } - - void lcl_drawFrame( QStyle::PrimitiveElement element, QImage* image, QStyle::State const & state, 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-6.3.5.2-kde4-detection.patch b/libreoffice-6.3.5.2-kde4-detection.patch new file mode 100644 index 0000000..85da606 --- /dev/null +++ b/libreoffice-6.3.5.2-kde4-detection.patch @@ -0,0 +1,203 @@ +diff -urN libreoffice-6.3.5.2/vcl/inc/unx/desktops.hxx libreoffice-6.3.5.2-patched/vcl/inc/unx/desktops.hxx +--- libreoffice-6.3.5.2/vcl/inc/unx/desktops.hxx 2020-02-11 22:14:56.000000000 +1000 ++++ libreoffice-6.3.5.2-patched/vcl/inc/unx/desktops.hxx 2020-03-25 22:24:27.343432021 +1000 +@@ -31,6 +31,7 @@ + DESKTOP_UNITY, + DESKTOP_XFCE, + DESKTOP_MATE, ++ DESKTOP_KDE4, + DESKTOP_KDE5, + DESKTOP_LXQT + }; // keep in sync with desktop_strings[] in salplug.cxx +diff -urN libreoffice-6.3.5.2/vcl/source/app/IconThemeSelector.cxx libreoffice-6.3.5.2-patched/vcl/source/app/IconThemeSelector.cxx +--- libreoffice-6.3.5.2/vcl/source/app/IconThemeSelector.cxx 2020-02-11 22:14:56.000000000 +1000 ++++ libreoffice-6.3.5.2-patched/vcl/source/app/IconThemeSelector.cxx 2020-03-25 22:24:27.343432021 +1000 +@@ -56,7 +56,8 @@ + return OUString("colibre"); + #else + OUString r; +- if ( desktopEnvironment.equalsIgnoreAsciiCase("kde5") || ++ if ( desktopEnvironment.equalsIgnoreAsciiCase("kde4") || ++ desktopEnvironment.equalsIgnoreAsciiCase("kde5") || + desktopEnvironment.equalsIgnoreAsciiCase("lxqt") ) { + r = "breeze"; + } +diff -urN libreoffice-6.3.5.2/vcl/source/app/salplug.cxx libreoffice-6.3.5.2-patched/vcl/source/app/salplug.cxx +--- libreoffice-6.3.5.2/vcl/source/app/salplug.cxx 2020-02-11 22:14:56.000000000 +1000 ++++ libreoffice-6.3.5.2-patched/vcl/source/app/salplug.cxx 2020-03-25 22:41:24.079451287 +1000 +@@ -95,6 +95,8 @@ + * not access the 'gnome_accessibility_module_shutdown' anymore. + * So make sure libgtk+ & co are still mapped into memory when + * atk-bridge's atexit handler gets called. ++ * #i109007# KDE3 seems to have the same problem. ++ * And same applies for KDE4. + */ + if( rModuleBase == "gtk" || rModuleBase == "gtk3" || rModuleBase == "gtk3_kde5" || rModuleBase == "win" ) + { +@@ -185,7 +187,8 @@ + desktop == DESKTOP_XFCE || + desktop == DESKTOP_MATE ) + pList = pStandardFallbackList; +- else if( desktop == DESKTOP_KDE5 || ++ else if( desktop == DESKTOP_KDE4 || ++ desktop == DESKTOP_KDE5 || + desktop == DESKTOP_LXQT ) + pList = pKDEFallbackList; + +@@ -318,7 +321,8 @@ + // Order to match desktops.hxx' DesktopType + static const char * const desktop_strings[] = { + "none", "unknown", "GNOME", "UNITY", +- "XFCE", "MATE", "KDE5", "LXQT" }; ++ "XFCE", "MATE", "KDE4", "KDE5", ++ "LXQT" }; + static OUString aDesktopEnvironment; + if( aDesktopEnvironment.isEmpty()) + { +diff -urN libreoffice-6.3.5.2/vcl/unx/generic/desktopdetect/desktopdetector.cxx libreoffice-6.3.5.2-patched/vcl/unx/generic/desktopdetect/desktopdetector.cxx +--- libreoffice-6.3.5.2/vcl/unx/generic/desktopdetect/desktopdetector.cxx 2020-02-11 22:14:56.000000000 +1000 ++++ libreoffice-6.3.5.2-patched/vcl/unx/generic/desktopdetect/desktopdetector.cxx 2020-03-25 22:28:24.099436507 +1000 +@@ -116,6 +116,80 @@ + } + + ++static bool bWasXError = false; ++ ++static bool WasXError() ++{ ++ bool bRet = bWasXError; ++ bWasXError = false; ++ return bRet; ++} ++ ++extern "C" ++{ ++ static int autodect_error_handler( Display*, XErrorEvent* ) ++ { ++ bWasXError = true; ++ return 0; ++ } ++ ++ typedef int(* XErrorHandler)(Display*,XErrorEvent*); ++} ++ ++static int KDEVersion( Display* pDisplay ) ++{ ++ int nRet = 0; ++ ++ Atom nFullSession = XInternAtom( pDisplay, "KDE_FULL_SESSION", True ); ++ Atom nKDEVersion = XInternAtom( pDisplay, "KDE_SESSION_VERSION", True ); ++ ++ if( nFullSession ) ++ { ++ if( !nKDEVersion ) ++ return 3; ++ ++ Atom aRealType = None; ++ int nFormat = 8; ++ unsigned long nItems = 0; ++ unsigned long nBytesLeft = 0; ++ unsigned char* pProperty = nullptr; ++ XGetWindowProperty( pDisplay, ++ DefaultRootWindow( pDisplay ), ++ nKDEVersion, ++ 0, 1, ++ False, ++ AnyPropertyType, ++ &aRealType, ++ &nFormat, ++ &nItems, ++ &nBytesLeft, ++ &pProperty ); ++ if( !WasXError() && nItems != 0 && pProperty ) ++ { ++ nRet = *reinterpret_cast< sal_Int32* >( pProperty ); ++ } ++ if( pProperty ) ++ { ++ XFree( pProperty ); ++ pProperty = nullptr; ++ } ++ } ++ return nRet; ++} ++ ++static bool is_kde4_desktop( Display* pDisplay ) ++{ ++ static const char * pFullVersion = getenv( "KDE_FULL_SESSION" ); ++ static const char * pSessionVersion = getenv( "KDE_SESSION_VERSION" ); ++ if ( pFullVersion && pSessionVersion && strcmp(pSessionVersion, "4") == 0 ) ++ return true; ++ ++ if ( KDEVersion( pDisplay ) == 4 ) ++ return true; ++ ++ return false; ++} ++ + static bool is_kde5_desktop() + { + static const char * pFullVersion = getenv( "KDE_FULL_SESSION" ); +@@ -141,6 +215,8 @@ + return DESKTOP_LXQT; + if ( aOver.equalsIgnoreAsciiCase( "kde5" ) ) + return DESKTOP_KDE5; ++ if ( aOver.equalsIgnoreAsciiCase( "kde4" ) ) ++ return DESKTOP_KDE4; + if ( aOver.equalsIgnoreAsciiCase( "gnome" ) ) + return DESKTOP_GNOME; + if ( aOver.equalsIgnoreAsciiCase( "gnome-wayland" ) ) +@@ -248,10 +324,16 @@ + return DESKTOP_NONE; + + DesktopType ret; +- if ( is_gnome_desktop( pDisplay ) ) +- ret = DESKTOP_GNOME; +- else +- ret = DESKTOP_UNKNOWN; ++ XErrorHandler pOldHdl = XSetErrorHandler( autodect_error_handler ); ++ if ( is_kde4_desktop( pDisplay ) ) ++ ret = DESKTOP_KDE4; ++ else if ( is_gnome_desktop( pDisplay ) ) ++ ret = DESKTOP_GNOME; ++ else ++ ret = DESKTOP_UNKNOWN; ++ ++ // set the default handler again ++ XSetErrorHandler( pOldHdl ); + + XCloseDisplay( pDisplay ); + +diff -urN libreoffice-6.3.5.2/vcl/unx/gtk3_kde5/kde5_filepicker.cxx libreoffice-6.3.5.2-patched/vcl/unx/gtk3_kde5/kde5_filepicker.cxx +--- libreoffice-6.3.5.2/vcl/unx/gtk3_kde5/kde5_filepicker.cxx 2020-02-11 22:14:56.000000000 +1000 ++++ libreoffice-6.3.5.2-patched/vcl/unx/gtk3_kde5/kde5_filepicker.cxx 2020-03-29 18:18:56.397261034 +1000 +@@ -248,7 +248,7 @@ + // dialog there in order not to lose the custom controls and insert the custom + // widget in the layout returned by QFileDialog::layout() + // (which returns nullptr for native file dialogs) +- if (Application::GetDesktopEnvironment() == "KDE5") ++ if (Application::GetDesktopEnvironment() == "KDE5" || Application::GetDesktopEnvironment() == "KDE4") + { + qApp->installEventFilter(this); + } +diff -urN libreoffice-6.3.5.2/vcl/unx/kde5/KDE5SalInstance.cxx libreoffice-6.3.5.2-patched/vcl/unx/kde5/KDE5SalInstance.cxx +--- libreoffice-6.3.5.2/vcl/unx/kde5/KDE5SalInstance.cxx 2020-02-11 22:14:56.000000000 +1000 ++++ libreoffice-6.3.5.2-patched/vcl/unx/kde5/KDE5SalInstance.cxx 2020-03-29 18:16:44.371267490 +1000 +@@ -52,7 +52,7 @@ + + bool KDE5SalInstance::hasNativeFileSelection() const + { +- if (Application::GetDesktopEnvironment() == "KDE5") ++ if (Application::GetDesktopEnvironment() == "KDE5" || Application::GetDesktopEnvironment() == "KDE4") + return true; + return Qt5Instance::hasNativeFileSelection(); + } +@@ -73,7 +73,7 @@ + // In order to insert custom controls, KDE5FilePicker currently relies on KFileWidget + // being used in the native file picker, which is only the case for KDE Plasma. + // Therefore, return the plain qt5 one in order to not lose custom controls. +- if (Application::GetDesktopEnvironment() == "KDE5") ++ if (Application::GetDesktopEnvironment() == "KDE5" || Application::GetDesktopEnvironment() == "KDE4") + return new KDE5FilePicker(context, eMode); + return Qt5Instance::createPicker(context, eMode); + } diff --git a/libreoffice-help-package b/libreoffice-help-package new file mode 100644 index 0000000..4cb3fe8 --- /dev/null +++ b/libreoffice-help-package @@ -0,0 +1,67 @@ +#!/bin/sh +l=`echo $1 |sed -e 's,-,_,g'` + +case $1 in +ar) ln="Arabic";; +bg) ln="Bulgarian";; +bn) ln="Bengali";; +bs) ln="Bosnian";; +ca) ln="Catalan";; +cs) ln="Czech";; +da) ln="Danish";; +de) ln="German";; +dz) ln="Dzongkha";; +el) ln="Greek";; +en-GB) ln="British English";; +es) ln="Spanish";; +et) ln="Estonian";; +eu) ln="Basque";; +fi) ln="Finnish";; +fr) ln="French";; +gl) ln="Galician";; +gu) ln="Gujarati";; +he) ln="Hebrew";; +hi) ln="Hindi";; +hr) ln="Croatian";; +hu) ln="Hungarian";; +it) ln="Italian";; +lt) ln="Lithuanian";; +lv) ln="Latvian";; +ja) ln="Japanese";; +ko) ln="Korean";; +mk) ln="Macedonian";; +nb) ln="Norwegian (Bokmal)";; +nl) ln="Dutch";; +nn) ln="Norwegian (Nynorsk)";; +pl) ln="Polish";; +pt) ln="Portuguese";; +pt-BR) ln="Brazilian";; +ro) ln="Romanian";; +ru) ln="Russian";; +si) ln="Sinhalese";; +sk) ln="Slovak";; +sl) ln="Slovenian";; +sv) ln="Swedish";; +ta) ln="Tamil";; +tr) ln="Turkish";; +uk) ln="Ukrainian";; +zh-CN) ln="Simplified Chinese";; +zh-TW) ln="Traditional Chinese";; +en-US) ln="English";; +*) ln="$l";; +esac + +cat <= 1.8.4 BuildRequires: ed @@ -129,7 +143,7 @@ BuildRequires: perl-Archive-Zip BuildRequires: perl-MDK-Common BuildRequires: perl-HTML-Parser BuildRequires: perl-XML-Twig -BuildRequires: python-translate >= 1.9.0 +BuildRequires: pythonegg(translate-toolkit) BuildRequires: recode BuildRequires: sac BuildRequires: servlet3 @@ -145,16 +159,15 @@ BuildRequires: glm-devel BuildRequires: hyphen-devel BuildRequires: java-devel BuildRequires: jemalloc-devel -BuildRequires: kdelibs4-devel BuildRequires: lpsolve-devel BuildRequires: mysql-connector-c++-devel BuildRequires: nas-devel BuildRequires: openldap-devel BuildRequires: pam-devel -BuildRequires: qt4-devel BuildRequires: readline-devel +BuildRequires: systemtap-devel BuildRequires: unixODBC-devel -BuildRequires: vigra-devel +#BuildRequires: vigra-devel BuildRequires: gpgmepp-devel BuildRequires: pkgconfig(bluez) BuildRequires: pkgconfig(cppunit) >= 1.14.0 @@ -176,23 +189,24 @@ BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(hunspell) -BuildRequires: pkgconfig(icu-le) BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(libabw-0.1) BuildRequires: pkgconfig(libclucene-core) -BuildRequires: pkgconfig(libcmis-0.5) +BuildRequires: pkgconfig(liblucene++-contrib) +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 +222,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) BuildRequires: pkgconfig(mythes) BuildRequires: pkgconfig(neon) BuildRequires: pkgconfig(nspr) @@ -227,17 +241,52 @@ 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: junit BuildRequires: java-1.8.0-openjdk-devel %endif -Suggests: %{name}-java = %{EVRD} +Recommends: %{name}-java = %{EVRD} # STLport-devel 4.5 + private patches are needed BuildConflicts: STLport-devel # Requres to all our packages @@ -294,6 +343,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 +360,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 @@ -318,13 +369,13 @@ This package contains the spreadsheet component for LibreOffice. %package common Summary: LibreOffice office suite common files Group: Office +Provides: libreoffice-l10n-en_US = %{EVRD} +Provides: LibreOffice-l10n-en_US = %{EVRD} # 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} +Recommends: %{name}-help-en_US = %{EVRD} # And then general requires for OOo follows Requires: ghostscript Requires: fonts-ttf-liberation @@ -388,9 +439,13 @@ Conflicts: %{name}-templates-pt_BR < %{EVRD} Conflicts: %{name}-templates-sv < %{EVRD} Conflicts: %{name}-templates-tr < %{EVRD} Conflicts: %{name}-templates-zh_CN < %{EVRD} -Suggests: noto-sans-fonts -Suggests: noto-sans-mono-fonts -Suggests: noto-serif-fonts +Obsoletes: %{name}-style-galaxy < %{EVRD} +Obsoletes: %{name}-style-oxygen < %{EVRD} +Conflicts: %{name}-style-galaxy < %{EVRD} +Conflicts: %{name}-style-oxygen < %{EVRD} +Recommends: noto-sans-fonts +Recommends: noto-sans-mono-fonts +Recommends: noto-serif-fonts %description common This package contains the application-independent files of LibreOffice. @@ -404,7 +459,8 @@ This package contains the application-independent files of LibreOffice. %{_libdir}/libreoffice/program/classes/ScriptProviderForBeanShell.jar %{_libdir}/libreoffice/program/services/scriptproviderforbeanshell.rdb %{ooodir}/share/gallery/sg24.* -%{ooodir}/share/libreofficekit/handle_*.png +%{ooodir}/share/libreofficekit +%{_datadir}/appdata/org.libreoffice.kde.metainfo.xml #---------------------------------------------------------------------------- @@ -478,6 +534,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 +552,40 @@ 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} +Recommends: %{name}-style-breeze = %{EVRD} +Obsoletes: %{name}-kde4 < %{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} +Recommends: %{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 +599,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 +616,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 +643,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.* @@ -594,95 +671,29 @@ This package contains the Python bindings for the UNO library. #---------------------------------------------------------------------------- -%package style-breeze -Summary: Breeze symbol style for LibreOffice -Group: Office -Requires: %{name}-common = %{EVRD} -Provides: %{name}-style = %{EVRD} -Obsoletes: %{name}-style-crystal < 1:5.1.1 +%define style_package()\ +%{expand:\ +%%package style-%1 \ +Summary: %1 symbol style for LibreOffice \ +Group: Office \ +Requires: %{name}-common = %{EVRD} \ +Provides: %{name}-style = %{EVRD} \ +Obsoletes: %{name}-common < 1:6.3.5 \ +Conflicts: %{name}-common < 1:6.3.5 \ +\ +%%description style-%1 \ +%1 symbol style for LibreOffice \ +\ +%%files style-%1 \ +%{ooodir}/share/config/images_%{1}*.zip +} -%description style-breeze -This package contains the "breeze" symbol style, needs to be manually -enabled in the LibreOffice option menu. - -%files style-breeze -%{ooodir}/share/config/images_breeze.zip - -#---------------------------------------------------------------------------- - -%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 -Requires: %{name}-common = %{EVRD} -Provides: %{name}-style = %{EVRD} -Conflicts: %{name}-common < 1:5.1.1 - -%description style-sifr -This package contains the "sifr" symbol style, needs to be manually -enabled in the LibreOffice option menu. - -%files style-sifr -%{ooodir}/share/config/images_sifr.zip - -#---------------------------------------------------------------------------- - -%package style-tango -Summary: Tango symbol style for LibreOffice -Group: Office -Requires: %{name}-common = %{EVRD} -Provides: %{name}-style = %{EVRD} - -%description style-tango -This package contains the "tango" symbol style, default style for GTK/Gnome. - -%files style-tango -%{ooodir}/share/config/images_tango.zip +%style_package breeze +%style_package colibre +%style_package elementary +%style_package karasa_jaga +%style_package sifr +%style_package tango #---------------------------------------------------------------------------- @@ -690,7 +701,7 @@ This package contains the "tango" symbol style, default style for GTK/Gnome. Summary: LibreOffice office suite - word processor Group: Office Requires: %{name}-common = %{EVRD} -Suggests: libreoffice-pagination +Recommends: libreoffice-pagination %description writer This package contains the word processor component for LibreOffice. @@ -699,6 +710,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 @@ -710,9 +722,6 @@ Group: Office Requires: %{name}-common = %{EVRD} Requires: %{name}-writer = %{EVRD} %if !%{javaless} -Requires: apache-commons-codec -Requires: apache-commons-lang -Requires: jakarta-commons-httpclient Requires: apache-commons-logging %endif @@ -760,19 +769,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 @@ -819,2106 +815,64 @@ creation and management of PostgreSQL databases through a GUI. #---------------------------------------------------------------------------- %if %{with l10n} -%package l10n-af -Summary: Afrikaans language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-af -Requires: urw-fonts -Requires: myspell-af -Provides: LibreOffice-l10n-af = %{EVRD} -%description l10n-af -This package contains the localization of LibreOffice in Afrikaans. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif +%define l10n_package()\ +%{expand:\ +%%package l10n-%{1} \ +Summary: %(echo "%{2}" | sed -e 's,___, ,g') language support for LibreOffice \ +Group: Office \ +Provides: %{ooname}-l10n = %{EVRD} \ +Requires: %{ooname}-common = %{EVRD} \ +Requires: locales-%(echo %{1} | awk -F '_' '{print $1}') \ +Provides: LibreOffice-l10n-%{1} = %{EVRD} \ +\ +%%description l10n-%{1} \ +This package contains the localization of LibreOffice in %(echo "%{2}" | sed -e 's,___, ,g'). \ +It contains the user interface, the templates and the autotext \ +features. Please note that not all of these are available for all \ +possible language. You can switch user interface language using the \ +standard locales system. \ +\ +%%files l10n-%{1} \ +%{ooodir}/share/registry/res/*_%{3}.* \ +%{ooodir}/share/registry/*-%{3}.* \ +%%optional %{ooodir}/share/registry/*_%{3}.* \ +%{ooodir}/share/autotext/%{3} \ +%{ooodir}/readmes/README_%{3} \ +%{ooodir}/program/resource/%{1} +} + +%{expand: +%(for i in %{langs}; do \ +[ "$i" = "en_US" ] && continue; \ +name="$(grep "^${i};" %{SOURCE5} | awk -F ';' '{print $2}' | tail -n 1 | sed -E -e 's,[[:blank:]],___,g' || :)" ; \ +j="$(echo "$i" | sed -e 's,_,-,g')" ; \ +echo "%%{l10n_package "$i" "$name" "$j"}"; \ +done)} + +%define help_package()\ +%{expand: +%%package help-%{1} \ +Summary: %(echo "%{2}" | sed -e 's,___, ,g') help for LibreOffice \ +Group: Office \ +Provides: %{ooname}-help = %{EVRD} \ +Requires: %{ooname}-l10n-%{1} = %{EVRD} \ +Provides: LibreOffice-help-%{1} = %{EVRD} \ +\ +%%description help-%{1} \ +Localized help files of LibreOffice in %(echo "%{2}" | sed -e 's,___, ,g'). \ +\ +%%files help-%{1} \ +%{ooodir}/help/%{3} +} + +%{expand: +%(for i in %{helplangs} ; do \ +name="$(grep "^${i};" %{SOURCE5} | awk -F ';' '{print $2}' | tail -n 1 || :)" ; \ +j="$(echo "$i" | sed -e 's,_,-,g')" ; \ +echo "%%{help_package "$i" "$(echo "$name" | sed -E -e 's,[[:blank:]],___,g')" "$j"}"; \ +done) } -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-ar -Summary: Arabic language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-ar -Requires: fonts-ttf-arabic -Provides: LibreOffice-l10n-ar = %{EVRD} - -%description l10n-ar -This package contains the localization of LibreOffice in Arabic. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-as -Summary: Assamese language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-as -Provides: LibreOffice-l10n-as = %{EVRD} - -%description l10n-as -This package contains the localization of LibreOffice in Assamese. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-bg -Summary: Bulgarian language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-bg -Provides: LibreOffice-l10n-bg = %{EVRD} -Suggests: %{ooname}-help-bg = %{EVRD} - -%description l10n-bg -This package contains the localization of LibreOffice in Bulgarian. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-bn -Summary: Bengali language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-bn -Provides: LibreOffice-l10n-bn = %{EVRD} -Suggests: %{ooname}-help-bn = %{EVRD} - -%description l10n-bn -This package contains the localization of LibreOffice in Bengali. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-br -Summary: Breton language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-br -Provides: LibreOffice-l10n-br = %{EVRD} - -%description l10n-br -This package contains the localization of LibreOffice in Breton. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-bs -Summary: Bosnian language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-bs -Provides: LibreOffice-l10n-bs = %{EVRD} -Suggests: %{ooname}-help-bs = %{EVRD} - -%description l10n-bs -This package contains the localization of LibreOffice in Bosnian. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-ca -Summary: Catalan language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-ca -Requires: urw-fonts -Requires: myspell-ca -Provides: LibreOffice-l10n-ca = %{EVRD} -Suggests: %{ooname}-help-ca = %{EVRD} - -%description l10n-ca -This package contains the localization of LibreOffice in Catalan. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-cs -Summary: Czech language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-cs -Requires: urw-fonts -Requires: myspell-cs -Requires: myspell-hyph-cs -Provides: LibreOffice-l10n-cs = %{EVRD} -Suggests: %{ooname}-help-cs = %{EVRD} - -%description l10n-cs -This package contains the localization of LibreOffice in Czech. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-cy -Summary: Welsh language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-cy -Requires: urw-fonts -Requires: myspell-cy -Provides: LibreOffice-l10n-cy = %{EVRD} - -%description l10n-cy -This package contains the localization of LibreOffice in Welsh. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-da -Summary: Danish language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-da -Requires: fonts-ttf-dejavu -Requires: urw-fonts -Requires: myspell-da, myspell-hyph-da -Provides: LibreOffice-l10n-da = %{EVRD} -Suggests: %{ooname}-help-da = %{EVRD} - -%description l10n-da -This package contains the localization of LibreOffice in Danish. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-de -Summary: German language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-de -Requires: fonts-ttf-dejavu -Requires: urw-fonts -Requires: myspell-de -Requires: myspell-hyph-de -Provides: LibreOffice-l10n-de = %{EVRD} -Suggests: %{ooname}-help-de = %{EVRD} - -%description l10n-de -This package contains the localization of LibreOffice in German. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-dz -Summary: Dzongkha language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-dz -Provides: LibreOffice-l10n-dz = %{EVRD} -Suggests: %{ooname}-help-dz = %{EVRD} - -%description l10n-dz -This package contains the localization of LibreOffice in Dzongkha. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-el -Summary: Greek language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-el -Requires: fonts-type1-greek -Requires: myspell-el -Requires: myspell-hyph-el -Provides: LibreOffice-l10n-el = %{EVRD} -Suggests: %{ooname}-help-el = %{EVRD} - -%description l10n-el -This package contains the localization of LibreOffice in Greek. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-en_GB -Summary: British language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-en -Requires: urw-fonts -Requires: myspell-en_GB -Requires: myspell-hyph-en -Provides: LibreOffice-l10n-en_GB = %{EVRD} -Suggests: %{ooname}-help-en_GB = %{EVRD} - -%description l10n-en_GB -This package contains the localization of LibreOffice in British. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-es -Summary: Spanish language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-es -Requires: fonts-ttf-dejavu -Requires: urw-fonts -Requires: myspell-es -Requires: myspell-hyph-es -Provides: LibreOffice-l10n-es = %{EVRD} -Suggests: %{ooname}-help-es = %{EVRD} - -%description l10n-es -This package contains the localization of LibreOffice in Spanish. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-et -Summary: Estonian language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-et -Requires: fonts-ttf-dejavu -Requires: urw-fonts -Requires: myspell-et -Requires: myspell-hyph-et -Provides: LibreOffice-l10n-et = %{EVRD} -Suggests: %{ooname}-help-et = %{EVRD} - -%description l10n-et -This package contains the localization of LibreOffice in Estonian. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-eu -Summary: Basque language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-eu -Requires: fonts-ttf-dejavu -Requires: urw-fonts -Provides: LibreOffice-l10n-eu = %{EVRD} -Suggests: %{ooname}-help-eu = %{EVRD} - -%description l10n-eu -This package contains the localization of LibreOffice in Basque. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-fa -Summary: Farsi language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-fa -Provides: LibreOffice-l10n-fa = %{EVRD} - -%description l10n-fa -This package contains the localization of LibreOffice in Farsi. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-fi -Summary: Finnish language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-fi -Requires: fonts-ttf-dejavu -Requires: urw-fonts -Provides: LibreOffice-l10n-fi = %{EVRD} -Suggests: %{ooname}-help-fi = %{EVRD} - -%description l10n-fi -This package contains the localization of LibreOffice in Finnish. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-fr -Summary: French language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-fr -Requires: fonts-ttf-dejavu -Requires: urw-fonts -Requires: myspell-fr -Requires: myspell-hyph-fr -Provides: LibreOffice-l10n-fr = %{EVRD} -Suggests: %{ooname}-help-fr = %{EVRD} - -%description l10n-fr -This package contains the localization of LibreOffice in French. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-ga -Summary: Irish language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-ga -Provides: LibreOffice-l10n-ga = %{EVRD} - -%description l10n-ga -This package contains the localization of LibreOffice in Irish. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-gl -Summary: Galician language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-gl -Provides: LibreOffice-l10n-gl = %{EVRD} -Suggests: %{ooname}-help-gl = %{EVRD} - -%description l10n-gl -This package contains the localization of LibreOffice in Galician. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-gu -Summary: Gujarati language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-gu -Provides: LibreOffice-l10n-gu = %{EVRD} -Suggests: %{ooname}-help-gu = %{EVRD} - -%description l10n-gu -This package contains the localization of LibreOffice in Gujarati. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-he -Summary: Hebrew language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-he -Requires: urw-fonts -Provides: LibreOffice-l10n-he = %{EVRD} -Suggests: %{ooname}-help-he = %{EVRD} - -%description l10n-he -This package contains the localization of LibreOffice in Hebrew. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-hi -Summary: Hindi language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-hi -Requires: urw-fonts -Provides: LibreOffice-l10n-hi = %{EVRD} -Suggests: %{ooname}-help-hi = %{EVRD} - -%description l10n-hi -This package contains the localization of LibreOffice in Hindi. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-hr -Summary: Croatian language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-hr -Provides: LibreOffice-l10n-hr = %{EVRD} -Suggests: %{ooname}-help-hr = %{EVRD} - -%description l10n-hr -This package contains the localization of LibreOffice in Croatian. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-hu -Summary: Hungarian language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-hu -Requires: urw-fonts -Requires: myspell-hu -Requires: myspell-hyph-hu -Provides: LibreOffice-l10n-hu = %{EVRD} -Suggests: %{ooname}-help-hu = %{EVRD} - -%description l10n-hu -This package contains the localization of LibreOffice in Hungarian. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-it -Summary: Italian language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: fonts-ttf-dejavu -Requires: urw-fonts -Requires: myspell-it -Requires: myspell-hyph-it -Provides: LibreOffice-l10n-it = %{EVRD} -Suggests: %{ooname}-help-it = %{EVRD} - -%description l10n-it -This package contains the localization of LibreOffice in Italian. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-ja -Summary: Japanese language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-ja -Requires: fonts-ttf-japanese -Provides: LibreOffice-l10n-ja = %{EVRD} -Suggests: %{ooname}-help-ja = %{EVRD} - -%description l10n-ja -This package contains the localization of LibreOffice in Japanese. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-kn -Summary: Kannada language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-kn -Provides: LibreOffice-l10n-kn = %{EVRD} - -%description l10n-kn -This package contains the localization of LibreOffice in Kannada. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-ko -Summary: Korean language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-ko -Requires: fonts-ttf-korean >= 1.0.2 -Provides: LibreOffice-l10n-ko = %{EVRD} -Suggests: %{ooname}-help-ko = %{EVRD} - -%description l10n-ko -This package contains the localization of LibreOffice in Korean. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-lt -Summary: Lithuanian language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-lt -Provides: LibreOffice-l10n-lt = %{EVRD} - -%description l10n-lt -This package contains the localization of LibreOffice in Lithuanian. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-lv -Summary: Latvian language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-lv -Provides: LibreOffice-l10n-lv = %{EVRD} - -%description l10n-lv -This package contains the localization of LibreOffice in Latvian. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-mai -Summary: Maithili language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-mai -Provides: LibreOffice-l10n-mai = %{EVRD} - -%description l10n-mai -This package contains the localization of LibreOffice in Maithili. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-ml -Summary: Malayalam language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-ml -Provides: LibreOffice-l10n-ml = %{EVRD} - -%description l10n-ml -This package contains the localization of LibreOffice in Malayalam. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-mk -Summary: Macedonian language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-mk -Provides: LibreOffice-l10n-mk = %{EVRD} -Suggests: %{ooname}-help-mk = %{EVRD} - -%description l10n-mk -This package contains the localization of LibreOffice in Macedonian. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-mr -Summary: Marathi language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-mr -Provides: LibreOffice-l10n-mr = %{EVRD} - -%description l10n-mr -This package contains the localization of LibreOffice in Marathi. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-nb -Summary: Norwegian Bokmal language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-no -Requires: urw-fonts -Provides: LibreOffice-l10n-nb = %{EVRD} -Suggests: %{ooname}-help-nb = %{EVRD} - -%description l10n-nb -This package contains the localization of LibreOffice in Norwegian Bokmal. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-nl -Summary: Dutch language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-nl -Requires: fonts-ttf-dejavu -Requires: urw-fonts -Requires: myspell-nl -Requires: myspell-hyph-nl -Provides: LibreOffice-l10n-nl = %{EVRD} -Suggests: %{ooname}-help-nl = %{EVRD} - -%description l10n-nl -This package contains the localization of LibreOffice in Dutch. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-nn -Summary: Norwegian Nynorsk language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-no -Requires: urw-fonts -Provides: LibreOffice-l10n-nn = %{EVRD} -Suggests: %{ooname}-help-nn = %{EVRD} - -%description l10n-nn -This package contains the localization of LibreOffice in Norwegian Nynorsk. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-nr -Summary: Ndebele language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-nr -Provides: LibreOffice-l10n-nr = %{EVRD} - -%description l10n-nr -This package contains the localization of LibreOffice in Ndebele. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-nso -Summary: Northern Shoto language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-nso -Provides: LibreOffice-l10n-nso = %{EVRD} - -%description l10n-nso -This package contains the localization of LibreOffice in Northern Shoto. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-or -Summary: Oriya language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-or -Provides: LibreOffice-l10n-or = %{EVRD} - -%description l10n-or -This package contains the localization of LibreOffice in Oriya. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-pa_IN -Summary: Punjabi language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-pa -Provides: LibreOffice-l10n-pa_IN = %{EVRD} -Provides: LibreOffice-l10n-pa = %{EVRD} - -%description l10n-pa_IN -This package contains the localization of LibreOffice in Punjabi. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-pl -Summary: Polish language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-pl -Requires: urw-fonts -Requires: myspell-pl -Requires: myspell-hyph-pl -Provides: LibreOffice-l10n-pl = %{EVRD} -Suggests: %{ooname}-help-pl = %{EVRD} - -%description l10n-pl -This package contains the localization of LibreOffice in Polish. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-pt -Summary: Portuguese language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-pt -Requires: fonts-ttf-dejavu -Requires: urw-fonts -Requires: myspell-pt -Requires: myspell-hyph-pt -Provides: LibreOffice-l10n-pt = %{EVRD} -Suggests: %{ooname}-help-pt = %{EVRD} - -%description l10n-pt -This package contains the localization of LibreOffice in Portuguese. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-pt_BR -Summary: Portuguese Brazilian language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: locales-pt -Requires: urw-fonts -Requires: myspell-pt_BR -Provides: LibreOffice-l10n_pt_BR = %{EVRD} -Suggests: %{ooname}-help-pt_BR = %{EVRD} - -%description l10n-pt_BR -This package contains the localization of LibreOffice in Portuguese -Brazilian. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-ro -Summary: Romanian language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-ro -Provides: LibreOffice-l10n-ro = %{EVRD} - -%description l10n-ro -This package contains the localization of LibreOffice in Romanian. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-ru -Summary: Russian language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-ru -Suggests: fonts-ttf-paratype -Requires: urw-fonts -Requires: myspell-ru -Requires: myspell-hyph-ru -Provides: LibreOffice-l10n-ru = %{EVRD} -Suggests: %{ooname}-help-ru = %{EVRD} - -%description l10n-ru -This package contains the localization of LibreOffice in Russian. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-shs -Summary: Secwepemctsin language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-shs -Provides: LibreOffice-l10n-shs = %{EVRD} - -%description l10n-shs -This package contains the localization of LibreOffice in Secwepemctsin. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-si -Summary: Sinhalese language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-si -Provides: LibreOffice-l10n-si = %{EVRD} -Suggests: %{ooname}-help-si = %{EVRD} - -%description l10n-si -This package contains the localization of LibreOffice in Sinhalese. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-sk -Summary: Slovak language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-sk -Requires: urw-fonts -Requires: myspell-sk -Requires: myspell-hyph-sk -Provides: LibreOffice-l10n-sk = %{EVRD} -Suggests: %{ooname}-help-sk = %{EVRD} - -%description l10n-sk -This package contains the localization of LibreOffice in Slovak. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-sl -Summary: Slovenian language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-sl -Requires: urw-fonts -Requires: myspell-sl, myspell-hyph-sl -Provides: LibreOffice-l10n-sl = %{EVRD} -Suggests: %{ooname}-help-sl = %{EVRD} - -%description l10n-sl -This package contains the localization of LibreOffice in Slovenian. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-sr -Summary: Serbian language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-sr -Provides: LibreOffice-l10n-sr = %{EVRD} - -%description l10n-sr -This package contains the localization of LibreOffice in Serbian. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-st -Summary: Sotho language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-st -Provides: LibreOffice-l10n-st = %{EVRD} - -%description l10n-st -This package contains the localization of LibreOffice in Sotho. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-ss -Summary: Swati language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-ss -Provides: LibreOffice-l10n-ss = %{EVRD} - -%description l10n-ss -This package contains the localization of LibreOffice in Swati. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-sv -Summary: Swedish language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-sv -Requires: fonts-ttf-dejavu -Requires: urw-fonts -Requires: myspell-sv -Requires: myspell-hyph-sv -Provides: LibreOffice-l10n-sv = %{EVRD} -Suggests: %{ooname}-help-sv = %{EVRD} - -%description l10n-sv -This package contains the localization of LibreOffice in Swedish. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-ta -Summary: Tamil language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-ta -Requires: urw-fonts -Provides: LibreOffice-l10n-ta = %{EVRD} - -%description l10n-ta -This package contains the localization of LibreOffice in Tamil. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-te -Summary: Telugu language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-te -Provides: LibreOffice-l10n-te = %{EVRD} - -%description l10n-te -This package contains the localization of LibreOffice in Telugu. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-th -Summary: Thai language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-th -Provides: LibreOffice-l10n-th = %{EVRD} - -%description l10n-th -This package contains the localization of LibreOffice in Thai. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-tn -Summary: Tswana language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-tn -Provides: LibreOffice-l10n-tn = %{EVRD} - -%description l10n-tn -This package contains the localization of LibreOffice in Tswana. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-tr -Summary: Turkish language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-tr -Requires: urw-fonts -Provides: LibreOffice-l10n-tr = %{EVRD} -Suggests: %{ooname}-help-tr = %{EVRD} - -%description l10n-tr -This package contains the localization of LibreOffice in Turkish. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-ts -Summary: Tsonga language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-ts -Provides: LibreOffice-l10n-ts = %{EVRD} - -%description l10n-ts -This package contains the localization of LibreOffice in Tsonga. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-uk -Summary: Ukrainian language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-uk -Provides: LibreOffice-l10n-uk = %{EVRD} -Suggests: %{ooname}-help-uk = %{EVRD} - -%description l10n-uk -This package contains the localization of LibreOffice in Ukrainian. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-ve -Summary: Venda language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-ve -Provides: LibreOffice-l10n-ve = %{EVRD} - -%description l10n-ve -This package contains the localization of LibreOffice in Venda. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-xh -Summary: Xhosa language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-xh -Provides: LibreOffice-l10n-xh = %{EVRD} - -%description l10n-xh -This package contains the localization of LibreOffice in Xhosa. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-zh_CN -Summary: Chinese Simplified language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-zh -Requires: fonts-ttf-chinese -Provides: LibreOffice-l10n-zh_CN = %{EVRD} -Suggests: %{ooname}-help-zh_CN = %{EVRD} - -%description l10n-zh_CN -This package contains the localization of LibreOffice in Chinese Simplified. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-zh_TW -Summary: Chinese Traditional language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-zh -Requires: fonts-ttf-chinese -Provides: LibreOffice-l10n-zh_TW = %{EVRD} -Suggests: %{ooname}-help-zh_TW = %{EVRD} - -%description l10n-zh_TW -This package contains the localization of LibreOffice in Chinese -Traditional. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package l10n-zu -Summary: Zulu language support for LibreOffice -Group: Office -Provides: %{ooname}-l10n = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Requires: locales-zu -Requires: urw-fonts -Requires: myspell-zu -Provides: LibreOffice-l10n-zu = %{EVRD} - -%description l10n-zu -This package contains the localization of LibreOffice in Zulu. -It contains the user interface, the templates and the autotext -features. Please note that not all of these are available for all -possible language. You can switch user interface language using the -standard locales system. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-ar -Summary: Arabic help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-ar = %{EVRD} -Provides: LibreOffice-help-ar = %{EVRD} - -%description help-ar -This package contains the localized help files of LibreOffice in Arabic. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-bg -Summary: Bulgarian help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-bg = %{EVRD} -Provides: LibreOffice-help-bg = %{EVRD} - -%description help-bg -This package contains the localized help files of LibreOffice in Bulgarian. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-bn -Summary: Bengali help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-bn = %{EVRD} -Provides: LibreOffice-help-bn = %{EVRD} - -%description help-bn -This package contains the localized help files of LibreOffice in Bengali. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-bs -Summary: Bosnian help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-bs = %{EVRD} -Provides: LibreOffice-help-bs = %{EVRD} - -%description help-bs -This package contains the localized help files of LibreOffice in Bosnian. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-ca -Summary: Catalan help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-ca = %{EVRD} -Provides: LibreOffice-help-ca = %{EVRD} - -%description help-ca -This package contains the localized help files of LibreOffice in Catalan. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-cs -Summary: Czech help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-cs = %{EVRD} -Provides: LibreOffice-help-cs = %{EVRD} - -%description help-cs -This package contains the localized help files of LibreOffice in Czech. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-da -Summary: Danish help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-da = %{EVRD} -Provides: LibreOffice-help-da = %{EVRD} - -%description help-da -This package contains the localized help files of LibreOffice in Danish. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-de -Summary: German help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-de = %{EVRD} -Provides: LibreOffice-help-de = %{EVRD} - -%description help-de -This package contains the localized help files of LibreOffice in German. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-dz -Summary: Dzongkha help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-dz = %{EVRD} -Provides: LibreOffice-help-dz = %{EVRD} - -%description help-dz -This package contains the localized help files of LibreOffice in Dzongkha. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-el -Summary: Greek help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-el = %{EVRD} -Provides: LibreOffice-help-el = %{EVRD} - -%description help-el -This package contains the localized help files of LibreOffice in Greek. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-en_GB -Summary: British help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-en_GB = %{EVRD} -Provides: LibreOffice-help-en_GB = %{EVRD} - -%description help-en_GB -This package contains the localized help files of LibreOffice in British. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-en_US -Summary: American English help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-common = %{EVRD} -Provides: LibreOffice-help-en_US = %{EVRD} - -%description help-en_US -This package contains the localized help files of LibreOffice -in American English. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-es -Summary: Spanish help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-es = %{EVRD} -Provides: LibreOffice-help-es = %{EVRD} - -%description help-es -This package contains the localized help files of LibreOffice in Spanish. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-et -Summary: Estonian help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-et = %{EVRD} -Provides: LibreOffice-help-et = %{EVRD} - -%description help-et -This package contains the localized help files of LibreOffice in Estonian. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-eu -Summary: Basque help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-eu = %{EVRD} -Provides: LibreOffice-help-eu = %{EVRD} - -%description help-eu -This package contains the localized help files of LibreOffice in Basque. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-fi -Summary: Finnish help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-fi = %{EVRD} -Provides: LibreOffice-help-fi = %{EVRD} - -%description help-fi -This package contains the localized help files of LibreOffice in Finnish. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-fr -Summary: French help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-fr = %{EVRD} -Provides: LibreOffice-help-fr = %{EVRD} - -%description help-fr -This package contains the localized help files of LibreOffice in French. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-gu -Summary: Gujarati help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-gu = %{EVRD} -Provides: LibreOffice-help-gu = %{EVRD} - -%description help-gu -This package contains the localized help files of LibreOffice in Gujarati. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-gl -Summary: Galician help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-gl = %{EVRD} -Provides: LibreOffice-help-gl = %{EVRD} - -%description help-gl -This package contains the localized help files of LibreOffice in Galician. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-he -Summary: Hebrew help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-he = %{EVRD} -Provides: LibreOffice-help-he = %{EVRD} - -%description help-he -This package contains the localized help files of LibreOffice in Hebrew. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-hi -Summary: Hindi help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-hi = %{EVRD} -Provides: LibreOffice-help-hi = %{EVRD} - -%description help-hi -This package contains the localized help files of LibreOffice in Hindi. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-hr -Summary: Croatian help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-hr = %{EVRD} -Provides: LibreOffice-help-hr = %{EVRD} - -%description help-hr -This package contains the localized help files of LibreOffice in Croatian. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-hu -Summary: Hungarian help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-hu = %{EVRD} -Provides: LibreOffice-help-hu = %{EVRD} - -%description help-hu -This package contains the localized help files of LibreOffice in Hungarian. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-it -Summary: Italian help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-it = %{EVRD} -Provides: LibreOffice-help-it = %{EVRD} - -%description help-it -This package contains the localized help files of LibreOffice in Italian. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-ja -Summary: Japanese help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-ja = %{EVRD} -Provides: LibreOffice-help-ja = %{EVRD} - -%description help-ja -This package contains the localized help files of LibreOffice in Japanese. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-ko -Summary: Korean help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-ko = %{EVRD} -Provides: LibreOffice-help-ko = %{EVRD} - -%description help-ko -This package contains the localized help files of LibreOffice in Korean. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-lt -Summary: Lithuanian help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-lt = %{EVRD} -Provides: LibreOffice-help-lt = %{EVRD} - -%description help-lt -This package contains the localized help files of LibreOffice in Lithuanian. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-lv -Summary: Latvian help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-lv = %{EVRD} -Provides: LibreOffice-help-lv = %{EVRD} - -%description help-lv -This package contains the localized help files of LibreOffice in Latvian. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-mk -Summary: Macedonian help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-mk = %{EVRD} -Provides: LibreOffice-help-mk = %{EVRD} - -%description help-mk -This package contains the localized help files of LibreOffice in Macedonian. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-nb -Summary: Norwegian Bokmal help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-nb = %{EVRD} -Provides: LibreOffice-help-nb = %{EVRD} - -%description help-nb -This package contains the localized help files of LibreOffice in Norwegian -Bokmal. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-nl -Summary: Dutch help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-nl = %{EVRD} -Provides: LibreOffice-help-nl = %{EVRD} - -%description help-nl -This package contains the localized help files of LibreOffice in Dutch. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-nn -Summary: Norwegian Nynorsk help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-nn = %{EVRD} -Provides: LibreOffice-help-nn = %{EVRD} - -%description help-nn -This package contains the localized help files of LibreOffice in Norwegian -Nynorsk. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-pl -Summary: Polish help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-pl = %{EVRD} -Provides: LibreOffice-help-pl = %{EVRD} - -%description help-pl -This package contains the localized help files of LibreOffice in Polish. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-pt -Summary: Portuguese help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-pt = %{EVRD} -Provides: LibreOffice-help-pt = %{EVRD} - -%description help-pt -This package contains the localized help files of LibreOffice in Portuguese. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-pt_BR -Summary: Portuguese Brazilian help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-pt_BR = %{EVRD} -Provides: LibreOffice-help-pt_BR = %{EVRD} - -%description help-pt_BR -This package contains the localized help files of LibreOffice in Portuguese -Brazilian. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-ro -Summary: Romanian help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-ro = %{EVRD} -Provides: LibreOffice-help-ro = %{EVRD} - -%description help-ro -This package contains the localized help files of LibreOffice in Romanian. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-ru -Summary: Russian help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-ru = %{EVRD} -Provides: LibreOffice-help-ru = %{EVRD} - -%description help-ru -This package contains the localized help files of LibreOffice in Russian. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-si -Summary: Sinhalese help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-si = %{EVRD} -Provides: LibreOffice-help-si = %{EVRD} - -%description help-si -This package contains the localized help files of LibreOffice in Sinhalese. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-sk -Summary: Slovak help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-sk = %{EVRD} -Provides: LibreOffice-help-sk = %{EVRD} - -%description help-sk -This package contains the localized help files of LibreOffice in Slovak. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-sl -Summary: Slovenian help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-sl = %{EVRD} -Provides: LibreOffice-help-sl = %{EVRD} - -%description help-sl -This package contains the localized help files of LibreOffice in Slovenian. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-sv -Summary: Swedish help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-sv = %{EVRD} -Provides: LibreOffice-help-sv = %{EVRD} - -%description help-sv -This package contains the localized help files of LibreOffice in Swedish. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-ta -Summary: Tamil help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-ta = %{EVRD} -Provides: LibreOffice-help-ta = %{EVRD} - -%description help-ta -This package contains the localized help files of LibreOffice in Tamil. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-tr -Summary: Turkish help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-tr = %{EVRD} -Provides: LibreOffice-help-tr = %{EVRD} - -%description help-tr -This package contains the localized help files of LibreOffice in Turkish. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-uk -Summary: Ukrainian help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-uk = %{EVRD} -Provides: LibreOffice-help-uk = %{EVRD} - -%description help-uk -This package contains the localized help files of LibreOffice in Ukrainian. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-zh_CN -Summary: Chinese Simplified help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-zh_CN = %{EVRD} -Provides: LibreOffice-help-zn_CN = %{EVRD} - -%description help-zh_CN -This package contains the localized help files of LibreOffice in Chinese -Simplified. -%endif - -#---------------------------------------------------------------------------- - -%if %{with l10n} -%package help-zh_TW -Summary: Chinese Traditional help for LibreOffice -Group: Office -Provides: %{ooname}-help = %{EVRD} -Requires: %{ooname}-l10n-zh_TW = %{EVRD} -Provides: LibreOffice-help-zn_CT = %{EVRD} - -%description help-zh_TW -This package contains the localized help files of LibreOffice in Chinese -Traditional. %endif #---------------------------------------------------------------------------- @@ -2942,22 +896,8 @@ 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 - +# path to external tarballs +EXTSRCDIR=`dirname %{SOURCE0}` export LC_ALL=en_US.UTF-8 export LANG=en_US @@ -2970,29 +910,55 @@ export PATH export CCACHE_DIR=%{ccachedir} %endif -%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" -export ARCH_FLAGS_CXX="%{optflags} -fno-omit-frame-pointer -fno-strict-aliasing -fpermissive -fvisibility-inlines-hidden" -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" +%if %{without clang} +%global ldflags %{ldflags} -lstdc++ +%endif + +%setup_compile_flags + +%if %{with clang} +# not using %%clang_gcc_wrapper here because it fails +# to deal with complex quotation like +# -DCPPUNIT_PLUGIN_EXPORT='extern "C" SAL_DLLPUBLIC_EXPORT' +for i in %noclang_optflags ; do + export CFLAGS="$(echo "$CFLAGS" | sed -e "s,${i},,g")" + export CXXFLAGS="$(echo "$CXXFLAGS" | sed -e "s,${i},,g")" +done +mkdir -p local_bin +install -m0755 %{SOURCE80} "local_bin/clang++" +export PATH="${PWD}/local_bin:${PATH}" +export CC=clang +export CXX=clang++ +export CPP=clang-cpp +# libstdc++ from gcc5 is too old, use newer version of libstdc++ +export CPPFLAGS="$CPPFLAGS -I%{_includedir}/libstdc++-gcc10 -I%{_includedir}/libstdc++-gcc10/%{_host}" +export CXXFLAGS="$CXXFLAGS -nostdinc++ $CPPFLAGS -Wno-unused-command-line-argument -D__STDCPP_WANT_MATH_SPEC_FUNCS__" +export LIBCCX_LIBS="-lstdc++-gcc10" +%endif echo "Configure start at: "`date` >> ooobuildtime.log touch autogen.lastrun -%configure2_5x \ + +%if %{with clang} +sed -i \ + -e "s!clang -V!clang -v!g" \ + -e "s!clang -qversion!clang --version!g" \ + configure +%endif + +%configure \ %{?_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" \ --disable-coinmp \ --disable-fetch-external \ - --enable-gstreamer-1.0 \ + --with-external-tar="$EXTSRCDIR" \ --disable-gstreamer-0.10 \ --enable-release-build \ - --enable-kde4 \ + --enable-gtk3-kde5 \ + --enable-kde5 \ + --enable-qt5 \ --disable-firebird-sdbc \ --disable-introspection \ --enable-eot \ @@ -3000,12 +966,14 @@ touch autogen.lastrun --enable-split-app-modules \ --enable-split-opt-features \ --without-fonts \ + --without-lxml \ --without-junit \ %if %{javaless} --with-ant-home="%{antpath}" \ - --without-system-apache-commons \ +%else + --with-jdk-home="%{java_home}" \ %endif - --with-lang="%{langs}" \ + --with-lang="$(echo %{langs} | sed -e 's,_,-,g')" \ --without-myspell-dicts \ --with-system-dicts \ --with-help \ @@ -3053,14 +1021,6 @@ ln -sf %{SOURCE2} external/tarballs/ ln -sf %{SOURCE3} external/tarballs/ cp %{SOURCE4} external/tarballs/ -%if %{javaless} -ln -sf %{SOURCE30} external/tarballs/ -ln -sf %{SOURCE31} external/tarballs/ -ln -sf %{SOURCE32} external/tarballs/ -ln -sf %{SOURCE32} external/tarballs/ -ln -sf %{SOURCE321} external/tarballs/ -%endif - ln -sf %{SOURCE33} external/tarballs/ ln -sf %{SOURCE35} external/tarballs/ ln -sf %{SOURCE36} external/tarballs/ @@ -3083,18 +1043,15 @@ 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 # We use make build here because the default target is "allandcheck". # Checking should go to check - -%make -r -s V=0 \ - ARCH_FLAGS="$ARCH_FLAGS" \ - ARCH_FLAGS_CC="$ARCH_FLAGS_CC" \ - ARCH_FLAGS_CXX="$ARCH_FLAGS_CXX" \ - ARCH_FLAGS_OPT="$ARCH_FLAGS_OPT" \ - build-nocheck +#%%make V=1 verbose=t GMAKE_OPTIONS='VERBOSE=1' build-nocheck +%make -r -s V=0 build-nocheck echo "Make end at: "`date` >> ooobuildtime.log echo "Install start at: "`date` >> ooobuildtime.log @@ -3170,13 +1127,6 @@ sort -u file-lists/sdk_list.txt > file-lists/sdk_list.uniq.sorted.txt # Fix weirdo filenames wreaking havoc because they're regular expressions 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 - 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 for i in lang_*.txt; do @@ -3205,20 +1155,9 @@ cat file-lists/core_list.uniq.sorted.txt > file-lists/core_list.txt egrep -v "libreoffice/share/xdg/(base|calc|draw|impress|math|writer)" file-lists/core_list.txt > file-lists/core_list.uniq.sorted.txt cat file-lists/core_list.uniq.sorted.txt > file-lists/core_list.txt -# files for help-* and l10n-* packages -%if %{with l10n} -%{expand:%(for i in %{langs}; do - [ "$i" = "en-US" ] && continue; - i=`echo $i |sed -e 's,-,_,g'`; - [ "$i" = "sh" ] && echo "%%files l10n-shs -f file-lists/lang_${i}_list.txt" || echo "%%files l10n-$i -f file-lists/lang_${i}_list.txt"; -done)} - -%{expand:%(for i in %{helplangs}; do - l=`echo $i |sed -e 's,-,_,g'`; - echo "%%files help-$l -f file-lists/help_${l}_list.txt"; - echo "%%{_libdir}/libreoffice/help/$i"; -done)} -%endif +## styles have their own packages +sed -E -i -e "/^.*images_.*\.zip$/d" file-lists/*.txt +echo %{ooodir}/share/config/images_helpimg.zip >> file-lists/core_list.txt %check # FIXME enable once the connection failures in firebird and hsqldb are fixed diff --git a/locales.csv b/locales.csv new file mode 100644 index 0000000..9606085 --- /dev/null +++ b/locales.csv @@ -0,0 +1,71 @@ +af;Afrikaans +ar;Arabic +as;Assamese +bg;Bulgarian +bn;Bengali +br;Breton +bs;Bosnian +ca;Catalan +cs;Czech +cy;Welsh +da;Danish +de;German +dz;Dzongkha +el;Greek +en_GB;British English +en_US;American English +es;Spanish +et;Estonian +eu;Basque +fa;Farsi +fi;Finnish +fr;French +ga;Irish +gl;Galician +gu;Gujarati +he;Hebrew +hi;Hindi +hr;Croatian +hu;Hungarian +it;Italian +ja;Japanese +kn;Kannada +ko;Korean +lt;Lithuanian +lv;Latvian +mai;Maithili +ml;Malayalam +mk;Macedonian +mr;Marathi +nb;Norwegian Bokmal +nl;Dutch +nn;Norwegian Nynorsk +nr;Ndebele +nso;Northern Shoto +or;Oriya +pa_IN;Punjabi +pl;Polish +pt;Portuguese +pt_BR;Portuguese Brazilian +ro;Romanian +ru;Russian +shs;Secwepemctsin +si;Sinhalese +sk;Slovak +sl;Slovenian +sr;Serbian +st;Sotho +ss;Swati +sv;Swedish +ta;Tamil +te;Telugu +th;Thai +tn;Tswana +tr;Turkish +ts;Tsonga +uk;Ukrainian +ve;Venda +xh;Xhosa +zh_CN;Chinese Simplified +zh_TW;Chinese Traditional +zu;Zulu diff --git a/loffice-libcxx-wrapper.sh b/loffice-libcxx-wrapper.sh new file mode 100644 index 0000000..16814df --- /dev/null +++ b/loffice-libcxx-wrapper.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +linker_flags="$(echo "$@" | tr ' ' '\n' | grep '^\-l' | tr '\n' ' ')" + +/usr/bin/clang++ "$@" $LIBCCX_LIBS $linker_flags diff --git a/span-old-compilers.patch b/span-old-compilers.patch new file mode 100644 index 0000000..5b9ddc0 --- /dev/null +++ b/span-old-compilers.patch @@ -0,0 +1,22 @@ +In rosa2016.1, we are building LibreOffice with clang 8 and libstdc++ from GCC 10. +Seems that libstdc++-gcc-10 does have the span header, but clang 8 is not capable of std::span: +"error: no member named 'span' in namespace 'std'" +(I am not sure) +include/o3tl/span.hxx tries to use system when available and uses the built in implementation when it is not available. +This patch tricks the compiler to always use the built in implementation. + +TODO: maybe fix libstdc++-gcc10 so that it by default reports that header does not exist. + +// mikhailnov, 04.04.2020 + +--- libreoffice-6.3.5.2/include/o3tl/span.hxx.orig2 2020-04-04 17:41:58.575172521 +0300 ++++ libreoffice-6.3.5.2/include/o3tl/span.hxx 2020-04-04 18:17:09.141934433 +0300 +@@ -12,7 +12,7 @@ + + #include + +-#if __has_include() ++#if 0 + + #include +