[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - 5 commits - Makefile.in scp2/source ure/Package_install.mk

[Andras Timar]

 Makefile.in                      |    9 ++++-----
 scp2/source/ooo/common_brand.scp |    2 +-
 scp2/source/ooo/file_ooo.scp     |    4 ++--
 ure/Package_install.mk           |    2 ++
 4 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit 0199dc2d96cae13687032fb162d37f82f67f1871
Author: Andras Timar <andras.timar at collabora.com>
Date:   Sun May 17 11:39:44 2015 +0200

    Don't put symlink to MacOS folder of sandboxed app
    
    Conflicts:
    	ure/Package_install.mk
    
    Change-Id: Ica4cfd3befa67aa1d03140ad2a766dfbb208ec0a
    (cherry picked from commit 1f63dc5ebb0ededd358f97a785559588efd92cf7)

diff --git a/ure/Package_install.mk b/ure/Package_install.mk
index 99801c7..e8b6515 100644
--- a/ure/Package_install.mk
+++ b/ure/Package_install.mk
@@ -14,7 +14,9 @@ $(eval $(call gb_Package_add_file,ure_install,$(LIBO_URE_BIN_FOLDER)/uno,uno))
 endif
 
 ifeq (MACOSX,$(OS))
+ifneq ($(ENABLE_MACOSX_SANDBOX),TRUE)
 $(eval $(call gb_Package_add_symbolic_link,ure_install,MacOS/urelibs,../Frameworks))
 endif
+endif
 
 # vim:set noet sw=4 ts=4:
commit 1255fffbcbe40928b1bf322220e8b4f0a869d2bb
Author: Andras Timar <andras.timar at collabora.com>
Date:   Sun May 17 11:07:14 2015 +0200

    Don't package unoinfo in case of Mac OS X like app structure
    
    Change-Id: I517ed7ac43b0655c7e571e0b9fead32c4f2e7948
    (cherry picked from commit d745e1dfd09a32efaea815ea4ac00059b956849f)

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index a099194..f497c5d 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -512,7 +512,7 @@ File gid_Brand_File_Desktophelper_Txt
 End
 #endif
 
-#if !defined WNT
+#if !defined WNT && !defined MACOSX
 File gid_Brand_File_Bin_Unoinfo
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
commit 6237d6ac5f8c3d02546c9fdd3720719afc98e6a8
Author: Andras Timar <andras.timar at collabora.com>
Date:   Sun May 17 10:59:11 2015 +0200

    Don't package gengal script in App Store case
    
    Conflicts:
    	scp2/source/ooo/file_ooo.scp
    
    Change-Id: Ia7002e5f56cad7efd264baa940ccc350ae5ee08c
    (cherry picked from commit 7680527415f89e6c76101bdb257c27fe9b607b07)

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 05c734c..2de4cfb 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -48,7 +48,7 @@ File gid_File_Basic_User_Standard
     Name = "wizards_basicsrvstandard.filelist";
 End
 
-#if defined UNX
+#if defined UNX && ! defined ENABLE_MACOSX_SANDBOX
 
 File gid_File_Script_Gengal
     BIN_FILE_BODY;
commit e3ccf703a4b7ae3946e9f570d75d4033f8310bc2
Author: Andras Timar <andras.timar at collabora.com>
Date:   Fri May 15 17:05:17 2015 +0200

    shell script in Contents/MacOS is not accepted
    
    (cherry picked from commit 4ecd2dd60d1685255fdf947a7bdfea20eac68e65)

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index ab8daaf..05c734c 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -91,7 +91,7 @@ End
 
 #endif
 
-#if defined UNX
+#if defined UNX && ! defined ENABLE_MACOSX_SANDBOX
 File gid_File_Bin_Senddoc
     BIN_FILE_BODY;
     Dir = FILELIST_DIR;
commit 8d8f6ab952b699756fc9a17f979933b311502770
Author: Andras Timar <andras.timar at collabora.com>
Date:   Mon May 11 22:26:29 2015 +0200

    create empty .lproj directories for languages supported by OS X
    
    The previous solution had problems. InfoPlist.strings were empty,
    because localization has not been working since the CFBundleTypeIconFile
    entries were removed from Info.plist. Icon file basename was the key
    in documents.ulf. So we packages 0 bytes long files. The second problem
    was that we used LibreOffice language codes, and OS X language codes are
    different in some cases. This caused problems such as French strings on
    English UI (e.g. Open/Save dialogs), because the system did not
    recognize en-US.lproj and en-GB.lproj, and fell back to the next one: fr.
    
    Change-Id: I9c502cdf737b497ca2ceef8f3c535ccfea2f6134
    
    Conflicts:
    	Makefile.in
    
    (cherry picked from commit e013f39a3fe928ea22cdde6e0da1c3fe8072c588)

diff --git a/Makefile.in b/Makefile.in
index 1df8ef3..7ceabf3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -304,14 +304,13 @@ ifeq ($(OS_FOR_BUILD),WNT)
 else
 	@$(SRCDIR)/solenv/bin/ooinstall $(TESTINSTALLDIR)
 ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
-# Unzip bin/InfoPlist_*.zip files into corresponding Resources/*.lproj directories.
-	set -x; for F in $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/bin/InfoPlist_*.zip; do \
-		bn=`basename $$F .zip`; \
-		lang=$${bn#InfoPlist_}; \
+#
+# Create Resources/*.lproj directories for languages supported by OS X
+	set -x; for lang in ca cs da de el en es fi fr hr hu id it ja ko ms nl no pl pt pt_PT ro ru sk sv th tr uk vi zh_CN zh_TW; do \
 		lproj=$(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/Resources/$$lang.lproj; \
 		mkdir $$lproj; \
-		(cd $$lproj; unzip $$F); \
 	done
+#
 # And remove the "bin" folder which should not be there
 	rm -rf $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/bin
 	@$(SRCDIR)/solenv/bin/macosx-codesign-app-bundle $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app