From 5c404effa22f8c90bbd0ba72171b0f362b88618d Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: May 24 2011 04:38:22 +0000
Subject: Resolves: rhbz#706110 oosplash.bin segfault on every login


---

diff --git a/0001-handle-NULL-display-gracefully.patch b/0001-handle-NULL-display-gracefully.patch
new file mode 100644
index 0000000..f80fff6
--- /dev/null
+++ b/0001-handle-NULL-display-gracefully.patch
@@ -0,0 +1,36 @@
+From d14700853b39685e5171b5aa99142106cd658aad Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Tue, 24 May 2011 06:30:46 +0200
+Subject: [PATCH] handle NULL display gracefully
+
+---
+ desktop/unx/source/splashx.c |    6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c
+index a8a87b0..dc88343 100755
+--- a/desktop/unx/source/splashx.c
++++ b/desktop/unx/source/splashx.c
+@@ -574,6 +574,9 @@ static void process_events()
+ // Draw the progress
+ void splash_draw_progress( int progress )
+ {
++    if (!display)
++        return;
++
+     // sanity
+     if ( progress < 0 )
+         progress = 0;
+@@ -604,7 +607,8 @@ void splash_draw_progress( int progress )
+ // Close the window & cleanup
+ void splash_close_window()
+ {
+-    XCloseDisplay( display );
++    if (display)
++        XCloseDisplay( display );
+ #ifdef USE_LIBPNG
+     png_destroy_read_struct( &png_ptr, &info_ptr, NULL );
+ #else
+-- 
+1.7.5.1
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 63bbba4..a0b8be9 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -15,7 +15,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        3.4.0.1
-Release:        1%{?dist}
+Release:        2%{?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
@@ -88,6 +88,7 @@ Patch13: 0001-bubble-down-configure-test-findings-on-visibility.patch
 Patch14: vbahelper.visibility.patch
 Patch15: 0001-rhbz-702635-set-correct-page-number-when-exporting-s.patch
 Patch16: 0001-fix-build-with-system-bsh.patch
+Patch17: 0001-handle-NULL-display-gracefully.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -705,6 +706,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch14 -p0 -b .vbahelper.visibility.patch
 %patch15 -p1 -b .rhbz702635-set-correct-page-number-when-exporting-s.patch
 %patch16 -p1 -b .fix-build-with-system-bsh.patch
+%patch17 -p1 -b .handle-NULL-display-gracefully.patch
 
 # these are horribly incomplete--empty translations and copied english
 # strings with spattering of translated strings
@@ -1996,6 +1998,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %{basisinstdir}/program/kde-open-url
 
 %changelog
+* Tue May 24 2011 David Tardon <dtardon@redhat.com> - 3.4.0.1-2
+- Resolves: rhbz#706110 oosplash.bin segfault on every login
+
 * Fri May 20 2011 David Tardon <dtardon@redhat.com> - 3.4.0.1-1
 - 3.4 RC1
 - Resolves: rhbz#702635 set correct page number when exporting selected