Hello community, here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2016-04-28 16:52:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreoffice (Old) and /work/SRC/openSUSE:Factory/.libreoffice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice" Changes: -------- --- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2016-04-11 09:11:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice.changes 2016-04-28 16:52:28.000000000 +0200 @@ -1,0 +2,17 @@ +Tue Apr 26 09:46:38 UTC 2016 - andras.ti...@collabora.com + +- Version update to 5.1.3.1: + * Various small bugfixes all around 5.1 series + +------------------------------------------------------------------- +Tue Apr 26 09:10:05 UTC 2016 - andras.ti...@collabora.com + +- fix bnc#856729 - LO-L3: Double borders in Calc + * bnc856729.patch + +------------------------------------------------------------------- +Sat Apr 23 07:09:45 UTC 2016 - dmuel...@suse.com + +- update constraints file for aarch64 + +------------------------------------------------------------------- @@ -454,0 +472,5 @@ + +------------------------------------------------------------------- +Wed May 6 16:54:47 UTC 2015 - dmuel...@suse.com + +- enable aarch64 build Old: ---- libreoffice-5.1.2.2.tar.xz libreoffice-help-5.1.2.2.tar.xz libreoffice-translations-5.1.2.2.tar.xz New: ---- bnc856729.patch libreoffice-5.1.3.1.tar.xz libreoffice-help-5.1.3.1.tar.xz libreoffice-translations-5.1.3.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice.spec ++++++ --- /var/tmp/diff_new_pack.vew8ct/_old 2016-04-28 16:52:44.000000000 +0200 +++ /var/tmp/diff_new_pack.vew8ct/_new 2016-04-28 16:52:44.000000000 +0200 @@ -22,7 +22,7 @@ %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.1.2 +%define tarball_url http://download.documentfoundation.org/libreoffice/src/5.1.3 # Old Make and bundle or not %if 0%{?suse_version} > 1230 %bcond_with oldmake @@ -64,7 +64,7 @@ %endif # This is used due to the need for beta releases Name: libreoffice -Version: 5.1.2.2 +Version: 5.1.3.1 Release: 0 Summary: A Free Office Suite (Framework) License: Apache-2.0 and Artistic-1.0 and BSD-3-Clause and BSD-4-Clause and GPL-2.0+ and LPPL-1.3c and LGPL-2.1+ and LGPL-3.0 and MPL-1.1 and MIT and SUSE-Public-Domain and W3C @@ -178,6 +178,8 @@ Patch15: 0003-boost-filesystem2.patch # PATCH-HOTFIX-UPSTREAM: disable test that rounds wrongly on most archs Patch16: libreoffice-hotfix-disablebrokenshapetest.patch +# bnc#856729 - LO-L3: fix double borders in Calc +Patch17: bnc856729.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: %{name}-share-linker @@ -262,7 +264,7 @@ Provides: %{name}-icon-theme-crystal = %{version} Obsoletes: %{name}-icon-theme-crystal < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: %arm %ix86 x86_64 ppc ppc64 +ExclusiveArch: %arm aarch64 %ix86 x86_64 ppc ppc64 %if %{with kdeintegration} BuildRequires: libkde4-devel %endif @@ -350,7 +352,7 @@ %ifarch %ix86 Recommends: jre-32 >= 1.6 %endif -%ifarch x86_64 +%ifarch x86_64 aarch64 ppc64 Recommends: jre-64 >= 1.6 %endif %ifarch ppc @@ -773,7 +775,7 @@ Requires: jre-32 > 1.5 Recommends: jre-32 >= 1.6 %endif -%ifarch x86_64 +%ifarch x86_64 aarch64 ppc64 Requires: jre-64 > 1.5 Recommends: jre-64 >= 1.6 %endif @@ -796,7 +798,7 @@ Requires: jre-32 > 1.5 Recommends: jre-32 >= 1.6 %endif -%ifarch x86_64 +%ifarch x86_64 aarch64 ppc64 Requires: jre-64 > 1.5 Recommends: jre-64 >= 1.6 %endif @@ -1073,6 +1075,7 @@ %patch14 -p1 %patch15 -p1 %patch16 -p1 +%patch17 -p1 %patch990 -p1 # 256x256 icons tar -xjf %{SOURCE20} ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.vew8ct/_old 2016-04-28 16:52:44.000000000 +0200 +++ /var/tmp/diff_new_pack.vew8ct/_new 2016-04-28 16:52:44.000000000 +0200 @@ -1,10 +1,32 @@ <constraints> - <hardware> - <physicalmemory> - <size unit="M">6000</size> - </physicalmemory> - <disk> - <size unit="G">30</size> - </disk> - </hardware> + + <overwrite> + <conditions> + <arch>aarch64</arch> + </conditions> + <hardware> + <physicalmemory> + <size unit="M">2000</size> + </physicalmemory> + <disk> + <size unit="G">40</size> + </disk> + </hardware> + </overwrite> + + <overwrite> + <conditions> + <arch>i586</arch> + <arch>x86_64</arch> + <arch>ppc64</arch> + </conditions> + <hardware> + <physicalmemory> + <size unit="M">4000</size> + </physicalmemory> + <disk> + <size unit="G">40</size> + </disk> + </hardware> + </overwrite> </constraints> ++++++ bnc856729.patch ++++++ >From a5928a57a53df84cacd2975e227f9e03d50456a6 Mon Sep 17 00:00:00 2001 From: Miklos Vajna <vmik...@collabora.co.uk> Date: Fri, 15 Apr 2016 15:46:06 +0200 Subject: [PATCH] tdf#99315 VclPixelProcessor2D: fix double border line width Regression from commit 2c91cb08d65cd35fa8ef6eaca3677aa82fb58cbe (better drawing support for borders of different width, fdo#33634, 2012-04-04), the problem is that previously the width of inner/outer double border lines got rounded to integer values quite early, but after the commit they are kept at a double precision for much longer, which needs pixel correction in VclPixelProcessor2D. Example: if the border with is 1.47, and the line gets moved by 0.2 pixels, then the inner and outer edge of the line will be 0.2 and 1.67, which gets rounded to 0 -> 2 in the pixel processor. Previously the input was rounded to 1, so moving by 0.2 resulted in 0.2 -> 1.2, which got rounded to 0 -> 1. The result is that sometimes the line width is 1 pixel wider than expected. Fix the problem by allowing VclPixelProcessor2D to request pixel correction from BorderLinePrimitive2D. It wouldn't be possible to do pixel correction only in VclPixelProcessor2D, as it has no idea what to correct: it only gets polygons, so it has no idea if e.g. the top of a polygon is the outer edge of a top border line or an inner edge of a bottom border line. Conflicts: drawinglayer/source/primitive2d/borderlineprimitive2d.cxx (cherry picked from commits 1ee570a4e625719f8bf270d372926c0d829ae6f0, 555c9add26e06030402c73f885de98f4b96826f0, 304f50684d3ac08e973fd27e6acf3e821394d164, 422f10c5d7ebe6f4b778636c9c1eb6dbdf708a27, ce12a5021a080cc1781e0e0256af5e0085e11ef2 and cac70559013e575009657aa3c5168b88b1f14691) Change-Id: I1971f3a952fbcdc598ab46c659e12d976c13cbe6 Reviewed-on: https://gerrit.libreoffice.org/24238 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Eike Rathke <er...@redhat.com> Tested-by: Eike Rathke <er...@redhat.com> --- drawinglayer/CppunitTest_drawinglayer_border.mk | 52 +++++++ drawinglayer/Module_drawinglayer.mk | 4 + drawinglayer/qa/unit/border.cxx | 150 +++++++++++++++++++++ .../source/primitive2d/borderlineprimitive2d.cxx | 28 +++- .../source/processor2d/vclpixelprocessor2d.cxx | 7 +- .../primitive2d/borderlineprimitive2d.hxx | 2 + 6 files changed, 239 insertions(+), 4 deletions(-) create mode 100644 drawinglayer/CppunitTest_drawinglayer_border.mk create mode 100644 drawinglayer/qa/unit/border.cxx diff --git a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx index 30e656d..30e7dcb 100644 --- a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx @@ -28,6 +28,17 @@ #include <numeric> #include <algorithm> +#if defined(ANDROID) +namespace std +{ +template<typename T> +T round(T x) +{ + return ::round(x); +} +} +#endif + namespace drawinglayer { namespace { @@ -63,7 +74,7 @@ primitive2d::Primitive2DReference makeSolidLinePrimitive( const basegfx::B2DVector& rVector, const basegfx::BColor& rColor, double fLineWidth, double fGap) { const basegfx::B2DVector aPerpendicular = basegfx::getPerpendicular(rVector); - const basegfx::B2DVector aLineWidthOffset = ((fLineWidth + 1.0) * 0.5) * aPerpendicular; + const basegfx::B2DVector aLineWidthOffset = (fLineWidth * 0.5) * aPerpendicular; basegfx::B2DPolygon aPolygon; aPolygon.append(rStart + aLineWidthOffset); @@ -163,6 +174,11 @@ primitive2d::Primitive2DReference makeSolidLinePrimitive( Primitive2DSequence BorderLinePrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const { + return createDecomposition(rViewInformation, false); + } + + Primitive2DSequence BorderLinePrimitive2D::createDecomposition(const geometry::ViewInformation2D& rViewInformation, bool bPixelCorrection) const + { Primitive2DSequence xRetval; if(!getStart().equal(getEnd()) && ( isInsideUsed() || isOutsideUsed() ) ) @@ -199,8 +215,11 @@ primitive2d::Primitive2DReference makeSolidLinePrimitive( xRetval[0] = makeHairLinePrimitive( getStart(), getEnd(), aVector, getRGBColorLeft(), 0.0); else + { + double fWidth = bPixelCorrection ? std::round(fLeftWidth) : fLeftWidth; xRetval[0] = makeSolidLinePrimitive( - aClipRegion, aTmpStart, aTmpEnd, aVector, getRGBColorLeft(), fLeftWidth, -fLeftWidth/2.0); + aClipRegion, aTmpStart, aTmpEnd, aVector, getRGBColorLeft(), fWidth, -fLeftWidth/2.0); + } // "outside" line @@ -208,8 +227,11 @@ primitive2d::Primitive2DReference makeSolidLinePrimitive( xRetval[1] = makeHairLinePrimitive( getStart(), getEnd(), aVector, getRGBColorRight(), fLeftWidth+mfDistance); else + { + double fWidth = bPixelCorrection ? std::round(fRightWidth) : fRightWidth; xRetval[1] = makeSolidLinePrimitive( - aClipRegion, aTmpStart, aTmpEnd, aVector, getRGBColorRight(), fRightWidth, mfDistance+fRightWidth/2.0); + aClipRegion, aTmpStart, aTmpEnd, aVector, getRGBColorRight(), fWidth, mfDistance+fRightWidth/2.0); + } } else { diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx index 8dcd74e..8398573 100644 --- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx @@ -1232,7 +1232,12 @@ namespace drawinglayer static_cast<const drawinglayer::primitive2d::BorderLinePrimitive2D&>(rCandidate); if (!tryDrawBorderLinePrimitive2DDirect(rBorder)) - process(rCandidate.get2DDecomposition(getViewInformation2D())); + { + if (rBorder.getStyle() == table::BorderLineStyle::DOUBLE) + process(rBorder.createDecomposition(getViewInformation2D(), true)); + else + process(rCandidate.get2DDecomposition(getViewInformation2D())); + } mpOutputDevice->SetAntialiasing(nAntiAliasing); break; diff --git a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx index 72e04d5..f152f2d 100644 --- a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx @@ -132,6 +132,8 @@ namespace drawinglayer bool hasGapColor( ) const { return mbHasGapColor; } short getStyle () const { return mnStyle; } double getPatternScale() const { return mfPatternScale; } + /// Same as create2DDecomposition(), but can do pixel correction if requested. + Primitive2DSequence createDecomposition(const geometry::ViewInformation2D& rViewInformation, bool bPixelCorrection) const; /// compare operator virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; -- 2.6.6 ++++++ libreoffice-5.1.2.2.tar.xz -> libreoffice-5.1.3.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-5.1.2.2.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-5.1.3.1.tar.xz differ: char 25, line 1 ++++++ libreoffice-help-5.1.2.2.tar.xz -> libreoffice-help-5.1.3.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-5.1.2.2/ChangeLog-helpcontent2 new/libreoffice-5.1.3.1/ChangeLog-helpcontent2 --- old/libreoffice-5.1.2.2/ChangeLog-helpcontent2 2016-03-29 18:00:09.000000000 +0200 +++ new/libreoffice-5.1.3.1/ChangeLog-helpcontent2 2016-04-20 01:55:45.000000000 +0200 @@ -1,14 +1,14 @@ -2016-03-29 Jan Iversen <j...@documentfoundation.org> [d015a3ceac681c257734620c0d5996940dad4c7d] +2016-04-20 Christian Lohmaier <lohmaier+libreoff...@googlemail.com> [857050cca29aa33725e5193358a494f7934eb0ec] -Version 5.1.2.2, tag libreoffice-5.1.2.2 +Version 5.1.3.1, tag libreoffice-5.1.3.1 -Change-Id: I394c061e7d50f00d5eba93b3fec792d8319dea06 +Change-Id: Ib9b7873ebc06fa952754bc8931040734456d7b9b -2016-03-16 Jan Iversen <j...@documentfoundation.org> [5215695e5607db25f4ac1957395c27d00f63f409] +2016-04-20 Christian Lohmaier <lohmaier+libreoff...@googlemail.com> [c996c20eb7664c7df7bf09fde6c2813aaf4fd481] -Branch libreoffice-5-1-2 +Branch libreoffice-5-1-3 -This is 'libreoffice-5-1-2' - the stable branch for the 5.1.2 release. +This is 'libreoffice-5-1-3' - the stable branch for the 5.1.3 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 5.1.x release, @@ -16,7 +16,15 @@ If you want to build something cool, unstable, and risky, use master. -Change-Id: I1191657ac2af2cd648ffc00fb90e768c2b6f3318 +Change-Id: Ie05ab5ff54d45ba6222a7d45a5b914fc40ddb922 + +2016-04-16 Christian Lohmaier <lohmaier+libreoff...@googlemail.com> [0115dc3ebecd36362fc6a1082738a5c8506c2ba9] + +remove doubled + in switchinline + +via pootle-feedback + +Change-Id: I9fcee24ad480d35a42fbcea00e4881ebbfa968dd 2016-03-02 Adolfo Jayme Barrientos <fit...@ubuntu.com> [32494e774e5e99a58ad49ce90d18c33264d0a00d] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-5.1.2.2/helpcontent2/source/text/swriter/01/06030000.xhp new/libreoffice-5.1.3.1/helpcontent2/source/text/swriter/01/06030000.xhp --- old/libreoffice-5.1.2.2/helpcontent2/source/text/swriter/01/06030000.xhp 2016-03-29 17:38:47.000000000 +0200 +++ new/libreoffice-5.1.3.1/helpcontent2/source/text/swriter/01/06030000.xhp 2016-04-20 01:35:31.000000000 +0200 @@ -63,8 +63,7 @@ <paragraph role="note" id="par_id3154276" xml-lang="en-US" l10n="U" oldref="18">To disable the Hyphenation dialog and always hyphenate automatically, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010400.xhp" name="Language Settings - Writing Aids">Language Settings - Writing Aids</link></emph>, and select the <emph>Hyphenate without inquiry</emph> check box.</paragraph> <paragraph role="paragraph" id="par_id3152950" xml-lang="en-US" l10n="U" oldref="17">To manually enter a hyphen directly in the document, click in the word where you want to add the hyphen, and then press <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Minus sign (-).</paragraph> -<paragraph role="paragraph" id="par_id3147523" xml-lang="en-US" l10n="U" oldref="32">To insert a non-breaking (protected) hyphen directly in the document, click in the word that you want to hyphenate, and then press Shift+<switchinline select="sys"><caseinline select="MAC">Command -</caseinline><defaultinline>+Ctrl </defaultinline></switchinline>+Minus sign(-).</paragraph> +<paragraph role="paragraph" id="par_id3147523" xml-lang="en-US" l10n="U" oldref="32">To insert a non-breaking (protected) hyphen directly in the document, click in the word that you want to hyphenate, and then press Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Minus sign(-).</paragraph> <paragraph role="paragraph" id="par_id3154573" xml-lang="en-US" l10n="U" oldref="33">To hide soft hyphens, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040600.xhp" name="Text Document - Formatting Aids">%PRODUCTNAME Writer - Formatting Aids</link></emph>, and then clear the <emph>Custom hyphens</emph> check box.</paragraph> <paragraph role="heading" id="hd_id3150360" xml-lang="en-US" level="2" l10n="U" oldref="20">Word</paragraph> <bookmark xml-lang="en-US" branch="hid/cui/ui/hyphenate/worded" id="bm_id3155903" localize="false"/> ++++++ libreoffice-translations-5.1.2.2.tar.xz -> libreoffice-translations-5.1.3.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-translations-5.1.2.2.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-translations-5.1.3.1.tar.xz differ: char 25, line 1
