[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.4_dfsg-4-71-g340ceba
The following commit has been merged in the debian-experimental-3.5 branch:
commit 340cebaa5d9359482e15c37718cd07eac7f06b68
Author: Rene Engelhard <rene@debian.org>
Date: Sun Apr 7 15:29:37 2013 +0200
backport #681185 fix from 3.6
diff --git a/changelog b/changelog
index 6a0d674..3edcff1 100644
--- a/changelog
+++ b/changelog
@@ -7,12 +7,13 @@ libreoffice (1:3.5.7-1) UNRELEASED; urgency=low
lib/servlet.jar..
* debian/patches/fix-internal-hsqldb-build.diff: ... and fix internal
hsqldb build to use /usr/share/java/servlet-api-2.5.jar
-
* debian/patches/poppler_0_2*.diff: fix build of sdext with poppler
0.21.x and fix the test with 0.20.x, thanks Pino Toscano
* debian/patches/odk-link-to-jdk-1.5-docs.diff: link to
http://java.sun.com/j2se/1.5/docs/api instead of /1.4.1/ as the former
doesn't exist anymore
+ * debian/patches/oosplash-wait-for-ProcessingDone.diff: backport from 3.6;
+ make oosplash wait for InternalIPC::ProcessingDone (closes: #681185)
* debian/rules:
- use generic python3.pc in default case instead of pythonX.Y.pc.
@@ -37,7 +38,7 @@ libreoffice (1:3.5.7-1) UNRELEASED; urgency=low
* debian/libreoffice-{core,gtk3}.bug-script.in:
- find out whether we have Experimental features enabled
- -- Rene Engelhard <rene@debian.org> Sat, 24 Nov 2012 18:31:33 +0100
+ -- Rene Engelhard <rene@debian.org> Thu, 21 Mar 2013 19:43:18 +0100
libreoffice (1:3.5.4+dfsg2-1) UNRELEASED; urgency=low
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 44ecbc3..36343e9 100644
--- a/patches/series
+++ b/patches/series
@@ -42,3 +42,4 @@ poppler_0_21_x.diff
fix-view-option.diff
odk-link-to-jdk-1.5-docs.diff
fix-internal-hsqldb-build.diff
+oosplash-wait-for-ProcessingDone.diff
--
LibreOffice packaging repository
Reply to: