[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.4_dfsg2-1-1-gd0a7999
The following commit has been merged in the master branch:
commit d0a79990bc89822f74b94e82626cbcd02a3ab2b9
Author: Rene Engelhard <rene@debian.org>
Date: Sun Apr 7 15:29:37 2013 +0200
backport #681185 fix from 3.6
Conflicts:
changelog
patches/series
diff --git a/changelog b/changelog
index c8385db..11d07ee 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:3.5.4+dfsg2-2) UNRELEASED; urgency=low
+
+ * debian/patches/oosplash-wait-for-ProcessingDone.diff: backport from 3.6;
+ make oosplash wait for InternalIPC::ProcessingDone (closes: #681185)
+
+ -- Rene Engelhard <rene@debian.org> Sun, 07 Apr 2013 15:33:36 +0200
+
libreoffice (1:3.5.4+dfsg2-1) unstable; urgency=low
* src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip: remove
diff --git a/patches/oosplash-wait-for-ProcessingDone.diff b/patches/oosplash-wait-for-ProcessingDone.diff
new file mode 100644
index 0000000..40f5a7a
--- /dev/null
+++ b/patches/oosplash-wait-for-ProcessingDone.diff
@@ -0,0 +1,35 @@
+From da329b8bb04f5d6a5c89afb7f083c7de679d5691 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman@redhat.com>
+Date: Thu, 06 Sep 2012 10:43:54 +0000
+Subject: deb#681185: wait for InternalIPC::ProcessingDone in oosplash
+
+Change-Id: I9606ec34ad0d8d24dca71d060bf5e1d37152903c
+(cherry picked from commit 5c804dce946a928adcaf97533f5345b33e688ff5)
+Reviewed-on: https://gerrit.libreoffice.org/569
+Reviewed-by: Michael Meeks <michael.meeks@suse.com>
+Tested-by: Michael Meeks <michael.meeks@suse.com>
+---
+diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
+index d1a09a7..8fe4774 100644
+--- a/desktop/unx/source/start.c
++++ b/desktop/unx/source/start.c
+@@ -512,6 +512,17 @@ send_args( int fd, rtl_uString *pCwdPath )
+ nLen = rtl_string_getLength( pOut ) + 1;
+ bResult = ( write( fd, rtl_string_getStr( pOut ), nLen ) == (ssize_t) nLen );
+
++ if ( bResult )
++ {
++ char resp[ strlen( "InternalIPC::ProcessingDone" ) ];
++ ssize_t n = read( fd, resp, SAL_N_ELEMENTS( resp ) );
++ bResult = n == (ssize_t) SAL_N_ELEMENTS( resp )
++ && (memcmp(
++ resp, "InternalIPC::ProcessingDone",
++ SAL_N_ELEMENTS( resp ) )
++ == 0);
++ }
++
+ /* cleanup */
+ rtl_uString_release( pEscapedCwdPath );
+ rtl_uString_release( pBuffer );
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/patches/series b/patches/series
index 11403b0..73855fc 100644
--- a/patches/series
+++ b/patches/series
@@ -51,3 +51,4 @@ he-lucida-sans-unicode.diff
ure-no-etc-opt-ure.diff
fix-view-option.diff
odk-link-to-jdk-1.5-docs.diff
+oosplash-wait-for-ProcessingDone.diff
--
LibreOffice packaging repository
Reply to: