diff --git a/libreoffice.changes b/libreoffice.changes index 73b967a..1275220 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jul 14 14:56:11 UTC 2015 - tchvatal@suse.com + +- Add patch to build with old cairo (sle11): + * old-cairo.patch + ------------------------------------------------------------------- Tue Jul 14 09:00:37 UTC 2015 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index e0e9166..5673db8 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -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: properly detect cairo version +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} diff --git a/old-cairo.patch b/old-cairo.patch new file mode 100644 index 0000000..190a05c --- /dev/null +++ b/old-cairo.patch @@ -0,0 +1,23 @@ +From b51fe01f7c8853c353401001bdd417b9ed27fb87 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Thu, 25 Jun 2015 15:10:37 +0100 +Subject: WaE: error: 'CAIRO_VERSION' is not defined + +Change-Id: I9e4f0d0af541226089a6295962a91ca09debb418 + +diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx +index f5dbaf4..d29a956 100644 +--- a/vcl/headless/svpgdi.cxx ++++ b/vcl/headless/svpgdi.cxx +@@ -141,7 +141,7 @@ bool SvpSalGraphics::drawAlphaRect(long nX, long nY, long nWidth, long nHeight, + #if !ENABLE_CAIRO_CANVAS + (void)nX; (void)nY; (void)nWidth; (void)nHeight; (void)nTransparency; + return false; +-#elif CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 6, 0) ++#elif defined(CAIRO_VERSION) && defined(CAIRO_VERSION_ENCODE) && CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 6, 0) + if (m_bUseLineColor || !m_bUseFillColor) + return false; + +-- +cgit v0.10.2 +