From f6c03ddd0e3997d61413b9cfdf689680228fe8d2 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Sun, 14 Apr 2019 02:35:23 +0000 Subject: [PATCH 01/96] MassBuild#1671: Increase release tag --- libreoffice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index d5b6614..3e400b8 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -42,7 +42,7 @@ Summary: Office suite Name: libreoffice Epoch: 1 Version: 6.0.7 -Release: 2 +Release: 3 License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic Group: Office Url: http://www.libreoffice.org From 76763db739d8d2d6564d4da7919373398b704e06 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Fri, 17 May 2019 10:27:12 +0000 Subject: [PATCH 02/96] MassBuild#1682: Increase release tag --- libreoffice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index 3e400b8..697df37 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -42,7 +42,7 @@ Summary: Office suite Name: libreoffice Epoch: 1 Version: 6.0.7 -Release: 3 +Release: 4 License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic Group: Office Url: http://www.libreoffice.org From 37468e3ba38a45bb4d4aa724502beea746104ae5 Mon Sep 17 00:00:00 2001 From: Date: Sat, 6 Jul 2019 19:06:28 +0000 Subject: [PATCH 03/96] MassBuild#1715: Increase release tag --- libreoffice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index 697df37..a060754 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -42,7 +42,7 @@ Summary: Office suite Name: libreoffice Epoch: 1 Version: 6.0.7 -Release: 4 +Release: 5 License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic Group: Office Url: http://www.libreoffice.org From 70d0af6a0106672f78ac7ab266af373ecd2aae44 Mon Sep 17 00:00:00 2001 From: Denis Silakov Date: Sat, 28 Sep 2019 16:34:27 +0300 Subject: [PATCH 04/96] Rebuild with new poppler --- libreoffice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index 625bf11..e6fc6b6 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -42,7 +42,7 @@ Summary: Office suite Name: libreoffice Epoch: 1 Version: 6.0.7 -Release: 6 +Release: 7 License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic Group: Office Url: http://www.libreoffice.org From cad11504e6186a0d6cf8457ba1dee25310defb1f Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Tue, 15 Oct 2019 18:40:30 +1000 Subject: [PATCH 05/96] Add patch to fix build with poppler 0.73 --- libreoffice-6.0.7.3-poppler-0.73.patch | 138 +++++++++++++++++++++++++ libreoffice.spec | 5 +- 2 files changed, 142 insertions(+), 1 deletion(-) create mode 100644 libreoffice-6.0.7.3-poppler-0.73.patch diff --git a/libreoffice-6.0.7.3-poppler-0.73.patch b/libreoffice-6.0.7.3-poppler-0.73.patch new file mode 100644 index 0000000..9504842 --- /dev/null +++ b/libreoffice-6.0.7.3-poppler-0.73.patch @@ -0,0 +1,138 @@ +diff -urN libreoffice-6.0.7.3/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx libreoffice-6.0.7.3-patched/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +--- libreoffice-6.0.7.3/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2018-10-31 02:55:21.000000000 +1000 ++++ libreoffice-6.0.7.3-patched/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2019-10-15 18:35:58.981281235 +1000 +@@ -310,7 +310,7 @@ + o_rOutputBuf.resize(header_size); + + // initialize stream +- Guchar *p; ++ unsigned char *p; + GfxRGB rgb; + std::unique_ptr imgStr( + new ImageStream(str, +@@ -415,7 +415,7 @@ + oneColor = { byteToCol( 0xff ), byteToCol( 0xff ), byteToCol( 0xff ) }; + if( colorMap->getColorSpace()->getMode() == csIndexed || colorMap->getColorSpace()->getMode() == csDeviceGray ) + { +- Guchar nIndex = 0; ++ unsigned char nIndex = 0; + colorMap->getRGB( &nIndex, &zeroColor ); + nIndex = 1; + colorMap->getRGB( &nIndex, &oneColor ); +@@ -569,7 +569,11 @@ + LinkAction* pAction = link->getAction(); + if (pAction && pAction->getKind() == actionURI) + { ++#if POPPLER_CHECK_VERSION(0, 72, 0) ++ const char* pURI = static_cast(pAction)->getURI()->c_str(); ++#else + const char* pURI = static_cast(pAction)->getURI()->getCString(); ++#endif + + std::vector aEsc( lcl_escapeLineFeeds(pURI) ); + +@@ -592,7 +596,11 @@ + printf( "restoreState\n" ); + } + ++#if POPPLER_CHECK_VERSION(0, 71, 0) ++void PDFOutDev::setDefaultCTM(const double *pMat) ++#else + void PDFOutDev::setDefaultCTM(double *pMat) ++#endif + { + assert(pMat); + +@@ -767,7 +775,11 @@ + + aFont = it->second; + ++#if POPPLER_CHECK_VERSION(0, 72, 0) ++ std::vector aEsc( lcl_escapeLineFeeds(aFont.familyName.c_str()) ); ++#else + std::vector aEsc( lcl_escapeLineFeeds(aFont.familyName.getCString()) ); ++#endif + printf( " %d %d %d %d %f %d %s", + aFont.isEmbedded, + aFont.isBold, +diff -urN libreoffice-6.0.7.3/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx libreoffice-6.0.7.3-patched/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +--- libreoffice-6.0.7.3/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 2018-10-31 02:55:21.000000000 +1000 ++++ libreoffice-6.0.7.3-patched/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 2019-10-15 18:35:58.981281235 +1000 +@@ -165,7 +165,11 @@ + //----- initialization and control + + // Set default transform matrix. ++#if POPPLER_CHECK_VERSION(0, 71, 0) ++ virtual void setDefaultCTM(const double *ctm) override; ++#else + virtual void setDefaultCTM(double *ctm) override; ++#endif + + // Start a page. + virtual void startPage(int pageNum, GfxState *state +@@ -278,9 +282,13 @@ + + // note: if you ever change Output_t, please keep in mind that the current code + // relies on it being of 8 bit size +-typedef Guchar Output_t; ++typedef unsigned char Output_t; + typedef std::vector< Output_t > OutputBuffer; + ++#if !POPPLER_CHECK_VERSION(0, 73, 0) ++static_assert(std::is_same_v, "unexpected typedef"); ++#endif ++ + #endif // INCLUDED_SDEXT_SOURCE_PDFIMPORT_XPDFWRAPPER_PDFIOUTDEV_GPL_HXX + + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +diff -urN libreoffice-6.0.7.3/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx libreoffice-6.0.7.3-patched/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx +--- libreoffice-6.0.7.3/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx 2018-10-31 02:55:21.000000000 +1000 ++++ libreoffice-6.0.7.3-patched/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx 2019-10-15 18:35:58.981281235 +1000 +@@ -242,7 +242,7 @@ + appendIHDR( o_rOutputBuf, width, height, 8, 6 ); // RGBA image + + // initialize stream +- Guchar *p, *pm; ++ unsigned char *p, *pm; + GfxRGB rgb; + GfxGray alpha; + ImageStream* imgStr = +@@ -328,7 +328,7 @@ + appendIHDR( o_rOutputBuf, width, height, 8, 6 ); // RGBA image + + // initialize stream +- Guchar *p; ++ unsigned char *p; + GfxRGB rgb; + ImageStream* imgStr = + new ImageStream(str, +@@ -374,7 +374,7 @@ + { + for( int x = 0; x < maskWidth; ++x ) + { +- Guchar aPixel = 0; ++ unsigned char aPixel = 0; + imgStrMask->getPixel( &aPixel ); + int nIndex = (y*height/maskHeight) * (width*4+1) + // mapped line + (x*width/maskWidth)*4 + 1 + 3 // mapped column +diff -urN libreoffice-6.0.7.3/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx libreoffice-6.0.7.3-patched/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx +--- libreoffice-6.0.7.3/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx 2018-10-31 02:55:21.000000000 +1000 ++++ libreoffice-6.0.7.3-patched/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx 2019-10-15 18:34:55.807287181 +1000 +@@ -69,7 +69,7 @@ + + // read config file + globalParams = new GlobalParams(); +- globalParams->setErrQuiet(gTrue); ++ globalParams->setErrQuiet(true); + #if defined(_MSC_VER) + globalParams->setupBaseFonts(nullptr); + #endif +@@ -143,7 +143,7 @@ + i, + PDFI_OUTDEV_RESOLUTION, + PDFI_OUTDEV_RESOLUTION, +- 0, gTrue, gTrue, gTrue); ++ 0, true, true, true); + rDoc.processLinks(&aOutDev, i); + } + diff --git a/libreoffice.spec b/libreoffice.spec index 48c8a6d..da259c5 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -42,7 +42,7 @@ Summary: Office suite Name: libreoffice Epoch: 1 Version: 6.0.7 -Release: 8 +Release: 9 License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic Group: Office Url: http://www.libreoffice.org @@ -103,6 +103,9 @@ Patch111: CVE-2019-9849.patch Patch112: CVE-2019-9850_1_2.patch Patch113: CVE-2019-9854.patch +# Backport poppler support fixes from upstream +Patch200: libreoffice-6.0.7.3-poppler-0.73.patch + BuildRequires: bison BuildRequires: bsh %if %{with ccache} From 0269c5b53f910b80f99f44b98e9371270b94bde2 Mon Sep 17 00:00:00 2001 From: VictorR2007 Date: Tue, 15 Oct 2019 16:00:24 +0300 Subject: [PATCH 06/96] Updated to 6.2.8 --- .abf.yml | 14 +- CVE-2019-9848.patch | 36 --- CVE-2019-9849.patch | 141 ---------- CVE-2019-9850_1_2.patch | 206 -------------- CVE-2019-9854.patch | 34 --- libreoffice-5.2.1.2-desktop-protocols.patch | 41 ++- ...office-5.4.3.1-breeze-fallback-theme.patch | 12 - ...breoffice-6.2.8.2-desktop-categories.patch | 44 +-- libreoffice.spec | 259 +++++++++--------- 9 files changed, 181 insertions(+), 606 deletions(-) delete mode 100644 CVE-2019-9848.patch delete mode 100644 CVE-2019-9849.patch delete mode 100644 CVE-2019-9850_1_2.patch delete mode 100644 CVE-2019-9854.patch delete mode 100644 libreoffice-5.4.3.1-breeze-fallback-theme.patch rename libreoffice-5.3.1.1-desktop-categories.patch => libreoffice-6.2.8.2-desktop-categories.patch (70%) diff --git a/.abf.yml b/.abf.yml index 13f9728..5440609 100644 --- a/.abf.yml +++ b/.abf.yml @@ -8,6 +8,7 @@ sources: 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz: 5c604f102e0716597b3d2659ac3e77f80a02f22d 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip: 1acea86fd399ed7817879d36370d3d1f8b109050 472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt: d2b6a076b40d8d517075e52220ddd8f89f655c8f + 49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf: ad0f4351a484ac9b5422beae749719299bdfcfb8 4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt: bf25bef71f72a4622089c85958bfd6c58d8516a6 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2: 1169780b4a0c515b23b96c913fd9bc52ceb7fb39 53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt: 4fea33622d89c7ac62053e5ee3616cfe504e0f14 @@ -18,14 +19,15 @@ sources: a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt: d831314cf4c74f5afb3b37ee718dd58f981b97a8 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip: 2d49e11b0b711970f494294dc3698f05eb294853 af9314c5972d95a5d6da23ffad818f68-OOOP-gallery-pack-2.8.0.0.zip: c71f095bf032e29ab0afc277fd2718e592ba6ba4 - apache-ant-1.10.5-bin.tar.bz2: 0a8b4cfc3c77bdd270fe1a618465de31e12fdbe5 + apache-ant-1.10.6-bin.tar.bz2: 0c0e0a64a6ad502c8a80f7ef07b9c73a261dbc79 b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt: 27847d6c320297905303ca7d2a45dbd0c492f705 b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt: a476a199de32a32221132c8e77fad96c88616b08 b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2: aa8faa4f9e6721eed9bc6878862d74d0cb23251c b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt: bdec3915c01cd60e20892376aa5e5a0d3980c389 commons-logging-1.2-src.tar.gz: 0a134d01e9aeb09b33f4c7450fb41abb7bed9db6 - libreoffice-6.0.7.3.tar.xz: d4add57e7fb837ae6376bdd418704530e4950aa2 - libreoffice-dictionaries-6.0.7.3.tar.xz: 92bf00132beb22abbb6515b7b0060347203ce08a - libreoffice-help-6.0.7.3.tar.xz: 9ace766d0965cfe7f29d9893c1af5cc852b93db6 - libreoffice-translations-6.0.7.3.tar.xz: b364e99b615190256bfb271407c2ad4c184ffbfa - pdfium-3235.tar.bz2: 10a6525bf0c014556766a19912fa6a80849a9117 + lxml-4.1.1.tgz: 154279bc5939d7099697887ea15c5ca921abeaeb + pdfium-3550.tar.bz2: 04b0116d3fa5eaabea94fed75fc30ae75916c071 + libreoffice-6.2.8.2.tar.xz: a0603d57c1e0f681cf07c37748fb03d6fec126fb + libreoffice-dictionaries-6.2.8.2.tar.xz: a787d7323dc08673cce4bffb4967569d12f4f9bf + libreoffice-help-6.2.8.2.tar.xz: 2499fb7905e26117d04b5f12ec4537bae0244864 + libreoffice-translations-6.2.8.2.tar.xz: 3dcdfe7cc263f6eff9e2b877c02166c21d90051d diff --git a/CVE-2019-9848.patch b/CVE-2019-9848.patch deleted file mode 100644 index 960c5c4..0000000 --- a/CVE-2019-9848.patch +++ /dev/null @@ -1,36 +0,0 @@ -Description: Explictly exclude LibreLogo from XScript usage -Author: Caolán McNamara -Upstream Commit: https://cgit.freedesktop.org/libreoffice/core/commit/?id=cb0024e3668979dfdef44db5aa15ddfaf035e695 -Bug: https://www.libreoffice.org/about-us/security/advisories/cve-2019-9848/ - -diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx -index a5e62da8c..02d79c356 100644 ---- a/sfx2/source/doc/objmisc.cxx -+++ b/sfx2/source/doc/objmisc.cxx -@@ -1347,6 +1347,16 @@ namespace - } - } - -+namespace { -+ -+// don't allow LibreLogo to be used with our mouseover/etc dom-alike events -+bool UnTrustedScript(const OUString& rScriptURL) -+{ -+ return rScriptURL.startsWithIgnoreAsciiCase("vnd.sun.star.script:LibreLogo"); -+} -+ -+} -+ - ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptContext, const OUString& _rScriptURL, - const Sequence< Any >& aParams, Any& aRet, Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam, bool bRaiseError, const css::uno::Any* pCaller ) - { -@@ -1359,6 +1369,9 @@ ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptCon - if ( bIsDocumentScript && !lcl_isScriptAccessAllowed_nothrow( _rxScriptContext ) ) - return ERRCODE_IO_ACCESSDENIED; - -+ if ( UnTrustedScript(_rScriptURL) ) -+ return ERRCODE_IO_ACCESSDENIED; -+ - bool bCaughtException = false; - Any aException; - try diff --git a/CVE-2019-9849.patch b/CVE-2019-9849.patch deleted file mode 100644 index 2221cae..0000000 --- a/CVE-2019-9849.patch +++ /dev/null @@ -1,141 +0,0 @@ -Description: More uses of referer URL with SvxBrushItem -Author: Stephan Bergmann -Upstream Commit: https://cgit.freedesktop.org/libreoffice/core/commit/?id=b518882de8213ef71a8003f95fbdf7689069c06d -Bug: https://www.libreoffice.org/about-us/security/advisories/cve-2019-9849/ - -diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx -index 295eb06fe..185b5bcb4 100644 ---- a/sw/inc/unosett.hxx -+++ b/sw/inc/unosett.hxx -@@ -210,7 +210,7 @@ public: - - static css::uno::Sequence GetPropertiesForNumFormat( - const SwNumFormat& rFormat, OUString const& rCharFormatName, -- OUString const* pHeadingStyleName); -+ OUString const* pHeadingStyleName, OUString const & referer); - static void SetPropertiesToNumFormat( - SwNumFormat & aFormat, - OUString & rCharStyleName, -diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx -index 777165819..b29cee3b5 100644 ---- a/sw/source/core/text/porfld.cxx -+++ b/sw/source/core/text/porfld.cxx -@@ -755,7 +755,7 @@ SwBulletPortion::SwBulletPortion( const sal_Unicode cBullet, - - SwGrfNumPortion::SwGrfNumPortion( - const OUString& rGraphicFollowedBy, -- const SvxBrushItem* pGrfBrush, -+ const SvxBrushItem* pGrfBrush, OUString const & referer, - const SwFormatVertOrient* pGrfOrient, const Size& rGrfSize, - const bool bLft, const bool bCntr, const sal_uInt16 nMinDst, - const bool bLabelAlignmentPosAndSpaceModeActive ) : -@@ -769,7 +769,7 @@ SwGrfNumPortion::SwGrfNumPortion( - if( pGrfBrush ) - { - *pBrush = *pGrfBrush; -- const Graphic* pGraph = pGrfBrush->GetGraphic(); -+ const Graphic* pGraph = pGrfBrush->GetGraphic(referer); - if( pGraph ) - SetAnimated( pGraph->IsAnimated() ); - else -diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx -index 38fc08993..4ecf25e7d 100644 ---- a/sw/source/core/text/porfld.hxx -+++ b/sw/source/core/text/porfld.hxx -@@ -168,6 +168,7 @@ class SwGrfNumPortion : public SwNumberPortion - public: - SwGrfNumPortion( const OUString& rGraphicFollowedBy, - const SvxBrushItem* pGrfBrush, -+ OUString const & referer, - const SwFormatVertOrient* pGrfOrient, - const Size& rGrfSize, - const bool bLeft, -diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx -index 6b2b93886..14e396869 100644 ---- a/sw/source/core/text/txtfld.cxx -+++ b/sw/source/core/text/txtfld.cxx -@@ -52,6 +52,7 @@ - #include - #include - #include -+#include - #include - - static bool lcl_IsInBody( SwFrame const *pFrame ) -@@ -478,8 +479,17 @@ SwNumberPortion *SwTextFormatter::NewNumberPortion( SwTextFormatInfo &rInf ) con - - if( SVX_NUM_BITMAP == rNumFormat.GetNumberingType() ) - { -+ OUString referer; -+ if (auto const sh1 = rInf.GetVsh()) { -+ if (auto const doc = sh1->GetDoc()) { -+ auto const sh2 = doc->GetPersist(); -+ if (sh2 != nullptr && sh2->HasName()) { -+ referer = sh2->GetMedium()->GetName(); -+ } -+ } -+ } - pRet = new SwGrfNumPortion( pTextNd->GetLabelFollowedBy(), -- rNumFormat.GetBrush(), -+ rNumFormat.GetBrush(), referer, - rNumFormat.GetGraphicOrientation(), - rNumFormat.GetGraphicSize(), - bLeft, bCenter, nMinDist, -diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx -index f7376b936..218afbdd9 100644 ---- a/sw/source/core/unocore/unosett.cxx -+++ b/sw/source/core/unocore/unosett.cxx -@@ -57,6 +57,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -1316,13 +1317,21 @@ uno::Sequence SwXNumberingRules::GetNumberingRuleByIndex( - SwStyleNameMapper::FillProgName(sValue, aUString, SwGetPoolIdFromName::TxtColl); - } - -- return GetPropertiesForNumFormat(rFormat, CharStyleName, (pDocShell) ? & aUString : nullptr); -+ OUString referer; -+ if (pDoc != nullptr) { -+ auto const sh = pDoc->GetPersist(); -+ if (sh != nullptr && sh->HasName()) { -+ referer = sh->GetMedium()->GetName(); -+ } -+ } -+ return GetPropertiesForNumFormat( -+ rFormat, CharStyleName, pDocShell ? & aUString : nullptr, referer); - - } - - uno::Sequence SwXNumberingRules::GetPropertiesForNumFormat( - const SwNumFormat& rFormat, OUString const& rCharFormatName, -- OUString const*const pHeadingStyleName) -+ OUString const*const pHeadingStyleName, OUString const & referer) - { - bool bChapterNum = pHeadingStyleName != nullptr; - -@@ -1454,7 +1463,7 @@ uno::Sequence SwXNumberingRules::GetPropertiesForNumFormat - //graphicbitmap - const Graphic* pGraphic = nullptr; - if(pBrush ) -- pGraphic = pBrush->GetGraphic(); -+ pGraphic = pBrush->GetGraphic(referer); - if(pGraphic) - { - uno::Reference xBmp = VCLUnoHelper::CreateBitmap( pGraphic->GetBitmapEx() ); -diff --git a/sw/source/uibase/config/StoredChapterNumbering.cxx b/sw/source/uibase/config/StoredChapterNumbering.cxx -index c575863f0..b972ec5ed 100644 ---- a/sw/source/uibase/config/StoredChapterNumbering.cxx -+++ b/sw/source/uibase/config/StoredChapterNumbering.cxx -@@ -129,7 +129,7 @@ public: - OUString dummy; // pass in empty HeadingStyleName - can't import anyway - uno::Sequence const ret( - SwXNumberingRules::GetPropertiesForNumFormat( -- *pNumFormat, *pCharStyleName, &dummy)); -+ *pNumFormat, *pCharStyleName, &dummy, "")); - return uno::makeAny(ret); - } - diff --git a/CVE-2019-9850_1_2.patch b/CVE-2019-9850_1_2.patch deleted file mode 100644 index 8cf5750..0000000 --- a/CVE-2019-9850_1_2.patch +++ /dev/null @@ -1,206 +0,0 @@ -Description: - expand LibreLogo check to global events - - decode url escape codes and check each path segment - - keep name percent-encoded - - expand pyuno path separators - - construct final url from parsed output -Authors: - Caolán McNamara - - Stephan Bergmann - -diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx -index b51498905..35b3091e4 100644 ---- a/include/sfx2/objsh.hxx -+++ b/include/sfx2/objsh.hxx -@@ -397,6 +397,8 @@ public: - */ - bool AdjustMacroMode(); - -+ static bool UnTrustedScript(const OUString& rScriptURL); -+ - SvKeyValueIterator* GetHeaderAttributes(); - void ClearHeaderAttributesForSourceViewHack(); - void SetHeaderAttributesForSourceViewHack(); -diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx -index 150ffa052..751099d92 100644 ---- a/scripting/source/protocolhandler/scripthandler.cxx -+++ b/scripting/source/protocolhandler/scripthandler.cxx -@@ -47,6 +47,7 @@ - - #include - #include -+#include - #include - - #include -@@ -133,8 +134,12 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification( - { - try - { -- bool bIsDocumentScript = ( aURL.Complete.indexOf( "document" ) !=-1 ); -- // TODO: isn't this somewhat strange? This should be a test for a location=document parameter, shouldn't it? -+ css::uno::Reference urifac( -+ css::uri::UriReferenceFactory::create(m_xContext)); -+ css::uno::Reference uri( -+ urifac->parse(aURL.Complete), css::uno::UNO_QUERY_THROW); -+ auto const loc = uri->getParameter("location"); -+ bool bIsDocumentScript = loc == "document"; - - if ( bIsDocumentScript ) - { -diff --git a/scripting/source/pyprov/pythonscript.py b/scripting/source/pyprov/pythonscript.py -index f5aa21733..316c5012c 100644 ---- a/scripting/source/pyprov/pythonscript.py -+++ b/scripting/source/pyprov/pythonscript.py -@@ -219,10 +219,18 @@ class MyUriHelper: - - # path to the .py file + "$functionname, arguments, etc - xStorageUri = self.m_uriRefFac.parse(scriptURI) -- sStorageUri = xStorageUri.getName().replace( "|", "/" ); -+ # getName will apply url-decoding to the name, so encode back -+ sStorageUri = xStorageUri.getName().replace("%", "%25") -+ sStorageUri = sStorageUri.replace( "|", "/" ) - - # path to the .py file, relative to the base -- sFileUri = sStorageUri[0:sStorageUri.find("$")] -+ funcNameStart = sStorageUri.find("$") -+ if funcNameStart != -1: -+ sFileUri = sStorageUri[0:funcNameStart] -+ sFuncName = sStorageUri[funcNameStart+1:] -+ else: -+ sFileUri = sStorageUri -+ - xFileUri = self.m_uriRefFac.parse(sFileUri) - if not xFileUri: - message = "pythonscript: invalid relative uri '" + sFileUri+ "'" -@@ -239,7 +247,9 @@ class MyUriHelper: - log.debug( message ) - raise RuntimeException( message ) - -- ret = sBaseUri + sStorageUri -+ ret = sAbsScriptUri -+ if funcNameStart != -1: -+ ret = ret + "$" + sFuncName - log.debug( "converting scriptURI="+scriptURI + " to storageURI=" + ret ) - return ret - except UnoException as e: -diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx -index 02d79c356..a508aea86 100644 ---- a/sfx2/source/doc/objmisc.cxx -+++ b/sfx2/source/doc/objmisc.cxx -@@ -41,6 +41,8 @@ - #include - #include - #include -+#include -+#include - #include - - #include -@@ -1347,14 +1349,36 @@ namespace - } - } - --namespace { -- - // don't allow LibreLogo to be used with our mouseover/etc dom-alike events --bool UnTrustedScript(const OUString& rScriptURL) -+bool SfxObjectShell::UnTrustedScript(const OUString& rScriptURL) - { -- return rScriptURL.startsWithIgnoreAsciiCase("vnd.sun.star.script:LibreLogo"); --} -+ if (!rScriptURL.startsWith("vnd.sun.star.script:")) -+ return false; -+ -+ // ensure URL Escape Codes are decoded -+ css::uno::Reference uri( -+ css::uri::UriReferenceFactory::create(comphelper::getProcessComponentContext())->parse(rScriptURL)); -+ css::uno::Reference sfUri(uri, css::uno::UNO_QUERY); -+ -+ if (!sfUri.is()) -+ return false; -+ -+ // pyuno encodes path separator as | -+ OUString sScript = sfUri->getName().replace('|', '/'); - -+ // check if any path portion matches LibreLogo and ban it if it does -+ sal_Int32 nIndex = 0; -+ do -+ { -+ OUString aToken = sScript.getToken(0, '/', nIndex); -+ if (aToken.startsWithIgnoreAsciiCase("LibreLogo")) -+ { -+ return true; -+ } -+ } -+ while (nIndex >= 0); -+ -+ return false; - } - - ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptContext, const OUString& _rScriptURL, -@@ -1363,19 +1387,22 @@ ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptCon - SAL_INFO("sfx", "in CallXScript" ); - ErrCode nErr = ERRCODE_NONE; - -- bool bIsDocumentScript = ( _rScriptURL.indexOf( "location=document" ) >= 0 ); -- // TODO: we should parse the URL, and check whether there is a parameter with this name. -- // Otherwise, we might find too much. -- if ( bIsDocumentScript && !lcl_isScriptAccessAllowed_nothrow( _rxScriptContext ) ) -- return ERRCODE_IO_ACCESSDENIED; -- -- if ( UnTrustedScript(_rScriptURL) ) -- return ERRCODE_IO_ACCESSDENIED; -- - bool bCaughtException = false; - Any aException; - try - { -+ css::uno::Reference urifac( -+ css::uri::UriReferenceFactory::create(comphelper::getProcessComponentContext())); -+ css::uno::Reference uri( -+ urifac->parse(_rScriptURL), css::uno::UNO_QUERY_THROW); -+ auto const loc = uri->getParameter("location"); -+ bool bIsDocumentScript = loc == "document"; -+ if ( bIsDocumentScript && !lcl_isScriptAccessAllowed_nothrow( _rxScriptContext ) ) -+ return ERRCODE_IO_ACCESSDENIED; -+ -+ if ( UnTrustedScript(_rScriptURL) ) -+ return ERRCODE_IO_ACCESSDENIED; -+ - // obtain/create a script provider - Reference< provider::XScriptProvider > xScriptProvider; - Reference< provider::XScriptProviderSupplier > xSPS( _rxScriptContext, UNO_QUERY ); -diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx -index 69076ad01..d18724d74 100644 ---- a/sfx2/source/notify/eventsupplier.cxx -+++ b/sfx2/source/notify/eventsupplier.cxx -@@ -209,18 +209,24 @@ void SfxEvents_Impl::Execute( uno::Any const & aEventData, const document::Docum - else if (aType == "Service" || - aType == "Script") - { -- if ( !aScript.isEmpty() ) -+ bool bAllowed = false; -+ util::URL aURL; -+ if (!aScript.isEmpty()) - { -- SfxViewFrame* pView = pDoc ? -- SfxViewFrame::GetFirst( pDoc ) : -- SfxViewFrame::Current(); -- - uno::Reference < util::XURLTransformer > xTrans( util::URLTransformer::create( ::comphelper::getProcessComponentContext() ) ); - -- util::URL aURL; - aURL.Complete = aScript; - xTrans->parseStrict( aURL ); - -+ bAllowed = !SfxObjectShell::UnTrustedScript(aURL.Complete); -+ } -+ -+ if (bAllowed) -+ { -+ SfxViewFrame* pView = pDoc ? -+ SfxViewFrame::GetFirst( pDoc ) : -+ SfxViewFrame::Current(); -+ - uno::Reference - < frame::XDispatchProvider > xProv; - diff --git a/CVE-2019-9854.patch b/CVE-2019-9854.patch deleted file mode 100644 index 65ec0ae..0000000 --- a/CVE-2019-9854.patch +++ /dev/null @@ -1,34 +0,0 @@ -Description: - an absolute uri is invalid input - - improve check for absolute URI -Authors: - Caolán McNamara - - Stephan Bergmann - -diff --git a/scripting/source/pyprov/pythonscript.py b/scripting/source/pyprov/pythonscript.py -index 316c5012c..c46565949 100644 ---- a/scripting/source/pyprov/pythonscript.py -+++ b/scripting/source/pyprov/pythonscript.py -@@ -237,6 +237,11 @@ class MyUriHelper: - log.debug( message ) - raise RuntimeException( message ) - -+ if not xFileUri.hasRelativePath(): -+ message = "pythonscript: an absolute uri is invalid '" + sFileUri+ "'" -+ log.debug( message ) -+ raise RuntimeException( message ) -+ - # absolute path to the .py file - xAbsScriptUri = self.m_uriRefFac.makeAbsolute(xBaseUri, xFileUri, True, RETAIN) - sAbsScriptUri = xAbsScriptUri.getUriReference() -diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx -index a508aea86..3ec10565b 100644 ---- a/sfx2/source/doc/objmisc.cxx -+++ b/sfx2/source/doc/objmisc.cxx -@@ -1371,7 +1371,7 @@ bool SfxObjectShell::UnTrustedScript(const OUString& rScriptURL) - do - { - OUString aToken = sScript.getToken(0, '/', nIndex); -- if (aToken.startsWithIgnoreAsciiCase("LibreLogo")) -+ if (aToken.startsWithIgnoreAsciiCase("LibreLogo") || aToken.indexOf('~') != -1) - { - return true; - } diff --git a/libreoffice-5.2.1.2-desktop-protocols.patch b/libreoffice-5.2.1.2-desktop-protocols.patch index 144516b..a2b4ce5 100644 --- a/libreoffice-5.2.1.2-desktop-protocols.patch +++ b/libreoffice-5.2.1.2-desktop-protocols.patch @@ -5,8 +5,8 @@ diff -urN libreoffice-5.2.1.2/sysui/desktop/menus/base.desktop libreoffice-5.2.1 Keywords=Data;SQL; InitialPreference=5 StartupWMClass=libreoffice-base --X-KDE-Protocols=file,http,ftp,webdav -+X-KDE-Protocols=file,http,webdav,smb,remote +-X-KDE-Protocols=file,http,ftp,webdav,webdavs ++X-KDE-Protocols=file,http,webdav,smb,remote,webdavs Actions=NewDocument; [Desktop Action NewDocument] @@ -17,8 +17,8 @@ diff -urN libreoffice-5.2.1.2/sysui/desktop/menus/calc.desktop libreoffice-5.2.1 Keywords=Accounting;Stats;OpenDocument Spreadsheet;Chart;Microsoft Excel;Microsoft Works;OpenOffice Calc;ods;xls;xlsx; InitialPreference=5 StartupWMClass=libreoffice-calc --X-KDE-Protocols=file,http,ftp,webdav -+X-KDE-Protocols=file,http,webdav,smb,remote +-X-KDE-Protocols=file,http,ftp,webdav,webdavs ++X-KDE-Protocols=file,http,webdav,smb,remote,webdavs Actions=NewDocument; [Desktop Action NewDocument] @@ -29,8 +29,8 @@ diff -urN libreoffice-5.2.1.2/sysui/desktop/menus/draw.desktop libreoffice-5.2.1 Keywords=Vector;Schema;Diagram;Layout;OpenDocument Graphics;Microsoft Publisher;Microsoft Visio;Corel Draw;cdr;odg;svg;pdf;vsd; InitialPreference=5 StartupWMClass=libreoffice-draw --X-KDE-Protocols=file,http,ftp,webdav -+X-KDE-Protocols=file,http,webdav,smb,remote +-X-KDE-Protocols=file,http,ftp,webdav,webdavs ++X-KDE-Protocols=file,http,webdav,smb,remote,webdavs Actions=NewDocument; [Desktop Action NewDocument] @@ -41,8 +41,8 @@ diff -urN libreoffice-5.2.1.2/sysui/desktop/menus/impress.desktop libreoffice-5. Keywords=Slideshow;Slides;OpenDocument Presentation;Microsoft PowerPoint;Microsoft Works;OpenOffice Impress;odp;ppt;pptx; InitialPreference=5 StartupWMClass=libreoffice-impress --X-KDE-Protocols=file,http,ftp,webdav -+X-KDE-Protocols=file,http,webdav,smb,remote +-X-KDE-Protocols=file,http,ftp,webdav,webdavs ++X-KDE-Protocols=file,http,webdav,smb,remote,webdavs Actions=NewDocument; [Desktop Action NewDocument] @@ -53,20 +53,11 @@ diff -urN libreoffice-5.2.1.2/sysui/desktop/menus/math.desktop libreoffice-5.2.1 Keywords=Equation;OpenDocument Formula;Formula;odf;MathML; InitialPreference=5 StartupWMClass=libreoffice-math --X-KDE-Protocols=file,http,ftp,webdav -+X-KDE-Protocols=file,http,webdav,smb,remote +-X-KDE-Protocols=file,http,ftp,webdav,webdavs ++X-KDE-Protocols=file,http,webdav,smb,remote,webdavs Actions=NewDocument; [Desktop Action NewDocument] -diff -urN libreoffice-5.2.1.2/sysui/desktop/menus/qstart.desktop libreoffice-5.2.1.2-patched/sysui/desktop/menus/qstart.desktop ---- libreoffice-5.2.1.2/sysui/desktop/menus/qstart.desktop 2016-08-25 10:26:36.000000000 +1000 -+++ libreoffice-5.2.1.2-patched/sysui/desktop/menus/qstart.desktop 2016-09-06 12:22:41.354727943 +1000 -@@ -25,4 +25,4 @@ - Name=%PRODUCTNAME Quickstarter - Comment=Hook for quickstarter startup - X-GIO-NoFuse=true --X-KDE-Protocols=file,http,ftp,webdav -+X-KDE-Protocols=file,http,webdav,smb,remote diff -urN libreoffice-5.2.1.2/sysui/desktop/menus/startcenter.desktop libreoffice-5.2.1.2-patched/sysui/desktop/menus/startcenter.desktop --- libreoffice-5.2.1.2/sysui/desktop/menus/startcenter.desktop 2016-08-25 10:26:36.000000000 +1000 +++ libreoffice-5.2.1.2-patched/sysui/desktop/menus/startcenter.desktop 2016-09-06 12:22:41.354727943 +1000 @@ -74,8 +65,8 @@ diff -urN libreoffice-5.2.1.2/sysui/desktop/menus/startcenter.desktop libreoffic StartupNotify=true X-GIO-NoFuse=true StartupWMClass=libreoffice-startcenter --X-KDE-Protocols=file,http,ftp,webdav -+X-KDE-Protocols=file,http,webdav,smb,remote +-X-KDE-Protocols=file,http,ftp,webdav,webdavs ++X-KDE-Protocols=file,http,webdav,smb,remote,webdavs ##Define Actions Actions=Writer;Calc;Impress;Draw;Base;Math; @@ -86,8 +77,8 @@ diff -urN libreoffice-5.2.1.2/sysui/desktop/menus/writer.desktop libreoffice-5.2 Keywords=Text;Letter;Fax;Document;OpenDocument Text;Microsoft Word;Microsoft Works;Lotus WordPro;OpenOffice Writer;CV;odt;doc;docx;rtf; InitialPreference=5 StartupWMClass=libreoffice-writer --X-KDE-Protocols=file,http,ftp,webdav -+X-KDE-Protocols=file,http,webdav,smb,remote +-X-KDE-Protocols=file,http,ftp,webdav,webdavs ++X-KDE-Protocols=file,http,webdav,smb,remote,webdavs Actions=NewDocument; [Desktop Action NewDocument] @@ -98,5 +89,5 @@ diff -urN libreoffice-5.2.1.2/sysui/desktop/menus/xsltfilter.desktop libreoffice NoDisplay=true StartupNotify=true X-GIO-NoFuse=true --X-KDE-Protocols=file,http,ftp,webdav -+X-KDE-Protocols=file,http,webdav,smb,remote +-X-KDE-Protocols=file,http,ftp,webdav,webdavs ++X-KDE-Protocols=file,http,webdav,smb,remote,webdavs diff --git a/libreoffice-5.4.3.1-breeze-fallback-theme.patch b/libreoffice-5.4.3.1-breeze-fallback-theme.patch deleted file mode 100644 index 4cf2c63..0000000 --- a/libreoffice-5.4.3.1-breeze-fallback-theme.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN libreoffice-5.4.3.1/vcl/source/app/IconThemeSelector.cxx libreoffice-5.4.3.1-patched/vcl/source/app/IconThemeSelector.cxx ---- libreoffice-5.4.3.1/vcl/source/app/IconThemeSelector.cxx 2017-10-18 04:42:39.000000000 +1000 -+++ libreoffice-5.4.3.1-patched/vcl/source/app/IconThemeSelector.cxx 2017-11-16 00:25:30.922971263 +1000 -@@ -16,7 +16,7 @@ - - namespace vcl { - --/*static*/ const OUStringLiteral IconThemeSelector::FALLBACK_ICON_THEME_ID("tango"); -+/*static*/ const OUStringLiteral IconThemeSelector::FALLBACK_ICON_THEME_ID("breeze"); - - namespace { - diff --git a/libreoffice-5.3.1.1-desktop-categories.patch b/libreoffice-6.2.8.2-desktop-categories.patch similarity index 70% rename from libreoffice-5.3.1.1-desktop-categories.patch rename to libreoffice-6.2.8.2-desktop-categories.patch index 91c2b8c..417d846 100644 --- a/libreoffice-5.3.1.1-desktop-categories.patch +++ b/libreoffice-6.2.8.2-desktop-categories.patch @@ -1,6 +1,6 @@ -diff -urN libreoffice-5.3.1.1/sysui/desktop/menus/base.desktop libreoffice-5.3.1.1-patched/sysui/desktop/menus/base.desktop ---- libreoffice-5.3.1.1/sysui/desktop/menus/base.desktop 2017-02-20 16:24:34.000000000 +0300 -+++ libreoffice-5.3.1.1-patched/sysui/desktop/menus/base.desktop 2017-03-12 14:41:46.552237494 +0300 +diff -urN libreoffice-6.2.8.2/sysui/desktop/menus/base.desktop libreoffice-6.2.8.2-patched/sysui/desktop/menus/base.desktop +--- libreoffice-6.2.8.2/sysui/desktop/menus/base.desktop 2019-10-10 14:27:52.000000000 +0300 ++++ libreoffice-6.2.8.2-patched/sysui/desktop/menus/base.desktop 2019-10-15 15:22:51.862066911 +0300 @@ -20,7 +20,7 @@ Terminal=false Icon=base @@ -10,9 +10,9 @@ diff -urN libreoffice-5.3.1.1/sysui/desktop/menus/base.desktop libreoffice-5.3.1 Exec=${UNIXBASISROOTNAME} --base %%FILE%% MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base; Name=%PRODUCTNAME Base -diff -Naur libreoffice-5.4.5.1/sysui/desktop/menus/calc.desktop-orig libreoffice-5.4.5.1/sysui/desktop/menus/calc.desktop ---- libreoffice-5.4.5.1/sysui/desktop/menus/calc.desktop-orig 2018-01-30 20:22:07.000000000 +0300 -+++ libreoffice-5.4.5.1/sysui/desktop/menus/calc.desktop 2018-02-12 12:18:52.915474626 +0300 +diff -urN libreoffice-6.2.8.2/sysui/desktop/menus/calc.desktop libreoffice-6.2.8.2-patched/sysui/desktop/menus/calc.desktop +--- libreoffice-6.2.8.2/sysui/desktop/menus/calc.desktop 2019-10-10 14:27:52.000000000 +0300 ++++ libreoffice-6.2.8.2-patched/sysui/desktop/menus/calc.desktop 2019-10-15 15:23:12.905195146 +0300 @@ -20,7 +20,7 @@ Terminal=false Icon=calc @@ -22,9 +22,9 @@ diff -Naur libreoffice-5.4.5.1/sysui/desktop/menus/calc.desktop-orig libreoffice Exec=${UNIXBASISROOTNAME} --calc %%FILE%% MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroEnabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroEnabled.12;application/vnd.ms-excel.sheet.binary.macroEnabled.12;text/csv;application/x-dbf;text/spreadsheet;application/csv;application/excel;application/tab-separated-values;application/vnd.lotus-1-2-3;application/vnd.oasis.opendocument.chart;application/vnd.oasis.opendocument.chart-template;application/x-dbase;application/x-dos_ms_excel;application/x-excel;application/x-msexcel;application/x-ms-excel;application/x-quattropro;application/x-123;text/comma-separated-values;text/tab-separated-values;text/x-comma-separated-values;text/x-csv;application/vnd.oasis.opendocument.spreadsheet-flat-xml;application/vnd.ms-works;application/clarisworks;application/x-iwork-numbers-sffnumbers;application/x-starcalc; Name=%PRODUCTNAME Calc -diff -urN libreoffice-5.3.1.1/sysui/desktop/menus/draw.desktop libreoffice-5.3.1.1-patched/sysui/desktop/menus/draw.desktop ---- libreoffice-5.3.1.1/sysui/desktop/menus/draw.desktop 2017-02-20 16:24:34.000000000 +0300 -+++ libreoffice-5.3.1.1-patched/sysui/desktop/menus/draw.desktop 2017-03-12 14:45:42.671234840 +0300 +diff -urN libreoffice-6.2.8.2/sysui/desktop/menus/draw.desktop libreoffice-6.2.8.2-patched/sysui/desktop/menus/draw.desktop +--- libreoffice-6.2.8.2/sysui/desktop/menus/draw.desktop 2019-10-10 14:27:52.000000000 +0300 ++++ libreoffice-6.2.8.2-patched/sysui/desktop/menus/draw.desktop 2019-10-15 15:23:51.381487406 +0300 @@ -20,7 +20,7 @@ Terminal=false Icon=draw @@ -32,11 +32,11 @@ diff -urN libreoffice-5.3.1.1/sysui/desktop/menus/draw.desktop libreoffice-5.3.1 -Categories=Office;FlowChart;Graphics;2DGraphics;VectorGraphics;X-Red-Hat-Base;X-MandrivaLinux-Office-Drawing; +Categories=Office;FlowChart; Exec=${UNIXBASISROOTNAME} --draw %%FILE%% - MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-flat-xml;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.visio;application/x-wpg;application/vnd.corel-draw;application/vnd.ms-publisher;image/x-freehand;application/clarisworks;application/x-pagemaker;application/pdf;application/x-stardraw; + MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-flat-xml;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.visio;application/x-wpg;application/vnd.corel-draw;application/vnd.ms-publisher;image/x-freehand;application/clarisworks;application/x-pagemaker;application/pdf;application/x-stardraw;image/x-emf;image/x-wmf; Name=%PRODUCTNAME Draw -diff -Naur libreoffice-5.4.5.1/sysui/desktop/menus/impress.desktop-orig libreoffice-5.4.5.1/sysui/desktop/menus/impress.desktop ---- libreoffice-5.4.5.1/sysui/desktop/menus/impress.desktop-orig 2018-01-30 20:22:07.000000000 +0300 -+++ libreoffice-5.4.5.1/sysui/desktop/menus/impress.desktop 2018-02-12 12:25:14.439535365 +0300 +diff -urN libreoffice-6.2.8.2/sysui/desktop/menus/impress.desktop libreoffice-6.2.8.2-patched/sysui/desktop/menus/impress.desktop +--- libreoffice-6.2.8.2/sysui/desktop/menus/impress.desktop 2019-10-10 14:27:52.000000000 +0300 ++++ libreoffice-6.2.8.2-patched/sysui/desktop/menus/impress.desktop 2019-10-15 15:24:15.991248327 +0300 @@ -20,7 +20,7 @@ Terminal=false Icon=impress @@ -46,9 +46,9 @@ diff -Naur libreoffice-5.4.5.1/sysui/desktop/menus/impress.desktop-orig libreoff Exec=${UNIXBASISROOTNAME} --impress %%FILE%% MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroEnabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroEnabled.12;application/vnd.openxmlformats-officedocument.presentationml.slide;application/vnd.openxmlformats-officedocument.presentationml.slideshow;application/vnd.ms-powerpoint.slideshow.macroEnabled.12;application/vnd.oasis.opendocument.presentation-flat-xml;application/x-iwork-keynote-sffkey; Name=%PRODUCTNAME Impress -diff -urN libreoffice-5.3.1.1/sysui/desktop/menus/math.desktop libreoffice-5.3.1.1-patched/sysui/desktop/menus/math.desktop ---- libreoffice-5.3.1.1/sysui/desktop/menus/math.desktop 2017-02-20 16:24:34.000000000 +0300 -+++ libreoffice-5.3.1.1-patched/sysui/desktop/menus/math.desktop 2017-03-12 14:45:15.964235140 +0300 +diff -urN libreoffice-6.2.8.2/sysui/desktop/menus/math.desktop libreoffice-6.2.8.2-patched/sysui/desktop/menus/math.desktop +--- libreoffice-6.2.8.2/sysui/desktop/menus/math.desktop 2019-10-10 14:27:52.000000000 +0300 ++++ libreoffice-6.2.8.2-patched/sysui/desktop/menus/math.desktop 2019-10-15 15:26:38.666534230 +0300 @@ -21,7 +21,7 @@ NoDisplay=false Icon=math @@ -58,9 +58,9 @@ diff -urN libreoffice-5.3.1.1/sysui/desktop/menus/math.desktop libreoffice-5.3.1 Exec=${UNIXBASISROOTNAME} --math %%FILE%% MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.oasis.opendocument.formula-template;text/mathml;application/mathml+xml; Name=%PRODUCTNAME Math -diff -urN libreoffice-5.3.1.1/sysui/desktop/menus/startcenter.desktop libreoffice-5.3.1.1-patched/sysui/desktop/menus/startcenter.desktop ---- libreoffice-5.3.1.1/sysui/desktop/menus/startcenter.desktop 2017-02-20 16:24:34.000000000 +0300 -+++ libreoffice-5.3.1.1-patched/sysui/desktop/menus/startcenter.desktop 2017-03-12 14:46:27.341234338 +0300 +diff -urN libreoffice-6.2.8.2/sysui/desktop/menus/startcenter.desktop libreoffice-6.2.8.2-patched/sysui/desktop/menus/startcenter.desktop +--- libreoffice-6.2.8.2/sysui/desktop/menus/startcenter.desktop 2019-10-10 14:27:52.000000000 +0300 ++++ libreoffice-6.2.8.2-patched/sysui/desktop/menus/startcenter.desktop 2019-10-15 15:27:32.279350728 +0300 @@ -21,7 +21,7 @@ NoDisplay=false Icon=startcenter @@ -70,9 +70,9 @@ diff -urN libreoffice-5.3.1.1/sysui/desktop/menus/startcenter.desktop libreoffic Exec=${UNIXBASISROOTNAME} %%FILE%% MimeType=application/vnd.openofficeorg.extension;x-scheme-handler/vnd.libreoffice.cmis; Name=%PRODUCTNAME -diff -Naur libreoffice-5.4.5.1/sysui/desktop/menus/writer.desktop-orig libreoffice-5.4.5.1/sysui/desktop/menus/writer.desktop ---- libreoffice-5.4.5.1/sysui/desktop/menus/writer.desktop-orig 2018-01-30 20:22:07.000000000 +0300 -+++ libreoffice-5.4.5.1/sysui/desktop/menus/writer.desktop 2018-02-12 12:29:38.212419191 +0300 +diff -urN libreoffice-6.2.8.2/sysui/desktop/menus/writer.desktop libreoffice-6.2.8.2-patched/sysui/desktop/menus/writer.desktop +--- libreoffice-6.2.8.2/sysui/desktop/menus/writer.desktop 2019-10-10 14:27:52.000000000 +0300 ++++ libreoffice-6.2.8.2-patched/sysui/desktop/menus/writer.desktop 2019-10-15 15:27:50.282510723 +0300 @@ -20,7 +20,7 @@ Terminal=false Icon=writer diff --git a/libreoffice.spec b/libreoffice.spec index 48c8a6d..f800c7c 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -19,13 +19,14 @@ %define relurl http://download.documentfoundation.org/libreoffice/src/%{version} %define devurl http://dev-www.libreoffice.org/ooo_external +%define devexurl http://dev-www.libreoffice.org/extern %define srcurl http://dev-www.libreoffice.org/src/ %define oxyurl http://ooo.itc.hu/oxygenoffice/download/libreoffice/ %define distroname ROSA %define ooname libreoffice -%define buildver %{version}.3 +%define buildver %{version}.2 %define ooodir %{_libdir}/libreoffice -%define antver 1.10.5 +%define antver 1.10.6 %define antpath %{_builddir}/libreoffice-%{version}/apache-ant-%{antver} %define ccachedir ~/.ccache-OOo @@ -41,8 +42,8 @@ Summary: Office suite Name: libreoffice Epoch: 1 -Version: 6.0.7 -Release: 8 +Version: 6.2.8 +Release: 1 License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic Group: Office Url: http://www.libreoffice.org @@ -51,16 +52,16 @@ Source0: %{relurl}/%{ooname}-%{buildver}.tar.xz Source1: %{relurl}/%{ooname}-dictionaries-%{buildver}.tar.xz Source2: %{relurl}/%{ooname}-help-%{buildver}.tar.xz Source3: %{relurl}/%{ooname}-translations-%{buildver}.tar.xz -Source4: http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll +Source4: %{devexurl}/185d60944ea767075d27247c3162b3bc-unowinreg.dll # Unused, should be dropped in future package updates Source10: Mandriva-Rosa_Icons.tar.bz2 %if %{javaless} Source20: http://archive.apache.org/dist/ant/binaries/apache-ant-%{antver}-bin.tar.bz2 -Source30: %{devurl}/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip -Source31: %{devurl}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz -Source32: %{devurl}/8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz -Source321: %{devurl}/commons-logging-1.2-src.tar.gz +Source30: %{devurl}/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip +Source31: %{devurl}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz +Source32: %{devurl}/8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz +Source321: %{devurl}/commons-logging-1.2-src.tar.gz %endif Source33: %{devurl}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip Source35: %{devurl}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip @@ -68,7 +69,7 @@ Source36: %{devurl}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip Source37: %{devurl}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip # Extensions -Source49: %{srcurl}pdfium-3235.tar.bz2 +Source49: %{srcurl}pdfium-3550.tar.bz2 Source51: %{srcurl}b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2 Source54: %{oxyurl}b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt Source56: %{srcurl}b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt @@ -83,6 +84,8 @@ Source67: %{oxyurl}b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0 Source68: %{srcurl}4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 Source69: %{srcurl}OpenCOLLADA-master-6509aa13af.tar.bz2 Source70: %{srcurl}1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt +Source71: %{srcurl}lxml-4.1.1.tgz +Source72: %{devexurl}/49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf Source1000: libreoffice.rpmlintrc @@ -92,22 +95,19 @@ Patch51: libreoffice-5.4.0.1-impress-kde-crash-hack.patch # ROSA vendor patch Patch100: libreoffice-4.1-vendor.patch -Patch101: libreoffice-5.3.1.1-desktop-categories.patch +Patch101: libreoffice-6.2.8.2-desktop-categories.patch Patch102: libreoffice-5.2.1.2-desktop-protocols.patch Patch104: libreoffice-5.1.2.2-desktop-startcenter-nomate.patch -# Use breeze icons theme as fallback instead of tango -Patch105: libreoffice-5.4.3.1-breeze-fallback-theme.patch - -Patch110: CVE-2019-9848.patch -Patch111: CVE-2019-9849.patch -Patch112: CVE-2019-9850_1_2.patch -Patch113: CVE-2019-9854.patch BuildRequires: bison BuildRequires: bsh %if %{with ccache} BuildRequires: ccache %endif +%if %{with clang} +BuildRequires: clang +BuildRequires: clang-devel +%endif BuildRequires: desktop-file-utils BuildRequires: doxygen >= 1.8.4 BuildRequires: ed @@ -153,6 +153,7 @@ BuildRequires: openldap-devel BuildRequires: pam-devel BuildRequires: qt4-devel BuildRequires: readline-devel +BuildRequires: systemtap-devel BuildRequires: unixODBC-devel BuildRequires: vigra-devel BuildRequires: gpgmepp-devel @@ -180,19 +181,20 @@ BuildRequires: pkgconfig(icu-le) BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(libabw-0.1) BuildRequires: pkgconfig(libclucene-core) -BuildRequires: pkgconfig(libcmis-0.5) +BuildRequires: pkgconfig(libcmis-0.5) >= 0.5.2 BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libcdr-0.1) BuildRequires: pkgconfig(libe-book-0.1) BuildRequires: pkgconfig(libeot) BuildRequires: pkgconfig(libexttextcat) BuildRequires: pkgconfig(libepubgen-0.1) -BuildRequires: pkgconfig(libixion-0.12) +BuildRequires: pkgconfig(libixion-0.14) BuildRequires: pkgconfig(liblangtag) BuildRequires: pkgconfig(libmspub-0.1) BuildRequires: pkgconfig(libmwaw-0.3) >= 0.3.4 +BuildRequires: pkgconfig(libnumbertext) BuildRequires: pkgconfig(libodfgen-0.1) >= 0.1.0 -BuildRequires: pkgconfig(liborcus-0.13) +BuildRequires: pkgconfig(liborcus-0.14) >= 0.14.1 BuildRequires: pkgconfig(libpagemaker-0.0) BuildRequires: pkgconfig(libpq) BuildRequires: pkgconfig(libqxp-0.0) @@ -208,7 +210,7 @@ BuildRequires: pkgconfig(libwpg-0.3) BuildRequires: pkgconfig(libwps-0.4) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxslt) -BuildRequires: pkgconfig(mdds-1.2) +BuildRequires: pkgconfig(mdds-1.4) >= 1.4.1 BuildRequires: pkgconfig(mythes) BuildRequires: pkgconfig(neon) BuildRequires: pkgconfig(nspr) @@ -227,13 +229,51 @@ BuildRequires: pkgconfig(xaw7) BuildRequires: pkgconfig(xmlsec1) >= 1.2.24 BuildRequires: pkgconfig(xpm) BuildRequires: pkgconfig(xtst) +BuildRequires: pkgconfig(valgrind) BuildRequires: pkgconfig(zlib) +BuildRequires: kf5activities-devel +BuildRequires: kf5completion-devel +BuildRequires: kf5config-devel +BuildRequires: kf5configwidgets-devel +BuildRequires: kf5coreaddons-devel +BuildRequires: kf5crash-devel +BuildRequires: kf5declarative-devel +BuildRequires: kf5doctools-devel +BuildRequires: kf5globalaccel-devel +BuildRequires: kf5i18n-devel +BuildRequires: kf5idletime-devel +BuildRequires: kf5init-devel +BuildRequires: kf5kcmutils-devel +BuildRequires: kf5kio-devel +BuildRequires: kf5newstuff-devel +BuildRequires: kf5notifications-devel +BuildRequires: kf5plasma-devel +BuildRequires: kf5service-devel +BuildRequires: kf5wayland-devel +BuildRequires: kf5widgetsaddons-devel +BuildRequires: kf5windowsystem-devel +BuildRequires: kf5xmlgui-devel +BuildRequires: pkgconfig(Qt5Concurrent) +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5DBus) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Multimedia) +BuildRequires: pkgconfig(Qt5Network) +BuildRequires: pkgconfig(Qt5Qml) +BuildRequires: pkgconfig(Qt5Quick) +BuildRequires: pkgconfig(Qt5QuickWidgets) +BuildRequires: pkgconfig(Qt5Sensors) +BuildRequires: pkgconfig(Qt5Script) +BuildRequires: pkgconfig(Qt5Test) +BuildRequires: pkgconfig(Qt5UiTools) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5X11Extras) %if !%{javaless} BuildRequires: ant BuildRequires: ant-apache-regexp -BuildRequires: apache-commons-codec -BuildRequires: apache-commons-lang -BuildRequires: jakarta-commons-httpclient +#BuildRequires: apache-commons-codec +#BuildRequires: apache-commons-lang +#BuildRequires: jakarta-commons-httpclient BuildRequires: junit BuildRequires: java-1.8.0-openjdk-devel %endif @@ -294,6 +334,7 @@ packages: %files base -f file-lists/base_list.txt %{_mandir}/man1/lobase* %{_iconsdir}/hicolor/scalable/apps/mandriva-rosa-lo-base_72.svg +%dir %{ooodir}/share/xdg %{ooodir}/share/xdg/base.desktop %{_datadir}/appdata/libreoffice-base.appdata.xml @@ -310,6 +351,7 @@ This package contains the spreadsheet component for LibreOffice. %files calc -f file-lists/calc_list.txt %{_mandir}/man1/localc* %{_iconsdir}/hicolor/scalable/apps/mandriva-rosa-lo-calc_72.svg +%dir %{ooodir}/share/xdg %{ooodir}/share/xdg/calc.desktop %{_datadir}/appdata/libreoffice-calc.appdata.xml @@ -320,8 +362,6 @@ Summary: LibreOffice office suite common files Group: Office # Require at least one style to be installed Requires: %{name}-style = %{EVRD} -# But force galaxy style because it was used by default -Requires: %{name}-style-galaxy = %{EVRD} # And breeze too, it should be default for Plasma 5 Requires: %{name}-style-breeze = %{EVRD} Suggests: %{name}-help-en_US = %{EVRD} @@ -388,6 +428,10 @@ Conflicts: %{name}-templates-pt_BR < %{EVRD} Conflicts: %{name}-templates-sv < %{EVRD} Conflicts: %{name}-templates-tr < %{EVRD} Conflicts: %{name}-templates-zh_CN < %{EVRD} +Obsoletes: %{name}-style-galaxy < %{EVRD} +Obsoletes: %{name}-style-oxygen < %{EVRD} +Conflicts: %{name}-style-galaxy < %{EVRD} +Conflicts: %{name}-style-oxygen < %{EVRD} Suggests: noto-sans-fonts Suggests: noto-sans-mono-fonts Suggests: noto-serif-fonts @@ -405,6 +449,7 @@ This package contains the application-independent files of LibreOffice. %{_libdir}/libreoffice/program/services/scriptproviderforbeanshell.rdb %{ooodir}/share/gallery/sg24.* %{ooodir}/share/libreofficekit/handle_*.png +%{_datadir}/appdata/org.libreoffice.kde.metainfo.xml #---------------------------------------------------------------------------- @@ -478,6 +523,7 @@ This package contains the drawing component for LibreOffice. %files draw -f file-lists/draw_list.txt %{_iconsdir}/hicolor/scalable/apps/mandriva-rosa-lo-draw_72.svg %{_mandir}/man1/lodraw* +%dir %{ooodir}/share/xdg %{ooodir}/share/xdg/draw.desktop %{_datadir}/appdata/libreoffice-draw.appdata.xml @@ -495,6 +541,39 @@ This package contains the GNOME VFS support and a GConf backend. #---------------------------------------------------------------------------- +%package gtk3-kde5 +Summary: GTK3-KDE5 Integration for LibreOffice (Widgets, Dialogs, Addressbook) +Group: Office +Requires: %{name}-common = %{EVRD} +Suggests: %{name}-style-breeze = %{EVRD} + +%description gtk3-kde5 +This package contains the KDE5 plugin for drawing LibreOffice widgets with +KDE5/Qt5.x and a KDEish File Picker when running under KDE5. + +%files gtk3-kde5 +%{ooodir}/program/libvclplug_gtk3_kde5lo.so +%{ooodir}/program/lo_kde5filepicker + +#---------------------------------------------------------------------------- + +%package kde5 +Summary: KDE5 Integration for LibreOffice (Widgets, Dialogs, Addressbook) +Group: Office +Requires: %{name}-common = %{EVRD} +Suggests: %{name}-style-breeze = %{EVRD} + +%description kde5 +This package contains the KDE5 plugin for drawing LibreOffice widgets with +KDE5/Qt5.x and a KDEish File Picker when running under KDE5. + +%files kde5 +%{ooodir}/program/libkde5be1lo.so +%{ooodir}/program/libvclplug_kde5lo.so +%{ooodir}/program/libvclplug_qt5lo.so + +#---------------------------------------------------------------------------- + %package impress Summary: LibreOffice office suite - presentation Group: Office @@ -508,27 +587,12 @@ This package contains the presentation component for LibreOffice. %files impress -f file-lists/impress_list.txt %{_iconsdir}/hicolor/scalable/apps/mandriva-rosa-lo-impress_72.svg %{_mandir}/man1/loimpress* +%dir %{ooodir}/share/xdg %{ooodir}/share/xdg/impress.desktop %{_datadir}/appdata/libreoffice-impress.appdata.xml #---------------------------------------------------------------------------- -%package kde4 -Summary: KDE4 Integration for LibreOffice (Widgets, Dialogs, Addressbook) -Group: Office -Requires: %{name}-common = %{EVRD} -Suggests: %{name}-style-breeze = %{EVRD} -Requires: %{name}-style-oxygen = %{EVRD} - -%description kde4 -This package contains the KDE4 plugin for drawing LibreOffice widgets with -KDE4/Qt4.x and a KDEish File Picker when running under KDE4. - -%files kde4 -f file-lists/kde4_list.txt -%{_datadir}/appdata/org.libreoffice.kde.metainfo.xml - -#---------------------------------------------------------------------------- - %package math Summary: LibreOffice office suite - equation editor Group: Office @@ -540,6 +604,7 @@ This package contains the equation editor component for LibreOffice. %files math -f file-lists/math_list.txt %{_iconsdir}/hicolor/scalable/apps/mandriva-rosa-lo-math_72.svg %{_mandir}/man1/lomath* +%dir %{ooodir}/share/xdg %{ooodir}/share/xdg/math.desktop #---------------------------------------------------------------------------- @@ -566,13 +631,13 @@ and sounds. %{ooodir}/share/gallery/flower* %{ooodir}/share/gallery/htmlexpo* %{ooodir}/share/gallery/people* +%{ooodir}/share/gallery/personas* %{ooodir}/share/gallery/sg[0-9]*.* %{ooodir}/share/gallery/sky.* %{ooodir}/share/gallery/sounds* %{ooodir}/share/gallery/symbols* %{ooodir}/share/gallery/transportation* %{ooodir}/share/gallery/txtshapes* -%{ooodir}/share/gallery/www-back* %{ooodir}/share/gallery/www-graf* %exclude %{ooodir}/share/gallery/sg24.* @@ -610,52 +675,6 @@ enabled in the LibreOffice option menu. #---------------------------------------------------------------------------- -%package style-galaxy -Summary: Default symbol style for LibreOffice -Group: Office -Requires: %{name}-common = %{EVRD} -Provides: %{name}-style = %{EVRD} -Conflicts: %{name}-common < 1:4.4.1 - -%description style-galaxy -This package contains the "Galaxy" symbol style from Sun, normally used on -MS Windows (tm) and when not using GNOME or KDE. Needs to be manually enabled -in the LibreOffice option menu. - -%files style-galaxy -%{ooodir}/share/config/images_galaxy.zip - -#---------------------------------------------------------------------------- - -%package style-hicontrast -Summary: Hicontrast symbol style for LibreOffice -Group: Office -Requires: %{name}-common = %{EVRD} -Provides: %{name}-style = %{EVRD} - -%description style-hicontrast -This package contains the "hicontrast" symbol style, needs to be manually -enabled in the LibreOffice option menu. - -%files style-hicontrast -%{ooodir}/share/config/images_hicontrast.zip - -#---------------------------------------------------------------------------- - -%package style-oxygen -Summary: Oxygen symbol style for LibreOffice -Group: Office -Requires: %{name}-common = %{EVRD} -Provides: %{name}-style = %{EVRD} - -%description style-oxygen -This package contains the "oxygen" symbol style, default style for KDE4. - -%files style-oxygen -%{ooodir}/share/config/images_oxygen.zip - -#---------------------------------------------------------------------------- - %package style-sifr Summary: Sifr symbol style for LibreOffice Group: Office @@ -699,6 +718,7 @@ This package contains the word processor component for LibreOffice. %{_iconsdir}/hicolor/scalable/apps/mandriva-rosa-lo-writer_72.svg %{_mandir}/man1/loweb* %{_mandir}/man1/lowriter* +%dir %{ooodir}/share/xdg %{ooodir}/share/xdg/writer.desktop %{_datadir}/appdata/libreoffice-writer.appdata.xml @@ -760,19 +780,6 @@ A LibreOffice extension for style and grammar proofreading. #---------------------------------------------------------------------------- -%package extension-mysql -Summary: MySQL/MariaDB connector for LibreOffice -Group: Office -Requires: %{name}-common = %{EVRD} - -%description extension-mysql -MySQL/MariaDB connector for LibreOffice. - -%files extension-mysql -%{ooodir}/share/extensions/mysql-connector-ooo - -#---------------------------------------------------------------------------- - %package extension-nlpsolver Summary: Solver extension for LibreOffice Calc Group: Office @@ -2942,22 +2949,6 @@ chmod 777 ~/tmp chmod +x bin/unpack-sources %build -export QT4DIR=%{_libdir}/qt4 -%ifarch X86_64 - export QT4INC=/usr/lib/qt4/include -%else - export QT4INC=%{_libdir}/qt4/include -%endif -export QT4LIB=%{_libdir}/qt4/lib - -export KDE4DIR=%{_libdir}/kde4 -%ifarch X86_64 - export KDE4INC=/usr/lib/kde4/include -%else - export KDE4INC=%{_libdir}/kde4/include -%endif -export KDE4LIB=%{_libdir}/kde4/lib - export LC_ALL=en_US.UTF-8 export LANG=en_US @@ -2970,6 +2961,11 @@ export PATH export CCACHE_DIR=%{ccachedir} %endif +%if %{with clang} +%global optflags $(echo %optflags | sed -e 's/-fvar-tracking-assignments//g' -e 's/-frecord-gcc-switches//g' -e 's/-ffat-lto-objects//g') +%clang_gcc_wrapper +export CPP="" +%else %global optflags %optflags -Wstrict-aliasing=0 export ARCH_FLAGS="%{optflags} -fno-omit-frame-pointer -fno-strict-aliasing" export ARCH_FLAGS_CC="%{optflags} -fno-omit-frame-pointer -fno-strict-aliasing" @@ -2978,21 +2974,34 @@ export ARCH_FLAGS_OPT="%{optflags} -O2" # Workaround for abf builds running out of memory export ARCH_FLAGS_CC="$ARCH_FLAGS_CC -g0" export ARCH_FLAGS_CXX="$ARCH_FLAGS_CC -g0" +%endif echo "Configure start at: "`date` >> ooobuildtime.log touch autogen.lastrun + +%if %{with clang} +sed -i \ + -e "s!clang -V!clang -v!g" \ + -e "s!clang -qversion!clang --version!g" \ + configure +%endif + %configure2_5x \ %{?_smp_mflags:--with-parallelism="`getconf _NPROCESSORS_ONLN`"} \ --with-vendor=ROSA \ --with-build-version="ROSA %{buildver}-%{release}" \ - --with-theme="breeze breeze_dark galaxy hicontrast oxygen sifr tango" \ + --with-theme="breeze breeze_dark sifr tango" \ --disable-coinmp \ --disable-fetch-external \ --enable-gstreamer-1.0 \ --disable-gstreamer-0.10 \ --enable-release-build \ - --enable-kde4 \ + --disable-gtk \ + --enable-gtk3 \ + --enable-gtk3-kde5 \ + --enable-kde5 \ + --enable-qt5 \ --disable-firebird-sdbc \ --disable-introspection \ --enable-eot \ @@ -3000,6 +3009,7 @@ touch autogen.lastrun --enable-split-app-modules \ --enable-split-opt-features \ --without-fonts \ + --without-lxml \ --without-junit \ %if %{javaless} --with-ant-home="%{antpath}" \ @@ -3083,6 +3093,9 @@ ln -sf %{SOURCE68} external/tarballs/ ln -sf %{SOURCE69} external/tarballs/ ln -sf %{SOURCE70} external/tarballs/ +cp %{SOURCE71} external/tarballs/ +cp %{SOURCE72} external/tarballs/ + touch external/tarballs/.downloaded # (tpg) silent output to reduce memory and free space @@ -3171,11 +3184,9 @@ sort -u file-lists/sdk_list.txt > file-lists/sdk_list.uniq.sorted.txt sed -i -e 's/\[/?/g;s/\]/?/g' file-lists/sdk*.txt ## styles have their own packages -for i in oxygen galaxy breeze hicontrast tango sifr; do +for i in breeze tango sifr; do sed -i "/^.*images_$i\.zip$/d" file-lists/common_list.txt done -# galaxy style too -sed -i "/^.*images\.zip$/d" file-lists/common_list.txt ## Split help cd file-lists From b30f11e43697db550ce4607380b2601234631e85 Mon Sep 17 00:00:00 2001 From: VictorR2007 Date: Tue, 15 Oct 2019 16:41:42 +0300 Subject: [PATCH 07/96] Updated to 6.2.8 --- libreoffice.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index f800c7c..fca7baf 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -271,9 +271,9 @@ BuildRequires: pkgconfig(Qt5X11Extras) %if !%{javaless} BuildRequires: ant BuildRequires: ant-apache-regexp -#BuildRequires: apache-commons-codec -#BuildRequires: apache-commons-lang -#BuildRequires: jakarta-commons-httpclient +BuildRequires: apache-commons-codec +BuildRequires: apache-commons-lang +BuildRequires: jakarta-commons-httpclient BuildRequires: junit BuildRequires: java-1.8.0-openjdk-devel %endif From 95e52159ea86376f4db815becb38d1c1e22f7d9c Mon Sep 17 00:00:00 2001 From: VictorR2007 Date: Tue, 15 Oct 2019 23:19:49 +0300 Subject: [PATCH 08/96] Updated to 6.3.2 --- .abf.yml | 19 +- CVE-2019-9848.patch | 36 --- CVE-2019-9849.patch | 141 --------- CVE-2019-9850_1_2.patch | 206 ------------- CVE-2019-9854.patch | 34 --- libreoffice-5.2.1.2-desktop-protocols.patch | 41 +-- ...ffice-5.4.0.1-impress-kde-crash-hack.patch | 19 -- ...office-5.4.3.1-breeze-fallback-theme.patch | 12 - libreoffice-6.0.7.3-poppler-0.73.patch | 138 --------- ...breoffice-6.2.8.2-desktop-categories.patch | 44 +-- libreoffice-help-package | 67 +++++ libreoffice.spec | 274 +++++++++--------- 12 files changed, 244 insertions(+), 787 deletions(-) delete mode 100644 CVE-2019-9848.patch delete mode 100644 CVE-2019-9849.patch delete mode 100644 CVE-2019-9850_1_2.patch delete mode 100644 CVE-2019-9854.patch delete mode 100644 libreoffice-5.4.0.1-impress-kde-crash-hack.patch delete mode 100644 libreoffice-5.4.3.1-breeze-fallback-theme.patch delete mode 100644 libreoffice-6.0.7.3-poppler-0.73.patch rename libreoffice-5.3.1.1-desktop-categories.patch => libreoffice-6.2.8.2-desktop-categories.patch (70%) create mode 100644 libreoffice-help-package diff --git a/.abf.yml b/.abf.yml index 13f9728..24de0ec 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,31 +1,30 @@ 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 + lxml-4.1.1.tgz: 154279bc5939d7099697887ea15c5ca921abeaeb + pdfium-3794.tar.bz2: 41ff3c2291c99db71ddca1873115b7fc0bfb5065 + libreoffice-6.3.2.2.tar.xz: e2967958910cda16a218ad2832849a767be38a38 + libreoffice-dictionaries-6.3.2.2.tar.xz: bfd07359fc34b7ce6285fee5978185a3b08c4d58 + libreoffice-help-6.3.2.2.tar.xz: 0a8a8c2631f9c901639367bcd407192a672c9dfe + libreoffice-translations-6.3.2.2.tar.xz: 0aac0e4a9fe88c09b000fa2c4b086cb5ed50974f + diff --git a/CVE-2019-9848.patch b/CVE-2019-9848.patch deleted file mode 100644 index 960c5c4..0000000 --- a/CVE-2019-9848.patch +++ /dev/null @@ -1,36 +0,0 @@ -Description: Explictly exclude LibreLogo from XScript usage -Author: Caolán McNamara -Upstream Commit: https://cgit.freedesktop.org/libreoffice/core/commit/?id=cb0024e3668979dfdef44db5aa15ddfaf035e695 -Bug: https://www.libreoffice.org/about-us/security/advisories/cve-2019-9848/ - -diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx -index a5e62da8c..02d79c356 100644 ---- a/sfx2/source/doc/objmisc.cxx -+++ b/sfx2/source/doc/objmisc.cxx -@@ -1347,6 +1347,16 @@ namespace - } - } - -+namespace { -+ -+// don't allow LibreLogo to be used with our mouseover/etc dom-alike events -+bool UnTrustedScript(const OUString& rScriptURL) -+{ -+ return rScriptURL.startsWithIgnoreAsciiCase("vnd.sun.star.script:LibreLogo"); -+} -+ -+} -+ - ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptContext, const OUString& _rScriptURL, - const Sequence< Any >& aParams, Any& aRet, Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam, bool bRaiseError, const css::uno::Any* pCaller ) - { -@@ -1359,6 +1369,9 @@ ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptCon - if ( bIsDocumentScript && !lcl_isScriptAccessAllowed_nothrow( _rxScriptContext ) ) - return ERRCODE_IO_ACCESSDENIED; - -+ if ( UnTrustedScript(_rScriptURL) ) -+ return ERRCODE_IO_ACCESSDENIED; -+ - bool bCaughtException = false; - Any aException; - try diff --git a/CVE-2019-9849.patch b/CVE-2019-9849.patch deleted file mode 100644 index 2221cae..0000000 --- a/CVE-2019-9849.patch +++ /dev/null @@ -1,141 +0,0 @@ -Description: More uses of referer URL with SvxBrushItem -Author: Stephan Bergmann -Upstream Commit: https://cgit.freedesktop.org/libreoffice/core/commit/?id=b518882de8213ef71a8003f95fbdf7689069c06d -Bug: https://www.libreoffice.org/about-us/security/advisories/cve-2019-9849/ - -diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx -index 295eb06fe..185b5bcb4 100644 ---- a/sw/inc/unosett.hxx -+++ b/sw/inc/unosett.hxx -@@ -210,7 +210,7 @@ public: - - static css::uno::Sequence GetPropertiesForNumFormat( - const SwNumFormat& rFormat, OUString const& rCharFormatName, -- OUString const* pHeadingStyleName); -+ OUString const* pHeadingStyleName, OUString const & referer); - static void SetPropertiesToNumFormat( - SwNumFormat & aFormat, - OUString & rCharStyleName, -diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx -index 777165819..b29cee3b5 100644 ---- a/sw/source/core/text/porfld.cxx -+++ b/sw/source/core/text/porfld.cxx -@@ -755,7 +755,7 @@ SwBulletPortion::SwBulletPortion( const sal_Unicode cBullet, - - SwGrfNumPortion::SwGrfNumPortion( - const OUString& rGraphicFollowedBy, -- const SvxBrushItem* pGrfBrush, -+ const SvxBrushItem* pGrfBrush, OUString const & referer, - const SwFormatVertOrient* pGrfOrient, const Size& rGrfSize, - const bool bLft, const bool bCntr, const sal_uInt16 nMinDst, - const bool bLabelAlignmentPosAndSpaceModeActive ) : -@@ -769,7 +769,7 @@ SwGrfNumPortion::SwGrfNumPortion( - if( pGrfBrush ) - { - *pBrush = *pGrfBrush; -- const Graphic* pGraph = pGrfBrush->GetGraphic(); -+ const Graphic* pGraph = pGrfBrush->GetGraphic(referer); - if( pGraph ) - SetAnimated( pGraph->IsAnimated() ); - else -diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx -index 38fc08993..4ecf25e7d 100644 ---- a/sw/source/core/text/porfld.hxx -+++ b/sw/source/core/text/porfld.hxx -@@ -168,6 +168,7 @@ class SwGrfNumPortion : public SwNumberPortion - public: - SwGrfNumPortion( const OUString& rGraphicFollowedBy, - const SvxBrushItem* pGrfBrush, -+ OUString const & referer, - const SwFormatVertOrient* pGrfOrient, - const Size& rGrfSize, - const bool bLeft, -diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx -index 6b2b93886..14e396869 100644 ---- a/sw/source/core/text/txtfld.cxx -+++ b/sw/source/core/text/txtfld.cxx -@@ -52,6 +52,7 @@ - #include - #include - #include -+#include - #include - - static bool lcl_IsInBody( SwFrame const *pFrame ) -@@ -478,8 +479,17 @@ SwNumberPortion *SwTextFormatter::NewNumberPortion( SwTextFormatInfo &rInf ) con - - if( SVX_NUM_BITMAP == rNumFormat.GetNumberingType() ) - { -+ OUString referer; -+ if (auto const sh1 = rInf.GetVsh()) { -+ if (auto const doc = sh1->GetDoc()) { -+ auto const sh2 = doc->GetPersist(); -+ if (sh2 != nullptr && sh2->HasName()) { -+ referer = sh2->GetMedium()->GetName(); -+ } -+ } -+ } - pRet = new SwGrfNumPortion( pTextNd->GetLabelFollowedBy(), -- rNumFormat.GetBrush(), -+ rNumFormat.GetBrush(), referer, - rNumFormat.GetGraphicOrientation(), - rNumFormat.GetGraphicSize(), - bLeft, bCenter, nMinDist, -diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx -index f7376b936..218afbdd9 100644 ---- a/sw/source/core/unocore/unosett.cxx -+++ b/sw/source/core/unocore/unosett.cxx -@@ -57,6 +57,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -1316,13 +1317,21 @@ uno::Sequence SwXNumberingRules::GetNumberingRuleByIndex( - SwStyleNameMapper::FillProgName(sValue, aUString, SwGetPoolIdFromName::TxtColl); - } - -- return GetPropertiesForNumFormat(rFormat, CharStyleName, (pDocShell) ? & aUString : nullptr); -+ OUString referer; -+ if (pDoc != nullptr) { -+ auto const sh = pDoc->GetPersist(); -+ if (sh != nullptr && sh->HasName()) { -+ referer = sh->GetMedium()->GetName(); -+ } -+ } -+ return GetPropertiesForNumFormat( -+ rFormat, CharStyleName, pDocShell ? & aUString : nullptr, referer); - - } - - uno::Sequence SwXNumberingRules::GetPropertiesForNumFormat( - const SwNumFormat& rFormat, OUString const& rCharFormatName, -- OUString const*const pHeadingStyleName) -+ OUString const*const pHeadingStyleName, OUString const & referer) - { - bool bChapterNum = pHeadingStyleName != nullptr; - -@@ -1454,7 +1463,7 @@ uno::Sequence SwXNumberingRules::GetPropertiesForNumFormat - //graphicbitmap - const Graphic* pGraphic = nullptr; - if(pBrush ) -- pGraphic = pBrush->GetGraphic(); -+ pGraphic = pBrush->GetGraphic(referer); - if(pGraphic) - { - uno::Reference xBmp = VCLUnoHelper::CreateBitmap( pGraphic->GetBitmapEx() ); -diff --git a/sw/source/uibase/config/StoredChapterNumbering.cxx b/sw/source/uibase/config/StoredChapterNumbering.cxx -index c575863f0..b972ec5ed 100644 ---- a/sw/source/uibase/config/StoredChapterNumbering.cxx -+++ b/sw/source/uibase/config/StoredChapterNumbering.cxx -@@ -129,7 +129,7 @@ public: - OUString dummy; // pass in empty HeadingStyleName - can't import anyway - uno::Sequence const ret( - SwXNumberingRules::GetPropertiesForNumFormat( -- *pNumFormat, *pCharStyleName, &dummy)); -+ *pNumFormat, *pCharStyleName, &dummy, "")); - return uno::makeAny(ret); - } - diff --git a/CVE-2019-9850_1_2.patch b/CVE-2019-9850_1_2.patch deleted file mode 100644 index 8cf5750..0000000 --- a/CVE-2019-9850_1_2.patch +++ /dev/null @@ -1,206 +0,0 @@ -Description: - expand LibreLogo check to global events - - decode url escape codes and check each path segment - - keep name percent-encoded - - expand pyuno path separators - - construct final url from parsed output -Authors: - Caolán McNamara - - Stephan Bergmann - -diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx -index b51498905..35b3091e4 100644 ---- a/include/sfx2/objsh.hxx -+++ b/include/sfx2/objsh.hxx -@@ -397,6 +397,8 @@ public: - */ - bool AdjustMacroMode(); - -+ static bool UnTrustedScript(const OUString& rScriptURL); -+ - SvKeyValueIterator* GetHeaderAttributes(); - void ClearHeaderAttributesForSourceViewHack(); - void SetHeaderAttributesForSourceViewHack(); -diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx -index 150ffa052..751099d92 100644 ---- a/scripting/source/protocolhandler/scripthandler.cxx -+++ b/scripting/source/protocolhandler/scripthandler.cxx -@@ -47,6 +47,7 @@ - - #include - #include -+#include - #include - - #include -@@ -133,8 +134,12 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification( - { - try - { -- bool bIsDocumentScript = ( aURL.Complete.indexOf( "document" ) !=-1 ); -- // TODO: isn't this somewhat strange? This should be a test for a location=document parameter, shouldn't it? -+ css::uno::Reference urifac( -+ css::uri::UriReferenceFactory::create(m_xContext)); -+ css::uno::Reference uri( -+ urifac->parse(aURL.Complete), css::uno::UNO_QUERY_THROW); -+ auto const loc = uri->getParameter("location"); -+ bool bIsDocumentScript = loc == "document"; - - if ( bIsDocumentScript ) - { -diff --git a/scripting/source/pyprov/pythonscript.py b/scripting/source/pyprov/pythonscript.py -index f5aa21733..316c5012c 100644 ---- a/scripting/source/pyprov/pythonscript.py -+++ b/scripting/source/pyprov/pythonscript.py -@@ -219,10 +219,18 @@ class MyUriHelper: - - # path to the .py file + "$functionname, arguments, etc - xStorageUri = self.m_uriRefFac.parse(scriptURI) -- sStorageUri = xStorageUri.getName().replace( "|", "/" ); -+ # getName will apply url-decoding to the name, so encode back -+ sStorageUri = xStorageUri.getName().replace("%", "%25") -+ sStorageUri = sStorageUri.replace( "|", "/" ) - - # path to the .py file, relative to the base -- sFileUri = sStorageUri[0:sStorageUri.find("$")] -+ funcNameStart = sStorageUri.find("$") -+ if funcNameStart != -1: -+ sFileUri = sStorageUri[0:funcNameStart] -+ sFuncName = sStorageUri[funcNameStart+1:] -+ else: -+ sFileUri = sStorageUri -+ - xFileUri = self.m_uriRefFac.parse(sFileUri) - if not xFileUri: - message = "pythonscript: invalid relative uri '" + sFileUri+ "'" -@@ -239,7 +247,9 @@ class MyUriHelper: - log.debug( message ) - raise RuntimeException( message ) - -- ret = sBaseUri + sStorageUri -+ ret = sAbsScriptUri -+ if funcNameStart != -1: -+ ret = ret + "$" + sFuncName - log.debug( "converting scriptURI="+scriptURI + " to storageURI=" + ret ) - return ret - except UnoException as e: -diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx -index 02d79c356..a508aea86 100644 ---- a/sfx2/source/doc/objmisc.cxx -+++ b/sfx2/source/doc/objmisc.cxx -@@ -41,6 +41,8 @@ - #include - #include - #include -+#include -+#include - #include - - #include -@@ -1347,14 +1349,36 @@ namespace - } - } - --namespace { -- - // don't allow LibreLogo to be used with our mouseover/etc dom-alike events --bool UnTrustedScript(const OUString& rScriptURL) -+bool SfxObjectShell::UnTrustedScript(const OUString& rScriptURL) - { -- return rScriptURL.startsWithIgnoreAsciiCase("vnd.sun.star.script:LibreLogo"); --} -+ if (!rScriptURL.startsWith("vnd.sun.star.script:")) -+ return false; -+ -+ // ensure URL Escape Codes are decoded -+ css::uno::Reference uri( -+ css::uri::UriReferenceFactory::create(comphelper::getProcessComponentContext())->parse(rScriptURL)); -+ css::uno::Reference sfUri(uri, css::uno::UNO_QUERY); -+ -+ if (!sfUri.is()) -+ return false; -+ -+ // pyuno encodes path separator as | -+ OUString sScript = sfUri->getName().replace('|', '/'); - -+ // check if any path portion matches LibreLogo and ban it if it does -+ sal_Int32 nIndex = 0; -+ do -+ { -+ OUString aToken = sScript.getToken(0, '/', nIndex); -+ if (aToken.startsWithIgnoreAsciiCase("LibreLogo")) -+ { -+ return true; -+ } -+ } -+ while (nIndex >= 0); -+ -+ return false; - } - - ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptContext, const OUString& _rScriptURL, -@@ -1363,19 +1387,22 @@ ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptCon - SAL_INFO("sfx", "in CallXScript" ); - ErrCode nErr = ERRCODE_NONE; - -- bool bIsDocumentScript = ( _rScriptURL.indexOf( "location=document" ) >= 0 ); -- // TODO: we should parse the URL, and check whether there is a parameter with this name. -- // Otherwise, we might find too much. -- if ( bIsDocumentScript && !lcl_isScriptAccessAllowed_nothrow( _rxScriptContext ) ) -- return ERRCODE_IO_ACCESSDENIED; -- -- if ( UnTrustedScript(_rScriptURL) ) -- return ERRCODE_IO_ACCESSDENIED; -- - bool bCaughtException = false; - Any aException; - try - { -+ css::uno::Reference urifac( -+ css::uri::UriReferenceFactory::create(comphelper::getProcessComponentContext())); -+ css::uno::Reference uri( -+ urifac->parse(_rScriptURL), css::uno::UNO_QUERY_THROW); -+ auto const loc = uri->getParameter("location"); -+ bool bIsDocumentScript = loc == "document"; -+ if ( bIsDocumentScript && !lcl_isScriptAccessAllowed_nothrow( _rxScriptContext ) ) -+ return ERRCODE_IO_ACCESSDENIED; -+ -+ if ( UnTrustedScript(_rScriptURL) ) -+ return ERRCODE_IO_ACCESSDENIED; -+ - // obtain/create a script provider - Reference< provider::XScriptProvider > xScriptProvider; - Reference< provider::XScriptProviderSupplier > xSPS( _rxScriptContext, UNO_QUERY ); -diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx -index 69076ad01..d18724d74 100644 ---- a/sfx2/source/notify/eventsupplier.cxx -+++ b/sfx2/source/notify/eventsupplier.cxx -@@ -209,18 +209,24 @@ void SfxEvents_Impl::Execute( uno::Any const & aEventData, const document::Docum - else if (aType == "Service" || - aType == "Script") - { -- if ( !aScript.isEmpty() ) -+ bool bAllowed = false; -+ util::URL aURL; -+ if (!aScript.isEmpty()) - { -- SfxViewFrame* pView = pDoc ? -- SfxViewFrame::GetFirst( pDoc ) : -- SfxViewFrame::Current(); -- - uno::Reference < util::XURLTransformer > xTrans( util::URLTransformer::create( ::comphelper::getProcessComponentContext() ) ); - -- util::URL aURL; - aURL.Complete = aScript; - xTrans->parseStrict( aURL ); - -+ bAllowed = !SfxObjectShell::UnTrustedScript(aURL.Complete); -+ } -+ -+ if (bAllowed) -+ { -+ SfxViewFrame* pView = pDoc ? -+ SfxViewFrame::GetFirst( pDoc ) : -+ SfxViewFrame::Current(); -+ - uno::Reference - < frame::XDispatchProvider > xProv; - diff --git a/CVE-2019-9854.patch b/CVE-2019-9854.patch deleted file mode 100644 index 65ec0ae..0000000 --- a/CVE-2019-9854.patch +++ /dev/null @@ -1,34 +0,0 @@ -Description: - an absolute uri is invalid input - - improve check for absolute URI -Authors: - Caolán McNamara - - Stephan Bergmann - -diff --git a/scripting/source/pyprov/pythonscript.py b/scripting/source/pyprov/pythonscript.py -index 316c5012c..c46565949 100644 ---- a/scripting/source/pyprov/pythonscript.py -+++ b/scripting/source/pyprov/pythonscript.py -@@ -237,6 +237,11 @@ class MyUriHelper: - log.debug( message ) - raise RuntimeException( message ) - -+ if not xFileUri.hasRelativePath(): -+ message = "pythonscript: an absolute uri is invalid '" + sFileUri+ "'" -+ log.debug( message ) -+ raise RuntimeException( message ) -+ - # absolute path to the .py file - xAbsScriptUri = self.m_uriRefFac.makeAbsolute(xBaseUri, xFileUri, True, RETAIN) - sAbsScriptUri = xAbsScriptUri.getUriReference() -diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx -index a508aea86..3ec10565b 100644 ---- a/sfx2/source/doc/objmisc.cxx -+++ b/sfx2/source/doc/objmisc.cxx -@@ -1371,7 +1371,7 @@ bool SfxObjectShell::UnTrustedScript(const OUString& rScriptURL) - do - { - OUString aToken = sScript.getToken(0, '/', nIndex); -- if (aToken.startsWithIgnoreAsciiCase("LibreLogo")) -+ if (aToken.startsWithIgnoreAsciiCase("LibreLogo") || aToken.indexOf('~') != -1) - { - return true; - } diff --git a/libreoffice-5.2.1.2-desktop-protocols.patch b/libreoffice-5.2.1.2-desktop-protocols.patch index 144516b..a2b4ce5 100644 --- a/libreoffice-5.2.1.2-desktop-protocols.patch +++ b/libreoffice-5.2.1.2-desktop-protocols.patch @@ -5,8 +5,8 @@ diff -urN libreoffice-5.2.1.2/sysui/desktop/menus/base.desktop libreoffice-5.2.1 Keywords=Data;SQL; InitialPreference=5 StartupWMClass=libreoffice-base --X-KDE-Protocols=file,http,ftp,webdav -+X-KDE-Protocols=file,http,webdav,smb,remote +-X-KDE-Protocols=file,http,ftp,webdav,webdavs ++X-KDE-Protocols=file,http,webdav,smb,remote,webdavs Actions=NewDocument; [Desktop Action NewDocument] @@ -17,8 +17,8 @@ diff -urN libreoffice-5.2.1.2/sysui/desktop/menus/calc.desktop libreoffice-5.2.1 Keywords=Accounting;Stats;OpenDocument Spreadsheet;Chart;Microsoft Excel;Microsoft Works;OpenOffice Calc;ods;xls;xlsx; InitialPreference=5 StartupWMClass=libreoffice-calc --X-KDE-Protocols=file,http,ftp,webdav -+X-KDE-Protocols=file,http,webdav,smb,remote +-X-KDE-Protocols=file,http,ftp,webdav,webdavs ++X-KDE-Protocols=file,http,webdav,smb,remote,webdavs Actions=NewDocument; [Desktop Action NewDocument] @@ -29,8 +29,8 @@ diff -urN libreoffice-5.2.1.2/sysui/desktop/menus/draw.desktop libreoffice-5.2.1 Keywords=Vector;Schema;Diagram;Layout;OpenDocument Graphics;Microsoft Publisher;Microsoft Visio;Corel Draw;cdr;odg;svg;pdf;vsd; InitialPreference=5 StartupWMClass=libreoffice-draw --X-KDE-Protocols=file,http,ftp,webdav -+X-KDE-Protocols=file,http,webdav,smb,remote +-X-KDE-Protocols=file,http,ftp,webdav,webdavs ++X-KDE-Protocols=file,http,webdav,smb,remote,webdavs Actions=NewDocument; [Desktop Action NewDocument] @@ -41,8 +41,8 @@ diff -urN libreoffice-5.2.1.2/sysui/desktop/menus/impress.desktop libreoffice-5. Keywords=Slideshow;Slides;OpenDocument Presentation;Microsoft PowerPoint;Microsoft Works;OpenOffice Impress;odp;ppt;pptx; InitialPreference=5 StartupWMClass=libreoffice-impress --X-KDE-Protocols=file,http,ftp,webdav -+X-KDE-Protocols=file,http,webdav,smb,remote +-X-KDE-Protocols=file,http,ftp,webdav,webdavs ++X-KDE-Protocols=file,http,webdav,smb,remote,webdavs Actions=NewDocument; [Desktop Action NewDocument] @@ -53,20 +53,11 @@ diff -urN libreoffice-5.2.1.2/sysui/desktop/menus/math.desktop libreoffice-5.2.1 Keywords=Equation;OpenDocument Formula;Formula;odf;MathML; InitialPreference=5 StartupWMClass=libreoffice-math --X-KDE-Protocols=file,http,ftp,webdav -+X-KDE-Protocols=file,http,webdav,smb,remote +-X-KDE-Protocols=file,http,ftp,webdav,webdavs ++X-KDE-Protocols=file,http,webdav,smb,remote,webdavs Actions=NewDocument; [Desktop Action NewDocument] -diff -urN libreoffice-5.2.1.2/sysui/desktop/menus/qstart.desktop libreoffice-5.2.1.2-patched/sysui/desktop/menus/qstart.desktop ---- libreoffice-5.2.1.2/sysui/desktop/menus/qstart.desktop 2016-08-25 10:26:36.000000000 +1000 -+++ libreoffice-5.2.1.2-patched/sysui/desktop/menus/qstart.desktop 2016-09-06 12:22:41.354727943 +1000 -@@ -25,4 +25,4 @@ - Name=%PRODUCTNAME Quickstarter - Comment=Hook for quickstarter startup - X-GIO-NoFuse=true --X-KDE-Protocols=file,http,ftp,webdav -+X-KDE-Protocols=file,http,webdav,smb,remote diff -urN libreoffice-5.2.1.2/sysui/desktop/menus/startcenter.desktop libreoffice-5.2.1.2-patched/sysui/desktop/menus/startcenter.desktop --- libreoffice-5.2.1.2/sysui/desktop/menus/startcenter.desktop 2016-08-25 10:26:36.000000000 +1000 +++ libreoffice-5.2.1.2-patched/sysui/desktop/menus/startcenter.desktop 2016-09-06 12:22:41.354727943 +1000 @@ -74,8 +65,8 @@ diff -urN libreoffice-5.2.1.2/sysui/desktop/menus/startcenter.desktop libreoffic StartupNotify=true X-GIO-NoFuse=true StartupWMClass=libreoffice-startcenter --X-KDE-Protocols=file,http,ftp,webdav -+X-KDE-Protocols=file,http,webdav,smb,remote +-X-KDE-Protocols=file,http,ftp,webdav,webdavs ++X-KDE-Protocols=file,http,webdav,smb,remote,webdavs ##Define Actions Actions=Writer;Calc;Impress;Draw;Base;Math; @@ -86,8 +77,8 @@ diff -urN libreoffice-5.2.1.2/sysui/desktop/menus/writer.desktop libreoffice-5.2 Keywords=Text;Letter;Fax;Document;OpenDocument Text;Microsoft Word;Microsoft Works;Lotus WordPro;OpenOffice Writer;CV;odt;doc;docx;rtf; InitialPreference=5 StartupWMClass=libreoffice-writer --X-KDE-Protocols=file,http,ftp,webdav -+X-KDE-Protocols=file,http,webdav,smb,remote +-X-KDE-Protocols=file,http,ftp,webdav,webdavs ++X-KDE-Protocols=file,http,webdav,smb,remote,webdavs Actions=NewDocument; [Desktop Action NewDocument] @@ -98,5 +89,5 @@ diff -urN libreoffice-5.2.1.2/sysui/desktop/menus/xsltfilter.desktop libreoffice NoDisplay=true StartupNotify=true X-GIO-NoFuse=true --X-KDE-Protocols=file,http,ftp,webdav -+X-KDE-Protocols=file,http,webdav,smb,remote +-X-KDE-Protocols=file,http,ftp,webdav,webdavs ++X-KDE-Protocols=file,http,webdav,smb,remote,webdavs diff --git a/libreoffice-5.4.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-6.0.7.3-poppler-0.73.patch b/libreoffice-6.0.7.3-poppler-0.73.patch deleted file mode 100644 index 9504842..0000000 --- a/libreoffice-6.0.7.3-poppler-0.73.patch +++ /dev/null @@ -1,138 +0,0 @@ -diff -urN libreoffice-6.0.7.3/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx libreoffice-6.0.7.3-patched/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx ---- libreoffice-6.0.7.3/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2018-10-31 02:55:21.000000000 +1000 -+++ libreoffice-6.0.7.3-patched/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2019-10-15 18:35:58.981281235 +1000 -@@ -310,7 +310,7 @@ - o_rOutputBuf.resize(header_size); - - // initialize stream -- Guchar *p; -+ unsigned char *p; - GfxRGB rgb; - std::unique_ptr imgStr( - new ImageStream(str, -@@ -415,7 +415,7 @@ - oneColor = { byteToCol( 0xff ), byteToCol( 0xff ), byteToCol( 0xff ) }; - if( colorMap->getColorSpace()->getMode() == csIndexed || colorMap->getColorSpace()->getMode() == csDeviceGray ) - { -- Guchar nIndex = 0; -+ unsigned char nIndex = 0; - colorMap->getRGB( &nIndex, &zeroColor ); - nIndex = 1; - colorMap->getRGB( &nIndex, &oneColor ); -@@ -569,7 +569,11 @@ - LinkAction* pAction = link->getAction(); - if (pAction && pAction->getKind() == actionURI) - { -+#if POPPLER_CHECK_VERSION(0, 72, 0) -+ const char* pURI = static_cast(pAction)->getURI()->c_str(); -+#else - const char* pURI = static_cast(pAction)->getURI()->getCString(); -+#endif - - std::vector aEsc( lcl_escapeLineFeeds(pURI) ); - -@@ -592,7 +596,11 @@ - printf( "restoreState\n" ); - } - -+#if POPPLER_CHECK_VERSION(0, 71, 0) -+void PDFOutDev::setDefaultCTM(const double *pMat) -+#else - void PDFOutDev::setDefaultCTM(double *pMat) -+#endif - { - assert(pMat); - -@@ -767,7 +775,11 @@ - - aFont = it->second; - -+#if POPPLER_CHECK_VERSION(0, 72, 0) -+ std::vector aEsc( lcl_escapeLineFeeds(aFont.familyName.c_str()) ); -+#else - std::vector aEsc( lcl_escapeLineFeeds(aFont.familyName.getCString()) ); -+#endif - printf( " %d %d %d %d %f %d %s", - aFont.isEmbedded, - aFont.isBold, -diff -urN libreoffice-6.0.7.3/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx libreoffice-6.0.7.3-patched/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx ---- libreoffice-6.0.7.3/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 2018-10-31 02:55:21.000000000 +1000 -+++ libreoffice-6.0.7.3-patched/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 2019-10-15 18:35:58.981281235 +1000 -@@ -165,7 +165,11 @@ - //----- initialization and control - - // Set default transform matrix. -+#if POPPLER_CHECK_VERSION(0, 71, 0) -+ virtual void setDefaultCTM(const double *ctm) override; -+#else - virtual void setDefaultCTM(double *ctm) override; -+#endif - - // Start a page. - virtual void startPage(int pageNum, GfxState *state -@@ -278,9 +282,13 @@ - - // note: if you ever change Output_t, please keep in mind that the current code - // relies on it being of 8 bit size --typedef Guchar Output_t; -+typedef unsigned char Output_t; - typedef std::vector< Output_t > OutputBuffer; - -+#if !POPPLER_CHECK_VERSION(0, 73, 0) -+static_assert(std::is_same_v, "unexpected typedef"); -+#endif -+ - #endif // INCLUDED_SDEXT_SOURCE_PDFIMPORT_XPDFWRAPPER_PDFIOUTDEV_GPL_HXX - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -diff -urN libreoffice-6.0.7.3/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx libreoffice-6.0.7.3-patched/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx ---- libreoffice-6.0.7.3/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx 2018-10-31 02:55:21.000000000 +1000 -+++ libreoffice-6.0.7.3-patched/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx 2019-10-15 18:35:58.981281235 +1000 -@@ -242,7 +242,7 @@ - appendIHDR( o_rOutputBuf, width, height, 8, 6 ); // RGBA image - - // initialize stream -- Guchar *p, *pm; -+ unsigned char *p, *pm; - GfxRGB rgb; - GfxGray alpha; - ImageStream* imgStr = -@@ -328,7 +328,7 @@ - appendIHDR( o_rOutputBuf, width, height, 8, 6 ); // RGBA image - - // initialize stream -- Guchar *p; -+ unsigned char *p; - GfxRGB rgb; - ImageStream* imgStr = - new ImageStream(str, -@@ -374,7 +374,7 @@ - { - for( int x = 0; x < maskWidth; ++x ) - { -- Guchar aPixel = 0; -+ unsigned char aPixel = 0; - imgStrMask->getPixel( &aPixel ); - int nIndex = (y*height/maskHeight) * (width*4+1) + // mapped line - (x*width/maskWidth)*4 + 1 + 3 // mapped column -diff -urN libreoffice-6.0.7.3/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx libreoffice-6.0.7.3-patched/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx ---- libreoffice-6.0.7.3/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx 2018-10-31 02:55:21.000000000 +1000 -+++ libreoffice-6.0.7.3-patched/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx 2019-10-15 18:34:55.807287181 +1000 -@@ -69,7 +69,7 @@ - - // read config file - globalParams = new GlobalParams(); -- globalParams->setErrQuiet(gTrue); -+ globalParams->setErrQuiet(true); - #if defined(_MSC_VER) - globalParams->setupBaseFonts(nullptr); - #endif -@@ -143,7 +143,7 @@ - i, - PDFI_OUTDEV_RESOLUTION, - PDFI_OUTDEV_RESOLUTION, -- 0, gTrue, gTrue, gTrue); -+ 0, true, true, true); - rDoc.processLinks(&aOutDev, i); - } - 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-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 @@ -148,14 +140,13 @@ 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: gpgmepp-devel @@ -183,19 +174,20 @@ BuildRequires: pkgconfig(icu-le) BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(libabw-0.1) BuildRequires: pkgconfig(libclucene-core) -BuildRequires: pkgconfig(libcmis-0.5) +BuildRequires: pkgconfig(libcmis-0.5) >= 0.5.2 BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libcdr-0.1) BuildRequires: pkgconfig(libe-book-0.1) BuildRequires: pkgconfig(libeot) BuildRequires: pkgconfig(libexttextcat) BuildRequires: pkgconfig(libepubgen-0.1) -BuildRequires: pkgconfig(libixion-0.12) +BuildRequires: pkgconfig(libixion-0.14) BuildRequires: pkgconfig(liblangtag) BuildRequires: pkgconfig(libmspub-0.1) BuildRequires: pkgconfig(libmwaw-0.3) >= 0.3.4 +BuildRequires: pkgconfig(libnumbertext) BuildRequires: pkgconfig(libodfgen-0.1) >= 0.1.0 -BuildRequires: pkgconfig(liborcus-0.13) +BuildRequires: pkgconfig(liborcus-0.14) >= 0.14.1 BuildRequires: pkgconfig(libpagemaker-0.0) BuildRequires: pkgconfig(libpq) BuildRequires: pkgconfig(libqxp-0.0) @@ -211,7 +203,7 @@ BuildRequires: pkgconfig(libwpg-0.3) BuildRequires: pkgconfig(libwps-0.4) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxslt) -BuildRequires: pkgconfig(mdds-1.2) +BuildRequires: pkgconfig(mdds-1.4) >= 1.4.1 BuildRequires: pkgconfig(mythes) BuildRequires: pkgconfig(neon) BuildRequires: pkgconfig(nspr) @@ -230,13 +222,48 @@ 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 @@ -297,6 +324,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 @@ -313,6 +341,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 @@ -323,8 +352,6 @@ Summary: LibreOffice office suite common files Group: Office # Require at least one style to be installed Requires: %{name}-style = %{EVRD} -# But force galaxy style because it was used by default -Requires: %{name}-style-galaxy = %{EVRD} # And breeze too, it should be default for Plasma 5 Requires: %{name}-style-breeze = %{EVRD} Suggests: %{name}-help-en_US = %{EVRD} @@ -391,6 +418,10 @@ Conflicts: %{name}-templates-pt_BR < %{EVRD} Conflicts: %{name}-templates-sv < %{EVRD} Conflicts: %{name}-templates-tr < %{EVRD} Conflicts: %{name}-templates-zh_CN < %{EVRD} +Obsoletes: %{name}-style-galaxy < %{EVRD} +Obsoletes: %{name}-style-oxygen < %{EVRD} +Conflicts: %{name}-style-galaxy < %{EVRD} +Conflicts: %{name}-style-oxygen < %{EVRD} Suggests: noto-sans-fonts Suggests: noto-sans-mono-fonts Suggests: noto-serif-fonts @@ -407,7 +438,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 #---------------------------------------------------------------------------- @@ -481,6 +513,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 @@ -498,6 +531,39 @@ This package contains the GNOME VFS support and a GConf backend. #---------------------------------------------------------------------------- +%package gtk3-kde5 +Summary: GTK3-KDE5 Integration for LibreOffice (Widgets, Dialogs, Addressbook) +Group: Office +Requires: %{name}-common = %{EVRD} +Suggests: %{name}-style-breeze = %{EVRD} + +%description gtk3-kde5 +This package contains the KDE5 plugin for drawing LibreOffice widgets with +KDE5/Qt5.x and a KDEish File Picker when running under KDE5. + +%files gtk3-kde5 +%{ooodir}/program/libvclplug_gtk3_kde5lo.so +%{ooodir}/program/lo_kde5filepicker + +#---------------------------------------------------------------------------- + +%package kde5 +Summary: KDE5 Integration for LibreOffice (Widgets, Dialogs, Addressbook) +Group: Office +Requires: %{name}-common = %{EVRD} +Suggests: %{name}-style-breeze = %{EVRD} + +%description kde5 +This package contains the KDE5 plugin for drawing LibreOffice widgets with +KDE5/Qt5.x and a KDEish File Picker when running under KDE5. + +%files kde5 +%{ooodir}/program/libkde5be1lo.so +%{ooodir}/program/libvclplug_kde5lo.so +%{ooodir}/program/libvclplug_qt5lo.so + +#---------------------------------------------------------------------------- + %package impress Summary: LibreOffice office suite - presentation Group: Office @@ -511,27 +577,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 @@ -543,6 +594,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 #---------------------------------------------------------------------------- @@ -569,13 +621,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.* @@ -613,52 +665,6 @@ enabled in the LibreOffice option menu. #---------------------------------------------------------------------------- -%package style-galaxy -Summary: Default symbol style for LibreOffice -Group: Office -Requires: %{name}-common = %{EVRD} -Provides: %{name}-style = %{EVRD} -Conflicts: %{name}-common < 1:4.4.1 - -%description style-galaxy -This package contains the "Galaxy" symbol style from Sun, normally used on -MS Windows (tm) and when not using GNOME or KDE. Needs to be manually enabled -in the LibreOffice option menu. - -%files style-galaxy -%{ooodir}/share/config/images_galaxy.zip - -#---------------------------------------------------------------------------- - -%package style-hicontrast -Summary: Hicontrast symbol style for LibreOffice -Group: Office -Requires: %{name}-common = %{EVRD} -Provides: %{name}-style = %{EVRD} - -%description style-hicontrast -This package contains the "hicontrast" symbol style, needs to be manually -enabled in the LibreOffice option menu. - -%files style-hicontrast -%{ooodir}/share/config/images_hicontrast.zip - -#---------------------------------------------------------------------------- - -%package style-oxygen -Summary: Oxygen symbol style for LibreOffice -Group: Office -Requires: %{name}-common = %{EVRD} -Provides: %{name}-style = %{EVRD} - -%description style-oxygen -This package contains the "oxygen" symbol style, default style for KDE4. - -%files style-oxygen -%{ooodir}/share/config/images_oxygen.zip - -#---------------------------------------------------------------------------- - %package style-sifr Summary: Sifr symbol style for LibreOffice Group: Office @@ -702,6 +708,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 @@ -713,9 +720,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 @@ -763,19 +767,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 @@ -2945,22 +2936,6 @@ chmod 777 ~/tmp chmod +x bin/unpack-sources %build -export QT4DIR=%{_libdir}/qt4 -%ifarch X86_64 - export QT4INC=/usr/lib/qt4/include -%else - export QT4INC=%{_libdir}/qt4/include -%endif -export QT4LIB=%{_libdir}/qt4/lib - -export KDE4DIR=%{_libdir}/kde4 -%ifarch X86_64 - export KDE4INC=/usr/lib/kde4/include -%else - export KDE4INC=%{_libdir}/kde4/include -%endif -export KDE4LIB=%{_libdir}/kde4/lib - export LC_ALL=en_US.UTF-8 export LANG=en_US @@ -2973,6 +2948,11 @@ export PATH export CCACHE_DIR=%{ccachedir} %endif +%if %{with clang} +%global optflags $(echo %optflags | sed -e 's/-fvar-tracking-assignments//g' -e 's/-frecord-gcc-switches//g' -e 's/-ffat-lto-objects//g') +%clang_gcc_wrapper +export CPP="" +%else %global optflags %optflags -Wstrict-aliasing=0 export ARCH_FLAGS="%{optflags} -fno-omit-frame-pointer -fno-strict-aliasing" export ARCH_FLAGS_CC="%{optflags} -fno-omit-frame-pointer -fno-strict-aliasing" @@ -2981,21 +2961,34 @@ export ARCH_FLAGS_OPT="%{optflags} -O2" # Workaround for abf builds running out of memory export ARCH_FLAGS_CC="$ARCH_FLAGS_CC -g0" export ARCH_FLAGS_CXX="$ARCH_FLAGS_CC -g0" +%endif echo "Configure start at: "`date` >> ooobuildtime.log touch autogen.lastrun + +%if %{with clang} +sed -i \ + -e "s!clang -V!clang -v!g" \ + -e "s!clang -qversion!clang --version!g" \ + configure +%endif + %configure2_5x \ %{?_smp_mflags:--with-parallelism="`getconf _NPROCESSORS_ONLN`"} \ --with-vendor=ROSA \ --with-build-version="ROSA %{buildver}-%{release}" \ - --with-theme="breeze breeze_dark galaxy hicontrast oxygen sifr tango" \ + --with-theme="breeze breeze_dark sifr tango" \ --disable-coinmp \ --disable-fetch-external \ --enable-gstreamer-1.0 \ --disable-gstreamer-0.10 \ --enable-release-build \ - --enable-kde4 \ + --disable-gtk \ + --enable-gtk3 \ + --enable-gtk3-kde5 \ + --enable-kde5 \ + --enable-qt5 \ --disable-firebird-sdbc \ --disable-introspection \ --enable-eot \ @@ -3003,10 +2996,10 @@ 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 \ %endif --with-lang="%{langs}" \ --without-myspell-dicts \ @@ -3056,14 +3049,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/ @@ -3086,6 +3071,9 @@ ln -sf %{SOURCE68} external/tarballs/ ln -sf %{SOURCE69} external/tarballs/ ln -sf %{SOURCE70} external/tarballs/ +cp %{SOURCE71} external/tarballs/ +cp %{SOURCE72} external/tarballs/ + touch external/tarballs/.downloaded # (tpg) silent output to reduce memory and free space @@ -3174,11 +3162,9 @@ sort -u file-lists/sdk_list.txt > file-lists/sdk_list.uniq.sorted.txt sed -i -e 's/\[/?/g;s/\]/?/g' file-lists/sdk*.txt ## styles have their own packages -for i in oxygen galaxy breeze hicontrast tango sifr; do +for i in breeze tango sifr; do sed -i "/^.*images_$i\.zip$/d" file-lists/common_list.txt done -# galaxy style too -sed -i "/^.*images\.zip$/d" file-lists/common_list.txt ## Split help cd file-lists From b816f3ced95e14a75d0e58a4163262e9a51f8913 Mon Sep 17 00:00:00 2001 From: VictorR2007 Date: Tue, 15 Oct 2019 23:21:48 +0300 Subject: [PATCH 09/96] Updated to 6.3.2 --- libreoffice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index c0e8506..b9a03fb 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -43,7 +43,7 @@ Summary: Office suite Name: libreoffice Epoch: 1 Version: 6.3.2 -Release: 1.1 +Release: 1 License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic Group: Office Url: http://www.libreoffice.org From 8a90af70e030e63638600e211f908a9e59eb0610 Mon Sep 17 00:00:00 2001 From: Victor Ryzhikh Date: Tue, 15 Oct 2019 20:55:08 +0000 Subject: [PATCH 10/96] Updated to 6.3.2 --- libreoffice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index b9a03fb..14d2dc8 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -56,7 +56,7 @@ Source4: %{devexurl}/185d60944ea767075d27247c3162b3bc-unowinreg.dll # Unused, should be dropped in future package updates Source10: Mandriva-Rosa_Icons.tar.bz2 -%if !%{javaless} +%if %{javaless} Source20: http://archive.apache.org/dist/ant/binaries/apache-ant-%{antver}-bin.tar.bz2 %endif Source33: %{devurl}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip From 2587aab2ab4d890629621d25691fb5c935b8f987 Mon Sep 17 00:00:00 2001 From: Victor Ryzhikh Date: Thu, 17 Oct 2019 15:00:10 +0000 Subject: [PATCH 11/96] Qt build dependencies removed --- libreoffice.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index fca7baf..e683605 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -145,13 +145,11 @@ 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 From 22a0e391c0752d7573fa94861e97dee9e07892ee Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Fri, 18 Oct 2019 13:13:32 +0300 Subject: [PATCH 12/96] Restore gtk2 VCL --- libreoffice.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index 14d2dc8..624bb3e 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -43,7 +43,7 @@ Summary: Office suite Name: libreoffice Epoch: 1 Version: 6.3.2 -Release: 1 +Release: 2 License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic Group: Office Url: http://www.libreoffice.org @@ -2984,7 +2984,7 @@ sed -i \ --enable-gstreamer-1.0 \ --disable-gstreamer-0.10 \ --enable-release-build \ - --disable-gtk \ + --enable-gtk \ --enable-gtk3 \ --enable-gtk3-kde5 \ --enable-kde5 \ From dfdccb915ad05229f1dc6b72e17480ad61a66086 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Fri, 18 Oct 2019 13:15:46 +0300 Subject: [PATCH 13/96] fix description of gtk3-kde5 --- libreoffice.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index 624bb3e..a1811fe 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -538,8 +538,8 @@ Requires: %{name}-common = %{EVRD} Suggests: %{name}-style-breeze = %{EVRD} %description gtk3-kde5 -This package contains the KDE5 plugin for drawing LibreOffice widgets with -KDE5/Qt5.x and a KDEish File Picker when running under KDE5. +This package contains the VCL plugin to draw interface with GTK+3 +but use KDE5 file picker. %files gtk3-kde5 %{ooodir}/program/libvclplug_gtk3_kde5lo.so From f743588052ec222585a29097d133694bce7b6ad3 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Fri, 18 Oct 2019 13:19:25 +0300 Subject: [PATCH 14/96] clang fixes: clang-devel is not needed, explicitly disable clang by default --- libreoffice.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index a1811fe..7da7f99 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -6,6 +6,7 @@ %bcond_without l10n %bcond_with icecream %bcond_with ccache +%bcond_with clang %if %{with l10n} %define langs en-US af ar as bg bn br bs ca cs cy da de dz el en-GB es et eu fa fi fr ga gl gu he hi hr hu it ja ko kn lt lv mai mk ml mr nb nl nn nr nso or pa-IN pl pt pt-BR ro ru si sk sl sr ss st sv ta te th tn tr ts uk ve xh zh-TW zh-CN zu @@ -100,8 +101,7 @@ BuildRequires: bsh BuildRequires: ccache %endif %if %{with clang} -BuildRequires: clang -BuildRequires: clang-devel +BuildRequires: clang lld %endif BuildRequires: desktop-file-utils BuildRequires: doxygen >= 1.8.4 From ea13c843fe0fd75a3ec65b6af59d31afbf02ef78 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Fri, 18 Oct 2019 13:26:15 +0300 Subject: [PATCH 15/96] Fix ownership of %%{ooodir}/share/xdg: it must not be owned by multiple packages --- libreoffice.spec | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index 7da7f99..ec65199 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -324,7 +324,6 @@ 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 @@ -341,7 +340,6 @@ 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 @@ -439,6 +437,8 @@ This package contains the application-independent files of LibreOffice. %{_libdir}/libreoffice/program/services/scriptproviderforbeanshell.rdb %{ooodir}/share/gallery/sg24.* %{ooodir}/share/libreofficekit +%dir %{ooodir}/share/xdg +%exclude %{ooodir}/share/xdg/*.desktop %{_datadir}/appdata/org.libreoffice.kde.metainfo.xml #---------------------------------------------------------------------------- @@ -513,7 +513,6 @@ 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 @@ -577,7 +576,6 @@ 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 @@ -594,7 +592,6 @@ 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 #---------------------------------------------------------------------------- @@ -708,7 +705,6 @@ 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 @@ -3177,6 +3173,8 @@ cd .. # Split gallery grep /share/gallery/ file-lists/common_list.txt >file-lists/gallery_list.txt sed -i -e '/\/share\/gallery\//d' file-lists/common_list.txt +# calc.desktop, writer.desktop etc. go into libreoffice-calc, libreoffice-writer etc. subpackages +sed -i -e '/\/share\/xdg\/.*.desktop/d' file-lists/common_list.txt # We catch those in a regex to catch Sun Template extras sed -i -e '/gallery\/sg[0-9]*\..*/d' file-lists/gallery_list.txt @@ -3191,9 +3189,6 @@ cat file-lists/common_list.uniq.sorted.txt >>file-lists/core_list.txt sort -u 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 -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 From 6dca72bb4c831c1b537f5c3d1b155147bf506710 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Fri, 18 Oct 2019 13:45:56 +0300 Subject: [PATCH 16/96] mk transitional package to migrate from libreoffice-kde4 to libreoffice-gtk3-kde5 --- libreoffice.spec | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/libreoffice.spec b/libreoffice.spec index ec65199..dec79cd 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -563,6 +563,27 @@ KDE5/Qt5.x and a KDEish File Picker when running under KDE5. #---------------------------------------------------------------------------- +%package kde4 +Summary: Transitional package to migrate from libreoffice-kde4 +Group: Office +# GTK3-KDE5 VCL is much more mature than QT5-KDE5 +# because of maturity of GTK3 VCL, +# so let's migrate users of libreoffice-kde4 to libreoffice-gtk3-kde5 +Requires: %{name}-gtk3-kde5 = %{EVRD} +%rename %{name}-kde4 + +%description kde5 +Transitional package to migrate from libreoffice-kde4 to libreoffice-gtk3-kde5. +KDE4 VCL was very buggy, we disabled it in ROSA and are migrating users to +libreoffice-gtk3-kde5 (not libreoffice-kde5 because GTK3 VCL is +much more mature that Qt5/KDE5 VCL). +You may delete this package and choose any VCL you want. + +%files kde5 +# empty transitional package + +#---------------------------------------------------------------------------- + %package impress Summary: LibreOffice office suite - presentation Group: Office From b910eda6a4628da2f133c610136a76fead885499 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Fri, 18 Oct 2019 13:57:27 +0300 Subject: [PATCH 17/96] restore MySQL connector (lost during update to 6.3.2) --- libreoffice.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index dec79cd..a81a360 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -44,7 +44,7 @@ Summary: Office suite Name: libreoffice Epoch: 1 Version: 6.3.2 -Release: 2 +Release: 3 License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic Group: Office Url: http://www.libreoffice.org @@ -784,6 +784,19 @@ 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 From 0a5e8f732b113587defd6e08b1c715344a40df14 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Fri, 18 Oct 2019 15:01:32 +0300 Subject: [PATCH 18/96] fix typo --- libreoffice.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index a81a360..2dd8754 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -572,14 +572,14 @@ Group: Office Requires: %{name}-gtk3-kde5 = %{EVRD} %rename %{name}-kde4 -%description kde5 +%description kde4 Transitional package to migrate from libreoffice-kde4 to libreoffice-gtk3-kde5. KDE4 VCL was very buggy, we disabled it in ROSA and are migrating users to libreoffice-gtk3-kde5 (not libreoffice-kde5 because GTK3 VCL is much more mature that Qt5/KDE5 VCL). You may delete this package and choose any VCL you want. -%files kde5 +%files kde4 # empty transitional package #---------------------------------------------------------------------------- From f88a97a59cca6cc9491526b676e82af5a96e0f8a Mon Sep 17 00:00:00 2001 From: Victor Ryzhikh Date: Thu, 26 Dec 2019 06:32:35 +0000 Subject: [PATCH 19/96] Updated to 6.3.4 --- .abf.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.abf.yml b/.abf.yml index 24de0ec..5dea7b1 100644 --- a/.abf.yml +++ b/.abf.yml @@ -23,8 +23,9 @@ sources: b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt: bdec3915c01cd60e20892376aa5e5a0d3980c389 lxml-4.1.1.tgz: 154279bc5939d7099697887ea15c5ca921abeaeb pdfium-3794.tar.bz2: 41ff3c2291c99db71ddca1873115b7fc0bfb5065 - libreoffice-6.3.2.2.tar.xz: e2967958910cda16a218ad2832849a767be38a38 - libreoffice-dictionaries-6.3.2.2.tar.xz: bfd07359fc34b7ce6285fee5978185a3b08c4d58 - libreoffice-help-6.3.2.2.tar.xz: 0a8a8c2631f9c901639367bcd407192a672c9dfe - libreoffice-translations-6.3.2.2.tar.xz: 0aac0e4a9fe88c09b000fa2c4b086cb5ed50974f + libreoffice-6.3.4.2.tar.xz: d7fcc2c5eb58c67083232715bd098cbd6d66855d + libreoffice-dictionaries-6.3.4.2.tar.xz: 5548a7d61064c1b1c91c2a6ed5eac72e6ca066ad + libreoffice-help-6.3.4.2.tar.xz: 32742d4267f4cd900ce61690b8fc476a6c4d6b69 + libreoffice-translations-6.3.4.2.tar.xz: eca5cb4af83b1f3d5bfa0e4b566104d33af037d7 + From 67defa22be526f8204be2de576045f34774bce33 Mon Sep 17 00:00:00 2001 From: Victor Ryzhikh Date: Thu, 26 Dec 2019 06:34:23 +0000 Subject: [PATCH 20/96] Updated to 6.3.4 --- libreoffice.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index 2dd8754..3d5f3d8 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -43,8 +43,8 @@ Summary: Office suite Name: libreoffice Epoch: 1 -Version: 6.3.2 -Release: 3 +Version: 6.3.4 +Release: 1 License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic Group: Office Url: http://www.libreoffice.org From 72a9c7becb08abd106906473c15f8c5eb14b39ea Mon Sep 17 00:00:00 2001 From: Victor Ryzhikh Date: Thu, 26 Dec 2019 07:20:09 +0000 Subject: [PATCH 21/96] Updated to 6.3.4 --- libreoffice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index 3d5f3d8..df2c2f8 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -203,7 +203,7 @@ BuildRequires: pkgconfig(libwpg-0.3) BuildRequires: pkgconfig(libwps-0.4) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxslt) -BuildRequires: pkgconfig(mdds-1.4) >= 1.4.1 +BuildRequires: pkgconfig(mdds-1.5) BuildRequires: pkgconfig(mythes) BuildRequires: pkgconfig(neon) BuildRequires: pkgconfig(nspr) From 7b60497a5f624cfccb7263f6c79dfb0aa2a050af Mon Sep 17 00:00:00 2001 From: Victor Ryzhikh Date: Thu, 26 Dec 2019 08:19:12 +0000 Subject: [PATCH 22/96] Updated to 6.3.4 --- libreoffice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index df2c2f8..2c0f5b3 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -181,7 +181,7 @@ BuildRequires: pkgconfig(libe-book-0.1) BuildRequires: pkgconfig(libeot) BuildRequires: pkgconfig(libexttextcat) BuildRequires: pkgconfig(libepubgen-0.1) -BuildRequires: pkgconfig(libixion-0.14) +BuildRequires: pkgconfig(libixion-0.15) BuildRequires: pkgconfig(liblangtag) BuildRequires: pkgconfig(libmspub-0.1) BuildRequires: pkgconfig(libmwaw-0.3) >= 0.3.4 From 8c7c795bb66e98c519312d0075acb8958f08efd6 Mon Sep 17 00:00:00 2001 From: Victor Ryzhikh Date: Thu, 26 Dec 2019 08:42:51 +0000 Subject: [PATCH 23/96] Updated libreoffice.spec --- libreoffice.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index 2c0f5b3..755834b 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -181,7 +181,7 @@ BuildRequires: pkgconfig(libe-book-0.1) BuildRequires: pkgconfig(libeot) BuildRequires: pkgconfig(libexttextcat) BuildRequires: pkgconfig(libepubgen-0.1) -BuildRequires: pkgconfig(libixion-0.15) +BuildRequires: pkgconfig(libixion-0.14) BuildRequires: pkgconfig(liblangtag) BuildRequires: pkgconfig(libmspub-0.1) BuildRequires: pkgconfig(libmwaw-0.3) >= 0.3.4 @@ -203,7 +203,7 @@ BuildRequires: pkgconfig(libwpg-0.3) BuildRequires: pkgconfig(libwps-0.4) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxslt) -BuildRequires: pkgconfig(mdds-1.5) +BuildRequires: pkgconfig(mdds-1.4) BuildRequires: pkgconfig(mythes) BuildRequires: pkgconfig(neon) BuildRequires: pkgconfig(nspr) From cda0c4b4d8a99f1eb0d93cca66e615ee0e53a4f5 Mon Sep 17 00:00:00 2001 From: NixTux Commit Bot Date: Sat, 4 Jan 2020 04:24:07 +0300 Subject: [PATCH 24/96] bot: rpm5 -> rpm4 (1) --- libreoffice.spec | 106 +++++++++++++++++++++++------------------------ 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index 755834b..75152db 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -33,8 +33,8 @@ %define ccachedir ~/.ccache-OOo %if %{_use_internal_dependency_generator} -%define __noautoreq 'libjawt.so|libmyspell.so|libstlport_gcc.so|libmono.so|mono|devel\\(libunoidl(.*)' -%define __noautoprov libsndfile.so\\|libportaudio.so\\|libdb-4.2.so\\|libdb_java-4.2.so\\|libmyspell.so\\|libstlport_gcc.so\\|librdf.so.0\\|libraptor.so.1\\|libxmlsec1-nss.so.1\\|libxmlsec1.so.1 +%global __requires_exclude 'libjawt.so|libmyspell.so|libstlport_gcc.so|libmono.so|mono|devel\\(libunoidl(.*)' +%global __provides_exclude libsndfile.so\\|libportaudio.so\\|libdb-4.2.so\\|libdb_java-4.2.so\\|libmyspell.so\\|libstlport_gcc.so\\|librdf.so.0\\|libraptor.so.1\\|libxmlsec1-nss.so.1\\|libxmlsec1.so.1 %else %define _requires_exceptions libjawt.so\\|libmyspell.so\\|libstlport_gcc.so\\|libmono.so\\|mono\\|devel(libunoidl)\\|devel(libunoidl(64bit)) %define _provides_exceptions libsndfile.so\\|libportaudio.so\\|libdb-4.2.so\\|libdb_java-4.2.so\\|libmyspell.so\\|libstlport_gcc.so\\|librdf.so.0\\|libraptor.so.1\\|libxmlsec1-nss.so.1\\|libxmlsec1.so.1 @@ -267,7 +267,7 @@ BuildRequires: ant-apache-regexp 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 @@ -352,7 +352,7 @@ Group: Office Requires: %{name}-style = %{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 @@ -420,9 +420,9 @@ Obsoletes: %{name}-style-galaxy < %{EVRD} Obsoletes: %{name}-style-oxygen < %{EVRD} Conflicts: %{name}-style-galaxy < %{EVRD} Conflicts: %{name}-style-oxygen < %{EVRD} -Suggests: noto-sans-fonts -Suggests: noto-sans-mono-fonts -Suggests: noto-serif-fonts +Recommends: noto-sans-fonts +Recommends: noto-sans-mono-fonts +Recommends: noto-serif-fonts %description common This package contains the application-independent files of LibreOffice. @@ -534,7 +534,7 @@ This package contains the GNOME VFS support and a GConf backend. Summary: GTK3-KDE5 Integration for LibreOffice (Widgets, Dialogs, Addressbook) Group: Office Requires: %{name}-common = %{EVRD} -Suggests: %{name}-style-breeze = %{EVRD} +Recommends: %{name}-style-breeze = %{EVRD} %description gtk3-kde5 This package contains the VCL plugin to draw interface with GTK+3 @@ -550,7 +550,7 @@ but use KDE5 file picker. Summary: KDE5 Integration for LibreOffice (Widgets, Dialogs, Addressbook) Group: Office Requires: %{name}-common = %{EVRD} -Suggests: %{name}-style-breeze = %{EVRD} +Recommends: %{name}-style-breeze = %{EVRD} %description kde5 This package contains the KDE5 plugin for drawing LibreOffice widgets with @@ -717,7 +717,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. @@ -910,7 +910,7 @@ Provides: %{ooname}-l10n = %{EVRD} Requires: %{ooname}-common = %{EVRD} Requires: locales-bg Provides: LibreOffice-l10n-bg = %{EVRD} -Suggests: %{ooname}-help-bg = %{EVRD} +Recommends: %{ooname}-help-bg = %{EVRD} %description l10n-bg This package contains the localization of LibreOffice in Bulgarian. @@ -930,7 +930,7 @@ Provides: %{ooname}-l10n = %{EVRD} Requires: %{ooname}-common = %{EVRD} Requires: locales-bn Provides: LibreOffice-l10n-bn = %{EVRD} -Suggests: %{ooname}-help-bn = %{EVRD} +Recommends: %{ooname}-help-bn = %{EVRD} %description l10n-bn This package contains the localization of LibreOffice in Bengali. @@ -969,7 +969,7 @@ Provides: %{ooname}-l10n = %{EVRD} Requires: %{ooname}-common = %{EVRD} Requires: locales-bs Provides: LibreOffice-l10n-bs = %{EVRD} -Suggests: %{ooname}-help-bs = %{EVRD} +Recommends: %{ooname}-help-bs = %{EVRD} %description l10n-bs This package contains the localization of LibreOffice in Bosnian. @@ -991,7 +991,7 @@ Requires: locales-ca Requires: urw-fonts Requires: myspell-ca Provides: LibreOffice-l10n-ca = %{EVRD} -Suggests: %{ooname}-help-ca = %{EVRD} +Recommends: %{ooname}-help-ca = %{EVRD} %description l10n-ca This package contains the localization of LibreOffice in Catalan. @@ -1014,7 +1014,7 @@ Requires: urw-fonts Requires: myspell-cs Requires: myspell-hyph-cs Provides: LibreOffice-l10n-cs = %{EVRD} -Suggests: %{ooname}-help-cs = %{EVRD} +Recommends: %{ooname}-help-cs = %{EVRD} %description l10n-cs This package contains the localization of LibreOffice in Czech. @@ -1058,7 +1058,7 @@ Requires: fonts-ttf-dejavu Requires: urw-fonts Requires: myspell-da, myspell-hyph-da Provides: LibreOffice-l10n-da = %{EVRD} -Suggests: %{ooname}-help-da = %{EVRD} +Recommends: %{ooname}-help-da = %{EVRD} %description l10n-da This package contains the localization of LibreOffice in Danish. @@ -1082,7 +1082,7 @@ Requires: urw-fonts Requires: myspell-de Requires: myspell-hyph-de Provides: LibreOffice-l10n-de = %{EVRD} -Suggests: %{ooname}-help-de = %{EVRD} +Recommends: %{ooname}-help-de = %{EVRD} %description l10n-de This package contains the localization of LibreOffice in German. @@ -1102,7 +1102,7 @@ Provides: %{ooname}-l10n = %{EVRD} Requires: %{ooname}-common = %{EVRD} Requires: locales-dz Provides: LibreOffice-l10n-dz = %{EVRD} -Suggests: %{ooname}-help-dz = %{EVRD} +Recommends: %{ooname}-help-dz = %{EVRD} %description l10n-dz This package contains the localization of LibreOffice in Dzongkha. @@ -1125,7 +1125,7 @@ Requires: fonts-type1-greek Requires: myspell-el Requires: myspell-hyph-el Provides: LibreOffice-l10n-el = %{EVRD} -Suggests: %{ooname}-help-el = %{EVRD} +Recommends: %{ooname}-help-el = %{EVRD} %description l10n-el This package contains the localization of LibreOffice in Greek. @@ -1148,7 +1148,7 @@ Requires: urw-fonts Requires: myspell-en_GB Requires: myspell-hyph-en Provides: LibreOffice-l10n-en_GB = %{EVRD} -Suggests: %{ooname}-help-en_GB = %{EVRD} +Recommends: %{ooname}-help-en_GB = %{EVRD} %description l10n-en_GB This package contains the localization of LibreOffice in British. @@ -1172,7 +1172,7 @@ Requires: urw-fonts Requires: myspell-es Requires: myspell-hyph-es Provides: LibreOffice-l10n-es = %{EVRD} -Suggests: %{ooname}-help-es = %{EVRD} +Recommends: %{ooname}-help-es = %{EVRD} %description l10n-es This package contains the localization of LibreOffice in Spanish. @@ -1196,7 +1196,7 @@ Requires: urw-fonts Requires: myspell-et Requires: myspell-hyph-et Provides: LibreOffice-l10n-et = %{EVRD} -Suggests: %{ooname}-help-et = %{EVRD} +Recommends: %{ooname}-help-et = %{EVRD} %description l10n-et This package contains the localization of LibreOffice in Estonian. @@ -1218,7 +1218,7 @@ Requires: locales-eu Requires: fonts-ttf-dejavu Requires: urw-fonts Provides: LibreOffice-l10n-eu = %{EVRD} -Suggests: %{ooname}-help-eu = %{EVRD} +Recommends: %{ooname}-help-eu = %{EVRD} %description l10n-eu This package contains the localization of LibreOffice in Basque. @@ -1259,7 +1259,7 @@ Requires: locales-fi Requires: fonts-ttf-dejavu Requires: urw-fonts Provides: LibreOffice-l10n-fi = %{EVRD} -Suggests: %{ooname}-help-fi = %{EVRD} +Recommends: %{ooname}-help-fi = %{EVRD} %description l10n-fi This package contains the localization of LibreOffice in Finnish. @@ -1283,7 +1283,7 @@ Requires: urw-fonts Requires: myspell-fr Requires: myspell-hyph-fr Provides: LibreOffice-l10n-fr = %{EVRD} -Suggests: %{ooname}-help-fr = %{EVRD} +Recommends: %{ooname}-help-fr = %{EVRD} %description l10n-fr This package contains the localization of LibreOffice in French. @@ -1322,7 +1322,7 @@ Provides: %{ooname}-l10n = %{EVRD} Requires: %{ooname}-common = %{EVRD} Requires: locales-gl Provides: LibreOffice-l10n-gl = %{EVRD} -Suggests: %{ooname}-help-gl = %{EVRD} +Recommends: %{ooname}-help-gl = %{EVRD} %description l10n-gl This package contains the localization of LibreOffice in Galician. @@ -1342,7 +1342,7 @@ Provides: %{ooname}-l10n = %{EVRD} Requires: %{ooname}-common = %{EVRD} Requires: locales-gu Provides: LibreOffice-l10n-gu = %{EVRD} -Suggests: %{ooname}-help-gu = %{EVRD} +Recommends: %{ooname}-help-gu = %{EVRD} %description l10n-gu This package contains the localization of LibreOffice in Gujarati. @@ -1363,7 +1363,7 @@ Requires: %{ooname}-common = %{EVRD} Requires: locales-he Requires: urw-fonts Provides: LibreOffice-l10n-he = %{EVRD} -Suggests: %{ooname}-help-he = %{EVRD} +Recommends: %{ooname}-help-he = %{EVRD} %description l10n-he This package contains the localization of LibreOffice in Hebrew. @@ -1384,7 +1384,7 @@ Requires: %{ooname}-common = %{EVRD} Requires: locales-hi Requires: urw-fonts Provides: LibreOffice-l10n-hi = %{EVRD} -Suggests: %{ooname}-help-hi = %{EVRD} +Recommends: %{ooname}-help-hi = %{EVRD} %description l10n-hi This package contains the localization of LibreOffice in Hindi. @@ -1404,7 +1404,7 @@ Provides: %{ooname}-l10n = %{EVRD} Requires: %{ooname}-common = %{EVRD} Requires: locales-hr Provides: LibreOffice-l10n-hr = %{EVRD} -Suggests: %{ooname}-help-hr = %{EVRD} +Recommends: %{ooname}-help-hr = %{EVRD} %description l10n-hr This package contains the localization of LibreOffice in Croatian. @@ -1427,7 +1427,7 @@ Requires: urw-fonts Requires: myspell-hu Requires: myspell-hyph-hu Provides: LibreOffice-l10n-hu = %{EVRD} -Suggests: %{ooname}-help-hu = %{EVRD} +Recommends: %{ooname}-help-hu = %{EVRD} %description l10n-hu This package contains the localization of LibreOffice in Hungarian. @@ -1450,7 +1450,7 @@ Requires: urw-fonts Requires: myspell-it Requires: myspell-hyph-it Provides: LibreOffice-l10n-it = %{EVRD} -Suggests: %{ooname}-help-it = %{EVRD} +Recommends: %{ooname}-help-it = %{EVRD} %description l10n-it This package contains the localization of LibreOffice in Italian. @@ -1471,7 +1471,7 @@ Requires: %{ooname}-common = %{EVRD} Requires: locales-ja Requires: fonts-ttf-japanese Provides: LibreOffice-l10n-ja = %{EVRD} -Suggests: %{ooname}-help-ja = %{EVRD} +Recommends: %{ooname}-help-ja = %{EVRD} %description l10n-ja This package contains the localization of LibreOffice in Japanese. @@ -1511,7 +1511,7 @@ Requires: %{ooname}-common = %{EVRD} Requires: locales-ko Requires: fonts-ttf-korean >= 1.0.2 Provides: LibreOffice-l10n-ko = %{EVRD} -Suggests: %{ooname}-help-ko = %{EVRD} +Recommends: %{ooname}-help-ko = %{EVRD} %description l10n-ko This package contains the localization of LibreOffice in Korean. @@ -1607,7 +1607,7 @@ Provides: %{ooname}-l10n = %{EVRD} Requires: %{ooname}-common = %{EVRD} Requires: locales-mk Provides: LibreOffice-l10n-mk = %{EVRD} -Suggests: %{ooname}-help-mk = %{EVRD} +Recommends: %{ooname}-help-mk = %{EVRD} %description l10n-mk This package contains the localization of LibreOffice in Macedonian. @@ -1647,7 +1647,7 @@ Requires: %{ooname}-common = %{EVRD} Requires: locales-no Requires: urw-fonts Provides: LibreOffice-l10n-nb = %{EVRD} -Suggests: %{ooname}-help-nb = %{EVRD} +Recommends: %{ooname}-help-nb = %{EVRD} %description l10n-nb This package contains the localization of LibreOffice in Norwegian Bokmal. @@ -1671,7 +1671,7 @@ Requires: urw-fonts Requires: myspell-nl Requires: myspell-hyph-nl Provides: LibreOffice-l10n-nl = %{EVRD} -Suggests: %{ooname}-help-nl = %{EVRD} +Recommends: %{ooname}-help-nl = %{EVRD} %description l10n-nl This package contains the localization of LibreOffice in Dutch. @@ -1692,7 +1692,7 @@ Requires: %{ooname}-common = %{EVRD} Requires: locales-no Requires: urw-fonts Provides: LibreOffice-l10n-nn = %{EVRD} -Suggests: %{ooname}-help-nn = %{EVRD} +Recommends: %{ooname}-help-nn = %{EVRD} %description l10n-nn This package contains the localization of LibreOffice in Norwegian Nynorsk. @@ -1792,7 +1792,7 @@ Requires: urw-fonts Requires: myspell-pl Requires: myspell-hyph-pl Provides: LibreOffice-l10n-pl = %{EVRD} -Suggests: %{ooname}-help-pl = %{EVRD} +Recommends: %{ooname}-help-pl = %{EVRD} %description l10n-pl This package contains the localization of LibreOffice in Polish. @@ -1816,7 +1816,7 @@ Requires: urw-fonts Requires: myspell-pt Requires: myspell-hyph-pt Provides: LibreOffice-l10n-pt = %{EVRD} -Suggests: %{ooname}-help-pt = %{EVRD} +Recommends: %{ooname}-help-pt = %{EVRD} %description l10n-pt This package contains the localization of LibreOffice in Portuguese. @@ -1837,7 +1837,7 @@ Requires: locales-pt Requires: urw-fonts Requires: myspell-pt_BR Provides: LibreOffice-l10n_pt_BR = %{EVRD} -Suggests: %{ooname}-help-pt_BR = %{EVRD} +Recommends: %{ooname}-help-pt_BR = %{EVRD} %description l10n-pt_BR This package contains the localization of LibreOffice in Portuguese @@ -1876,12 +1876,12 @@ Group: Office Provides: %{ooname}-l10n = %{EVRD} Requires: %{ooname}-common = %{EVRD} Requires: locales-ru -Suggests: fonts-ttf-paratype +Recommends: fonts-ttf-paratype Requires: urw-fonts Requires: myspell-ru Requires: myspell-hyph-ru Provides: LibreOffice-l10n-ru = %{EVRD} -Suggests: %{ooname}-help-ru = %{EVRD} +Recommends: %{ooname}-help-ru = %{EVRD} %description l10n-ru This package contains the localization of LibreOffice in Russian. @@ -1920,7 +1920,7 @@ Provides: %{ooname}-l10n = %{EVRD} Requires: %{ooname}-common = %{EVRD} Requires: locales-si Provides: LibreOffice-l10n-si = %{EVRD} -Suggests: %{ooname}-help-si = %{EVRD} +Recommends: %{ooname}-help-si = %{EVRD} %description l10n-si This package contains the localization of LibreOffice in Sinhalese. @@ -1943,7 +1943,7 @@ Requires: urw-fonts Requires: myspell-sk Requires: myspell-hyph-sk Provides: LibreOffice-l10n-sk = %{EVRD} -Suggests: %{ooname}-help-sk = %{EVRD} +Recommends: %{ooname}-help-sk = %{EVRD} %description l10n-sk This package contains the localization of LibreOffice in Slovak. @@ -1965,7 +1965,7 @@ Requires: locales-sl Requires: urw-fonts Requires: myspell-sl, myspell-hyph-sl Provides: LibreOffice-l10n-sl = %{EVRD} -Suggests: %{ooname}-help-sl = %{EVRD} +Recommends: %{ooname}-help-sl = %{EVRD} %description l10n-sl This package contains the localization of LibreOffice in Slovenian. @@ -2046,7 +2046,7 @@ Requires: urw-fonts Requires: myspell-sv Requires: myspell-hyph-sv Provides: LibreOffice-l10n-sv = %{EVRD} -Suggests: %{ooname}-help-sv = %{EVRD} +Recommends: %{ooname}-help-sv = %{EVRD} %description l10n-sv This package contains the localization of LibreOffice in Swedish. @@ -2144,7 +2144,7 @@ Requires: %{ooname}-common = %{EVRD} Requires: locales-tr Requires: urw-fonts Provides: LibreOffice-l10n-tr = %{EVRD} -Suggests: %{ooname}-help-tr = %{EVRD} +Recommends: %{ooname}-help-tr = %{EVRD} %description l10n-tr This package contains the localization of LibreOffice in Turkish. @@ -2183,7 +2183,7 @@ Provides: %{ooname}-l10n = %{EVRD} Requires: %{ooname}-common = %{EVRD} Requires: locales-uk Provides: LibreOffice-l10n-uk = %{EVRD} -Suggests: %{ooname}-help-uk = %{EVRD} +Recommends: %{ooname}-help-uk = %{EVRD} %description l10n-uk This package contains the localization of LibreOffice in Ukrainian. @@ -2242,7 +2242,7 @@ Requires: %{ooname}-common = %{EVRD} Requires: locales-zh Requires: fonts-ttf-chinese Provides: LibreOffice-l10n-zh_CN = %{EVRD} -Suggests: %{ooname}-help-zh_CN = %{EVRD} +Recommends: %{ooname}-help-zh_CN = %{EVRD} %description l10n-zh_CN This package contains the localization of LibreOffice in Chinese Simplified. @@ -2263,7 +2263,7 @@ Requires: %{ooname}-common = %{EVRD} Requires: locales-zh Requires: fonts-ttf-chinese Provides: LibreOffice-l10n-zh_TW = %{EVRD} -Suggests: %{ooname}-help-zh_TW = %{EVRD} +Recommends: %{ooname}-help-zh_TW = %{EVRD} %description l10n-zh_TW This package contains the localization of LibreOffice in Chinese @@ -3004,7 +3004,7 @@ sed -i \ configure %endif -%configure2_5x \ +%configure \ %{?_smp_mflags:--with-parallelism="`getconf _NPROCESSORS_ONLN`"} \ --with-vendor=ROSA \ --with-build-version="ROSA %{buildver}-%{release}" \ @@ -3110,7 +3110,7 @@ touch external/tarballs/.downloaded # We use make build here because the default target is "allandcheck". # Checking should go to check -%make -r -s V=0 \ +%make_build -r -s V=0 \ ARCH_FLAGS="$ARCH_FLAGS" \ ARCH_FLAGS_CC="$ARCH_FLAGS_CC" \ ARCH_FLAGS_CXX="$ARCH_FLAGS_CXX" \ From 6b44fc31e41a7cec958aa4e0c8a5d448476f4b88 Mon Sep 17 00:00:00 2001 From: NixTux Commit Bot Date: Mon, 13 Jan 2020 15:51:42 +0300 Subject: [PATCH 25/96] bot: rpm5 -> rpm4 (8) --- libreoffice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index 75152db..46af5e0 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -3110,7 +3110,7 @@ touch external/tarballs/.downloaded # We use make build here because the default target is "allandcheck". # Checking should go to check -%make_build -r -s V=0 \ +%make -r -s V=0 \ ARCH_FLAGS="$ARCH_FLAGS" \ ARCH_FLAGS_CC="$ARCH_FLAGS_CC" \ ARCH_FLAGS_CXX="$ARCH_FLAGS_CXX" \ From 1dd387d96e8567efab38f43f80c0b14e13723e0c Mon Sep 17 00:00:00 2001 From: Victor Ryzhikh Date: Thu, 27 Feb 2020 06:35:00 +0000 Subject: [PATCH 26/96] Added Provides: libreoffice-kde4 --- libreoffice.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index e683605..afd16e6 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -43,7 +43,7 @@ Summary: Office suite Name: libreoffice Epoch: 1 Version: 6.2.8 -Release: 1 +Release: 2 License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic Group: Office Url: http://www.libreoffice.org @@ -560,6 +560,7 @@ Summary: KDE5 Integration for LibreOffice (Widgets, Dialogs, Addressbook) Group: Office Requires: %{name}-common = %{EVRD} Suggests: %{name}-style-breeze = %{EVRD} +Provides: libreoffice-kde4 %description kde5 This package contains the KDE5 plugin for drawing LibreOffice widgets with From c9b051cdc8015b10cfe1efe0da7947f8b6e4b6ff Mon Sep 17 00:00:00 2001 From: Victor Ryzhikh Date: Thu, 27 Feb 2020 17:05:42 +0000 Subject: [PATCH 27/96] Updated to 6.3.5 --- .abf.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.abf.yml b/.abf.yml index 5dea7b1..b1bfa38 100644 --- a/.abf.yml +++ b/.abf.yml @@ -23,9 +23,7 @@ sources: b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt: bdec3915c01cd60e20892376aa5e5a0d3980c389 lxml-4.1.1.tgz: 154279bc5939d7099697887ea15c5ca921abeaeb pdfium-3794.tar.bz2: 41ff3c2291c99db71ddca1873115b7fc0bfb5065 - libreoffice-6.3.4.2.tar.xz: d7fcc2c5eb58c67083232715bd098cbd6d66855d - libreoffice-dictionaries-6.3.4.2.tar.xz: 5548a7d61064c1b1c91c2a6ed5eac72e6ca066ad - libreoffice-help-6.3.4.2.tar.xz: 32742d4267f4cd900ce61690b8fc476a6c4d6b69 - libreoffice-translations-6.3.4.2.tar.xz: eca5cb4af83b1f3d5bfa0e4b566104d33af037d7 - - + libreoffice-6.3.5.2.tar.xz: 76ef06f0cd0ce0f29c3e78f73763ec63ee34fc32 + libreoffice-dictionaries-6.3.5.2.tar.xz: 15a2ad38276bb1c2249ffb8a8dfd9218c56e8a98 + libreoffice-help-6.3.5.2.tar.xz: 2cb7747b123c4bc8b0986889f55794a93e7b5319 + libreoffice-translations-6.3.5.2.tar.xz: 74a9919d8e49daedf6de4b39b81c3f27 From 7c605d4114cb7870ca20317401d2a1246908f023 Mon Sep 17 00:00:00 2001 From: Victor Ryzhikh Date: Thu, 27 Feb 2020 17:35:17 +0000 Subject: [PATCH 28/96] Updated to 6.3.5 --- libreoffice.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index 46af5e0..ba7830a 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -43,7 +43,7 @@ Summary: Office suite Name: libreoffice Epoch: 1 -Version: 6.3.4 +Version: 6.3.5 Release: 1 License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic Group: Office @@ -124,7 +124,7 @@ BuildRequires: perl-Archive-Zip BuildRequires: perl-MDK-Common BuildRequires: perl-HTML-Parser BuildRequires: perl-XML-Twig -BuildRequires: python-translate >= 1.9.0 +BuildRequires: python2-translate >= 1.9.0 BuildRequires: recode BuildRequires: sac BuildRequires: servlet3 From 17c2f4cacf2ff8697a083c222a441b8e1115fbe8 Mon Sep 17 00:00:00 2001 From: Victor Ryzhikh Date: Thu, 27 Feb 2020 18:47:34 +0000 Subject: [PATCH 29/96] Remove Provides: libreoffice-kde4 --- libreoffice.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index afd16e6..5c27953 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -560,7 +560,6 @@ Summary: KDE5 Integration for LibreOffice (Widgets, Dialogs, Addressbook) Group: Office Requires: %{name}-common = %{EVRD} Suggests: %{name}-style-breeze = %{EVRD} -Provides: libreoffice-kde4 %description kde5 This package contains the KDE5 plugin for drawing LibreOffice widgets with From 7f385409f123cbd018c9a0985da2c2b69c24e9c1 Mon Sep 17 00:00:00 2001 From: Victor Ryzhikh Date: Thu, 27 Feb 2020 18:52:03 +0000 Subject: [PATCH 30/96] Updated to 6.3.5 --- libreoffice.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index ba7830a..78f80d0 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -181,7 +181,7 @@ BuildRequires: pkgconfig(libe-book-0.1) BuildRequires: pkgconfig(libeot) BuildRequires: pkgconfig(libexttextcat) BuildRequires: pkgconfig(libepubgen-0.1) -BuildRequires: pkgconfig(libixion-0.14) +BuildRequires: pkgconfig(libixion-0.15) BuildRequires: pkgconfig(liblangtag) BuildRequires: pkgconfig(libmspub-0.1) BuildRequires: pkgconfig(libmwaw-0.3) >= 0.3.4 @@ -203,7 +203,7 @@ BuildRequires: pkgconfig(libwpg-0.3) BuildRequires: pkgconfig(libwps-0.4) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxslt) -BuildRequires: pkgconfig(mdds-1.4) +BuildRequires: pkgconfig(mdds-1.5) BuildRequires: pkgconfig(mythes) BuildRequires: pkgconfig(neon) BuildRequires: pkgconfig(nspr) From 3ba965403ae1b93775632eb0c9c57b9618adede4 Mon Sep 17 00:00:00 2001 From: Victor Ryzhikh Date: Fri, 28 Feb 2020 18:56:50 +0000 Subject: [PATCH 31/96] Updated to 6.3.5 --- .abf.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.abf.yml b/.abf.yml index b1bfa38..47c9263 100644 --- a/.abf.yml +++ b/.abf.yml @@ -26,4 +26,4 @@ sources: libreoffice-6.3.5.2.tar.xz: 76ef06f0cd0ce0f29c3e78f73763ec63ee34fc32 libreoffice-dictionaries-6.3.5.2.tar.xz: 15a2ad38276bb1c2249ffb8a8dfd9218c56e8a98 libreoffice-help-6.3.5.2.tar.xz: 2cb7747b123c4bc8b0986889f55794a93e7b5319 - libreoffice-translations-6.3.5.2.tar.xz: 74a9919d8e49daedf6de4b39b81c3f27 + libreoffice-translations-6.3.5.2.tar.xz: 0ef79bb374a9919d8e49daedf6de4b39b81c3f27 From b85db8dc22ed7e891fbc3dfff490f884d52897e2 Mon Sep 17 00:00:00 2001 From: Victor Ryzhikh Date: Fri, 28 Feb 2020 22:37:09 +0000 Subject: [PATCH 32/96] Updated to 6.3.5 --- libreoffice.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libreoffice.spec b/libreoffice.spec index 78f80d0..79f56bf 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -116,6 +116,7 @@ BuildRequires: icecream BuildRequires: icu BuildRequires: imagemagick BuildRequires: locales-en +BuildRequires: mariadb BuildRequires: pkgconfig(libstaroffice-0.0) BuildRequires: pkgconfig(libzmf-0.0) BuildRequires: pentaho-libxml From ca4cc96fb0cc3baecb3bcde613b59baaef4d30c0 Mon Sep 17 00:00:00 2001 From: Victor Ryzhikh Date: Sat, 29 Feb 2020 06:43:24 +0000 Subject: [PATCH 33/96] Updated to 6.3.5 --- libreoffice.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libreoffice.spec b/libreoffice.spec index 79f56bf..233548a 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -134,6 +134,7 @@ BuildRequires: tcsh BuildRequires: unzip BuildRequires: xsltproc >= 1.0.19 BuildRequires: zip +BuildRequires: boost BuildRequires: boost-devel BuildRequires: cups-devel BuildRequires: db-devel From 30bcdcb7958b48fa5d58c3545a0216aea61c8c01 Mon Sep 17 00:00:00 2001 From: Victor Ryzhikh Date: Sat, 29 Feb 2020 09:26:48 +0000 Subject: [PATCH 34/96] Updated to 6.3.5 --- libreoffice.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index 233548a..79f56bf 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -134,7 +134,6 @@ BuildRequires: tcsh BuildRequires: unzip BuildRequires: xsltproc >= 1.0.19 BuildRequires: zip -BuildRequires: boost BuildRequires: boost-devel BuildRequires: cups-devel BuildRequires: db-devel From a6776283b04df3dbe912db62435acf91755102cb Mon Sep 17 00:00:00 2001 From: Victor Ryzhikh Date: Sun, 1 Mar 2020 06:48:29 +0000 Subject: [PATCH 35/96] Updated to 6.3.5 --- libreoffice.spec | 69 ++++++++++++++++-------------------------------- 1 file changed, 23 insertions(+), 46 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index 79f56bf..679e964 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -7,6 +7,7 @@ %bcond_with icecream %bcond_with ccache %bcond_with clang +%bcond_with gtk3-kde5 %if %{with l10n} %define langs en-US af ar as bg bn br bs ca cs cy da de dz el en-GB es et eu fa fi fr ga gl gu he hi hr hu it ja ko kn lt lv mai mk ml mr nb nl nn nr nso or pa-IN pl pt pt-BR ro ru si sk sl sr ss st sv ta te th tn tr ts uk ve xh zh-TW zh-CN zu @@ -101,7 +102,8 @@ BuildRequires: bsh BuildRequires: ccache %endif %if %{with clang} -BuildRequires: clang lld +BuildRequires: clang +BuildRequires: clang-devel %endif BuildRequires: desktop-file-utils BuildRequires: doxygen >= 1.8.4 @@ -116,7 +118,6 @@ BuildRequires: icecream BuildRequires: icu BuildRequires: imagemagick BuildRequires: locales-en -BuildRequires: mariadb BuildRequires: pkgconfig(libstaroffice-0.0) BuildRequires: pkgconfig(libzmf-0.0) BuildRequires: pentaho-libxml @@ -125,7 +126,7 @@ BuildRequires: perl-Archive-Zip BuildRequires: perl-MDK-Common BuildRequires: perl-HTML-Parser BuildRequires: perl-XML-Twig -BuildRequires: python2-translate >= 1.9.0 +BuildRequires: python2-translate BuildRequires: recode BuildRequires: sac BuildRequires: servlet3 @@ -149,7 +150,7 @@ BuildRequires: pam-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 @@ -168,7 +169,6 @@ BuildRequires: pkgconfig(gdk-pixbuf-xlib-2.0) BuildRequires: pkgconfig(graphite2) BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) BuildRequires: pkgconfig(egl) -BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(hunspell) BuildRequires: pkgconfig(icu-le) @@ -325,6 +325,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 @@ -341,6 +342,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 @@ -438,8 +440,6 @@ This package contains the application-independent files of LibreOffice. %{_libdir}/libreoffice/program/services/scriptproviderforbeanshell.rdb %{ooodir}/share/gallery/sg24.* %{ooodir}/share/libreofficekit -%dir %{ooodir}/share/xdg -%exclude %{ooodir}/share/xdg/*.desktop %{_datadir}/appdata/org.libreoffice.kde.metainfo.xml #---------------------------------------------------------------------------- @@ -514,6 +514,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 @@ -531,6 +532,8 @@ This package contains the GNOME VFS support and a GConf backend. #---------------------------------------------------------------------------- +%if %{with gtk3-kde5} + %package gtk3-kde5 Summary: GTK3-KDE5 Integration for LibreOffice (Widgets, Dialogs, Addressbook) Group: Office @@ -538,13 +541,15 @@ Requires: %{name}-common = %{EVRD} Recommends: %{name}-style-breeze = %{EVRD} %description gtk3-kde5 -This package contains the VCL plugin to draw interface with GTK+3 -but use KDE5 file picker. +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 +%endif + #---------------------------------------------------------------------------- %package kde5 @@ -564,27 +569,6 @@ KDE5/Qt5.x and a KDEish File Picker when running under KDE5. #---------------------------------------------------------------------------- -%package kde4 -Summary: Transitional package to migrate from libreoffice-kde4 -Group: Office -# GTK3-KDE5 VCL is much more mature than QT5-KDE5 -# because of maturity of GTK3 VCL, -# so let's migrate users of libreoffice-kde4 to libreoffice-gtk3-kde5 -Requires: %{name}-gtk3-kde5 = %{EVRD} -%rename %{name}-kde4 - -%description kde4 -Transitional package to migrate from libreoffice-kde4 to libreoffice-gtk3-kde5. -KDE4 VCL was very buggy, we disabled it in ROSA and are migrating users to -libreoffice-gtk3-kde5 (not libreoffice-kde5 because GTK3 VCL is -much more mature that Qt5/KDE5 VCL). -You may delete this package and choose any VCL you want. - -%files kde4 -# empty transitional package - -#---------------------------------------------------------------------------- - %package impress Summary: LibreOffice office suite - presentation Group: Office @@ -598,6 +582,7 @@ 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 @@ -614,6 +599,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 #---------------------------------------------------------------------------- @@ -727,6 +713,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 @@ -785,19 +772,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 @@ -3015,9 +2989,11 @@ sed -i \ --enable-gstreamer-1.0 \ --disable-gstreamer-0.10 \ --enable-release-build \ - --enable-gtk \ + --disable-gtk \ --enable-gtk3 \ +%if %{with gtk3-kde5} --enable-gtk3-kde5 \ +%endif --enable-kde5 \ --enable-qt5 \ --disable-firebird-sdbc \ @@ -3208,8 +3184,6 @@ cd .. # Split gallery grep /share/gallery/ file-lists/common_list.txt >file-lists/gallery_list.txt sed -i -e '/\/share\/gallery\//d' file-lists/common_list.txt -# calc.desktop, writer.desktop etc. go into libreoffice-calc, libreoffice-writer etc. subpackages -sed -i -e '/\/share\/xdg\/.*.desktop/d' file-lists/common_list.txt # We catch those in a regex to catch Sun Template extras sed -i -e '/gallery\/sg[0-9]*\..*/d' file-lists/gallery_list.txt @@ -3224,6 +3198,9 @@ cat file-lists/common_list.uniq.sorted.txt >>file-lists/core_list.txt sort -u 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 +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 From ad91aa60ae050f480b571a155630f55ce4dccae6 Mon Sep 17 00:00:00 2001 From: Victor Ryzhikh Date: Mon, 2 Mar 2020 09:54:45 +0000 Subject: [PATCH 36/96] Updated to 6.3.5 --- libreoffice.spec | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index 679e964..839ee15 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -17,7 +17,7 @@ %define helplangs en-US %endif -%define javaless 1 +%define javaless 0 %define relurl http://download.documentfoundation.org/libreoffice/src/%{version} %define devurl http://dev-www.libreoffice.org/ooo_external @@ -169,9 +169,9 @@ BuildRequires: pkgconfig(gdk-pixbuf-xlib-2.0) BuildRequires: pkgconfig(graphite2) BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) 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) @@ -2941,6 +2941,9 @@ chmod 777 ~/tmp chmod +x bin/unpack-sources %build +# path to external tarballs +EXTSRCDIR=`dirname %{SOURCE0}` + export LC_ALL=en_US.UTF-8 export LANG=en_US @@ -2986,16 +2989,15 @@ sed -i \ --with-theme="breeze breeze_dark sifr tango" \ --disable-coinmp \ --disable-fetch-external \ - --enable-gstreamer-1.0 \ + --with-external-tar="$EXTSRCDIR" \ --disable-gstreamer-0.10 \ --enable-release-build \ - --disable-gtk \ - --enable-gtk3 \ %if %{with gtk3-kde5} --enable-gtk3-kde5 \ %endif --enable-kde5 \ --enable-qt5 \ + --enable-vlc \ --disable-firebird-sdbc \ --disable-introspection \ --enable-eot \ @@ -3007,6 +3009,8 @@ sed -i \ --without-junit \ %if %{javaless} --with-ant-home="%{antpath}" \ +%else + --with-jdk-home="%{java_home}" \ %endif --with-lang="%{langs}" \ --without-myspell-dicts \ From 4d32f53093101ff579f898c9efa8831e72eb8c76 Mon Sep 17 00:00:00 2001 From: Victor Ryzhikh Date: Mon, 2 Mar 2020 09:56:27 +0000 Subject: [PATCH 37/96] Updated to 6.3.5 --- libreoffice.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index 839ee15..4db14e7 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -2997,7 +2997,6 @@ sed -i \ %endif --enable-kde5 \ --enable-qt5 \ - --enable-vlc \ --disable-firebird-sdbc \ --disable-introspection \ --enable-eot \ From 9817e35662c70f90b27f9363e56121c29ef727fa Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Thu, 19 Mar 2020 20:54:08 +1000 Subject: [PATCH 38/96] Replace python2-translate with more universal pythonegg(translate-toolkit) in BuildRequires --- libreoffice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index 4db14e7..460740d 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -126,7 +126,7 @@ BuildRequires: perl-Archive-Zip BuildRequires: perl-MDK-Common BuildRequires: perl-HTML-Parser BuildRequires: perl-XML-Twig -BuildRequires: python2-translate +BuildRequires: pythonegg(translate-toolkit) BuildRequires: recode BuildRequires: sac BuildRequires: servlet3 From 382678162e72033d49bda43f8dd85ab28b62a06f Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Mon, 23 Mar 2020 18:11:13 +1000 Subject: [PATCH 39/96] Build requires pkgconfig(mdds-1.4) instead of pkgconfig(mdds-1.5), pkgconfig(libixion-0.14) instead of pkgconfig(libixion-0.15) --- libreoffice.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index 460740d..3cb2e99 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -182,7 +182,7 @@ BuildRequires: pkgconfig(libe-book-0.1) BuildRequires: pkgconfig(libeot) BuildRequires: pkgconfig(libexttextcat) BuildRequires: pkgconfig(libepubgen-0.1) -BuildRequires: pkgconfig(libixion-0.15) +BuildRequires: pkgconfig(libixion-0.14) BuildRequires: pkgconfig(liblangtag) BuildRequires: pkgconfig(libmspub-0.1) BuildRequires: pkgconfig(libmwaw-0.3) >= 0.3.4 @@ -204,7 +204,7 @@ BuildRequires: pkgconfig(libwpg-0.3) BuildRequires: pkgconfig(libwps-0.4) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxslt) -BuildRequires: pkgconfig(mdds-1.5) +BuildRequires: pkgconfig(mdds-1.4) BuildRequires: pkgconfig(mythes) BuildRequires: pkgconfig(neon) BuildRequires: pkgconfig(nspr) From 1c86212e00a5aaee5c60e662f46649042d277000 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Tue, 24 Mar 2020 01:04:15 +1000 Subject: [PATCH 40/96] Build as javaless like before --- libreoffice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index 3cb2e99..973912c 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -17,7 +17,7 @@ %define helplangs en-US %endif -%define javaless 0 +%define javaless 1 %define relurl http://download.documentfoundation.org/libreoffice/src/%{version} %define devurl http://dev-www.libreoffice.org/ooo_external From 8ec20b6230ad0a585fa0bbc33a2b5d5ad54fb061 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Wed, 25 Mar 2020 22:46:07 +1000 Subject: [PATCH 41/96] Add patch to re-enable KDE4 detection and enable gtk3-kde5 integratio plugin --- libreoffice-6.3.5.2-kde4-detection.patch | 170 +++++++++++++++++++++++ libreoffice.spec | 7 +- 2 files changed, 173 insertions(+), 4 deletions(-) create mode 100644 libreoffice-6.3.5.2-kde4-detection.patch 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..6918038 --- /dev/null +++ b/libreoffice-6.3.5.2-kde4-detection.patch @@ -0,0 +1,170 @@ +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 --git a/libreoffice.spec b/libreoffice.spec index 973912c..ce87295 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -7,7 +7,7 @@ %bcond_with icecream %bcond_with ccache %bcond_with clang -%bcond_with gtk3-kde5 +%bcond_without gtk3-kde5 %if %{with l10n} %define langs en-US af ar as bg bn br bs ca cs cy da de dz el en-GB es et eu fa fi fr ga gl gu he hi hr hu it ja ko kn lt lv mai mk ml mr nb nl nn nr nso or pa-IN pl pt pt-BR ro ru si sk sl sr ss st sv ta te th tn tr ts uk ve xh zh-TW zh-CN zu @@ -45,7 +45,7 @@ Summary: Office suite Name: libreoffice Epoch: 1 Version: 6.3.5 -Release: 1 +Release: 2 License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic Group: Office Url: http://www.libreoffice.org @@ -89,6 +89,7 @@ Source1000: libreoffice.rpmlintrc Patch0: libreoffice-5.4.0.1-disable-test-languagetag.patch Patch1: libreoffice-4.2.5-icu-49.patch +Patch2: libreoffice-6.3.5.2-kde4-detection.patch # ROSA vendor patch Patch100: libreoffice-4.1-vendor.patch @@ -533,7 +534,6 @@ This package contains the GNOME VFS support and a GConf backend. #---------------------------------------------------------------------------- %if %{with gtk3-kde5} - %package gtk3-kde5 Summary: GTK3-KDE5 Integration for LibreOffice (Widgets, Dialogs, Addressbook) Group: Office @@ -547,7 +547,6 @@ 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 - %endif #---------------------------------------------------------------------------- From a1f51bea175ecb21a9bd6ee2a45c882b7c6bb301 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Wed, 25 Mar 2020 22:54:32 +1000 Subject: [PATCH 42/96] Obsolete libreoffice-kde4 package --- libreoffice.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libreoffice.spec b/libreoffice.spec index ce87295..14b0c60 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -556,6 +556,7 @@ Summary: KDE5 Integration for LibreOffice (Widgets, Dialogs, Addressbook) Group: Office Requires: %{name}-common = %{EVRD} Recommends: %{name}-style-breeze = %{EVRD} +Obsoletes: %{name}-kde4 < %{EVRD} %description kde5 This package contains the KDE5 plugin for drawing LibreOffice widgets with From 0a0bd4dc8f3445c4ebb44e61225d79082e3b08b4 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Thu, 26 Mar 2020 20:20:19 +1000 Subject: [PATCH 43/96] Build with clang for 2016.1 --- libreoffice.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libreoffice.spec b/libreoffice.spec index 1ed272e..f9a7e34 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -6,7 +6,11 @@ %bcond_without l10n %bcond_with icecream %bcond_with ccache +%if %{mdvver} < 201900 +%bcond_without clang +%else %bcond_with clang +%endif %bcond_without gtk3-kde5 %if %{with l10n} From 7ad3adb03f516103272a6c1f08547c77082f34b4 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Thu, 26 Mar 2020 21:47:00 +1000 Subject: [PATCH 44/96] Change condition syntax gtk3-kde5 -> gtk3_kde5 --- libreoffice.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index f9a7e34..6c752e0 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -11,7 +11,7 @@ %else %bcond_with clang %endif -%bcond_without gtk3-kde5 +%bcond_without gtk3_kde5 %if %{with l10n} %define langs en-US af ar as bg bn br bs ca cs cy da de dz el en-GB es et eu fa fi fr ga gl gu he hi hr hu it ja ko kn lt lv mai mk ml mr nb nl nn nr nso or pa-IN pl pt pt-BR ro ru si sk sl sr ss st sv ta te th tn tr ts uk ve xh zh-TW zh-CN zu @@ -537,7 +537,7 @@ This package contains the GNOME VFS support and a GConf backend. #---------------------------------------------------------------------------- -%if %{with gtk3-kde5} +%if %{with gtk3_kde5} %package gtk3-kde5 Summary: GTK3-KDE5 Integration for LibreOffice (Widgets, Dialogs, Addressbook) Group: Office @@ -2995,7 +2995,7 @@ sed -i \ --with-external-tar="$EXTSRCDIR" \ --disable-gstreamer-0.10 \ --enable-release-build \ -%if %{with gtk3-kde5} +%if %{with gtk3_kde5} --enable-gtk3-kde5 \ %endif --enable-kde5 \ From 88eb380fb8ccc88995283183bf56ea1cb14d6000 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Thu, 26 Mar 2020 23:22:22 +1000 Subject: [PATCH 45/96] Build requires libcxx-devel when building with clang --- libreoffice.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index 6c752e0..3a84464 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -107,8 +107,9 @@ BuildRequires: bsh BuildRequires: ccache %endif %if %{with clang} -BuildRequires: clang -BuildRequires: clang-devel +BuildRequires: clang +BuildRequires: clang-devel +BuildRequires: libcxx-devel %endif BuildRequires: desktop-file-utils BuildRequires: doxygen >= 1.8.4 From 911841c14c52b0c0e67b5f484e68075817b532e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=BB=D0=B0=D0=B4=D0=B8=D0=BC=D0=B8=D1=80=20=D0=9F?= =?UTF-8?q?=D0=BE=D1=82=D0=B0=D0=BF=D0=BE=D0=B2?= Date: Fri, 27 Mar 2020 07:00:13 +0000 Subject: [PATCH 46/96] Bump release --- libreoffice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index 3a84464..8a0bccc 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -49,7 +49,7 @@ Summary: Office suite Name: libreoffice Epoch: 1 Version: 6.3.5 -Release: 2 +Release: 3 License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic Group: Office Url: http://www.libreoffice.org From 2753c0f73336efc57bc64b1ebe1251f45db6e840 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Sun, 29 Mar 2020 01:12:36 +1000 Subject: [PATCH 47/96] Requires libcxxabi-devel to build with clang, also adjust build flags for clang to use libc++ as stdlib --- libreoffice.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index 3a84464..bad9017 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -110,6 +110,7 @@ BuildRequires: ccache BuildRequires: clang BuildRequires: clang-devel BuildRequires: libcxx-devel +BuildRequires: libcxxabi-devel %endif BuildRequires: desktop-file-utils BuildRequires: doxygen >= 1.8.4 @@ -2961,11 +2962,13 @@ export CCACHE_DIR=%{ccachedir} %endif %if %{with clang} -%global optflags $(echo %optflags | sed -e 's/-fvar-tracking-assignments//g' -e 's/-frecord-gcc-switches//g' -e 's/-ffat-lto-objects//g') +%global optflags $(echo %{optflags} | sed -e 's/-fvar-tracking-assignments//g' -e 's/-frecord-gcc-switches//g' -e 's/-ffat-lto-objects//g') +%global optflags %{optflags} -stdlib=libc++ -nostdinc++ -I/include/c++/v1 +%global ldflags %{ldflags} -stdlib=libc++ -nostdinc++ -lc++ -lc++abi %clang_gcc_wrapper export CPP="" %else -%global optflags %optflags -Wstrict-aliasing=0 +%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" From a7b3d2dd63d76bb8390e7d1bbba759d0d07912e1 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Sun, 29 Mar 2020 18:22:54 +1000 Subject: [PATCH 48/96] Update KDE4-detection patch to show KDE instead of Qt dialogs in KDE4 --- libreoffice-6.3.5.2-kde4-detection.patch | 33 ++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/libreoffice-6.3.5.2-kde4-detection.patch b/libreoffice-6.3.5.2-kde4-detection.patch index 6918038..85da606 100644 --- a/libreoffice-6.3.5.2-kde4-detection.patch +++ b/libreoffice-6.3.5.2-kde4-detection.patch @@ -168,3 +168,36 @@ diff -urN libreoffice-6.3.5.2/vcl/unx/generic/desktopdetect/desktopdetector.cxx 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); + } From 05ac125bc35a13535e8dba9d40c37fb90e982a95 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Sun, 29 Mar 2020 18:23:24 +1000 Subject: [PATCH 49/96] Bump release --- libreoffice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index bad9017..33bd0ed 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -49,7 +49,7 @@ Summary: Office suite Name: libreoffice Epoch: 1 Version: 6.3.5 -Release: 2 +Release: 5 License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic Group: Office Url: http://www.libreoffice.org From 235b2b646899b3d53e2459d68341261489131952 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Mon, 30 Mar 2020 08:24:09 +1000 Subject: [PATCH 50/96] Fix path to libc++ headers --- libreoffice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index 33bd0ed..3ff4d7d 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -2963,7 +2963,7 @@ export CCACHE_DIR=%{ccachedir} %if %{with clang} %global optflags $(echo %{optflags} | sed -e 's/-fvar-tracking-assignments//g' -e 's/-frecord-gcc-switches//g' -e 's/-ffat-lto-objects//g') -%global optflags %{optflags} -stdlib=libc++ -nostdinc++ -I/include/c++/v1 +%global optflags %{optflags} -stdlib=libc++ -nostdinc++ -I/usr/include/c++/v1 %global ldflags %{ldflags} -stdlib=libc++ -nostdinc++ -lc++ -lc++abi %clang_gcc_wrapper export CPP="" From 1b2077412c3040cfb4ce5f300d4ee4b7ca2a47df Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Tue, 31 Mar 2020 23:29:08 +0300 Subject: [PATCH 51/96] w/a combinations of incompatible clang++ args, try to avoid overlinkg --- libreoffice.spec | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index 3ff4d7d..0017c72 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -49,7 +49,7 @@ Summary: Office suite Name: libreoffice Epoch: 1 Version: 6.3.5 -Release: 5 +Release: 6 License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic Group: Office Url: http://www.libreoffice.org @@ -2962,9 +2962,15 @@ export CCACHE_DIR=%{ccachedir} %endif %if %{with clang} -%global optflags $(echo %{optflags} | sed -e 's/-fvar-tracking-assignments//g' -e 's/-frecord-gcc-switches//g' -e 's/-ffat-lto-objects//g') -%global optflags %{optflags} -stdlib=libc++ -nostdinc++ -I/usr/include/c++/v1 -%global ldflags %{ldflags} -stdlib=libc++ -nostdinc++ -lc++ -lc++abi +%setup_compile_flags +# libstdc++ from gcc5 is too old, use LLVM libc++ +# https://libcxx.llvm.org/docs/UsingLibcxx.html +# clang -c -stdlib=libc++ -> +# -> "argument unused during compilation: '-stdlib=libc++'" -> +# -> -Wno-unused-command-line-argument +export CXXFLAGS="$CXXFLAGS -stdlib=libc++ -nostdinc++ -I/usr/include/c++/v1 -Wno-unused-command-line-argument" +# Try to avoid overlinkg C code with libc++ by adjusting CXXFLAGS instead of LDFLAGS +export CXXFLAGS="$CXXFLAGS -Xlinker -lc++ -Xlinker -lc++abi" %clang_gcc_wrapper export CPP="" %else From 9ff20671f26725fe1463d858ee27ee642b1e784b Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Wed, 1 Apr 2020 01:38:04 +0300 Subject: [PATCH 52/96] W/a old system boost being incompatible with C++17 which removed std::auto_ptr --- libreoffice.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libreoffice.spec b/libreoffice.spec index 0017c72..27a07c6 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -2971,6 +2971,9 @@ export CCACHE_DIR=%{ccachedir} export CXXFLAGS="$CXXFLAGS -stdlib=libc++ -nostdinc++ -I/usr/include/c++/v1 -Wno-unused-command-line-argument" # Try to avoid overlinkg C code with libc++ by adjusting CXXFLAGS instead of LDFLAGS export CXXFLAGS="$CXXFLAGS -Xlinker -lc++ -Xlinker -lc++abi" +# Workaround old system boost being incompatible with C++17 which removed std::auto_ptr +# https://github.com/TRIQS/triqs/issues/523#issuecomment-351960463 +export CXXFLAGS="$CXXFLAGS -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR" %clang_gcc_wrapper export CPP="" %else From 38549dfff0fc4c642646f6a108ea9e4c83458a43 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Wed, 1 Apr 2020 05:13:17 +0300 Subject: [PATCH 53/96] correct CPP=clang-cpp is now set in %%clang_gcc_wrapper --- libreoffice.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index 27a07c6..24bf5a1 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -2975,7 +2975,6 @@ export CXXFLAGS="$CXXFLAGS -Xlinker -lc++ -Xlinker -lc++abi" # https://github.com/TRIQS/triqs/issues/523#issuecomment-351960463 export CXXFLAGS="$CXXFLAGS -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR" %clang_gcc_wrapper -export CPP="" %else %global optflags %{optflags} -Wstrict-aliasing=0 export ARCH_FLAGS="%{optflags} -fno-omit-frame-pointer -fno-strict-aliasing" From 37be0024da31822327a5a64666e692fbbd75fd36 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Wed, 1 Apr 2020 05:23:43 +0300 Subject: [PATCH 54/96] Delete not existing variables and probably odd tuning of gcc flags --- libreoffice.spec | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index 24bf5a1..cf560a4 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -2975,15 +2975,6 @@ export CXXFLAGS="$CXXFLAGS -Xlinker -lc++ -Xlinker -lc++abi" # https://github.com/TRIQS/triqs/issues/523#issuecomment-351960463 export CXXFLAGS="$CXXFLAGS -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR" %clang_gcc_wrapper -%else -%global optflags %{optflags} -Wstrict-aliasing=0 -export ARCH_FLAGS="%{optflags} -fno-omit-frame-pointer -fno-strict-aliasing" -export ARCH_FLAGS_CC="%{optflags} -fno-omit-frame-pointer -fno-strict-aliasing" -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" %endif echo "Configure start at: "`date` >> ooobuildtime.log @@ -3104,13 +3095,7 @@ 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 -r -s V=0 build-nocheck echo "Make end at: "`date` >> ooobuildtime.log echo "Install start at: "`date` >> ooobuildtime.log From be02c9ddd8a3cf95142546aa90b0be787fcde0e6 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Wed, 1 Apr 2020 05:31:21 +0300 Subject: [PATCH 55/96] remove unmaintained conditioning, internal RPM dep. gen. is always used nowadays --- libreoffice.spec | 5 ----- 1 file changed, 5 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index cf560a4..4170f12 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -37,13 +37,8 @@ %define ccachedir ~/.ccache-OOo -%if %{_use_internal_dependency_generator} %global __requires_exclude 'libjawt.so|libmyspell.so|libstlport_gcc.so|libmono.so|mono|devel\\(libunoidl(.*)' %global __provides_exclude libsndfile.so\\|libportaudio.so\\|libdb-4.2.so\\|libdb_java-4.2.so\\|libmyspell.so\\|libstlport_gcc.so\\|librdf.so.0\\|libraptor.so.1\\|libxmlsec1-nss.so.1\\|libxmlsec1.so.1 -%else -%define _requires_exceptions libjawt.so\\|libmyspell.so\\|libstlport_gcc.so\\|libmono.so\\|mono\\|devel(libunoidl)\\|devel(libunoidl(64bit)) -%define _provides_exceptions libsndfile.so\\|libportaudio.so\\|libdb-4.2.so\\|libdb_java-4.2.so\\|libmyspell.so\\|libstlport_gcc.so\\|librdf.so.0\\|libraptor.so.1\\|libxmlsec1-nss.so.1\\|libxmlsec1.so.1 -%endif Summary: Office suite Name: libreoffice From 1c0e1bfb489e3df4dc63da1f128c35eeace5b981 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Wed, 1 Apr 2020 05:36:27 +0300 Subject: [PATCH 56/96] gtk3_kde5 switch makes no sense to my mind, I will better remove it to avoid keeping yet another unmaintanined build conditionalizing --- libreoffice.spec | 5 ----- 1 file changed, 5 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index 4170f12..58e30b5 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -11,7 +11,6 @@ %else %bcond_with clang %endif -%bcond_without gtk3_kde5 %if %{with l10n} %define langs en-US af ar as bg bn br bs ca cs cy da de dz el en-GB es et eu fa fi fr ga gl gu he hi hr hu it ja ko kn lt lv mai mk ml mr nb nl nn nr nso or pa-IN pl pt pt-BR ro ru si sk sl sr ss st sv ta te th tn tr ts uk ve xh zh-TW zh-CN zu @@ -534,7 +533,6 @@ This package contains the GNOME VFS support and a GConf backend. #---------------------------------------------------------------------------- -%if %{with gtk3_kde5} %package gtk3-kde5 Summary: GTK3-KDE5 Integration for LibreOffice (Widgets, Dialogs, Addressbook) Group: Office @@ -548,7 +546,6 @@ 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 -%endif #---------------------------------------------------------------------------- @@ -2993,9 +2990,7 @@ sed -i \ --with-external-tar="$EXTSRCDIR" \ --disable-gstreamer-0.10 \ --enable-release-build \ -%if %{with gtk3_kde5} --enable-gtk3-kde5 \ -%endif --enable-kde5 \ --enable-qt5 \ --disable-firebird-sdbc \ From 72bcf8aecbfd400208c2a83e26e5e4337d6a2228 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Wed, 1 Apr 2020 05:47:55 +0300 Subject: [PATCH 57/96] don't block default multithreaded SRPM/RPM packing to speed it up a lot --- libreoffice.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index 58e30b5..a27ab2b 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1,7 +1,5 @@ %define _enable_debug_packages %{nil} %define debug_package %{nil} -%define _binary_payload w1.xzdio -%define _source_payload w1.xzdio %bcond_without l10n %bcond_with icecream From f8150393c291897a374c6859c4e7b538974c6d93 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Wed, 1 Apr 2020 05:51:16 +0300 Subject: [PATCH 58/96] Enable debuginfo, avoid shipping not stripped binaries --- libreoffice.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index a27ab2b..6506b41 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1,6 +1,3 @@ -%define _enable_debug_packages %{nil} -%define debug_package %{nil} - %bcond_without l10n %bcond_with icecream %bcond_with ccache @@ -2951,8 +2948,9 @@ export PATH export CCACHE_DIR=%{ccachedir} %endif -%if %{with clang} %setup_compile_flags + +%if %{with clang} # libstdc++ from gcc5 is too old, use LLVM libc++ # https://libcxx.llvm.org/docs/UsingLibcxx.html # clang -c -stdlib=libc++ -> From f1f68a93c53753a7cfebafbcf8f9742d698dd371 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Wed, 1 Apr 2020 05:55:04 +0300 Subject: [PATCH 59/96] RPM4 may not understand quotes in regexp in the same way as RPM5 did --- libreoffice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index 6506b41..dc29061 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -31,7 +31,7 @@ %define ccachedir ~/.ccache-OOo -%global __requires_exclude 'libjawt.so|libmyspell.so|libstlport_gcc.so|libmono.so|mono|devel\\(libunoidl(.*)' +%global __requires_exclude libjawt.so|libmyspell.so|libstlport_gcc.so|libmono.so|mono|devel\\(libunoidl(.*) %global __provides_exclude libsndfile.so\\|libportaudio.so\\|libdb-4.2.so\\|libdb_java-4.2.so\\|libmyspell.so\\|libstlport_gcc.so\\|librdf.so.0\\|libraptor.so.1\\|libxmlsec1-nss.so.1\\|libxmlsec1.so.1 Summary: Office suite From 081715487642fa72307baf7d5d70c6c8d3eb5659 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Wed, 1 Apr 2020 06:21:47 +0300 Subject: [PATCH 60/96] BR liblucene++-contrib checking for CLUCENE... yes checking for CLucene/analysis/cjk/CJKAnalyzer.h... no configure: error: Your version of libclucene has contribs-lib missing. --- libreoffice.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libreoffice.spec b/libreoffice.spec index dc29061..0775d60 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -171,6 +171,7 @@ BuildRequires: pkgconfig(hunspell) BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(libabw-0.1) BuildRequires: pkgconfig(libclucene-core) +BuildRequires: pkgconfig(liblucene++-contrib) BuildRequires: pkgconfig(libcmis-0.5) >= 0.5.2 BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libcdr-0.1) From 7d34a8509331f88056d6615d9697f267b74c1ac3 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Wed, 1 Apr 2020 08:52:36 +0300 Subject: [PATCH 61/96] Try to force -lc++ lc++abi which are lost when in $LIBS or $LDFLAGS, be verbose ``` /builddir/build/BUILD/libreoffice-6.3.5/workdir/CxxObject/l10ntools/source/idxdict/idxdict.o: In function `main': /builddir/build/BUILD/libreoffice-6.3.5/l10ntools/source/idxdict/idxdict.cxx:30: undefined reference to `std::__1::ios_base::sync_with_stdio(bool)' /builddir/build/BUILD/libreoffice-6.3.5/workdir/CxxObject/l10ntools/source/idxdict/idxdict.o: In function `std::__1::basic_istream >::getline(char*, long)': /usr/include/c++/v1/istream:275: undefined reference to `std::__1::cin' /builddir/build/BUILD/libreoffice-6.3.5/workdir/CxxObject/l10ntools/source/idxdict/idxdict.o: In function `std::__1::basic_ios >::widen(char) const': /usr/include/c++/v1/ios:759: undefined reference to `std::__1::ios_base::getloc() const' /builddir/build/BUILD/libreoffice-6.3.5/workdir/CxxObject/l10ntools/source/idxdict/idxdict.o: In function `std::__1::ctype const& std::__1::use_facet >(std::__1::locale const&)': /usr/include/c++/v1/__locale:234: undefined reference to `std::__1::ctype::id' <...> ``` https://t.me/libreofficeru/25659 --- libreoffice.spec | 9 +++++---- loffice-libcxx-wrapper.sh | 3 +++ 2 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 loffice-libcxx-wrapper.sh diff --git a/libreoffice.spec b/libreoffice.spec index 0775d60..1969a30 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -78,6 +78,7 @@ Source70: %{srcurl}1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.ox Source71: %{srcurl}lxml-4.1.1.tgz Source72: %{devexurl}/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf +Source80: loffice-libcxx-wrapper.sh Source1000: libreoffice.rpmlintrc Patch0: libreoffice-5.4.0.1-disable-test-languagetag.patch @@ -2958,12 +2959,13 @@ export CCACHE_DIR=%{ccachedir} # -> "argument unused during compilation: '-stdlib=libc++'" -> # -> -Wno-unused-command-line-argument export CXXFLAGS="$CXXFLAGS -stdlib=libc++ -nostdinc++ -I/usr/include/c++/v1 -Wno-unused-command-line-argument" -# Try to avoid overlinkg C code with libc++ by adjusting CXXFLAGS instead of LDFLAGS -export CXXFLAGS="$CXXFLAGS -Xlinker -lc++ -Xlinker -lc++abi" # Workaround old system boost being incompatible with C++17 which removed std::auto_ptr # https://github.com/TRIQS/triqs/issues/523#issuecomment-351960463 export CXXFLAGS="$CXXFLAGS -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR" %clang_gcc_wrapper +export LIBCCX_LIBS="-lc++ -lc++abi" +install -m0755 %{SOURCE80} "local_bin/clang++wr" +sed -i -e "s,/usr/bin/clang++,${PWD}/local_bin/clang++wr,g" "local_bin/clang++" %endif echo "Configure start at: "`date` >> ooobuildtime.log @@ -3079,10 +3081,9 @@ 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 build-nocheck +%make V=1 verbose=t build-nocheck echo "Make end at: "`date` >> ooobuildtime.log echo "Install start at: "`date` >> ooobuildtime.log diff --git a/loffice-libcxx-wrapper.sh b/loffice-libcxx-wrapper.sh new file mode 100644 index 0000000..1feb8bb --- /dev/null +++ b/loffice-libcxx-wrapper.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +/usr/bin/clang++ "$@" $LIBCCX_LIBS From 4e2a3ea1430d27d2e4476486e7147eae988ca83a Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Wed, 1 Apr 2020 18:46:12 +0300 Subject: [PATCH 62/96] Fix linking with libcppunit [build ULF] /builddir/build/BUILD/libreoffice-6.3.5/workdir/ScpMergeTarget/scp2/source/ooo/module_reportbuilder.ulf /builddir/build/BUILD/libreoffice-6.3.5/workdir/CxxObject/sal/cppunittester/cppunittester.o: In function `(anonymous namespace)::ProtectedFixtureFunctor::run() const': /builddir/build/BUILD/libreoffice-6.3.5/sal/cppunittester/cppunittester.cxx:259: undefined reference to `CppUnit::PlugInParameters::PlugInParameters(std::__1::basic_string, std::__1::allocator > const&)' /builddir/build/BUILD/libreoffice-6.3.5/sal/cppunittester/cppunittester.cxx:259: undefined reference to `CppUnit::PlugInManager::load(std::__1::basic_string, std::__1::allocator > const&, CppUnit::PlugInParameters const&)' /builddir/build/BUILD/libreoffice-6.3.5/sal/cppunittester/cppunittester.cxx:304: undefined reference to `CppUnit::TestFactoryRegistry::getRegistry(std::__1::basic_string, std::__1::allocator > const&)' /builddir/build/BUILD/libreoffice-6.3.5/sal/cppunittester/cppunittester.cxx:314: undefined reference to `CppUnit::TestFactoryRegistry::getRegistry(std::__1::basic_string, std::__1::allocator > const&)' /builddir/build/BUILD/libreoffice-6.3.5/sal/cppunittester/cppunittester.cxx:316: undefined reference to `CppUnit::TestRunner::run(CppUnit::TestResult&, std::__1::basic_string, std::__1::allocator > const&)' --- libreoffice.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libreoffice.spec b/libreoffice.spec index 1969a30..8019002 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -2964,6 +2964,7 @@ export CXXFLAGS="$CXXFLAGS -stdlib=libc++ -nostdinc++ -I/usr/include/c++/v1 -Wno export CXXFLAGS="$CXXFLAGS -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR" %clang_gcc_wrapper export LIBCCX_LIBS="-lc++ -lc++abi" +export CPPUNIT_LIBS="-lcppunit" install -m0755 %{SOURCE80} "local_bin/clang++wr" sed -i -e "s,/usr/bin/clang++,${PWD}/local_bin/clang++wr,g" "local_bin/clang++" %endif From 69560d65b864b038b167843c3c78fef56d3f41d8 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Wed, 1 Apr 2020 19:34:35 +0300 Subject: [PATCH 63/96] put linker flags into the end of cli args --- loffice-libcxx-wrapper.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/loffice-libcxx-wrapper.sh b/loffice-libcxx-wrapper.sh index 1feb8bb..16814df 100644 --- a/loffice-libcxx-wrapper.sh +++ b/loffice-libcxx-wrapper.sh @@ -1,3 +1,5 @@ #!/bin/sh -/usr/bin/clang++ "$@" $LIBCCX_LIBS +linker_flags="$(echo "$@" | tr ' ' '\n' | grep '^\-l' | tr '\n' ' ')" + +/usr/bin/clang++ "$@" $LIBCCX_LIBS $linker_flags From e2a55f6ad948e35e4fcb295fb6d1bccf7a6606c5 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Wed, 1 Apr 2020 19:58:58 +0300 Subject: [PATCH 64/96] Use bundled cppunit due to probable C++ ABI mismatch when linking with system cppunit, which is linked with another C++ ABI, and libc++ --- .abf.yml | 1 + libreoffice.spec | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/.abf.yml b/.abf.yml index fc99c62..3b5b683 100644 --- a/.abf.yml +++ b/.abf.yml @@ -28,3 +28,4 @@ sources: libreoffice-dictionaries-6.3.5.2.tar.xz: 15a2ad38276bb1c2249ffb8a8dfd9218c56e8a98 libreoffice-help-6.3.5.2.tar.xz: 2cb7747b123c4bc8b0986889f55794a93e7b5319 libreoffice-translations-6.3.5.2.tar.xz: 0ef79bb374a9919d8e49daedf6de4b39b81c3f27 + cppunit-1.14.0.tar.gz: 3eba38567bad4e300f76c764f91a7301bacc716d diff --git a/libreoffice.spec b/libreoffice.spec index 8019002..435b839 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -48,6 +48,9 @@ Source1: %{relurl}/%{ooname}-dictionaries-%{buildver}.tar.xz Source2: %{relurl}/%{ooname}-help-%{buildver}.tar.xz Source3: %{relurl}/%{ooname}-translations-%{buildver}.tar.xz Source4: %{devexurl}/185d60944ea767075d27247c3162b3bc-unowinreg.dll +%if %{with clang} +Source5: http://dev-www.libreoffice.org/src/cppunit-1.14.0.tar.gz +%endif # Unused, should be dropped in future package updates Source10: Mandriva-Rosa_Icons.tar.bz2 @@ -150,7 +153,9 @@ BuildRequires: unixODBC-devel #BuildRequires: vigra-devel BuildRequires: gpgmepp-devel BuildRequires: pkgconfig(bluez) +%if !%{with clang} BuildRequires: pkgconfig(cppunit) >= 1.14.0 +%endif BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(libetonyek-0.1) @@ -3016,6 +3021,9 @@ sed -i \ --with-external-thes-dir=%{_datadir}/dict/ooo \ --with-system-libs \ --with-system-ucpp \ +%if %{with clang} + --without-system-cppunit \ +%endif --enable-ext-ct2n \ --enable-ext-numbertext \ --enable-ext-nlpsolver \ From f01be3bf2e6d80a3bc4996762d8ed9bcce407851 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Wed, 1 Apr 2020 20:56:28 +0300 Subject: [PATCH 65/96] attach experimental parts of libc++ (TODO: probably we need to depends sctrictly from the version of libc++ against which we were built because experimental aBI is not stable) --- libreoffice.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index 435b839..ddfbdf2 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -103,6 +103,8 @@ BuildRequires: ccache BuildRequires: clang BuildRequires: clang-devel BuildRequires: libcxx-devel +# libc++experimental is static only +BuildRequires: libcxx-static-devel BuildRequires: libcxxabi-devel %endif BuildRequires: desktop-file-utils @@ -2940,6 +2942,11 @@ chmod 777 ~/tmp # 4.4.1.2 specific chmod +x bin/unpack-sources +%if %{with clang} +grep -Irl 'include ' | \ + sed -i -E -e 's,include[[:blank:]]([[:blank:]])*,include ,g' +%endif + %build # path to external tarballs EXTSRCDIR=`dirname %{SOURCE0}` @@ -2968,7 +2975,7 @@ export CXXFLAGS="$CXXFLAGS -stdlib=libc++ -nostdinc++ -I/usr/include/c++/v1 -Wno # https://github.com/TRIQS/triqs/issues/523#issuecomment-351960463 export CXXFLAGS="$CXXFLAGS -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR" %clang_gcc_wrapper -export LIBCCX_LIBS="-lc++ -lc++abi" +export LIBCCX_LIBS="-lc++ -lc++abi -lc++experimental" export CPPUNIT_LIBS="-lcppunit" install -m0755 %{SOURCE80} "local_bin/clang++wr" sed -i -e "s,/usr/bin/clang++,${PWD}/local_bin/clang++wr,g" "local_bin/clang++" From c7157b85059100022bfa6d09d74551bd20025245 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Wed, 1 Apr 2020 21:37:21 +0300 Subject: [PATCH 66/96] Fix grep|sed cmd Fixes e2a55f6ad948e35e4fcb295fb6d1bccf7a6606c5 --- libreoffice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index ddfbdf2..dfefc5d 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -2943,7 +2943,7 @@ chmod 777 ~/tmp chmod +x bin/unpack-sources %if %{with clang} -grep -Irl 'include ' | \ +grep -IrlE 'include[[:blank:]]([[:blank:]])*' | xargs \ sed -i -E -e 's,include[[:blank:]]([[:blank:]])*,include ,g' %endif From 7e4226a87fe80f202998eae5bb112eed684c2fc9 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Wed, 1 Apr 2020 22:15:09 +0300 Subject: [PATCH 67/96] More std::experimental for libc++ --- libreoffice.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index dfefc5d..ba03e37 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -2943,8 +2943,10 @@ chmod 777 ~/tmp chmod +x bin/unpack-sources %if %{with clang} -grep -IrlE 'include[[:blank:]]([[:blank:]])*' | xargs \ - sed -i -E -e 's,include[[:blank:]]([[:blank:]])*,include ,g' +grep -IrlE 'include[[:blank:]]([[:blank:]])*' | xargs sed -i -E \ + -e 's,include[[:blank:]]([[:blank:]])*,include ,g' \ + -e 's,std::string_view,std::experimental::string_view,g' \ + -e 's,std::u16string_view,std::experimental::u16string_view,g' %endif %build From 093e86075123491dbd4cc3eefb310039167caf28 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Wed, 1 Apr 2020 23:09:33 +0300 Subject: [PATCH 68/96] Revert libc++experimental, was removed frome experimantal --- libreoffice.spec | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index ba03e37..435b839 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -103,8 +103,6 @@ BuildRequires: ccache BuildRequires: clang BuildRequires: clang-devel BuildRequires: libcxx-devel -# libc++experimental is static only -BuildRequires: libcxx-static-devel BuildRequires: libcxxabi-devel %endif BuildRequires: desktop-file-utils @@ -2942,13 +2940,6 @@ chmod 777 ~/tmp # 4.4.1.2 specific chmod +x bin/unpack-sources -%if %{with clang} -grep -IrlE 'include[[:blank:]]([[:blank:]])*' | xargs sed -i -E \ - -e 's,include[[:blank:]]([[:blank:]])*,include ,g' \ - -e 's,std::string_view,std::experimental::string_view,g' \ - -e 's,std::u16string_view,std::experimental::u16string_view,g' -%endif - %build # path to external tarballs EXTSRCDIR=`dirname %{SOURCE0}` @@ -2977,7 +2968,7 @@ export CXXFLAGS="$CXXFLAGS -stdlib=libc++ -nostdinc++ -I/usr/include/c++/v1 -Wno # https://github.com/TRIQS/triqs/issues/523#issuecomment-351960463 export CXXFLAGS="$CXXFLAGS -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR" %clang_gcc_wrapper -export LIBCCX_LIBS="-lc++ -lc++abi -lc++experimental" +export LIBCCX_LIBS="-lc++ -lc++abi" export CPPUNIT_LIBS="-lcppunit" install -m0755 %{SOURCE80} "local_bin/clang++wr" sed -i -e "s,/usr/bin/clang++,${PWD}/local_bin/clang++wr,g" "local_bin/clang++" From 7c24887628227219dc62c6cdd1abcb04cf84007c Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Wed, 1 Apr 2020 23:18:08 +0300 Subject: [PATCH 69/96] Allow C preprocessor to work with C++17-specific includes --- libreoffice.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libreoffice.spec b/libreoffice.spec index 435b839..79b7263 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -2964,6 +2964,7 @@ export CCACHE_DIR=%{ccachedir} # -> "argument unused during compilation: '-stdlib=libc++'" -> # -> -Wno-unused-command-line-argument export CXXFLAGS="$CXXFLAGS -stdlib=libc++ -nostdinc++ -I/usr/include/c++/v1 -Wno-unused-command-line-argument" +export CPPFLAGS="$CPPFLAGS -I/usr/include/c++/v1" # Workaround old system boost being incompatible with C++17 which removed std::auto_ptr # https://github.com/TRIQS/triqs/issues/523#issuecomment-351960463 export CXXFLAGS="$CXXFLAGS -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR" From 884293b5473e36e87d82d64ca004c4f8d3272cd4 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Sat, 4 Apr 2020 01:17:14 +0300 Subject: [PATCH 70/96] Use libstdc++-gcc10 because of ABI incompatibility of libc++ and libstdc++ --- libreoffice.spec | 28 +++++----------------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index 79b7263..90371de 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -48,9 +48,6 @@ Source1: %{relurl}/%{ooname}-dictionaries-%{buildver}.tar.xz Source2: %{relurl}/%{ooname}-help-%{buildver}.tar.xz Source3: %{relurl}/%{ooname}-translations-%{buildver}.tar.xz Source4: %{devexurl}/185d60944ea767075d27247c3162b3bc-unowinreg.dll -%if %{with clang} -Source5: http://dev-www.libreoffice.org/src/cppunit-1.14.0.tar.gz -%endif # Unused, should be dropped in future package updates Source10: Mandriva-Rosa_Icons.tar.bz2 @@ -101,9 +98,7 @@ BuildRequires: ccache %endif %if %{with clang} BuildRequires: clang -BuildRequires: clang-devel -BuildRequires: libcxx-devel -BuildRequires: libcxxabi-devel +BuildRequires: stdc++-gcc10-devel %endif BuildRequires: desktop-file-utils BuildRequires: doxygen >= 1.8.4 @@ -153,9 +148,7 @@ BuildRequires: unixODBC-devel #BuildRequires: vigra-devel BuildRequires: gpgmepp-devel BuildRequires: pkgconfig(bluez) -%if !%{with clang} BuildRequires: pkgconfig(cppunit) >= 1.14.0 -%endif BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(libetonyek-0.1) @@ -2958,19 +2951,11 @@ export CCACHE_DIR=%{ccachedir} %setup_compile_flags %if %{with clang} -# libstdc++ from gcc5 is too old, use LLVM libc++ -# https://libcxx.llvm.org/docs/UsingLibcxx.html -# clang -c -stdlib=libc++ -> -# -> "argument unused during compilation: '-stdlib=libc++'" -> -# -> -Wno-unused-command-line-argument -export CXXFLAGS="$CXXFLAGS -stdlib=libc++ -nostdinc++ -I/usr/include/c++/v1 -Wno-unused-command-line-argument" -export CPPFLAGS="$CPPFLAGS -I/usr/include/c++/v1" -# Workaround old system boost being incompatible with C++17 which removed std::auto_ptr -# https://github.com/TRIQS/triqs/issues/523#issuecomment-351960463 -export CXXFLAGS="$CXXFLAGS -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR" +# 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" %clang_gcc_wrapper -export LIBCCX_LIBS="-lc++ -lc++abi" -export CPPUNIT_LIBS="-lcppunit" +export LIBCCX_LIBS="-lstdc++-gcc10" install -m0755 %{SOURCE80} "local_bin/clang++wr" sed -i -e "s,/usr/bin/clang++,${PWD}/local_bin/clang++wr,g" "local_bin/clang++" %endif @@ -3022,9 +3007,6 @@ sed -i \ --with-external-thes-dir=%{_datadir}/dict/ooo \ --with-system-libs \ --with-system-ucpp \ -%if %{with clang} - --without-system-cppunit \ -%endif --enable-ext-ct2n \ --enable-ext-numbertext \ --enable-ext-nlpsolver \ From 4851e52a41d29d86b5cd5488dfcd9ab5292fc22a Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Sat, 4 Apr 2020 05:04:40 +0300 Subject: [PATCH 71/96] more verbosity --- libreoffice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index 90371de..2222217 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -3075,7 +3075,7 @@ touch external/tarballs/.downloaded # We use make build here because the default target is "allandcheck". # Checking should go to check -%make V=1 verbose=t build-nocheck +%make V=1 verbose=t GMAKE_OPTIONS='VERBOSE=1' build-nocheck echo "Make end at: "`date` >> ooobuildtime.log echo "Install start at: "`date` >> ooobuildtime.log From 1312ec35a03a4fda4fe17a79820756830efae053 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Sat, 4 Apr 2020 14:42:04 +0300 Subject: [PATCH 72/96] Don't use %%clang_gcc_wrapper because it fails to deal with complex quotation like -DCPPUNIT_PLUGIN_EXPORT='extern "C" SAL_DLLPUBLIC_EXPORT' --- libreoffice.spec | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index 2222217..c8d3218 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -2951,13 +2951,23 @@ export CCACHE_DIR=%{ccachedir} %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" -%clang_gcc_wrapper export LIBCCX_LIBS="-lstdc++-gcc10" -install -m0755 %{SOURCE80} "local_bin/clang++wr" -sed -i -e "s,/usr/bin/clang++,${PWD}/local_bin/clang++wr,g" "local_bin/clang++" %endif echo "Configure start at: "`date` >> ooobuildtime.log From 8eb31fe67cb33b2041de8b5723bcde6c5827aa38 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Sat, 4 Apr 2020 15:53:25 +0300 Subject: [PATCH 73/96] cherry-pick "Adapt o3tl::span to removal of std::span::cbegin et al" https://github.com/LibreOffice/core/commit/6fbfad6b ``` In file included from /builddir/build/BUILD/libreoffice-6.3.5/include/sfx2/dispatch.hxx:30: /builddir/build/BUILD/libreoffice-6.3.5/include/o3tl/span.hxx:19:29: error: no member named 'span' in namespace 'std' namespace o3tl { using std::span; } ~~~~~^ 1 warning generated. In file included from /builddir/build/BUILD/libreoffice-6.3.5/sfx2/source/appl/appmisc.cxx:56: /builddir/build/BUILD/libreoffice-6.3.5/include/sfx2/dispatch.hxx:146:46: error: no template named 'span' in namespace 'o3tl' o3tl::span pSIDs = o3tl::span()); ~~~~~~^ /builddir/build/BUILD/libreoffice-6.3.5/include/sfx2/dispatch.hxx:146:83: error: no member named 'span' in namespace 'o3tl' o3tl::span pSIDs = o3tl::span()); ~~~~~~^ /builddir/build/BUILD/libreoffice-6.3.5/include/sfx2/dispatch.hxx:146:88: error: unexpected type name 'sal_uInt16': expected expression o3tl::span pSIDs = o3tl::span()); ^ 1 warning and 4 errors generated. ``` --- ...ad6b00e8c35346ee59cd32a0d7ccc0d8c19c.patch | 61 +++++++++++++++++++ libreoffice.spec | 2 + 2 files changed, 63 insertions(+) create mode 100644 6fbfad6b00e8c35346ee59cd32a0d7ccc0d8c19c.patch 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/libreoffice.spec b/libreoffice.spec index c8d3218..e0347ca 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -84,6 +84,8 @@ Source1000: libreoffice.rpmlintrc Patch0: libreoffice-5.4.0.1-disable-test-languagetag.patch Patch1: libreoffice-4.2.5-icu-49.patch Patch2: libreoffice-6.3.5.2-kde4-detection.patch +# https://github.com/LibreOffice/core/commit/6fbfad6b +Patch3: 6fbfad6b00e8c35346ee59cd32a0d7ccc0d8c19c.patch # ROSA vendor patch Patch100: libreoffice-4.1-vendor.patch From 817b8bac554e11c63befbbd52743c9ee95f49828 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Sat, 4 Apr 2020 17:35:30 +0300 Subject: [PATCH 74/96] Define __STDCPP_WANT_MATH_SPEC_FUNCS__ ``` math.h:116:31: warning: '__STDCPP_WANT_MATH_SPEC_FUNCS__' is not defined, evaluates to 0 [-Wundef] <...> ``` --- libreoffice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index e0347ca..007ef8e 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -2968,7 +2968,7 @@ 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" +export CXXFLAGS="$CXXFLAGS -nostdinc++ $CPPFLAGS -Wno-unused-command-line-argument -D__STDCPP_WANT_MATH_SPEC_FUNCS__" export LIBCCX_LIBS="-lstdc++-gcc10" %endif From 36d79cc2d91e2b98792739621669fe15cb9c0ba1 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Sat, 4 Apr 2020 18:27:04 +0300 Subject: [PATCH 75/96] patch: do not try to use std::span, because clang 8 can't --- libreoffice.spec | 2 ++ span-old-compilers.patch | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 span-old-compilers.patch diff --git a/libreoffice.spec b/libreoffice.spec index 007ef8e..0d6dd61 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -86,6 +86,8 @@ Patch1: libreoffice-4.2.5-icu-49.patch Patch2: libreoffice-6.3.5.2-kde4-detection.patch # https://github.com/LibreOffice/core/commit/6fbfad6b Patch3: 6fbfad6b00e8c35346ee59cd32a0d7ccc0d8c19c.patch +# For Clang <9, GCC <10, when building with libstdc++-gcc10 +Patch4: span-old-compilers.patch # ROSA vendor patch Patch100: libreoffice-4.1-vendor.patch 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 + From 80bc506427aa2cddf6505a8c02bcfcc792db7e3a Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Sat, 4 Apr 2020 19:46:37 +0300 Subject: [PATCH 76/96] RPM5 fails to process debuginfo, off it there --- libreoffice.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libreoffice.spec b/libreoffice.spec index 0d6dd61..dfc4cac 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -7,6 +7,13 @@ %bcond_with clang %endif +%if %rpm5 +# "/usr/lib/rpm/bin/debugedit: canonicalization unexpectedly shrank by one character" +%define debugcflags %{nil} +%define _enable_debug_packages %{nil} +%define debug_package %{nil} +%endif + %if %{with l10n} %define langs en-US af ar as bg bn br bs ca cs cy da de dz el en-GB es et eu fa fi fr ga gl gu he hi hr hu it ja ko kn lt lv mai mk ml mr nb nl nn nr nso or pa-IN pl pt pt-BR ro ru si sk sl sr ss st sv ta te th tn tr ts uk ve xh zh-TW zh-CN zu %define helplangs ar bg bn bs ca cs da de dz el en-GB es et eu fi fr gl gu he hi hr hu it ja ko lt lv mk nb nl nn pl pt pt-BR ro ru si sk sl sv ta tr uk zh-CN zh-TW en-US From d919e9890c401fc5bd4209e1e105653be4e0f94c Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Sat, 4 Apr 2020 20:48:21 +0300 Subject: [PATCH 77/96] patch: prefer gtk3_kde5 over kde5 because of maturity of gtk3 rendering --- gtk3_kde5-priority.patch | 21 +++++++++++++++++++++ libreoffice.spec | 4 +++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 gtk3_kde5-priority.patch 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.spec b/libreoffice.spec index dfc4cac..dec7c81 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -45,7 +45,7 @@ Summary: Office suite Name: libreoffice Epoch: 1 Version: 6.3.5 -Release: 6 +Release: 7 License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic Group: Office Url: http://www.libreoffice.org @@ -95,6 +95,8 @@ Patch2: libreoffice-6.3.5.2-kde4-detection.patch Patch3: 6fbfad6b00e8c35346ee59cd32a0d7ccc0d8c19c.patch # For Clang <9, GCC <10, when building with libstdc++-gcc10 Patch4: span-old-compilers.patch +# prefer gtk3_kde5 over kde5 because of maturity of gtk3 rendering +Patch5: gtk3_kde5-priority.patch # ROSA vendor patch Patch100: libreoffice-4.1-vendor.patch From a8eafd29b2e65a9741646efd48ee3fd0a179d0fb Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Sat, 4 Apr 2020 20:55:40 +0300 Subject: [PATCH 78/96] there were no problems with debuginfo with rpm5+gcc in rosa2019.0 --- libreoffice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index dec7c81..1225583 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -7,7 +7,7 @@ %bcond_with clang %endif -%if %rpm5 +%if %rpm5 && %{with clang} # "/usr/lib/rpm/bin/debugedit: canonicalization unexpectedly shrank by one character" %define debugcflags %{nil} %define _enable_debug_packages %{nil} From 6b0101b62678b9f1ea71e04ff1e84cf118ed62c2 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Sat, 4 Apr 2020 20:59:06 +0300 Subject: [PATCH 79/96] Fix regexp compilation on rpm5 Fixes: f1f68a93 --- libreoffice.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libreoffice.spec b/libreoffice.spec index 1225583..67126f4 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -38,7 +38,10 @@ %define ccachedir ~/.ccache-OOo +# for rpm4 %global __requires_exclude libjawt.so|libmyspell.so|libstlport_gcc.so|libmono.so|mono|devel\\(libunoidl(.*) +# for rpm5, overrides %%__requires_exclude +%global __noautoreq 'libjawt.so|libmyspell.so|libstlport_gcc.so|libmono.so|mono|devel\\(libunoidl(.*)' %global __provides_exclude libsndfile.so\\|libportaudio.so\\|libdb-4.2.so\\|libdb_java-4.2.so\\|libmyspell.so\\|libstlport_gcc.so\\|librdf.so.0\\|libraptor.so.1\\|libxmlsec1-nss.so.1\\|libxmlsec1.so.1 Summary: Office suite From dabdfac6c54aa113f52e1e98b76bcb030a55fdbc Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Sat, 4 Apr 2020 21:31:11 +0300 Subject: [PATCH 80/96] move kde4 users to gtk3-kde5, not kde5 --- libreoffice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index 67126f4..85740e7 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -549,6 +549,7 @@ 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 @@ -565,7 +566,6 @@ Summary: KDE5 Integration for LibreOffice (Widgets, Dialogs, Addressbook) Group: Office Requires: %{name}-common = %{EVRD} Recommends: %{name}-style-breeze = %{EVRD} -Obsoletes: %{name}-kde4 < %{EVRD} %description kde5 This package contains the KDE5 plugin for drawing LibreOffice widgets with From ce45dcfe52c6ae605e666148d13de2b76cf9fa29 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Sat, 4 Apr 2020 22:20:56 +0300 Subject: [PATCH 81/96] clean up --- .abf.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.abf.yml b/.abf.yml index 3b5b683..fc99c62 100644 --- a/.abf.yml +++ b/.abf.yml @@ -28,4 +28,3 @@ sources: libreoffice-dictionaries-6.3.5.2.tar.xz: 15a2ad38276bb1c2249ffb8a8dfd9218c56e8a98 libreoffice-help-6.3.5.2.tar.xz: 2cb7747b123c4bc8b0986889f55794a93e7b5319 libreoffice-translations-6.3.5.2.tar.xz: 0ef79bb374a9919d8e49daedf6de4b39b81c3f27 - cppunit-1.14.0.tar.gz: 3eba38567bad4e300f76c764f91a7301bacc716d From 15457474785bc8429928d7bbef07b03add2e0969 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Sat, 4 Apr 2020 22:24:26 +0300 Subject: [PATCH 82/96] Revert build verbosity Verbosity is not needed in most cases, but the log with it is ~750 MB! PArtially reverts 7d34a8509331f88056d6615d9697f267b74c1ac3 --- libreoffice.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index 85740e7..7f02966 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -3101,7 +3101,8 @@ touch external/tarballs/.downloaded # We use make build here because the default target is "allandcheck". # Checking should go to check -%make V=1 verbose=t GMAKE_OPTIONS='VERBOSE=1' 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 From 0d50bd925bdc02ae81a9ccf82423ab0c8ceae36e Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Sun, 5 Apr 2020 21:45:44 +0300 Subject: [PATCH 83/96] patch: force icons in menus to be ON in GTK+3 VCLs --- 0001-Force-icons-in-menus-in-GTK-3-VCLs.patch | 31 +++++++++++++++++++ libreoffice.spec | 3 +- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 0001-Force-icons-in-menus-in-GTK-3-VCLs.patch 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/libreoffice.spec b/libreoffice.spec index 7f02966..2a36100 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -48,7 +48,7 @@ Summary: Office suite Name: libreoffice Epoch: 1 Version: 6.3.5 -Release: 7 +Release: 8 License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic Group: Office Url: http://www.libreoffice.org @@ -100,6 +100,7 @@ Patch3: 6fbfad6b00e8c35346ee59cd32a0d7ccc0d8c19c.patch Patch4: span-old-compilers.patch # prefer gtk3_kde5 over kde5 because of maturity of gtk3 rendering Patch5: gtk3_kde5-priority.patch +Patch6: 0001-Force-icons-in-menus-in-GTK-3-VCLs.patch # ROSA vendor patch Patch100: libreoffice-4.1-vendor.patch From 4d7cb530601becc167a7ad0b8fc9f4f824ec0804 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Sun, 5 Apr 2020 23:24:22 +0300 Subject: [PATCH 84/96] Package all styles, move breeze_dark from -common to -style-breeze --- libreoffice.spec | 74 +++++++++++++++++------------------------------- 1 file changed, 26 insertions(+), 48 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index 2a36100..9d74a7b 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -664,49 +664,30 @@ 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 +} \ +%{nil} -%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-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 #---------------------------------------------------------------------------- @@ -3002,7 +2983,6 @@ sed -i \ %{?_smp_mflags:--with-parallelism="`getconf _NPROCESSORS_ONLN`"} \ --with-vendor=ROSA \ --with-build-version="ROSA %{buildver}-%{release}" \ - --with-theme="breeze breeze_dark sifr tango" \ --disable-coinmp \ --disable-fetch-external \ --with-external-tar="$EXTSRCDIR" \ @@ -3179,11 +3159,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 breeze tango sifr; do - sed -i "/^.*images_$i\.zip$/d" file-lists/common_list.txt -done - ## Split help cd file-lists for i in lang_*.txt; do @@ -3212,6 +3187,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 +## styles have their own packages +sed -E -i -e "/^.*images_.*\.zip$/d" file-lists/common_list.txt + # files for help-* and l10n-* packages %if %{with l10n} %{expand:%(for i in %{langs}; do From e0de300fa3b7257654f2f4c303a91d53dd640c0f Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Mon, 6 Apr 2020 01:00:47 +0300 Subject: [PATCH 85/96] Templatize l10n packages to reduce the spec by more that 2000 lines --- libreoffice.spec | 2186 ++-------------------------------------------- locales.csv | 71 ++ 2 files changed, 136 insertions(+), 2121 deletions(-) create mode 100644 locales.csv diff --git a/libreoffice.spec b/libreoffice.spec index 9d74a7b..b6c683f 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -15,11 +15,11 @@ %endif %if %{with l10n} -%define langs en-US af ar as bg bn br bs ca cs cy da de dz el en-GB es et eu fa fi fr ga gl gu he hi hr hu it ja ko kn lt lv mai mk ml mr nb nl nn nr nso or pa-IN pl pt pt-BR ro ru si sk sl sr ss st sv ta te th tn tr ts uk ve xh zh-TW zh-CN zu -%define helplangs ar bg bn bs ca cs da de dz el en-GB es et eu fi fr gl gu he hi hr hu it ja ko lt lv mk nb nl nn pl pt pt-BR ro ru si sk sl sv ta tr uk zh-CN zh-TW en-US +%define langs en_US af ar as bg bn br bs ca cs cy da de dz el en_GB es et eu fa fi fr ga gl gu he hi hr hu it ja ko kn lt lv mai mk ml mr nb nl nn nr nso or pa_IN pl pt pt_BR ro ru si sk sl sr ss st sv ta te th tn tr ts uk ve xh zh_TW zh_CN zu +%define helplangs ar bg bn bs ca cs da de dz el en_GB es et eu fi fr gl gu he hi hr hu it ja ko lt lv mk nb nl nn pl pt pt_BR ro ru si sk sl sv ta tr uk zh_CN zh_TW en_US %else -%define langs en-US -%define helplangs en-US +%define langs en_US +%define helplangs en_US %endif %define javaless 1 @@ -58,6 +58,7 @@ Source1: %{relurl}/%{ooname}-dictionaries-%{buildver}.tar.xz Source2: %{relurl}/%{ooname}-help-%{buildver}.tar.xz Source3: %{relurl}/%{ooname}-translations-%{buildver}.tar.xz Source4: %{devexurl}/185d60944ea767075d27247c3162b3bc-unowinreg.dll +Source5: locales.csv # Unused, should be dropped in future package updates Source10: Mandriva-Rosa_Icons.tar.bz2 @@ -679,8 +680,7 @@ Conflicts: %{name}-common < 1:6.3.5 \ \ %%files style-%1 \ %{ooodir}/share/config/images_%{1}*.zip -} \ -%{nil} +} %style_package breeze %style_package colibre @@ -809,2106 +809,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-%{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} \ +This package contains the 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} -Recommends: %{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} -Recommends: %{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} -Recommends: %{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} -Recommends: %{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} -Recommends: %{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} -Recommends: %{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} -Recommends: %{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} -Recommends: %{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} -Recommends: %{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} -Recommends: %{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} -Recommends: %{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} -Recommends: %{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} -Recommends: %{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} -Recommends: %{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} -Recommends: %{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} -Recommends: %{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} -Recommends: %{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} -Recommends: %{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} -Recommends: %{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} -Recommends: %{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} -Recommends: %{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} -Recommends: %{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} -Recommends: %{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} -Recommends: %{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} -Recommends: %{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} -Recommends: %{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} -Recommends: %{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} -Recommends: %{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} -Recommends: %{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} -Recommends: %{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} -Recommends: %{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 -Recommends: fonts-ttf-paratype -Requires: urw-fonts -Requires: myspell-ru -Requires: myspell-hyph-ru -Provides: LibreOffice-l10n-ru = %{EVRD} -Recommends: %{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} -Recommends: %{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} -Recommends: %{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} -Recommends: %{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} -Recommends: %{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} -Recommends: %{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} -Recommends: %{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} -Recommends: %{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} -Recommends: %{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 #---------------------------------------------------------------------------- @@ -3005,7 +963,7 @@ sed -i \ %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 \ @@ -3188,22 +1146,8 @@ egrep -v "libreoffice/share/xdg/(base|calc|draw|impress|math|writer)" file-lists cat file-lists/core_list.uniq.sorted.txt > file-lists/core_list.txt ## styles have their own packages -sed -E -i -e "/^.*images_.*\.zip$/d" file-lists/common_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 +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 From 55abc184c5214b548f117c8cc5ea7db8f5405e50 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Mon, 6 Apr 2020 19:33:45 +0300 Subject: [PATCH 86/96] Shorten description line to make rpmlint happy --- libreoffice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index b6c683f..112c5ff 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -854,7 +854,7 @@ Requires: %{ooname}-l10n-%{1} = %{EVRD} \ Provides: LibreOffice-help-%{1} = %{EVRD} \ \ %%description help-%{1} \ -This package contains the localized help files of LibreOffice in %(echo "%{2}" | sed -e 's,___, ,g'). \ +Localized help files of LibreOffice in %(echo "%{2}" | sed -e 's,___, ,g'). \ \ %%files help-%{1} \ %{ooodir}/help/%{3} From 3bfa619f5373b1c2649fb0abc8a11a6b435ba08d Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Mon, 6 Apr 2020 22:14:45 +0300 Subject: [PATCH 87/96] Fix names of locales-* packages (e.g. locales-zh_CN -> locales-zh) --- libreoffice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index 112c5ff..a48c739 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -817,7 +817,7 @@ Summary: %(echo "%{2}" | sed -e 's,___, ,g') language support for LibreOffice \ Group: Office \ Provides: %{ooname}-l10n = %{EVRD} \ Requires: %{ooname}-common = %{EVRD} \ -Requires: locales-%{1} \ +Requires: locales-%(echo %{1} | awk -F '_' '{print $1}') \ Provides: LibreOffice-l10n-%{1} = %{EVRD} \ \ %%description l10n-%{1} \ From fa22e95cbbc57eac382130fdd0806ba8b50680c2 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Tue, 7 Apr 2020 01:20:28 +0300 Subject: [PATCH 88/96] Provide l10n en_US in common as that locale is not in a separate package, but %%help_package template requires it --- libreoffice.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libreoffice.spec b/libreoffice.spec index a48c739..06d8477 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -365,6 +365,8 @@ 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} # And breeze too, it should be default for Plasma 5 From ea213318e986b467faf11ebbacfc5ba2b7318cd0 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Mon, 8 Jun 2020 17:41:26 +0300 Subject: [PATCH 89/96] Use the same config with clang + libstdc++-gcc10 in rosa2019.05 as tested in rosa2016.1, this will also help to fix linking with libboost because -lstdc++-gcc10 is forced in that configuration, and is forced only for C++ code, not for C code "DEBUG: checking for exit in -lboost_date_time... (cached) no DEBUG: configure: error: Could not link against boost_date_time !" --- libreoffice.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index 06d8477..5577889 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1,7 +1,7 @@ %bcond_without l10n %bcond_with icecream %bcond_with ccache -%if %{mdvver} < 201900 +%if %{mdvver} < 201910 %bcond_without clang %else %bcond_with clang @@ -48,7 +48,7 @@ Summary: Office suite Name: libreoffice Epoch: 1 Version: 6.3.5 -Release: 8 +Release: 9 License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic Group: Office Url: http://www.libreoffice.org From 3152461e9fab7f4d594f43dc7e5f21318ecfe475 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Mon, 8 Jun 2020 18:41:02 +0300 Subject: [PATCH 90/96] Revert "Use the same config with clang + libstdc++-gcc10 in rosa2019.05 as tested in rosa2016.1, this will also help to fix linking with libboost because -lstdc++-gcc10 is forced in that configuration, and is forced only for C++ code, not for C code" This reverts commit ea213318e986b467faf11ebbacfc5ba2b7318cd0. --- libreoffice.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index 5577889..06d8477 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1,7 +1,7 @@ %bcond_without l10n %bcond_with icecream %bcond_with ccache -%if %{mdvver} < 201910 +%if %{mdvver} < 201900 %bcond_without clang %else %bcond_with clang @@ -48,7 +48,7 @@ Summary: Office suite Name: libreoffice Epoch: 1 Version: 6.3.5 -Release: 9 +Release: 8 License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic Group: Office Url: http://www.libreoffice.org From baa18bb237a05ce1cdd7fdb9055dfc5dbaae7de5 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Mon, 8 Jun 2020 18:41:46 +0300 Subject: [PATCH 91/96] Force rebuilding configure because it seems to work incorrectly "DEBUG: checking for exit in -lboost_date_time... (cached) no DEBUG: configure: error: Could not link against boost_date_time !" It tries to process "AC_MSG_CHECKING([which boost to use]) if test "$with_system_boost" = "yes"; then AC_MSG_RESULT([external]) SYSTEM_BOOST=TRUE AX_BOOST_BASE(1.47) AX_BOOST_DATE_TIME AX_BOOST_FILESYSTEM AX_BOOST_IOSTREAMS AX_BOOST_LOCALE AC_LANG_PUSH([C++]) " with cc compiler, not cxx --- libreoffice.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libreoffice.spec b/libreoffice.spec index 06d8477..03cd9a1 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -44,6 +44,8 @@ %global __noautoreq 'libjawt.so|libmyspell.so|libstlport_gcc.so|libmono.so|mono|devel\\(libunoidl(.*)' %global __provides_exclude libsndfile.so\\|libportaudio.so\\|libdb-4.2.so\\|libdb_java-4.2.so\\|libmyspell.so\\|libstlport_gcc.so\\|librdf.so.0\\|libraptor.so.1\\|libxmlsec1-nss.so.1\\|libxmlsec1.so.1 +%undefine _disable_rebuild_configure + Summary: Office suite Name: libreoffice Epoch: 1 From 2e597851f8a9163b83a79350410a0abefb5d2985 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Mon, 22 Jun 2020 12:57:33 +1000 Subject: [PATCH 92/96] Add -lstdc++ to ldflags --- libreoffice.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index 03cd9a1..0fa65ee 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -50,7 +50,7 @@ Summary: Office suite Name: libreoffice Epoch: 1 Version: 6.3.5 -Release: 8 +Release: 9 License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic Group: Office Url: http://www.libreoffice.org @@ -908,6 +908,10 @@ export PATH export CCACHE_DIR=%{ccachedir} %endif +%if %{without clang} +%global ldflags %{ldflags} -lstdc++ +%endif + %setup_compile_flags %if %{with clang} From ed556d9e0ff4c78748dfa2e69ebb64bfc64d5765 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Mon, 22 Jun 2020 15:04:53 +1000 Subject: [PATCH 93/96] Set _python_bytecompile_build to 0 --- libreoffice.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libreoffice.spec b/libreoffice.spec index 0fa65ee..e93f11a 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -46,6 +46,8 @@ %undefine _disable_rebuild_configure +%global _python_bytecompile_build 0 + Summary: Office suite Name: libreoffice Epoch: 1 From 295e20163e81fbd8f3f3e37e229c0226f4f43d6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9-=D0=97?= Date: Wed, 24 Jun 2020 17:15:45 +0000 Subject: [PATCH 94/96] MassBuild#2065: Increase release tag --- libreoffice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index 06d8477..0c3ee46 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -48,7 +48,7 @@ Summary: Office suite Name: libreoffice Epoch: 1 Version: 6.3.5 -Release: 8 +Release: 9 License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic Group: Office Url: http://www.libreoffice.org From 816a17340ffdb48a1131fce2190ad9b7d836c606 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Fri, 26 Jun 2020 13:25:08 +1000 Subject: [PATCH 95/96] Bump relase --- libreoffice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index e93f11a..f7f3b63 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -52,7 +52,7 @@ Summary: Office suite Name: libreoffice Epoch: 1 Version: 6.3.5 -Release: 9 +Release: 10 License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic Group: Office Url: http://www.libreoffice.org From 1e2b8e14e92f0ee2ea37672d4987098ac86a9c63 Mon Sep 17 00:00:00 2001 From: Alzim Date: Sat, 15 Aug 2020 22:53:20 +0300 Subject: [PATCH 96/96] Updated to 6.3.6.2 --- .abf.yml | 9 ++++----- libreoffice.spec | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.abf.yml b/.abf.yml index fc99c62..92dee8b 100644 --- a/.abf.yml +++ b/.abf.yml @@ -6,7 +6,6 @@ sources: 1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt: 206a371b46a3d991722b059b5d6f3bb29f1fc48b 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip: 1acea86fd399ed7817879d36370d3d1f8b109050 472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt: d2b6a076b40d8d517075e52220ddd8f89f655c8f - 49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf: ad0f4351a484ac9b5422beae749719299bdfcfb8 4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt: bf25bef71f72a4622089c85958bfd6c58d8516a6 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2: 1169780b4a0c515b23b96c913fd9bc52ceb7fb39 53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt: 4fea33622d89c7ac62053e5ee3616cfe504e0f14 @@ -22,9 +21,9 @@ sources: b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt: a476a199de32a32221132c8e77fad96c88616b08 b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2: aa8faa4f9e6721eed9bc6878862d74d0cb23251c b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt: bdec3915c01cd60e20892376aa5e5a0d3980c389 + 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 - libreoffice-6.3.5.2.tar.xz: 76ef06f0cd0ce0f29c3e78f73763ec63ee34fc32 - libreoffice-dictionaries-6.3.5.2.tar.xz: 15a2ad38276bb1c2249ffb8a8dfd9218c56e8a98 - libreoffice-help-6.3.5.2.tar.xz: 2cb7747b123c4bc8b0986889f55794a93e7b5319 - libreoffice-translations-6.3.5.2.tar.xz: 0ef79bb374a9919d8e49daedf6de4b39b81c3f27 diff --git a/libreoffice.spec b/libreoffice.spec index f7f3b63..b5aa825 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -51,8 +51,8 @@ Summary: Office suite Name: libreoffice Epoch: 1 -Version: 6.3.5 -Release: 10 +Version: 6.3.6 +Release: 1 License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic Group: Office Url: http://www.libreoffice.org