rpm/libreoffice
SHA256
1
0
Fork 0
forked from pool/libreoffice
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=303

Browse Source
This commit is contained in:
Tomáš Chvátal 2015-07-16 08:35:11 +00:00 committed by Git OBS Bridge
parent 4760dee09f
commit 89023d5a7d
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libreoffice.spec
View File

@ -168,6 +168,8 @@ 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
@ -968,6 +970,7 @@ 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 Normal file
View File

@ -0,0 +1,22 @@
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;