[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_4.0.3_rc1-3-15-g6bb0ab2
The following commit has been merged in the master branch:
commit 6bb0ab2b22d0e02a513e69cc55eeeffe776d6cfe
Author: Rene Engelhard <rene@debian.org>
Date: Sat May 4 14:40:55 2013 +0200
remove obsolete file
diff --git a/patches/oosplash-wait-for-ProcessingDone.diff b/patches/oosplash-wait-for-ProcessingDone.diff
deleted file mode 100644
index 40f5a7a..0000000
--- a/patches/oosplash-wait-for-ProcessingDone.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-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
--
LibreOffice packaging repository
Reply to: