[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.3-1-21-g3f08112
The following commit has been merged in the master branch:
commit 3f08112ca069d4ebab34fd27fc9af4bb2f72f8f4
Author: Rene Engelhard <rene@debian.org>
Date: Thu Sep 15 21:47:17 2011 +0200
debian/patches/handle-NULL-display-gracefully.diff: backport from libreoffice-3-4
diff --git a/changelog b/changelog
index 84e4b16..bbe99b8 100644
--- a/changelog
+++ b/changelog
@@ -8,6 +8,7 @@ libreoffice (1:3.4.3-2) UNRELEASED; urgency=low
for the patch (closes: #633480)
* debian/patches/update-sdbc-postgresql.diff: update SDBC PostgreSQL
driver to Lionels new LibreOffice version.
+ * debian/patches/handle-NULL-display-gracefully.diff: backport from libreoffice-3-4
* debian/control.in:
- remove obsolete Pre-Depends on debconf in ure
@@ -23,7 +24,7 @@ libreoffice (1:3.4.3-2) UNRELEASED; urgency=low
[ Lionel Elie Mamane ]
* debian/rules: we need translate-toolkit (>= 1.9.0)
- -- Rene Engelhard <rene@debian.org> Mon, 12 Sep 2011 23:23:06 +0200
+ -- Rene Engelhard <rene@debian.org> Thu, 15 Sep 2011 21:46:24 +0200
libreoffice (1:3.4.3-1) unstable; urgency=low
diff --git a/patches/handle-NULL-display-gracefully.diff b/patches/handle-NULL-display-gracefully.diff
new file mode 100644
index 0000000..8479838
--- /dev/null
+++ b/patches/handle-NULL-display-gracefully.diff
@@ -0,0 +1,38 @@
+--- /dev/null 2011-09-14 22:08:43.143634037 +0200
++++ libreoffice-3.4.3/libreoffice-build/patches/hotfixes/handle-NULL-display-gracefully.diff 2011-09-15 21:39:32.000000000 +0200
+@@ -0,0 +1,35 @@
++From 253ff23c3a93b5ea45a2451a8bc97fca19856a75 Mon Sep 17 00:00:00 2001
++From: David Tardon <dtardon@redhat.com>
++Date: Tue, 24 May 2011 04:30:46 +0000
++Subject: handle NULL display gracefully
++
++(cherry-picked from core 2daa098c3c1b49ce4d46306eddc45f7a66b7c021)
++
++Signed-off-by: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
++---
++diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c
++index 4f5d4b2..e975733 100755
++--- desktop/unx/source/splashx.c
+++++ desktop/unx/source/splashx.c
++@@ -589,6 +589,9 @@ static void process_events()
++ // Draw the progress
++ void splash_draw_progress( int progress )
++ {
+++ if (!display)
+++ return;
+++
++ // sanity
++ if ( progress < 0 )
++ progress = 0;
++@@ -619,7 +622,8 @@ void splash_draw_progress( int progress )
++ // Close the window & cleanup
++ void splash_close_window()
++ {
++- XCloseDisplay( display );
+++ if (display)
+++ XCloseDisplay( display );
++ display = NULL;
++ #ifdef USE_LIBPNG
++ png_destroy_read_struct( &png_ptr, &info_ptr, NULL );
++--
++cgit v0.9.0.2-2-gbebe
diff --git a/patches/series b/patches/series
index 54e899f..3cfe7b1 100644
--- a/patches/series
+++ b/patches/series
@@ -22,3 +22,4 @@ oosplash-javaldx-path.diff
no-deprecated-options-in-qstart-wrappers.diff
fix-sample-icc-1.3.2-patch.diff
update-sdbc-postgresql.diff
+handle-NULL-display-gracefully.diff
--
LibreOffice packaging repository
Reply to: