[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 2 commits - configure.ac scp2/source solenv/bin

[Tor Lillqvist]

 configure.ac                          |    1 +
 scp2/source/ooo/file_library_ooo.scp  |    2 ++
 solenv/bin/macosx-codesign-app-bundle |    1 -
 3 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 838ebc1da42026f53d0d755bbbbc8c19fe68a861
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Jan 28 23:12:56 2014 +0200

    Don't unintentionally drop a period, and actually simplify
    
    Change-Id: Iaf0f71dd75dcc07438d7ca8fb6bf874496e2f9c1

diff --git a/solenv/bin/macosx-codesign-app-bundle b/solenv/bin/macosx-codesign-app-bundle
index 80a647c..a0423df 100755
--- a/solenv/bin/macosx-codesign-app-bundle
+++ b/solenv/bin/macosx-codesign-app-bundle
@@ -40,7 +40,6 @@ find $APP_BUNDLE \( -name '*.dylib' -or -name '*.dylib.*' -or -name '*.so' \
         -or -name '*.applescript' \) ! -type l | grep -v "LibreOfficePython\.framework" |
 while read dylib; do
     id=`basename "$dylib"`
-    id=`echo $id | sed -e 's/\.dylib.*/dylib/'`
     codesign --verbose --identifier=$MACOSX_BUNDLE_IDENTIFIER.$id --sign "$MACOSX_CODESIGNING_IDENTITY" "$dylib"
 done
 
commit 782f8d5bf2a1cde3a276d6636453153e7306bcc1
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Jan 28 23:05:34 2014 +0200

    No libAppleRemote in the sandboxed case
    
    Change-Id: I995a894593810004ba70e79e87eba6cfcaa0eb80

diff --git a/configure.ac b/configure.ac
index f047e08..9e9f41d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2620,6 +2620,7 @@ if test "$_os" = "Darwin"; then
     elif test -n "$MACOSX_CODESIGNING_IDENTITY" -a "$enable_macosx_sandbox" = yes; then
         ENABLE_MACOSX_SANDBOX=YES
         AC_DEFINE(HAVE_FEATURE_MACOSX_SANDBOX)
+        SCPDEFS="$SCPDEFS -DENABLE_SANDBOX"
         AC_MSG_RESULT([yes])
     else
         AC_MSG_RESULT([no])
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index f353d45..3716a13 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -665,6 +665,7 @@ End
 #endif
 
 #if defined(MACOSX)
+#ifndef ENABLE_SANDBOX
 File gid_File_Lib_AppleRemote
     Name = LIBNAME(AppleRemote);
     LIB_FILE_BODY;
@@ -672,6 +673,7 @@ File gid_File_Lib_AppleRemote
     Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
+#endif
 
 #if defined(MACOSX)
 File gid_File_Lib_Basebmp