[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - scp2/source

Tor Lillqvist tml at collabora.com
Mon Jun 9 02:09:33 PDT 2014


 scp2/source/ooo/file_library_ooo.scp |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 2585c1a4bd9ad1ac93151207c471ede1b556a991
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Jun 9 12:01:55 2014 +0300

    We build no avmediaQuickTime library in the sandboxed (i.e. App Store) case
    
    Change-Id: I373e435037279d14bde819ffaa38e510ced9a029

diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 6c27cf2..d0aa641 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -102,10 +102,13 @@ End
 #endif
 
 #ifdef MACOSX
+
+#ifndef ENABLE_MACOSX_SANDBOX
 File gid_File_Lib_avmediaQuickTime
 	PACKED_LIB_FILE_BODY;
 	Name = LIBNAME(avmediaQuickTime);
 End
+#endif
 
 #if MAXOSX_SDK_VERSION >= 1070
 File gid_File_Lib_avmediaMacAVF


More information about the Libreoffice-commits mailing list