[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 3 commits - configure.ac lo.xcent.in

[Tor Lillqvist]

 configure.ac |   15 ++++++++++++++-
 lo.xcent.in  |    9 +--------
 2 files changed, 15 insertions(+), 9 deletions(-)

New commits:
commit ef81d67c15d8981795c4f063d61c77eef6406d94
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Sep 22 00:10:05 2014 +0300

    Bump patch level for new Mac App Store submit attempt
    
    Change-Id: I432ce5afe65c91fb3133a975508724ed00932e2f

diff --git a/configure.ac b/configure.ac
index 6dd799b..fce44a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea.
 
-AC_INIT([LibreOffice],[4.2.10.12],[],[],[https://libreoffice-from-collabora.com/])
+AC_INIT([LibreOffice],[4.2.10.13],[],[],[https://libreoffice-from-collabora.com/])
 
 AC_PREREQ([2.59])
 
commit b0fd980fc6eeaf3043233f17c89bc9abfdb4d36a
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Sep 22 00:07:53 2014 +0300

    The com.apple.application-identifier value should be prefixed with the teamid
    
    Change-Id: I6b58492ba051bb5032870aa47cfacbe3a292e31f

diff --git a/configure.ac b/configure.ac
index 9ba3da3..6dd799b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1231,6 +1231,12 @@ AC_ARG_ENABLE(macosx-sandbox,
          adherence to App Store rules.]),
 ,)
 
+AC_ARG_WITH(macosx-teamid,
+    AS_HELP_STRING([--with-macosx-teamid=<teamid>],
+        [The "team id" to be used for com.apple.application-identifier
+         in the entitlements when building a sandboxed LibreOffice.]),
+,)
+
 AC_ARG_ENABLE(canonical-installation-tree-structure,
     AS_HELP_STRING([--enable-canonical-installation-tree-structure],
         [Make the installation tree structure be more canonical for
@@ -2921,8 +2927,14 @@ if test $_os = Darwin; then
 
     AC_MSG_CHECKING([whether to sandbox the application])
 
+    if test -n "$with_macosx_teamid" -a "$with_macosx_teamid != yes -a "$with_macosx_teamid != no; then
+        MACOSX_TEAMID="$with_macosx_teamid"
+    fi
+
     if test -z "$MACOSX_CODESIGNING_IDENTITY" -a "$enable_macosx_sandbox" = yes; then
         AC_MSG_ERROR([OS X sandboxing requires code signing])
+    elif test -z "$MACOSX_TEAMID" -a "$enable_macosx_sandbox" = yes; then
+        AC_MSG_ERROR([OS X sandboxing requires a team id])
     elif test -n "$ENABLE_JAVA" -a "$enable_macosx_sandbox" = yes; then
         AC_MSG_ERROR([OS X sandboxing (actually App Store rules) disallows use of Java])
     elif test -n "$MACOSX_CODESIGNING_IDENTITY" -a "$enable_macosx_sandbox" = yes; then
@@ -2952,6 +2964,7 @@ AC_SUBST(MACOSX_CODESIGNING_IDENTITY)
 AC_SUBST(MACOSX_PACKAGE_SIGNING_IDENTITY)
 AC_SUBST(ENABLE_MACOSX_SANDBOX)
 AC_SUBST(MACOSX_BUNDLE_IDENTIFIER)
+AC_SUBST(MACOSX_TEAMID)
 AC_SUBST(MACOSX_APP_NAME)
 
 dnl ===================================================================
diff --git a/lo.xcent.in b/lo.xcent.in
index 19802dd..f804daf 100644
--- a/lo.xcent.in
+++ b/lo.xcent.in
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>com.apple.application-identifier</key>
-	<string>@MACOSX_BUNDLE_IDENTIFIER@</string>
+	<string>@MACOSX_TEAMID at .@MACOSX_BUNDLE_IDENTIFIER@</string>
 	<key>com.apple.security.app-sandbox</key>
 	<true/>
 	<key>com.apple.security.files.bookmarks.app-scope</key>
commit a1379c6d2555c77b1b096165ac2aab42808e90a7
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sun Sep 21 23:55:38 2014 +0300

    We don't build the Apple Remote code when sandboxed
    
    So no need for the related entitlements.
    
    Change-Id: I54ba7c0586ee77f30096b50755a9a85bbb7965a5

diff --git a/lo.xcent.in b/lo.xcent.in
index ca636d7..19802dd 100644
--- a/lo.xcent.in
+++ b/lo.xcent.in
@@ -20,13 +20,6 @@
 	<true/>
 	<key>com.apple.security.device.bluetooth</key>
 	<true/>
-	<!-- usb needed for the apple_remote thingie... -->
-	<key>com.apple.security.device.usb</key>
-	<true/>
-	<key>com.apple.security.temporary-exception.apple-events</key>
-	<array>
-		<string>mac.remotecontrols</string>
-	</array>
 	<key>com.apple.security.print</key>
 	<true/>
 </dict>