[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 2 commits - solenv/bin sysui/desktop

[Tor Lillqvist]

 solenv/bin/macosx-codesign-app-bundle |    2 +-
 sysui/desktop/macosx/Info.plist       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a5f8d1bafafd56db57f85fddaf90d6039a5720be
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sun Feb 23 21:05:34 2014 +0200

    Use different CFBundleSignature than upstream
    
    CFBundleSignature is an obsolete concept anyway, it is fine to use
    '????' apparently.
    
    Change-Id: Ifc16e834739a5d7ee5fc5d99a3e3469f2aafa0ee

diff --git a/sysui/desktop/macosx/Info.plist b/sysui/desktop/macosx/Info.plist
index 9682cb0..6a7bb9a 100755
--- a/sysui/desktop/macosx/Info.plist
+++ b/sysui/desktop/macosx/Info.plist
@@ -1415,7 +1415,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleSignature</key>
-	<string>LibO</string>
+	<string>????</string>
 	<key>LSRequiresCarbon</key>
 	<string>1</string>
 	<key>NSPrincipalClass</key>
commit 568783cb7a93b8f2fcad67ebd32ff4220b05a7e9
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sun Feb 23 21:03:45 2014 +0200

    Include the directory names in the "ids" to make them unique
    
    There are lots of files with the same name, especially in an app
    bundle that includes help in multiple languages.
    
    Change-Id: I66cd2e3c3f22d681d88d02da6fd48ab9651c6f67

diff --git a/solenv/bin/macosx-codesign-app-bundle b/solenv/bin/macosx-codesign-app-bundle
index 48454a3..f01a5cf 100755
--- a/solenv/bin/macosx-codesign-app-bundle
+++ b/solenv/bin/macosx-codesign-app-bundle
@@ -39,7 +39,7 @@ find "$APP_BUNDLE" \( -name '*.dylib' -or -name '*.dylib.*' -or -name '*.so' \
         -or -name '*.jar' -or -name '*.jnilib' -or -name 'LICENSE' -or -name 'LICENSE.html' \
         -or -name '*.applescript' \) ! -type l | grep -v "LibreOfficePython\.framework" |
 while read dylib; do
-    id=`basename "$dylib"`
+    id=`echo ${dylib#${APP_BUNDLE}/Contents/} | sed -e 's,/,.,g'`
     codesign --verbose --identifier=$MACOSX_BUNDLE_IDENTIFIER.$id --sign "$MACOSX_CODESIGNING_IDENTITY" "$dylib"
 done