[libreoffice] Resolves: rhbz#757653 fix headless crash with cairo canvas

[Caolán McNamara]

commit b60a2d714576211f593a07d290be16db80ea3b21
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Nov 29 10:05:30 2011 +0000

    Resolves: rhbz#757653 fix headless crash with cairo canvas

 ...iro-canvas-crash-for-non-X-or-svp-backend.patch |   26 ++++++++++++++++++++
 libreoffice.spec                                   |    7 ++++-
 2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/0001-gtk3-fix-cairo-canvas-crash-for-non-X-or-svp-backend.patch b/0001-gtk3-fix-cairo-canvas-crash-for-non-X-or-svp-backend.patch
new file mode 100644
index 0000000..f833632
--- /dev/null
+++ b/0001-gtk3-fix-cairo-canvas-crash-for-non-X-or-svp-backend.patch
@@ -0,0 +1,26 @@
+From a07e8231a5cd3e12f7120486098479ab6ae6bcc2 Mon Sep 17 00:00:00 2001
+From: Michael Meeks <michael.meeks at suse.com>
+Date: Thu, 20 Oct 2011 21:49:40 +0100
+Subject: [PATCH] gtk3: fix cairo canvas crash for non X (or svp) backend
+
+---
+ canvas/source/cairo/cairo_xlib_cairo.cxx |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/canvas/source/cairo/cairo_xlib_cairo.cxx b/canvas/source/cairo/cairo_xlib_cairo.cxx
+index a0569ab..8e9120d 100644
+--- a/canvas/source/cairo/cairo_xlib_cairo.cxx
++++ b/canvas/source/cairo/cairo_xlib_cairo.cxx
+@@ -55,6 +55,9 @@ namespace cairo
+             return false;
+ 
+         Display* pDisplay = (Display*)pOutDev->GetSystemGfxData().pDisplay;
++        if( !pDisplay )
++            return false;
++
+         int nDummy;
+         return XQueryExtension( pDisplay, "RENDER", &nDummy, &nDummy, &nDummy );
+     }
+-- 
+1.7.6.4
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 7ca5692..b43b2c8 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -27,7 +27,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        3.4.4.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and (CDDL or GPLv2) and Public Domain
 Group:          Applications/Productivity
 URL:            http://www.documentfoundation.org/develop
@@ -145,6 +145,7 @@ Patch39: 0001-Related-rhbz-753201-fedora-ant-java-1.5.0-gcj-won-t-.patch
 Patch40: solenv.fix.mk.inheritance.patch
 Patch41: libreoffice-ppc64.patch
 Patch42: 0001-Resolves-rhbz-751290-KDE-black-on-dark-tooltips.patch
+Patch43: 0001-gtk3-fix-cairo-canvas-crash-for-non-X-or-svp-backend.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -833,6 +834,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch40 -p1 -b .solenv.fix.mk.inheritance.patch
 %patch41 -p1 -b .libreoffice-ppc64.patch
 %patch42 -p1 -b .rhbz751290-KDE-black-on-dark-tooltips.patch
+%patch43 -p1 -b .fix-cairo-canvas-crash-for-non-X-or-svp-backend.patch
 
 # these are horribly incomplete--empty translations and copied english
 # strings with spattering of translated strings
@@ -2135,6 +2137,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Tue Nov 29 2011 Caolán McNamara <caolanm at redhat.com> - 3.4.4.2-5
+- Resolves: rhbz#757653 fix headless crash with cairo canvas
+
 * Tue Nov 22 2011 Lukas Tinkl <ltinkl at redhat.com> - 3.4.4.2-4
 - Resolves: rhbz#751290 - [kde] LibreOffice has black on dark-grey tooltip-texts