pool/libreoffice
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Add patch to fix flaky test:

Browse Source 
* use-long-for-test-comparsion.patch

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=340
This commit is contained in:
Tomáš Chvátal 2015-10-22 08:12:05 +00:00 committed by Git OBS Bridge
parent 595bb50e6e
commit b721b43a7e
3 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libreoffice.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Oct 22 08:11:48 UTC 2015 - tchvatal@suse.com
- Add patch to fix flaky test:
* use-long-for-test-comparsion.patch
-------------------------------------------------------------------
Wed Oct 21 16:58:28 UTC 2015 - tchvatal@suse.com

3
libreoffice.spec
View File

@ -173,6 +173,8 @@ Patch7: 0001-Make-HAVE_JAVA6-be-always-false.patch
Patch10: bnc-889755.diff
# bnc#679938 - LO-L3: saving to doc file the chapter name in the header does not change with chapters
Patch11: bnc-679938.diff
# PATCH-FIX-UPSTREAM: taken from Master to fix flaky test
Patch12: use-long-for-test-comparsion.patch
# try to save space by using hardlinks
Patch990: install-with-hardlinks.diff
BuildRequires: %{name}-share-linker
@ -1002,6 +1004,7 @@ Provides additional %{langname} translations and resources for %{project}. \
%endif
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch990 -p1
# 256x256 icons
tar -xjf %{SOURCE20}

29
use-long-for-test-comparsion.patch Normal file
View File

@ -0,0 +1,29 @@
From 494aa9ee5d01699c0dcbc912091de30a314c09fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Kukan?= <matus.kukan@gmail.com>
Date: Fri, 18 Sep 2015 12:57:39 +0200
Subject: Workaround unit test failure by comparing as long
On 32bit system, for some reason casting to double gives wrong results.
Failing unit test was testTdf87924 in CppunitTest_sw_ooxmlimport.
Change-Id: If93e5288a381e50f30d035d56131b1d9235ac658
Reviewed-on: https://gerrit.libreoffice.org/18684
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx
index 657071b..0cf558c 100644
--- a/oox/source/shape/WpsContext.cxx
+++ b/oox/source/shape/WpsContext.cxx
@@ -100,7 +100,7 @@ oox::core::ContextHandlerRef WpsContext::onCreateContext(sal_Int32 nElementToken
// If the text is not rotated the way the shape wants it already, set the angle.
const sal_Int32 nRotation = -270;
- if (basegfx::rad2deg(fRotate) != static_cast<double>(NormAngle360(nRotation * 100)) / 100)
+ if (static_cast<long>(basegfx::rad2deg(fRotate)) != NormAngle360(nRotation * 100) / 100)
{
comphelper::SequenceAsHashMap aCustomShapeGeometry(xPropertySet->getPropertyValue("CustomShapeGeometry"));
aCustomShapeGeometry["TextPreRotateAngle"] = uno::makeAny(nRotation);
--
cgit v0.10.2