Accepting request 506091 from LibreOffice:Factory

- Update to 5.4.0.1:
  * First rc of the series, now only serious bugs will be fixed
- Drop upstreamed patch 0001-undo-clone.patch
- Drop upstreamed patch 0001-watermark.patch

- Add suse color palette bsc#1045339

OBS-URL: https://build.opensuse.org/request/show/506091
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=133

0001-undo-clone.patch

@@ -1,90 +0,0 @@
-From cd38a25d41e1ce2acad25b1b5b2a5e77239e36ed Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tam=C3=A1s=20Zolnai?= <tamas.zolnai@collabora.com>
-Date: Mon, 12 Jun 2017 14:34:59 +0200
-Subject: tdf#108480: Undo from clone formating does not remove vertical
- alignment
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In the related change:
-d36aa2ba3132ce62a370b7260ca620642cbf7dbf
-wrong method was used to set cell properties, which does
-not handle undo actions, so use the proper function.
-
-Other issue was related to undo handling of vertical text
-alignment in general. In some cases undo actions were lost
-after user clicked out of the cell. It is because vertical
-alignment is not affecting the outliner and so the related
-undo actions were just dropped in EndTextEdit() method.
-
-Change-Id: I3a6a95fac711056a658a3dee616733939cd13330
-Reviewed-on: https://gerrit.libreoffice.org/38699
-Tested-by: Jenkins <ci@libreoffice.org>
-Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
-(cherry picked from commit 37d8ac12902506f4185e10f1de4f566dbaf53e42)
-Reviewed-on: https://gerrit.libreoffice.org/38724
-
-diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
-index ff71c07..ea521d7 100644
---- a/svx/source/svdraw/svdedxv.cxx
-+++ b/svx/source/svdraw/svdedxv.cxx
-@@ -2228,9 +2228,8 @@ void SdrObjEditView::TakeFormatPaintBrush( std::shared_ptr< SfxItemSet >& rForma
-         if( pObj && (pObj->GetObjInventor() == SdrInventor::Default ) && (pObj->GetObjIdentifier() == OBJ_TABLE) )
-         {
-             auto pTable = static_cast<const sdr::table::SdrTableObj*>(pObj);
--            if (pTable->getActiveCell().is()) {
--                SfxItemSet const & rSet = pTable->GetActiveCellItemSet();
--                rFormatSet->Put(rSet);
-+            if (mxSelectionController.is() && pTable->getActiveCell().is()) {
-+                mxSelectionController->GetAttributes(*rFormatSet, false);
-             }
-         }
-     }
-@@ -2378,8 +2377,8 @@ void SdrObjEditView::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoChar
-     if( pObj && (pObj->GetObjInventor() == SdrInventor::Default) && (pObj->GetObjIdentifier() == OBJ_TABLE) )
-     {
-         auto pTable = static_cast<sdr::table::SdrTableObj*>(pObj);
--        if (pTable->getActiveCell().is()) {
--            pTable->SetMergedItemSetAndBroadcastOnActiveCell(rFormatSet);
-+        if (pTable->getActiveCell().is() && mxSelectionController.is()) {
-+            mxSelectionController->SetAttributes(rFormatSet, false);
-         }
-     }
- }
-diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
-index 4c51d41..ef58d32 100644
---- a/svx/source/table/svdotable.cxx
-+++ b/svx/source/table/svdotable.cxx
-@@ -1768,18 +1768,19 @@ bool SdrTableObj::BegTextEdit(SdrOutliner& rOutl)
- 
- void SdrTableObj::EndTextEdit(SdrOutliner& rOutl)
- {
--    if(rOutl.IsModified())
-+
-+    if (GetModel() && GetModel()->IsUndoEnabled() && !mpImpl->maUndos.empty())
-     {
--        if( GetModel() && GetModel()->IsUndoEnabled() )
--        {
--            // These actions should be on the undo stack after text edit.
--            for (std::unique_ptr<SdrUndoAction>& pAction : mpImpl->maUndos)
--                GetModel()->AddUndo(pAction.release());
--            mpImpl->maUndos.clear();
-+        // These actions should be on the undo stack after text edit.
-+        for (std::unique_ptr<SdrUndoAction>& pAction : mpImpl->maUndos)
-+            GetModel()->AddUndo(pAction.release());
-+        mpImpl->maUndos.clear();
- 
--            GetModel()->AddUndo( GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*this) );
--        }
-+        GetModel()->AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*this));
-+    }
- 
-+    if(rOutl.IsModified())
-+    {
-         OutlinerParaObject* pNewText = nullptr;
-         Paragraph* p1stPara = rOutl.GetParagraph( 0 );
-         sal_Int32 nParaAnz = rOutl.GetParagraphCount();
--- 
-cgit v0.10.2
-

0001-watermark.patch

@@ -1,77 +0,0 @@
-From 42353b95629322f51e059337ab06579ffb1c6934 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Szymon=20K=C5=82os?= <szymon.klos@collabora.com>
-Date: Fri, 9 Jun 2017 11:10:28 +0200
-Subject: Watermark: fix rotation calculation
-
-* when angle > 180 was used calculated value was 0
-* values are rounded
-
-Change-Id: I0cade407883a60d8d802b487668882e95f42ddce
-Reviewed-on: https://gerrit.libreoffice.org/38597
-Tested-by: Jenkins <ci@libreoffice.org>
-Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
-
-diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
-index 8d6965c..94c066e9 100644
---- a/sw/source/core/edit/edfcol.cxx
-+++ b/sw/source/core/edit/edfcol.cxx
-@@ -266,6 +266,29 @@ void SwEditShell::SetClassification(const OUString& rName, SfxClassificationPoli
-     }
- }
- 
-+sal_Int16 lcl_GetAngle(const drawing::HomogenMatrix3& rMatrix)
-+{
-+    basegfx::B2DHomMatrix aTransformation;
-+    basegfx::B2DTuple aScale;
-+    basegfx::B2DTuple aTranslate;
-+    double fRotate = 0;
-+    double fShear = 0;
-+
-+    aTransformation.set(0, 0, rMatrix.Line1.Column1);
-+    aTransformation.set(0, 1, rMatrix.Line1.Column2);
-+    aTransformation.set(0, 2, rMatrix.Line1.Column3);
-+    aTransformation.set(1, 0, rMatrix.Line2.Column1);
-+    aTransformation.set(1, 1, rMatrix.Line2.Column2);
-+    aTransformation.set(1, 2, rMatrix.Line2.Column3);
-+    aTransformation.set(2, 0, rMatrix.Line3.Column1);
-+    aTransformation.set(2, 1, rMatrix.Line3.Column2);
-+    aTransformation.set(2, 2, rMatrix.Line3.Column3);
-+
-+    aTransformation.decompose(aScale, aTranslate, fRotate, fShear);
-+    sal_Int16 nDeg = round(basegfx::rad2deg(fRotate));
-+    return nDeg < 0 ? round(nDeg) * -1 : round(360.0 - nDeg);
-+}
-+
- SfxWatermarkItem SwEditShell::GetWatermark()
- {
-     SwDocShell* pDocShell = GetDoc()->GetDocShell();
-@@ -311,13 +334,7 @@ SfxWatermarkItem SwEditShell::GetWatermark()
-             if (xPropertySet->getPropertyValue(UNO_NAME_FILLCOLOR) >>= nColor)
-                 aItem.SetColor(nColor);
-             if (xPropertySet->getPropertyValue("Transformation") >>= aMatrix)
--            {
--                double y = aMatrix.Line2.Column1;
--                double x = aMatrix.Line1.Column1;
--                double nRad = atan2(y, x) * -1;
--                double nDeg = nRad * 180.0 / F_PI;
--                aItem.SetAngle(nDeg);
--            }
-+                aItem.SetAngle(lcl_GetAngle(aMatrix));
-             if (xPropertySet->getPropertyValue(UNO_NAME_FILL_TRANSPARENCE) >>= nTransparency)
-                 aItem.SetTransparency(nTransparency);
- 
-@@ -374,10 +391,7 @@ void SwEditShell::SetWatermark(const SfxWatermarkItem& rWatermark)
-             xPropertySet->getPropertyValue(UNO_NAME_FILLCOLOR) >>= nColor;
-             xPropertySet->getPropertyValue(UNO_NAME_FILL_TRANSPARENCE) >>= nTransparency;
-             xPropertySet->getPropertyValue("Transformation") >>= aMatrix;
--            double y = aMatrix.Line2.Column1;
--            double x = aMatrix.Line1.Column1;
--            double nRad = atan2(y, x) * -1;
--            nAngle = nRad * 180.0 / F_PI;
-+            nAngle = lcl_GetAngle(aMatrix);
- 
-             // If the header already contains a watermark, see if it its text is up to date.
-             uno::Reference<text::XTextRange> xTextRange(xWatermark, uno::UNO_QUERY);
--- 
-cgit v0.10.2
-

SUSE.soc

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ooo:color-table xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ooo="http://openoffice.org/2004/office"><draw:color draw:name="Black" draw:color="#000000"/><draw:color draw:name="White" draw:color="#ffffff"/><draw:color draw:name="SUSE Corporate Blue" draw:color="#0d2c40"/><draw:color draw:name="SUSE Light Green" draw:color="#a0ff5f"/><draw:color draw:name="SUSE Dark Green" draw:color="#00c081"/><draw:color draw:name="SUSE Teal" draw:color="#02a49c"/><draw:color draw:name="SUSE Light Blue" draw:color="#71d6e0"/><draw:color draw:name="SUSE Blue" draw:color="#00b2e2"/><draw:color draw:name="SUSE Dark Blue" draw:color="#0007b0"/><draw:color draw:name="SUSE Dark Purple" draw:color="#24193b"/><draw:color draw:name="SUSE Purple" draw:color="#841781"/><draw:color draw:name="SUSE Light Orange" draw:color="#ffef8d"/><draw:color draw:name="SUSE Orange" draw:color="#fd9a2b"/><draw:color draw:name="SUSE Dark Orange" draw:color="#ed6924"/><draw:color draw:name="SUSE Light Pink" draw:color="#f7a3d5"/><draw:color draw:name="SUSE Dark Pink" draw:color="#de0080"/><draw:color draw:name="SUSE Black" draw:color="#000000"/><draw:color draw:name="SUSE Dark Gray" draw:color="#5f5f5f"/><draw:color draw:name="SUSE Medium Gray" draw:color="#a7a9ac"/><draw:color draw:name="SUSE Light Gray" draw:color="#dcddde"/><draw:color draw:name="SUSE Lighter Gray" draw:color="#ededed"/><draw:color draw:name="SUSE Green" draw:color="#02d35f"/></ooo:color-table>

libreoffice-5.4.0.0.beta2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5c13946d3496480caa638ee87e888437fe32c98aee24209714d1e4bb7336a080
-size 193405736

libreoffice-5.4.0.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:139c672f405ecbae84ad01fe401990b65dc29e7bdcbef83d9a7a3dec128e08dc
+size 192102356

libreoffice-help-5.4.0.0.beta2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0660379842c191d16233466ebd0388c03ae193945c6e2a1680713cdbb3e15e77
-size 2324248

libreoffice-help-5.4.0.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2fc2b584f8c63b3c181f028deef9b44c4574af7c1e91710fa8d24def21f8e3cc
+size 2343100

libreoffice-translations-5.4.0.0.beta2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6eb70808ef78cc499dfda6bc4d4f7e06c4bb4b9537d5587a5d21e48c9107c824
-size 136326580

libreoffice-translations-5.4.0.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6ba02ecf0c4a29205cfe691ed22ac732a2539bf3c2fcd14cd020eb8bdc28adca
+size 135955252

libreoffice.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sat Jun 24 09:51:43 UTC 2017 - tchvatal@suse.com
+
+- Update to 5.4.0.1:
+  * First rc of the series, now only serious bugs will be fixed
+- Drop upstreamed patch 0001-undo-clone.patch
+- Drop upstreamed patch 0001-watermark.patch
+
+-------------------------------------------------------------------
+Wed Jun 21 13:04:49 UTC 2017 - tchvatal@suse.com
+
+- Add suse color palette bsc#1045339
+
 -------------------------------------------------------------------
 Mon Jun 19 13:20:00 UTC 2017 - tchvatal@suse.com
 

libreoffice.spec

@@ -22,7 +22,8 @@
 %define         numbertext_version 0.9.5
 # Urls
 %define         external_url       http://dev-www.libreoffice.org/src/
-%define         tarball_url        http://download.documentfoundation.org/libreoffice/src/5.4.0
+#%define         tarball_url        http://download.documentfoundation.org/libreoffice/src/5.4.0
+%define         tarball_url        http://dev-builds.libreoffice.org/pre-releases/src/
 # Wether to enable the kde integration
 %if 0%{?is_opensuse}
 %bcond_without kdeintegration
@@ -35,7 +36,7 @@
 %bcond_with firebird
 %endif
 Name:           libreoffice
-Version:        5.4.0.0.beta2
+Version:        5.4.0.1
 Release:        0
 Summary:        A Free Office Suite (Framework)
 License:        LGPL-3.0+ and MPL-2.0+
@@ -44,6 +45,8 @@ Url:            http://www.documentfoundation.org/
 Source0:        %{tarball_url}/libreoffice-%{version}.tar.xz
 Source1:        %{tarball_url}/libreoffice-help-%{version}.tar.xz
 Source2:        %{tarball_url}/libreoffice-translations-%{version}.tar.xz
+# SUSE color palette bsc#1045339 https://intra.microfocus.net/brandcentral/suse/identity.php#palette
+Source3:        SUSE.soc
 Source99:       %{name}-rpmlintrc
 # prebuilt extensions
 Source402:      %{external_url}/b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_%{numbertext_version}.oxt
@@ -80,9 +83,6 @@ Patch4:         nlpsolver-no-broken-help.diff
 Patch5:         mediawiki-no-broken-help.diff
 # PATCH-HOTFIX-UPSTREAM: disable test that rounds wrongly on most archs
 Patch16:        libreoffice-hotfix-disablebrokenshapetest.patch
-# PATCH-FIX-UPSTREAM taken from git will be in next release
-Patch17:        0001-undo-clone.patch
-Patch18:        0001-watermark.patch
 # try to save space by using hardlinks
 Patch990:       install-with-hardlinks.diff
 BuildRequires:  %{name}-share-linker
@@ -912,8 +912,6 @@ Provides additional %{langname} translations and resources for %{project}. \
 %patch4
 %patch5
 %patch16 -p1
-%patch17 -p1
-%patch18 -p1
 %patch990 -p1
 
 # Do not generate doxygen timestamp
@@ -1225,6 +1223,10 @@ for i in file-lists/*.txt; do
 done
 rm pyfiles.txt
 
+# Install color palette
+cp %{SOURCE3} %{buildroot}%{_libdir}/libreoffice/share/palette/SUSE.soc
+echo "%{_libdir}/libreoffice/share/palette/SUSE.soc" >> file-lists/common_list.txt
+
 # Symlink libreofficekit to libdir
 ln -s %{_libdir}/%{name}/program/liblibreofficekitgtk.so %{buildroot}%{_libdir}/liblibreofficekitgtk.so