Updated to 6.0.6.2

.abf.yml

@@ -18,14 +18,14 @@ 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.3-bin.tar.bz2: 35df2cad868ad0017fdf499739b1f099d8c34fda
+  apache-ant-1.10.5-bin.tar.bz2: 0a8b4cfc3c77bdd270fe1a618465de31e12fdbe5
   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-5.4.7.1.tar.xz: 1db41657fc7e337ed1013a258727889dba7c95f2
+  libreoffice-6.0.6.2.tar.xz: a0d8640e6dd81306694af907a014cf00648937b4
-  libreoffice-dictionaries-5.4.7.1.tar.xz: 7be81a10e64219eb8de9c5c2142a9cf32bf5c41a
+  libreoffice-dictionaries-6.0.6.2.tar.xz: 4d3a8b0078e8e179867d9a90607050c5baa5555c
-  libreoffice-help-5.4.7.1.tar.xz: 7f57dfafad41e4f43e096038830c29207425dad1
+  libreoffice-help-6.0.6.2.tar.xz: 49abdebfa094abb5e032da9deb10c20e4c70e503
-  libreoffice-translations-5.4.7.1.tar.xz: a6b6f77f2816de7d51a44c5daffe1d0d022a2493
+  libreoffice-translations-6.0.6.2.tar.xz: 06f91cd45b4a22f54f2aa806296e24944b707b05
-  pdfium-3064.tar.bz2: 70135df62d10db3471054bd29fb9bf48d8bc5b7c
+  pdfium-3235.tar.bz2: 10a6525bf0c014556766a19912fa6a80849a9117

libreoffice-5.4.0.1-disable-test-firebird.patch

@@ -1,16 +0,0 @@
-diff -urN libreoffice-5.4.0.1/dbaccess/Module_dbaccess.mk libreoffice-5.4.0.1-patched/dbaccess/Module_dbaccess.mk
---- libreoffice-5.4.0.1/dbaccess/Module_dbaccess.mk	2017-06-22 13:47:10.000000000 +0300
-+++ libreoffice-5.4.0.1-patched/dbaccess/Module_dbaccess.mk	2017-07-07 20:15:08.269290040 +0300
-@@ -34,12 +34,6 @@
- 	UIConfig_dbtdata \
- ))
- 
--ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)
--$(eval $(call gb_Module_add_check_targets,dbaccess,\
--    CppunitTest_dbaccess_firebird_test \
--))
--endif
--
- $(eval $(call gb_Module_add_check_targets,dbaccess,\
- 	CppunitTest_dbaccess_dialog_save \
- 	CppunitTest_dbaccess_empty_stdlib_save \

libreoffice-5.4.0.1-disable-test-hsqldb.patch

@@ -1,16 +0,0 @@
-diff -urN libreoffice-5.4.0.1/dbaccess/Module_dbaccess.mk libreoffice-5.4.0.1-patched/dbaccess/Module_dbaccess.mk
---- libreoffice-5.4.0.1/dbaccess/Module_dbaccess.mk	2017-06-22 13:47:10.000000000 +0300
-+++ libreoffice-5.4.0.1-patched/dbaccess/Module_dbaccess.mk	2017-07-07 20:10:12.107270157 +0300
-@@ -49,12 +49,6 @@
- 		CppunitTest_dbaccess_RowSetClones) \
- ))
- 
--ifeq ($(ENABLE_JAVA),TRUE)
--$(eval $(call gb_Module_add_check_targets,dbaccess,\
--    CppunitTest_dbaccess_hsqldb_test \
--))
--endif
--
- # This runs a suite of performance tests on embedded firebird and HSQLDB.
- # Instructions on running the test can be found in qa/unit/embeddedb_performancetest
- ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)

libreoffice-5.4.4.2-bug107039.patch

@@ -1,31 +0,0 @@
-From de84816c1acefe0607827418f73477ff7163728d Mon Sep 17 00:00:00 2001
-From: Tor Lillqvist <tml@collabora.com>
-Date: Tue, 2 Jan 2018 12:21:48 +0200
-Subject: tdf#107039: Avoid deadlock by locking the SolarMutex early on in one
- place
-
-See bug report for backtraces of the deadlocking threads.
-
-Change-Id: I0334118e173c37b6f9596249e1e2f0d196bbab3f
-Reviewed-on: https://gerrit.libreoffice.org/47249
-Tested-by: Jenkins <ci@libreoffice.org>
-Reviewed-by: Tor Lillqvist <tml@collabora.com>
----
- framework/source/services/autorecovery.cxx | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
-index dd93c89..8141af1 100644
---- a/framework/source/services/autorecovery.cxx
-+++ b/framework/source/services/autorecovery.cxx
-@@ -1565,6 +1565,7 @@ void SAL_CALL AutoRecovery::documentEventOccured(const css::document::DocumentEv
-         (aEvent.EventName == EVENT_ON_SAVEASDONE)
-        )
-     {
-+        SolarMutexGuard g;
-         implts_markDocumentAsSaved(xDocument);
-         implts_updateDocumentUsedForSavingState(xDocument, SAVE_FINISHED);
-     }
--- 
-cgit v1.1
-

libreoffice.rpmlintrc

@@ -9,3 +9,8 @@ addFilter("E: no-dependency-on")
 addFilter("W: jar-not-indexed")
 addFilter("W: invalid-license")
 addFilter("W: devel-file-in-non-devel-package")
+# 2978 warnings
+addFilter("W: uncompressed-zip")
+addFilter("W: only-non-binary-in-usr-lib")
+addFilter("W: no-documentation")
+addFilter("W: file-not-in-%lang")

libreoffice.spec

@@ -23,9 +23,9 @@
 %define oxyurl http://ooo.itc.hu/oxygenoffice/download/libreoffice/
 %define distroname ROSA
 %define ooname libreoffice
-%define buildver %{version}.1
+%define buildver %{version}.2
 %define ooodir %{_libdir}/libreoffice
-%define antver 1.10.3
+%define antver 1.10.5
 %define antpath %{_builddir}/libreoffice-%{version}/apache-ant-%{antver}
 
 %define ccachedir ~/.ccache-OOo
@@ -41,8 +41,8 @@
 Summary:	Office suite
 Name:		libreoffice
 Epoch:		1
-Version:	5.4.7
+Version:	6.0.6
-Release:	2
+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
@@ -68,7 +68,7 @@ Source36:	%{devurl}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 Source37:	%{devurl}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 
 # Extensions
-Source49:	%{srcurl}pdfium-3064.tar.bz2
+Source49:	%{srcurl}pdfium-3235.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
@@ -88,9 +88,6 @@ Source1000:	libreoffice.rpmlintrc
 
 Patch0:		libreoffice-5.4.0.1-disable-test-languagetag.patch
 Patch1:		libreoffice-4.2.5-icu-49.patch
-Patch2:		libreoffice-5.4.0.1-disable-test-hsqldb.patch
-Patch3:		libreoffice-5.4.0.1-disable-test-firebird.patch
-
 Patch51:	libreoffice-5.4.0.1-impress-kde-crash-hack.patch
 
 # ROSA vendor patch
@@ -101,9 +98,6 @@ 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
 
-# Backports from upstream
-Patch200:	libreoffice-5.4.4.2-bug107039.patch
-
 BuildRequires:	bison
 BuildRequires:	bsh
 %if %{with ccache}
@@ -145,6 +139,7 @@ BuildRequires:	db-devel
 BuildRequires:	glm-devel
 BuildRequires:	hyphen-devel
 BuildRequires:	java-devel
+BuildRequires:	jemalloc-devel
 BuildRequires:	kdelibs4-devel
 BuildRequires:	lpsolve-devel
 BuildRequires:	mysql-connector-c++-devel
@@ -186,17 +181,16 @@ BuildRequires:	pkgconfig(libcdr-0.1)
 BuildRequires:	pkgconfig(libe-book-0.1)
 BuildRequires:	pkgconfig(libeot)
 BuildRequires:	pkgconfig(libexttextcat)
-BuildRequires:	pkgconfig(libgltf-0.1)
+BuildRequires:	pkgconfig(libepubgen-0.1)
 BuildRequires:	pkgconfig(libixion-0.12)
 BuildRequires:	pkgconfig(liblangtag)
 BuildRequires:	pkgconfig(libmspub-0.1)
 BuildRequires:	pkgconfig(libmwaw-0.3) >= 0.3.4
 BuildRequires:	pkgconfig(libodfgen-0.1) >= 0.1.0
-# Build for > 6.0.0
+BuildRequires:	pkgconfig(liborcus-0.13) 
-#BuildRequires:	pkgconfig(liborcus-0.13)
-BuildRequires:	pkgconfig(liborcus-0.12)
 BuildRequires:	pkgconfig(libpagemaker-0.0)
 BuildRequires:	pkgconfig(libpq)
+BuildRequires:	pkgconfig(libqxp-0.0)
 BuildRequires:	pkgconfig(librevenge-0.0)
 BuildRequires:	pkgconfig(librsvg-2.0)
 BuildRequires:	pkgconfig(libstartup-notification-1.0)
@@ -391,6 +385,9 @@ Conflicts:	%{name}-templates-pt_BR < %{EVRD}
 Conflicts:	%{name}-templates-sv < %{EVRD}
 Conflicts:	%{name}-templates-tr < %{EVRD}
 Conflicts:	%{name}-templates-zh_CN < %{EVRD}
+Suggests:	noto-sans-fonts
+Suggests:	noto-sans-mono-fonts
+Suggests:	noto-serif-fonts
 
 %description common
 This package contains the application-independent files of LibreOffice.