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

- Version bump to 5.0 rc5:

Browse Source 
* Bunch of final touchups here and there
- Remove some upstreamed patches:
  * old-cairo.patch

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=306
This commit is contained in:
Tomáš Chvátal 2015-08-04 09:26:59 +00:00 committed by Git OBS Bridge
parent b6599aeac9
commit 2e2f061226
9 changed files with 18 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libreoffice-5.0.0.3.tar.xz
View File

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

3
libreoffice-5.0.0.5.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9b17f5848ecbe5302ff676abaa187f49ddc35bed1a56898b7e3e0b3e152dce10
size 166444400

3
libreoffice-help-5.0.0.3.tar.xz
View File

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

3
libreoffice-help-5.0.0.5.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9b515f8890a19166d2193f5e2b76dea334b2399d0e976fdd355f6e3feaaa98a3
size 1882344

3
libreoffice-translations-5.0.0.3.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:34f76fac859d7f5b3c34b5cfe81404e9ab4d5d771dc551d8507fa2757ebbd0e1
size 129775160

3
libreoffice-translations-5.0.0.5.tar.xz Normal file
View File

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

8
libreoffice.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Aug 4 09:19:53 UTC 2015 - tchvatal@suse.com
- Version bump to 5.0 rc5:
* Bunch of final touchups here and there
- Remove some upstreamed patches:
* old-cairo.patch
-------------------------------------------------------------------
Wed Jul 22 12:12:07 UTC 2015 - tchvatal@suse.com

5
libreoffice.spec
View File

@ -65,7 +65,7 @@ Requires: python-importlib
%endif
# This is used due to the need for beta releases
Name: libreoffice
Version: 5.0.0.3
Version: 5.0.0.5
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
@ -168,8 +168,6 @@ Patch4: nlpsolver-no-broken-help.diff
Patch5: mediawiki-no-broken-help.diff
# PATCH-FIX-SUSE: do not declare java6 available for without system libs build
Patch7: 0001-Make-HAVE_JAVA6-be-always-false.patch
# PATCH-FIX-UPSTREAM: build with old sle11 cairo
Patch8: old-cairo.patch
# try to save space by using hardlinks
Patch990: install-with-hardlinks.diff
BuildRequires: %{name}-share-linker
@ -973,7 +971,6 @@ Provides additional %{langname} translations and resources for %{project}. \
%if !%{with systemlibs}
%patch7 -p1
%endif
%patch8 -p1
%patch990 -p1
# 256x256 icons
tar -xjf %{SOURCE20}

22
old-cairo.patch
View File

@ -1,22 +0,0 @@
Index: libreoffice-5.0.0.3/vcl/headless/svpgdi.cxx
===================================================================
--- libreoffice-5.0.0.3.orig/vcl/headless/svpgdi.cxx
+++ libreoffice-5.0.0.3/vcl/headless/svpgdi.cxx
@@ -108,7 +108,7 @@ namespace
if (rBuffer->getScanlineFormat() != basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_BGRX)
return false;
-#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 6, 0)
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0)
basegfx::B2IVector size = rBuffer->getSize();
sal_Int32 nStride = rBuffer->getScanlineStride();
return (cairo_format_stride_for_width(CAIRO_FORMAT_RGB24, size.getX()) == nStride);
@@ -142,7 +142,7 @@ bool SvpSalGraphics::drawAlphaRect(long
bool bRet = false;
(void)nX; (void)nY; (void)nWidth; (void)nHeight; (void)nTransparency;
#if ENABLE_CAIRO_CANVAS
-#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 6, 0)
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0)
if (m_bUseLineColor || !m_bUseFillColor)
return bRet;