[openoffice.org/f14] Resolves: rhbz#757653 fix headless crash with cairo canvas

[Caolán McNamara]

commit bc89d39d6092ed28fbb9613024e739645f33a4bf
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Nov 29 10:24:38 2011 +0000

    Resolves: rhbz#757653 fix headless crash with cairo canvas

 ...iro-canvas-crash-for-non-X-or-svp-backend.patch |   26 ++++++++++++++++++++
 openoffice.org.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/openoffice.org.spec b/openoffice.org.spec
index 78225ae..e57c4d9 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -1,6 +1,6 @@
 %define oootag OOO330
 %define ooomilestone 20
-%define rh_rpm_release 9
+%define rh_rpm_release 10
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -182,6 +182,7 @@ Patch98: 0001-Resolves-fdo-39159-don-t-restore-original-view-setti.patch
 Patch99: 0001-Resolves-rhbz-738255-avoid-crash-on-NULL-pointer.patch
 Patch100: 2011-2713.patch
 Patch101: 0001-DOCX-fdo-32170-Skip-unsupported-w-sdt-elements.patch
+Patch102: 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}
@@ -1780,6 +1781,7 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
 %patch99 -p1 -b .rhbz738255-avoid-crash-on-NULL-pointer.patch
 %patch100 -p1 -b .2011-2713.patch
 %patch101 -p1 -b .rhbz624561-Skip-unsupported-w-sdt-elements.patch
+%patch102 -p1 -b .gtk3-fix-cairo-canvas-crash-for-non-X-or-svp-backend.patch
 touch scripting/source/pyprov/delzip
 touch scripting/util/provider/beanshell/delzip
 touch scripting/util/provider/javascript/delzip
@@ -3975,6 +3977,9 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
 %endif
 
 %changelog
+* Tue Nov 29 2011 Caolán McNamara <caolanm at redhat.com> - 1:3.3.0-20.10
+- Resolves: rhbz#757653 fix headless crash with cairo canvas
+
 * Tue Oct 25 2011 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-20.9
 - Resolves: rhbz#624561 Skip unsupported <w:sdt> elements (dtardon)